From c9863b6044bf9d15dc152ee4782d728e5ef81097 Mon Sep 17 00:00:00 2001 From: Technus Date: Wed, 15 Mar 2017 19:19:35 +0100 Subject: Refactor of packages --- .../com/github/technus/tectech/CustomItemList.java | 288 ++-- .../github/technus/tectech/GT_CustomLoader.java | 37 +- .../github/technus/tectech/GT_Loader_Machines.java | 140 +- .../github/technus/tectech/GT_Loader_Recipes.java | 4 +- .../java/com/github/technus/tectech/TecTech.java | 185 +-- src/main/java/com/github/technus/tectech/XSTR.java | 32 +- .../technus/tectech/auxiliary/Reference.java | 13 +- .../technus/tectech/auxiliary/TecTechConfig.java | 60 +- .../technus/tectech/blocks/QuantumGlass.java | 86 -- .../technus/tectech/blocks/QuantumGlassRender.java | 121 -- .../technus/tectech/casing/GT_Block_CasingsTT.java | 114 -- .../tectech/casing/GT_Container_CasingsTT.java | 10 - .../technus/tectech/casing/GT_Item_CasingsTT.java | 14 - .../tectech/casing/GT_Loader_CasingsTT.java | 10 - .../Behaviour_elementalMatterContainer.java | 18 +- .../elementalMatter/classes/cElementalDecay.java | 28 +- .../classes/cElementalDefinition.java | 38 +- .../classes/cElementalDefinitionStack.java | 32 +- .../classes/cElementalDefinitionStackTree.java | 273 ++-- .../classes/cElementalInstanceStack.java | 55 +- .../classes/cElementalInstanceStackTree.java | 335 ++--- .../classes/cElementalPrimitive.java | 21 +- .../elementalMatter/classes/rElementalRecipe.java | 16 +- .../classes/rElementalRecipeTree.java | 44 +- .../tectech/elementalMatter/commonValues.java | 26 +- .../definitions/cPrimitiveDefinition.java | 18 +- .../definitions/dAtomDefinition.java | 329 ++--- .../definitions/dHadronDefinition.java | 66 +- .../definitions/eBosonDefinition.java | 12 +- .../definitions/eLeptonDefinition.java | 24 +- .../definitions/eNeutrinoDefinition.java | 20 +- .../definitions/eQuarkDefinition.java | 28 +- .../gui/GT_Container_MultiMachineEM.java | 96 -- .../elementalMatter/gui/GT_Container_Param.java | 205 --- .../gui/GT_Container_Uncertainty.java | 121 -- .../gui/GT_GUIContainer_MultiMachineEM.java | 183 --- .../elementalMatter/gui/GT_GUIContainer_Param.java | 37 - .../gui/GT_GUIContainer_Uncertainty.java | 106 -- .../gui/GT_GUIContainer_UncertaintyAdv.java | 115 -- .../interfaces/iElementalInstanceContainer.java | 1 + .../interfaces/iHasElementalDefinition.java | 1 + .../machine/GT_MetaTileEntity_Computer.java | 50 - .../machine/GT_MetaTileEntity_EMbhg.java | 94 -- .../machine/GT_MetaTileEntity_EMcollider.java | 73 - .../machine/GT_MetaTileEntity_EMcrafter.java | 50 - .../machine/GT_MetaTileEntity_EMdequantifier.java | 65 - .../machine/GT_MetaTileEntity_EMjunction.java | 118 -- .../machine/GT_MetaTileEntity_EMmachine.java | 50 - .../machine/GT_MetaTileEntity_EMpipe.java | 162 --- .../machine/GT_MetaTileEntity_EMquantifier.java | 388 ------ .../machine/GT_MetaTileEntity_EMscanner.java | 50 - .../machine/GT_MetaTileEntity_EMtransformer.java | 108 -- .../machine/GT_MetaTileEntity_EMwormhole.java | 73 - .../GT_MetaTileEntity_Hatch_DynamoMulti.java | 113 -- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 240 ---- .../GT_MetaTileEntity_Hatch_EnergyMulti.java | 114 -- .../GT_MetaTileEntity_Hatch_InputElemental.java | 43 - .../GT_MetaTileEntity_Hatch_MufflerElemental.java | 171 --- .../GT_MetaTileEntity_Hatch_OutputElemental.java | 70 - .../machine/GT_MetaTileEntity_Hatch_Param.java | 182 --- .../GT_MetaTileEntity_Hatch_Uncertainty.java | 288 ---- ...GT_MetaTileEntity_MultiblockBase_Elemental.java | 1391 ------------------- .../github/technus/tectech/proxy/ClientProxy.java | 102 +- .../github/technus/tectech/proxy/CommonProxy.java | 43 +- .../technus/tectech/things/block/QuantumGlass.java | 83 ++ .../tectech/things/block/QuantumGlassRender.java | 122 ++ .../tectech/things/casing/GT_Block_CasingsTT.java | 114 ++ .../things/casing/GT_Container_CasingsTT.java | 10 + .../tectech/things/casing/GT_Item_CasingsTT.java | 14 + .../tectech/things/casing/GT_Loader_CasingsTT.java | 10 + .../github/technus/tectech/things/machineTT.java | 7 + ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 249 ++++ .../GT_MetaTileEntity_MultiblockBase_EM.java | 1410 ++++++++++++++++++++ .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 114 ++ .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 115 ++ .../GT_MetaTileEntity_Hatch_InputElemental.java | 44 + .../GT_MetaTileEntity_Hatch_MufflerElemental.java | 173 +++ .../GT_MetaTileEntity_Hatch_OutputElemental.java | 70 + .../hatch/GT_MetaTileEntity_Hatch_Param.java | 183 +++ .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java | 297 +++++ .../hatch/gui/GT_Container_Param.java | 208 +++ .../hatch/gui/GT_Container_Uncertainty.java | 121 ++ .../hatch/gui/GT_GUIContainer_Param.java | 37 + .../hatch/gui/GT_GUIContainer_Uncertainty.java | 109 ++ .../hatch/gui/GT_GUIContainer_UncertaintyAdv.java | 117 ++ .../multi/GT_MetaTileEntity_EM_bhg.java | 94 ++ .../multi/GT_MetaTileEntity_EM_collider.java | 73 + .../multi/GT_MetaTileEntity_EM_computer.java | 50 + .../multi/GT_MetaTileEntity_EM_crafter.java | 50 + .../multi/GT_MetaTileEntity_EM_dequantifier.java | 65 + .../multi/GT_MetaTileEntity_EM_junction.java | 118 ++ .../multi/GT_MetaTileEntity_EM_machine.java | 50 + .../multi/GT_MetaTileEntity_EM_quantifier.java | 388 ++++++ .../multi/GT_MetaTileEntity_EM_scanner.java | 50 + .../multi/GT_MetaTileEntity_EM_transformer.java | 109 ++ .../multi/GT_MetaTileEntity_EM_wormhole.java | 73 + .../multi/gui/GT_Container_MultiMachineEM.java | 100 ++ .../multi/gui/GT_GUIContainer_MultiMachineEM.java | 185 +++ .../pipe/GT_MetaTileEntity_Pipe_EM.java | 165 +++ 99 files changed, 6354 insertions(+), 6223 deletions(-) delete mode 100644 src/main/java/com/github/technus/tectech/blocks/QuantumGlass.java delete mode 100644 src/main/java/com/github/technus/tectech/blocks/QuantumGlassRender.java delete mode 100644 src/main/java/com/github/technus/tectech/casing/GT_Block_CasingsTT.java delete mode 100644 src/main/java/com/github/technus/tectech/casing/GT_Container_CasingsTT.java delete mode 100644 src/main/java/com/github/technus/tectech/casing/GT_Item_CasingsTT.java delete mode 100644 src/main/java/com/github/technus/tectech/casing/GT_Loader_CasingsTT.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_Container_MultiMachineEM.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_Container_Param.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_Container_Uncertainty.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_GUIContainer_MultiMachineEM.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_GUIContainer_Param.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_GUIContainer_Uncertainty.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/gui/GT_GUIContainer_UncertaintyAdv.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Computer.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMbhg.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMcollider.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMcrafter.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMdequantifier.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMmachine.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMpipe.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMquantifier.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMscanner.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMtransformer.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMwormhole.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_DynamoMulti.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_EnergyMulti.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_InputElemental.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_MufflerElemental.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_OutputElemental.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_Param.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_Uncertainty.java delete mode 100644 src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java create mode 100644 src/main/java/com/github/technus/tectech/things/block/QuantumGlass.java create mode 100644 src/main/java/com/github/technus/tectech/things/block/QuantumGlassRender.java create mode 100644 src/main/java/com/github/technus/tectech/things/casing/GT_Block_CasingsTT.java create mode 100644 src/main/java/com/github/technus/tectech/things/casing/GT_Container_CasingsTT.java create mode 100644 src/main/java/com/github/technus/tectech/things/casing/GT_Item_CasingsTT.java create mode 100644 src/main/java/com/github/technus/tectech/things/casing/GT_Loader_CasingsTT.java create mode 100644 src/main/java/com/github/technus/tectech/things/machineTT.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/GT_MetaTileEntity_Hatch_ElementalContainer.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/GT_MetaTileEntity_MultiblockBase_EM.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_Container_Param.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_Uncertainty.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantifier.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_quantifier.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/gui/GT_Container_MultiMachineEM.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java create mode 100644 src/main/java/com/github/technus/tectech/things/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java (limited to 'src/main/java/com') 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) + 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; + } } \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/GT_CustomLoader.java b/src/main/java/com/github/technus/tectech/GT_CustomLoader.java index 8026b4b6e2..196b97c074 100644 --- a/src/main/java/com/github/technus/tectech/GT_CustomLoader.java +++ b/src/main/java/com/github/technus/tectech/GT_CustomLoader.java @@ -1,26 +1,27 @@ package com.github.technus.tectech; -import com.github.technus.tectech.casing.GT_Loader_CasingsTT; +import com.github.technus.tectech.things.casing.GT_Loader_CasingsTT; public class GT_CustomLoader { - private GT_Loader_Machines ElementalLoader; - private GT_Loader_CasingsTT ElementalCasing; - private GT_Loader_Recipes ElementalRecipes; + private GT_Loader_Machines ElementalLoader; + private GT_Loader_CasingsTT ElementalCasing; + private GT_Loader_Recipes ElementalRecipes; - public GT_CustomLoader() {} + public GT_CustomLoader() { + } - public void run() { - ElementalCasing = new GT_Loader_CasingsTT(); - ElementalCasing.run(); - TecTech.Logger.info("Casing Init Done"); - ElementalLoader = new GT_Loader_Machines(); - ElementalLoader.run(); - TecTech.Logger.info("Machine Init Done"); - } + public void run() { + ElementalCasing = new GT_Loader_CasingsTT(); + ElementalCasing.run(); + TecTech.Logger.info("Casing Init Done"); + ElementalLoader = new GT_Loader_Machines(); + ElementalLoader.run(); + TecTech.Logger.info("Machine Init Done"); + } - public void run2() { - ElementalRecipes = new GT_Loader_Recipes(); - ElementalRecipes.run(); - TecTech.Logger.info("Recipe Init Done Done"); - } + public void run2() { + ElementalRecipes = new GT_Loader_Recipes(); + ElementalRecipes.run(); + TecTech.Logger.info("Recipe Init Done Done"); + } } diff --git a/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java b/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java index f11da31d19..1364498063 100644 --- a/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java +++ b/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java @@ -1,7 +1,5 @@ package com.github.technus.tectech; -import com.github.technus.tectech.elementalMatter.machine.*; - /** * Created by danie_000 on 16.11.2016. */ @@ -12,112 +10,112 @@ public class GT_Loader_Machines implements Runnable { // =================================================================================================== CustomItemList.eM_in_UV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 12070, "hatch.emin.tier.08", "UV Elemental Input Hatch",8).getStackForm(1L)); + 12070, "hatch.emin.tier.08", "UV Elemental Input Hatch", 8).getStackForm(1L)); CustomItemList.eM_in_UHV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 12071, "hatch.emin.tier.09", "UHV Elemental Input Hatch",9).getStackForm(1L)); + 12071, "hatch.emin.tier.09", "UHV Elemental Input Hatch", 9).getStackForm(1L)); CustomItemList.eM_in_UEV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 12072, "hatch.emin.tier.10", "UEV Elemental Input Hatch",10).getStackForm(1L)); + 12072, "hatch.emin.tier.10", "UEV Elemental Input Hatch", 10).getStackForm(1L)); CustomItemList.eM_in_UIV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 12073, "hatch.emin.tier.11", "UIV Elemental Input Hatch",11).getStackForm(1L)); + 12073, "hatch.emin.tier.11", "UIV Elemental Input Hatch", 11).getStackForm(1L)); CustomItemList.eM_in_UMV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 12074, "hatch.emin.tier.12", "UMV Elemental Input Hatch",12).getStackForm(1L)); + 12074, "hatch.emin.tier.12", "UMV Elemental Input Hatch", 12).getStackForm(1L)); CustomItemList.eM_in_UXV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 12075, "hatch.emin.tier.13", "UXV Elemental Input Hatch",13).getStackForm(1L)); + 12075, "hatch.emin.tier.13", "UXV Elemental Input Hatch", 13).getStackForm(1L)); // =================================================================================================== // eM OUT // =================================================================================================== CustomItemList.eM_out_UV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 12080, "hatch.emout.tier.08", "UV Elemental Output Hatch",8).getStackForm(1L)); + 12080, "hatch.emout.tier.08", "UV Elemental Output Hatch", 8).getStackForm(1L)); CustomItemList.eM_out_UHV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 12081, "hatch.emout.tier.09", "UHV Elemental Output Hatch",9).getStackForm(1L)); + 12081, "hatch.emout.tier.09", "UHV Elemental Output Hatch", 9).getStackForm(1L)); CustomItemList.eM_out_UEV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 12082, "hatch.emout.tier.10", "UEV Elemental Output Hatch",10).getStackForm(1L)); + 12082, "hatch.emout.tier.10", "UEV Elemental Output Hatch", 10).getStackForm(1L)); CustomItemList.eM_out_UIV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 12083, "hatch.emout.tier.11", "UIV Elemental Output Hatch",11).getStackForm(1L)); + 12083, "hatch.emout.tier.11", "UIV Elemental Output Hatch", 11).getStackForm(1L)); CustomItemList.eM_out_UMV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 12084, "hatch.emout.tier.12", "UMV Elemental Output Hatch",12).getStackForm(1L)); + 12084, "hatch.emout.tier.12", "UMV Elemental Output Hatch", 12).getStackForm(1L)); CustomItemList.eM_out_UXV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 12085, "hatch.emout.tier.13", "UXV Elemental Output Hatch",13).getStackForm(1L)); + 12085, "hatch.emout.tier.13", "UXV Elemental Output Hatch", 13).getStackForm(1L)); // =================================================================================================== // eM Waste OUT // =================================================================================================== CustomItemList.eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_MufflerElemental( - 12090, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch",8,1e10f).getStackForm(1L)); + 12090, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f).getStackForm(1L)); CustomItemList.eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_MufflerElemental( - 12091, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch",9,5e10f).getStackForm(1L)); + 12091, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f).getStackForm(1L)); CustomItemList.eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_MufflerElemental( - 12092, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch",10,25e10f).getStackForm(1L)); + 12092, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f).getStackForm(1L)); CustomItemList.eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_MufflerElemental( - 12093, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch",11,125e10f).getStackForm(1L)); + 12093, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f).getStackForm(1L)); CustomItemList.eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_MufflerElemental( - 12094, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch",12,125e11f).getStackForm(1L)); + 12094, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f).getStackForm(1L)); CustomItemList.eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_MufflerElemental( - 12095, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch",13,125e12f).getStackForm(1L)); + 12095, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f).getStackForm(1L)); // =================================================================================================== // Multi AMP Power INPUTS // =================================================================================================== CustomItemList.eM_energymulti4_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12100, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch",8,4).getStackForm(1L)); + 12100, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch", 8, 4).getStackForm(1L)); CustomItemList.eM_energymulti16_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12110, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch",8,16).getStackForm(1L)); + 12110, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch", 8, 16).getStackForm(1L)); CustomItemList.eM_energymulti64_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12120, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch",8,64).getStackForm(1L)); + 12120, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch", 8, 64).getStackForm(1L)); CustomItemList.eM_energymulti4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12101, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch",9,4).getStackForm(1L)); + 12101, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch", 9, 4).getStackForm(1L)); CustomItemList.eM_energymulti16_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12111, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch",9,16).getStackForm(1L)); + 12111, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch", 9, 16).getStackForm(1L)); CustomItemList.eM_energymulti64_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12121, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch",9,64).getStackForm(1L)); + 12121, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch", 9, 64).getStackForm(1L)); CustomItemList.eM_energymulti4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12102, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch",10,4).getStackForm(1L)); + 12102, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch", 10, 4).getStackForm(1L)); CustomItemList.eM_energymulti16_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12112, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch",10,16).getStackForm(1L)); + 12112, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch", 10, 16).getStackForm(1L)); CustomItemList.eM_energymulti64_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12122, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch",10,64).getStackForm(1L)); + 12122, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch", 10, 64).getStackForm(1L)); CustomItemList.eM_energymulti4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12103, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch",11,4).getStackForm(1L)); + 12103, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch", 11, 4).getStackForm(1L)); CustomItemList.eM_energymulti16_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12113, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch",11,16).getStackForm(1L)); + 12113, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch", 11, 16).getStackForm(1L)); CustomItemList.eM_energymulti64_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12123, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch",11,64).getStackForm(1L)); + 12123, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch", 11, 64).getStackForm(1L)); CustomItemList.eM_energymulti4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12104, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch",12,4).getStackForm(1L)); + 12104, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch", 12, 4).getStackForm(1L)); CustomItemList.eM_energymulti16_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12114, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch",12,16).getStackForm(1L)); + 12114, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch", 12, 16).getStackForm(1L)); CustomItemList.eM_energymulti64_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12124, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch",12,64).getStackForm(1L)); + 12124, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch", 12, 64).getStackForm(1L)); CustomItemList.eM_energymulti4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12105, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch",13,4).getStackForm(1L)); + 12105, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch", 13, 4).getStackForm(1L)); CustomItemList.eM_energymulti16_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12115, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch",13,16).getStackForm(1L)); + 12115, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch", 13, 16).getStackForm(1L)); CustomItemList.eM_energymulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 12125, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch",13,64).getStackForm(1L)); + 12125, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L)); // =================================================================================================== @@ -125,73 +123,73 @@ public class GT_Loader_Machines implements Runnable { // =================================================================================================== CustomItemList.eM_dynamomulti4_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12130, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch",8,4).getStackForm(1L)); + 12130, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch", 8, 4).getStackForm(1L)); CustomItemList.eM_dynamomulti16_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12140, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch",8,16).getStackForm(1L)); + 12140, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch", 8, 16).getStackForm(1L)); CustomItemList.eM_dynamomulti64_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12150, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch",8,64).getStackForm(1L)); + 12150, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch", 8, 64).getStackForm(1L)); CustomItemList.eM_dynamomulti4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12131, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch",9,4).getStackForm(1L)); + 12131, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch", 9, 4).getStackForm(1L)); CustomItemList.eM_dynamomulti16_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12141, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch",9,16).getStackForm(1L)); + 12141, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch", 9, 16).getStackForm(1L)); CustomItemList.eM_dynamomulti64_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12151, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch",9,64).getStackForm(1L)); + 12151, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch", 9, 64).getStackForm(1L)); CustomItemList.eM_dynamomulti4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12132, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch",10,4).getStackForm(1L)); + 12132, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch", 10, 4).getStackForm(1L)); CustomItemList.eM_dynamomulti16_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12142, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch",10,16).getStackForm(1L)); + 12142, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch", 10, 16).getStackForm(1L)); CustomItemList.eM_dynamomulti64_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12152, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch",10,64).getStackForm(1L)); + 12152, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch", 10, 64).getStackForm(1L)); CustomItemList.eM_dynamomulti4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12133, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch",11,4).getStackForm(1L)); + 12133, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch", 11, 4).getStackForm(1L)); CustomItemList.eM_dynamomulti16_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12143, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch",11,16).getStackForm(1L)); + 12143, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch", 11, 16).getStackForm(1L)); CustomItemList.eM_dynamomulti64_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12153, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch",11,64).getStackForm(1L)); + 12153, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch", 11, 64).getStackForm(1L)); CustomItemList.eM_dynamomulti4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12134, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch",12,4).getStackForm(1L)); + 12134, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch", 12, 4).getStackForm(1L)); CustomItemList.eM_dynamomulti16_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12144, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch",12,16).getStackForm(1L)); + 12144, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch", 12, 16).getStackForm(1L)); CustomItemList.eM_dynamomulti64_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12154, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch",12,64).getStackForm(1L)); + 12154, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch", 12, 64).getStackForm(1L)); CustomItemList.eM_dynamomulti4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12135, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch",13,4).getStackForm(1L)); + 12135, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch", 13, 4).getStackForm(1L)); CustomItemList.eM_dynamomulti16_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12145, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch",13,16).getStackForm(1L)); + 12145, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch", 13, 16).getStackForm(1L)); CustomItemList.eM_dynamomulti64_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 12155, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch",13,64).getStackForm(1L)); + 12155, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, 64).getStackForm(1L)); // =================================================================================================== // MULTIBLOCKS EM // =================================================================================================== - CustomItemList.Machine_Multi_Transformer.set(new GT_MetaTileEntity_EMtransformer(12160,"multimachine.em.transformer", "Active Transformer").getStackForm(1L)); - CustomItemList.Machine_Multi_MatterToEM.set(new GT_MetaTileEntity_EMquantifier(12161,"multimachine.em.mattertoem","Matter Quantifier").getStackForm(1L)); - CustomItemList.Machine_Multi_EMToMatter.set(new GT_MetaTileEntity_EMdequantifier(12162,"multimachine.em.emtomatter","Matter De-quantifier").getStackForm(1L)); - CustomItemList.Machine_Multi_EMjunction.set(new GT_MetaTileEntity_EMjunction(12163,"multimachine.em.junction","Matter junction").getStackForm(1L)); - CustomItemList.Machine_Multi_EMmachine.set(new GT_MetaTileEntity_EMmachine(12164,"multimachine.em.processing","Quantum Processing Machine").getStackForm(1L)); - CustomItemList.Machine_Multi_EMCrafter.set(new GT_MetaTileEntity_EMcrafter(12165,"multimachine.em.crafter","Matter Assembler").getStackForm(1L)); - CustomItemList.Machine_Multi_Collider.set(new GT_MetaTileEntity_EMcollider(12166,"multimachine.em.collider","Matter Collider").getStackForm(1L)); - CustomItemList.Machine_Multi_BHG.set(new GT_MetaTileEntity_EMbhg(12167,"multimachine.em.blackholegenerator","Black Hole Generator").getStackForm(1L)); - CustomItemList.Machine_Multi_Wormhole.set(new GT_MetaTileEntity_EMwormhole(12168,"multimachine.em.wormhole","Wormhole").getStackForm(1L)); - CustomItemList.Machine_Multi_Scanner.set(new GT_MetaTileEntity_EMscanner(12169,"multimachine.em.scanner","Elemental Scanner").getStackForm(1L)); - CustomItemList.Machine_Multi_Computer.set(new GT_MetaTileEntity_Computer(12170,"multimachine.em.computer","Quantum computer").getStackForm(1L)); + CustomItemList.Machine_Multi_Transformer.set(new GT_MetaTileEntity_EM_transformer(12160, "multimachine.em.transformer", "Active Transformer").getStackForm(1L)); + CustomItemList.Machine_Multi_MatterToEM.set(new GT_MetaTileEntity_EM_quantifier(12161, "multimachine.em.mattertoem", "Matter Quantifier").getStackForm(1L)); + CustomItemList.Machine_Multi_EMToMatter.set(new GT_MetaTileEntity_EM_dequantifier(12162, "multimachine.em.emtomatter", "Matter De-quantifier").getStackForm(1L)); + CustomItemList.Machine_Multi_EMjunction.set(new GT_MetaTileEntity_EM_junction(12163, "multimachine.em.junction", "Matter junction").getStackForm(1L)); + CustomItemList.Machine_Multi_EMmachine.set(new GT_MetaTileEntity_EM_machine(12164, "multimachine.em.processing", "Quantum Processing Machine").getStackForm(1L)); + CustomItemList.Machine_Multi_EMCrafter.set(new GT_MetaTileEntity_EM_crafter(12165, "multimachine.em.crafter", "Matter Assembler").getStackForm(1L)); + CustomItemList.Machine_Multi_Collider.set(new GT_MetaTileEntity_EM_collider(12166, "multimachine.em.collider", "Matter Collider").getStackForm(1L)); + CustomItemList.Machine_Multi_BHG.set(new GT_MetaTileEntity_EM_bhg(12167, "multimachine.em.blackholegenerator", "Black Hole Generator").getStackForm(1L)); + CustomItemList.Machine_Multi_Wormhole.set(new GT_MetaTileEntity_EM_wormhole(12168, "multimachine.em.wormhole", "Wormhole").getStackForm(1L)); + CustomItemList.Machine_Multi_Scanner.set(new GT_MetaTileEntity_EM_scanner(12169, "multimachine.em.scanner", "Elemental Scanner").getStackForm(1L)); + CustomItemList.Machine_Multi_Computer.set(new GT_MetaTileEntity_EM_computer(12170, "multimachine.em.computer", "Quantum computer").getStackForm(1L)); // =================================================================================================== // Hatches EM // =================================================================================================== - CustomItemList.Parametrizer_Hatch.set(new GT_MetaTileEntity_Hatch_Param(12180,"hatch.param.tier.06","Parametrizer for machines",6).getStackForm(1L)); - CustomItemList.Uncertainty_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(12181,"hatch.emcertain.tier.06","Uncertainty resolver",6).getStackForm(1L)); - CustomItemList.UncertaintyX_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(12182,"hatch.emcertain.tier.10","Uncertainty resolver X",10).getStackForm(1L)); + CustomItemList.Parametrizer_Hatch.set(new GT_MetaTileEntity_Hatch_Param(12180, "hatch.param.tier.06", "Parametrizer for machines", 6).getStackForm(1L)); + CustomItemList.Uncertainty_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(12181, "hatch.emcertain.tier.06", "Uncertainty resolver", 6).getStackForm(1L)); + CustomItemList.UncertaintyX_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(12182, "hatch.emcertain.tier.10", "Uncertainty resolver X", 10).getStackForm(1L)); // =================================================================================================== // EM pipe // =================================================================================================== - CustomItemList.EMpipe.set(new GT_MetaTileEntity_EMpipe(12179,"pipe.elementalmatter","Quantum tunnel").getStackForm(1L)); + CustomItemList.EMpipe.set(new GT_MetaTileEntity_Pipe_EM(12179, "pipe.elementalmatter", "Quantum tunnel").getStackForm(1L)); } } diff --git a/src/main/java/com/github/technus/tectech/GT_Loader_Recipes.java b/src/main/java/com/github/technus/tectech/GT_Loader_Recipes.java index 2d26587d31..fc957224dc 100644 --- a/src/main/java/com/github/technus/tectech/GT_Loader_Recipes.java +++ b/src/main/java/com/github/technus/tectech/GT_Loader_Recipes.java @@ -2,7 +2,7 @@ package com.github.technus.tectech; import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive; import com.github.technus.tectech.elementalMatter.definitions.*; -import com.github.technus.tectech.elementalMatter.machine.GT_MetaTileEntity_EMquantifier; +import com.github.technus.tectech.things.metaTileEntity.multi.GT_MetaTileEntity_EM_quantifier; /** * Created by danie_000 on 16.11.2016. @@ -30,6 +30,6 @@ public class GT_Loader_Recipes implements Runnable { // Recipe init // =================================================================================================== - GT_MetaTileEntity_EMquantifier.run(); + GT_MetaTileEntity_EM_quantifier.run(); } } diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index d776dac376..5104cbc055 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -2,8 +2,9 @@ package com.github.technus.tectech; import com.github.technus.tectech.auxiliary.Reference; import com.github.technus.tectech.auxiliary.TecTechConfig; -import com.github.technus.tectech.blocks.QuantumGlass; -import com.github.technus.tectech.casing.GT_Container_CasingsTT; +import com.github.technus.tectech.things.block.QuantumGlass; +import com.github.technus.tectech.things.casing.GT_Container_CasingsTT; +import com.github.technus.tectech.things.machineTT; import com.github.technus.tectech.proxy.CommonProxy; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -20,94 +21,108 @@ import cpw.mods.fml.relauncher.SideOnly; import eu.usrv.yamcore.auxiliary.IngameErrorLog; import eu.usrv.yamcore.auxiliary.LogHelper; import eu.usrv.yamcore.items.ModItemManager; +import gregtech.api.GregTech_API; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.List; + @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);" - + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;") + + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;") public class TecTech { - @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE) - public static CommonProxy proxy; - - @Instance(Reference.MODID) - public static TecTech instance; - - //public static ModFluidManager FluidManager = null; - //public static ModBlockManager BlockManager = null; - public static ModItemManager ItemManager = null; - public static IngameErrorLog Module_AdminErrorLogs = null; - public static GT_CustomLoader GTCustomLoader = null; - public static TecTechConfig ModConfig; - public static XSTR Rnd = null; - public static LogHelper Logger = new LogHelper(Reference.MODID); - public static CreativeTabs mainTab=null; - - public static void AddLoginError(String pMessage) { - if (Module_AdminErrorLogs != null) - Module_AdminErrorLogs.AddErrorLogOnAdminJoin(pMessage); - } - - @EventHandler - public void PreLoad(FMLPreInitializationEvent PreEvent) { - Logger.setDebugOutput(true); - Rnd = new XSTR(); - - //ItemManager = new ModItemManager(Refstrings.MODID); - //BlockManager = new ModBlockManager(Refstrings.MODID); - //FluidManager = new ModFluidManager(Refstrings.MODID); - - ModConfig = new TecTechConfig(PreEvent.getModConfigurationDirectory(), Reference.COLLECTIONNAME, - Reference.MODID); - if (!ModConfig.LoadConfig()) - Logger.error(Reference.MODID+" could not load its config file. Things are going to be weird!"); - - if (ModConfig.ModAdminErrorLogs_Enabled) { - Logger.debug("Module_AdminErrorLogs is enabled"); - Module_AdminErrorLogs = new IngameErrorLog(); - } - } - - @EventHandler - public void load(FMLInitializationEvent event) { - GameRegistry.registerBlock(QuantumGlass.INSTANCE,QuantumGlass.INSTANCE.getUnlocalizedName()); - proxy.registerRenderInfo(); - } - - @EventHandler - public void PostLoad(FMLPostInitializationEvent PostEvent) { - GTCustomLoader = new GT_CustomLoader(); - GTCustomLoader.run(); - GTCustomLoader.run2(); - - mainTab=new CreativeTabs("TecTech") { - @SideOnly(Side.CLIENT) - @Override - public Item getTabIconItem() { - return CustomItemList.eM_TimeSpaceWarp.getItem(); - } - - @SideOnly(Side.CLIENT) - @Override - public ItemStack getIconItemStack() { - return CustomItemList.eM_TimeSpaceWarp.getWithDamage(1,8); - } - }; - RegisterThingsInTabs(); - if(Loader.isModLoaded("dreamcraft"));//TODO init recipes for GTNH coremod - } - - public void RegisterThingsInTabs(){ - QuantumGlass.INSTANCE.setCreativeTab(mainTab);//TODO? COPY PASTE GT CLASSES TO ADD MY THINGS TO CREATIVE TAB - GT_Container_CasingsTT.sBlockCasingsTT.setCreativeTab(mainTab); - } - - /** - * Do some stuff once the server starts - * - * @param pEvent - */ - @EventHandler - public void serverLoad(FMLServerStartingEvent pEvent) {} + @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE) + public static CommonProxy proxy; + + @Instance(Reference.MODID) + public static TecTech instance; + + //public static ModFluidManager FluidManager = null; + //public static ModBlockManager BlockManager = null; + public static ModItemManager ItemManager = null; + public static IngameErrorLog Module_AdminErrorLogs = null; + public static GT_CustomLoader GTCustomLoader = null; + public static TecTechConfig ModConfig; + public static XSTR Rnd = null; + public static LogHelper Logger = new LogHelper(Reference.MODID); + public static CreativeTabs mainTab = null; + + public static void AddLoginError(String pMessage) { + if (Module_AdminErrorLogs != null) + Module_AdminErrorLogs.AddErrorLogOnAdminJoin(pMessage); + } + + @EventHandler + public void PreLoad(FMLPreInitializationEvent PreEvent) { + Logger.setDebugOutput(true); + Rnd = new XSTR(); + + //ItemManager = new ModItemManager(Refstrings.MODID); + //BlockManager = new ModBlockManager(Refstrings.MODID); + //FluidManager = new ModFluidManager(Refstrings.MODID); + + ModConfig = new TecTechConfig(PreEvent.getModConfigurationDirectory(), Reference.COLLECTIONNAME, + Reference.MODID); + if (!ModConfig.LoadConfig()) + Logger.error(Reference.MODID + " could not load its config file. Things are going to be weird!"); + + if (ModConfig.ModAdminErrorLogs_Enabled) { + Logger.debug("Module_AdminErrorLogs is enabled"); + Module_AdminErrorLogs = new IngameErrorLog(); + } + } + + @EventHandler + public void load(FMLInitializationEvent event) { + GameRegistry.registerBlock(QuantumGlass.INSTANCE, QuantumGlass.INSTANCE.getUnlocalizedName()); + proxy.registerRenderInfo(); + } + + @EventHandler + public void PostLoad(FMLPostInitializationEvent PostEvent) { + GTCustomLoader = new GT_CustomLoader(); + GTCustomLoader.run(); + GTCustomLoader.run2(); + + mainTab = new CreativeTabs("TecTech") { + @SideOnly(Side.CLIENT) + @Override + public Item getTabIconItem() { + return CustomItemList.eM_TimeSpaceWarp.getItem(); + } + + @SideOnly(Side.CLIENT) + @Override + public ItemStack getIconItemStack() { + return CustomItemList.eM_TimeSpaceWarp.getWithDamage(1, 8); + } + + @Override + public void displayAllReleventItems(List stuffToShow) { + for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { + if (GregTech_API.METATILEENTITIES[i] instanceof machineTT) { + stuffToShow.add(new ItemStack(GregTech_API.sBlockMachines, 1, i)); + } + } + super.displayAllReleventItems(stuffToShow); + } + }; + RegisterThingsInTabs(); + if (Loader.isModLoaded("dreamcraft")) ;//TODO init recipes for GTNH coremod + } + + public void RegisterThingsInTabs() { + QuantumGlass.INSTANCE.setCreativeTab(mainTab);//TODO? COPY PASTE GT CLASSES TO ADD MY THINGS TO CREATIVE TAB + GT_Container_CasingsTT.sBlockCasingsTT.setCreativeTab(mainTab); + } + + /** + * Do some stuff once the server starts + * + * @param pEvent + */ + @EventHandler + public void serverLoad(FMLServerStartingEvent pEvent) { + } } diff --git a/src/main/java/com/github/technus/tectech/XSTR.java b/src/main/java/com/github/technus/tectech/XSTR.java index e733e8cfb8..4fa4b98fbd 100644 --- a/src/main/java/com/github/technus/tectech/XSTR.java +++ b/src/main/java/com/github/technus/tectech/XSTR.java @@ -2,24 +2,24 @@ package com.github.technus.tectech; /** * A subclass of java.util.random that implements the Xorshift random number * generator - * + *

* - it is 30% faster than the generator from Java's library - it produces * random sequences of higher quality than java.util.Random - this class also * provides a clone() function - * + *

* Usage: XSRandom rand = new XSRandom(); //Instantiation x = rand.nextInt(); * //pull a random number - * + *

* To use the class in legacy code, you may also instantiate an XSRandom object * and assign it to a java.util.Random object: java.util.Random rand = new * XSRandom(); - * + *

* for an explanation of the algorithm, see * http://demesos.blogspot.com/2011/09/pseudo-random-number-generators.html * * @author Wilfried Elmenreich University of Klagenfurt/Lakeside Labs * http://www.elmenreich.tk - * + *

* This code is released under the GNU Lesser General Public License Version 3 * http://www.gnu.org/licenses/lgpl-3.0.txt */ @@ -42,12 +42,13 @@ public class XSTR extends Random { private static final int PROBE_INCREMENT = 0x9e3779b9; private static final long SEEDER_INCREMENT = 0xbb67ae8584caa73bL; private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53) - private static final float FLOAT_UNIT = 0x1.0p-24f; // 1.0f / (1 << 24) + private static final float FLOAT_UNIT = 0x1.0p-24f; // 1.0f / (1 << 24) /* MODIFIED BY: Robotia Modification: Implemented Random class seed generator */ + /** * Creates a new pseudo random number generator. The seed is initialized to * the current time, as if by @@ -56,13 +57,14 @@ public class XSTR extends Random { public XSTR() { this(seedUniquifier() ^ System.nanoTime()); } + private static final AtomicLong seedUniquifier = new AtomicLong(8682522807148012L); private static long seedUniquifier() { // L'Ecuyer, "Tables of Linear Congruential Generators of // Different Sizes and Good Lattice Structure", 1999 - for (;;) { + for (; ; ) { long current = seedUniquifier.get(); long next = current * 181783497276652981L; if (seedUniquifier.compareAndSet(current, next)) { @@ -80,13 +82,15 @@ public class XSTR extends Random { public XSTR(long seed) { this.seed = seed; } + public boolean nextBoolean() { return next(1) != 0; } public double nextDouble() { - return (((long)(next(26)) << 27) + next(27)) * DOUBLE_UNIT; + return (((long) (next(26)) << 27) + next(27)) * DOUBL