Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mixin package refactor #247

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ usesMixins = true
# Adds some debug arguments like verbose output and export
usesMixinDebug = true
# Specify the location of your implementation of IMixinPlugin. Leave it empty otherwise.
mixinPlugin =
mixinPlugin =
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
mixinsPackage = mixins
mixinsPackage = mixin.mixins
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
# This parameter is for legacy compatability only
# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import com.gtnewhorizon.gtnhmixins.ILateMixinLoader;
import com.gtnewhorizon.gtnhmixins.LateMixin;
import com.mitchej123.hodgepodge.mixins.Mixins;
import com.mitchej123.hodgepodge.mixin.Mixins;

@LateMixin
public class HodgepodgeLateMixins implements ILateMixinLoader {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.client.event.EntityViewRenderEvent;

import com.mitchej123.hodgepodge.mixins.late.biomesoplenty.AccessorFogHandler;
import com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty.AccessorFogHandler;

import biomesoplenty.client.fog.FogHandler;
import biomesoplenty.client.fog.IBiomeFog;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
import com.mitchej123.hodgepodge.Common;
import com.mitchej123.hodgepodge.mixins.Mixins;
import com.mitchej123.hodgepodge.mixin.Mixins;

import cpw.mods.fml.relauncher.IFMLLoadingPlugin;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins;
package com.mitchej123.hodgepodge.mixin;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins;
package com.mitchej123.hodgepodge.mixin;

public enum TargetedMod {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.mitchej123.hodgepodge.common;
package com.mitchej123.hodgepodge.mixin.ducks;

import net.minecraft.world.World;

public interface BlockInvoker_FixXray {
public interface BlockDuck_FixXray {

boolean hodgepodge$shouldRayTraceStopOnBlock(World worldIn, int x, int y, int z);
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.common;
package com.mitchej123.hodgepodge.mixin.ducks;

public interface KeyBindingDuck {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.mitchej123.hodgepodge.common;
package com.mitchej123.hodgepodge.mixin.hooks;

import java.util.ArrayList;

import net.minecraft.nbt.NBTTagList;

import thaumcraft.common.entities.golems.Marker;

public class ThaumcraftMixinMethods {
public class ThaumcraftHook {

public static ArrayList<Marker> overwriteMarkersDimID(NBTTagList nbtTagList, ArrayList<Marker> markers) {
for (int i = 0; i < nbtTagList.tagCount(); i++) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.cofhcore;
package com.mitchej123.hodgepodge.mixin.mixins.early.cofhcore;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.cofhcore;
package com.mitchej123.hodgepodge.mixin.mixins.early.cofhcore;

import org.lwjgl.input.Keyboard;
import org.spongepowered.asm.mixin.Mixin;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.forge;
package com.mitchej123.hodgepodge.mixin.mixins.early.forge;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.forge;
package com.mitchej123.hodgepodge.mixin.mixins.early.forge;

import java.io.File;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.forge;
package com.mitchej123.hodgepodge.mixin.mixins.early.forge;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.forge;
package com.mitchej123.hodgepodge.mixin.mixins.early.forge;

import java.net.MalformedURLException;
import java.net.URL;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.forge;
package com.mitchej123.hodgepodge.mixin.mixins.early.forge;

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiIngame;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.forge;
package com.mitchej123.hodgepodge.mixin.mixins.early.forge;

import static org.objectweb.asm.Opcodes.PUTFIELD;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import net.minecraft.world.World;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import net.minecraft.world.World;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import net.minecraft.world.World;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import net.minecraftforge.fluids.FluidStack;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import net.minecraft.entity.player.EntityPlayer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import java.lang.ref.WeakReference;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2;

import net.minecraft.block.Block;
import net.minecraft.world.World;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.ic2.textures;
package com.mitchej123.hodgepodge.mixin.mixins.early.ic2.textures;

import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.gui.FontRenderer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.entity.AbstractClientPlayer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.block.BlockBed;
import net.minecraft.entity.player.EntityPlayer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.block.Block;
import net.minecraft.block.BlockFence;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.Random;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.ArrayList;
import java.util.EnumMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.block.Block;
import net.minecraft.util.AxisAlignedBB;
Expand All @@ -7,10 +7,10 @@
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

import com.mitchej123.hodgepodge.common.BlockInvoker_FixXray;
import com.mitchej123.hodgepodge.mixin.ducks.BlockDuck_FixXray;

@Mixin(Block.class)
public abstract class MixinBlock_FixXray implements BlockInvoker_FixXray {
public abstract class MixinBlock_FixXray implements BlockDuck_FixXray {

@Shadow
public abstract AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y, int z);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.util.ChunkCoordinates;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.Arrays;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.particle.EffectRenderer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.enchantment.Enchantment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.entity.Entity;
import net.minecraft.entity.projectile.EntityFireball;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.entity.EntityLivingBase;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.ConcurrentModificationException;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import static org.objectweb.asm.Opcodes.PUTFIELD;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.entity.EntityLiving;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.Collection;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.EntityRenderer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.renderer.EntityRenderer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.gui.FontRenderer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.net.URI;
import java.net.URISyntaxException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.settings.GameSettings;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.settings.GameSettings;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.gui.GuiGameOver;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;
package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft;

import net.minecraft.client.gui.GuiNewChat;

Expand Down
Loading