Refactor of packages

68 files changed, 2714 insertions, 2583 deletions

diff --git a/src/main/java/com/github/technus/tectech/CustomItemList.java b/src/main/java/com/github/technus/tectech/CustomItemList.java
index 65bdba09b7..5b3c2fd350 100644
--- a/src/main/java/com/github/technus/tectech/CustomItemList.java
+++ b/src/main/java/com/github/technus/tectech/CustomItemList.java
@@ -10,144 +10,152 @@ import net.minecraft.item.ItemStack;
 
 import static gregtech.api.enums.GT_Values.W;
 
-public enum CustomItemList implements IItemContainer
-{
-	EMpipe,
-	eM_dynamomulti4_UV,eM_dynamomulti16_UV,eM_dynamomulti64_UV,
-	eM_dynamomulti4_UHV,eM_dynamomulti16_UHV,eM_dynamomulti64_UHV,
-	eM_dynamomulti4_UEV,eM_dynamomulti16_UEV,eM_dynamomulti64_UEV,
-	eM_dynamomulti4_UIV,eM_dynamomulti16_UIV,eM_dynamomulti64_UIV,
-	eM_dynamomulti4_UMV,eM_dynamomulti16_UMV,eM_dynamomulti64_UMV,
-	eM_dynamomulti4_UXV,eM_dynamomulti16_UXV,eM_dynamomulti64_UXV,
-	eM_energymulti4_UV,eM_energymulti16_UV,eM_energymulti64_UV,
-	eM_energymulti4_UHV,eM_energymulti16_UHV,eM_energymulti64_UHV,
-	eM_energymulti4_UEV,eM_energymulti16_UEV,eM_energymulti64_UEV,
-	eM_energymulti4_UIV,eM_energymulti16_UIV,eM_energymulti64_UIV,
-	eM_energymulti4_UMV,eM_energymulti16_UMV,eM_energymulti64_UMV,
-	eM_energymulti4_UXV,eM_energymulti16_UXV,eM_energymulti64_UXV,
-	eM_in_UV,eM_in_UHV,eM_in_UEV,eM_in_UIV,eM_in_UMV,eM_in_UXV,
-	eM_out_UV,eM_out_UHV,eM_out_UEV,eM_out_UIV,eM_out_UMV,eM_out_UXV,
-	eM_muffler_UV,eM_muffler_UHV,eM_muffler_UEV,eM_muffler_UIV,eM_muffler_UMV,eM_muffler_UXV,
-	Parametrizer_Hatch,Uncertainty_Hatch,UncertaintyX_Hatch,
-	eM_Casing,eM_Field,eM_Field_Casing,eM_Coil,eM_Tele,eM_TimeSpaceWarp,
-	debugBlock,
-	Machine_Multi_MatterToEM,Machine_Multi_EMToMatter,Machine_Multi_EMjunction,
-	Machine_Multi_Transformer,Machine_Multi_Computer,
-	Machine_Multi_BHG,Machine_Multi_EMmachine,Machine_Multi_Collider,Machine_Multi_Wormhole,Machine_Multi_EMCrafter,Machine_Multi_Scanner;
-
-
-	private ItemStack mStack = null;
-	private boolean mHasNotBeenSet = true;
-
-	//public static Fluid sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas;
-
-	@Override
-	public IItemContainer set(Item aItem) {
-		mHasNotBeenSet = false;
-		if (aItem == null) return this;
-		ItemStack aStack = new ItemStack(aItem, 1, 0);
-		mStack = GT_Utility.copyAmount(1, aStack);
-		return this;
-	}
-
-	@Override
-	public IItemContainer set(ItemStack aStack) {
-		mHasNotBeenSet = false;
-		mStack = GT_Utility.copyAmount(1, aStack);
-		return this;
-	}
-
-	@Override
-	public Item getItem() {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return null;
-		return mStack.getItem();
-	}
-
-	@Override
-	public Block getBlock() {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		return GT_Utility.getBlockFromStack(getItem());
-	}
-
-	@Override
-	public final boolean hasBeenSet() {
-		return !mHasNotBeenSet;
-	}
-
-	@Override
-	public boolean isStackEqual(Object aStack) {
-		return isStackEqual(aStack, false, false);
-	}
-
-	@Override
-	public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) {
-		if (GT_Utility.isStackInvalid(aStack)) return false;
-		return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT);
-	}
-
-	@Override
-	public ItemStack get(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack));
-	}
-
-	@Override
-	public ItemStack getWildcard(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack));
-	}
-
-	@Override
-	public ItemStack getUndamaged(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack));
-	}
-
-	@Override
-	public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(mStack));
-	}
-
-	@Override
-	public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements) {
-		ItemStack rStack = get(1, aReplacements);
-		if (GT_Utility.isStackInvalid(rStack)) return null;
-		rStack.setStackDisplayName(aDisplayName);
-		return GT_Utility.copyAmount(aAmount, rStack);
-	}
-
-	@Override
-	public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements) {
-		ItemStack rStack = get(1, aReplacements);
-		if (GT_Utility.isStackInvalid(rStack)) return null;
-		GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
-		return GT_Utility.copyAmount(aAmount, rStack);
-	}
-
-	@Override
-	public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack));
-	}
-
-	@Override
-	public IItemContainer registerOre(Object... aOreNames) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, get(1));
-		return this;
-	}
-
-	@Override
-	public IItemContainer registerWildcardAsOre(Object... aOreNames) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, getWildcard(1));
-		return this;
-	}
+public enum CustomItemList implements IItemContainer {
+    EMpipe,
+    eM_dynamomulti4_UV, eM_dynamomulti16_UV, eM_dynamomulti64_UV,
+    eM_dynamomulti4_UHV, eM_dynamomulti16_UHV, eM_dynamomulti64_UHV,
+    eM_dynamomulti4_UEV, eM_dynamomulti16_UEV, eM_dynamomulti64_UEV,
+    eM_dynamomulti4_UIV, eM_dynamomulti16_UIV, eM_dynamomulti64_UIV,
+    eM_dynamomulti4_UMV, eM_dynamomulti16_UMV, eM_dynamomulti64_UMV,
+    eM_dynamomulti4_UXV, eM_dynamomulti16_UXV, eM_dynamomulti64_UXV,
+    eM_energymulti4_UV, eM_energymulti16_UV, eM_energymulti64_UV,
+    eM_energymulti4_UHV, eM_energymulti16_UHV, eM_energymulti64_UHV,
+    eM_energymulti4_UEV, eM_energymulti16_UEV, eM_energymulti64_UEV,
+    eM_energymulti4_UIV, eM_energymulti16_UIV, eM_energymulti64_UIV,
+    eM_energymulti4_UMV, eM_energymulti16_UMV, eM_energymulti64_UMV,
+    eM_energymulti4_UXV, eM_energymulti16_UXV, eM_energymulti64_UXV,
+    eM_in_UV, eM_in_UHV, eM_in_UEV, eM_in_UIV, eM_in_UMV, eM_in_UXV,
+    eM_out_UV, eM_out_UHV, eM_out_UEV, eM_out_UIV, eM_out_UMV, eM_out_UXV,
+    eM_muffler_UV, eM_muffler_UHV, eM_muffler_UEV, eM_muffler_UIV, eM_muffler_UMV, eM_muffler_UXV,
+    Parametrizer_Hatch, Uncertainty_Hatch, UncertaintyX_Hatch,
+    eM_Casing, eM_Field, eM_Field_Casing, eM_Coil, eM_Tele, eM_TimeSpaceWarp,
+    debugBlock,
+    Machine_Multi_MatterToEM, Machine_Multi_EMToMatter, Machine_Multi_EMjunction,
+    Machine_Multi_Transformer, Machine_Multi_Computer,
+    Machine_Multi_BHG, Machine_Multi_EMmachine, Machine_Multi_Collider, Machine_Multi_Wormhole, Machine_Multi_EMCrafter, Machine_Multi_Scanner;
+
+
+    private ItemStack mStack = null;
+    private boolean mHasNotBeenSet = true;
+
+    //public static Fluid sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas;
+
+    @Override
+    public IItemContainer set(Item aItem) {
+        mHasNotBeenSet = false;
+        if (aItem == null) return this;
+        ItemStack aStack = new ItemStack(aItem, 1, 0);
+        mStack = GT_Utility.copyAmount(1, aStack);
+        return this;
+    }
+
+    @Override
+    public IItemContainer set(ItemStack aStack) {
+        mHasNotBeenSet = false;
+        mStack = GT_Utility.copyAmount(1, aStack);
+        return this;
+    }
+
+    @Override
+    public Item getItem() {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return null;
+        return mStack.getItem();
+    }
+
+    @Override
+    public Block getBlock() {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        return GT_Utility.getBlockFromStack(getItem());
+    }
+
+    @Override
+    public final boolean hasBeenSet() {
+        return !mHasNotBeenSet;
+    }
+
+    @Override
+    public boolean isStackEqual(Object aStack) {
+        return isStackEqual(aStack, false, false);
+    }
+
+    @Override
+    public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) {
+        if (GT_Utility.isStackInvalid(aStack)) return false;
+        return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT);
+    }
+
+    @Override
+    public ItemStack get(long aAmount, Object... aReplacements) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
+        return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack));
+    }
+
+    @Override
+    public ItemStack getWildcard(long aAmount, Object... aReplacements) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
+        return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack));
+    }
+
+    @Override
+    public ItemStack getUndamaged(long aAmount, Object... aReplacements) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
+        return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack));
+    }
+
+    @Override
+    public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) {
+        if (mHasNotBeenSet)<