diff options
69 files changed, 971 insertions, 130 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 9bc7289819..ae49064f64 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -33,10 +33,14 @@ import com.github.technus.tectech.recipe.EyeOfHarmonyRecipeStorage; import com.github.technus.tectech.util.XSTR; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; import eu.usrv.yamcore.auxiliary.IngameErrorLog; import eu.usrv.yamcore.auxiliary.LogHelper; import gregtech.GT_Mod; diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index f22d14c501..e1e842b3a7 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -38,7 +38,6 @@ import net.minecraftforge.fluids.FluidStack; import vexatos.tgregworks.reference.PartTypes; import vexatos.tgregworks.util.TGregUtils; -import com.github.technus.tectech.Reference; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; @@ -48,8 +47,13 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviou import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_Recycler; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine; -import cpw.mods.fml.common.Loader; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsBotania; +import gregtech.api.enums.MaterialsKevlar; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IItemContainer; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -2854,7 +2858,8 @@ public class DreamCraftRecipeLoader { ItemList.Circuit_Parts_InductorXSMD.get(16L), ItemList.Circuit_Parts_CapacitorXSMD.get(20L), ItemList.Circuit_Parts_ResistorXSMD.get(20L), ItemList.Circuit_Chip_NOR.get(32L), ItemList.Circuit_Chip_Ram.get(64L), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedwireFine", 24L, 10101), // Fine Lumiium + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedwireFine", 24L, 10101), // Fine + // Lumiium // Wire new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, }, new FluidStack[] { new FluidStack(solderUEV, 1440), Materials.Radon.getPlasma(1440L), @@ -2875,7 +2880,8 @@ public class DreamCraftRecipeLoader { ItemList.Circuit_Parts_TransistorXSMD.get(24L), ItemList.Circuit_Parts_ResistorXSMD.get(24L), ItemList.Circuit_Parts_CapacitorXSMD.get(24L), ItemList.Circuit_Parts_DiodeXSMD.get(24L), ItemList.Circuit_Chip_NOR.get(64L), ItemList.Circuit_Chip_SoC2.get(32L), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedwireFine", 32L, 10101), // Fine Lumiium + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedwireFine", 32L, 10101), // Fine + // Lumiium // Wire new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64), }, @@ -2999,7 +3005,8 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Universium, 8L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L), GT_OreDictUnificator.get("plateDenseShirabon", 8L), ItemList.Sensor_UXV.get(16L), - ItemList.Emitter_UXV.get(16L), getModItem(EternalSingularity.ID, "eternal_singularity", 16L), + ItemList.Emitter_UXV.get(16L), + getModItem(EternalSingularity.ID, "eternal_singularity", 16L), Materials.Universium.getNanite(16), Materials.BlackDwarfMatter.getNanite(16), Materials.WhiteDwarfMatter.getNanite(16) }, new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L), @@ -3127,7 +3134,8 @@ public class DreamCraftRecipeLoader { new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 2L }, getModItem(Avaritia.ID, "Singularity", 2L, 0), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 6), - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 2, 0), ItemList.Field_Generator_UHV.get(1L) }, + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 2, 0), + ItemList.Field_Generator_UHV.get(1L) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 8000), new FluidStack(solderUEV, 1152 * 8), Materials.NaquadahEnriched.getMolten(1296L) }, ItemList.Casing_Dim_Bridge.get(1), @@ -3144,7 +3152,8 @@ public class DreamCraftRecipeLoader { new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ledox, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CallistoIce, 1), - ItemList.Reactor_Coolant_Sp_6.get(1L), getModItem(GTPlusPlus.ID, "itemScrewLaurenium", 12, 0), + ItemList.Reactor_Coolant_Sp_6.get(1L), + getModItem(GTPlusPlus.ID, "itemScrewLaurenium", 12, 0), new Object[] { OrePrefixes.circuit.get(Materials.Elite), 2L }, GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 2), ItemList.Super_Chest_IV.get(1), ItemList.Super_Tank_IV.get(1), @@ -3163,7 +3172,8 @@ public class DreamCraftRecipeLoader { 32_000_000, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), - getModItem(GTPlusPlus.ID, "itemScrewLaurenium", 12, 0), ItemList.Reactor_Coolant_Sp_6.get(1L), + getModItem(GTPlusPlus.ID, "itemScrewLaurenium", 12, 0), + ItemList.Reactor_Coolant_Sp_6.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 1), }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 500), new FluidStack(solderUEV, 288), Materials.NaquadahEnriched.getMolten(144L) }, @@ -5499,7 +5509,8 @@ public class DreamCraftRecipeLoader { getModItem(TinkerConstruct.ID, "heavyPlate", 1, 501), // UV Solar panel - getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), ItemList.Quantum_Chest_IV.get(1), + getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), + ItemList.Quantum_Chest_IV.get(1), // Gravitation Engine getModItem(GraviSuite.ID, "itemSimpleItem", 64, 3), ItemList.EnergisedTesseract.get(1) }, diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java index 6bc93c55df..47bba94c2e 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase; -import gregtech.api.enums.Mods; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -10,6 +9,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental; import cpw.mods.fml.common.Optional; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; /** diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java index 3acc856d6e..09014b8b8e 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java @@ -1,6 +1,11 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations; -import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.*; +import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.magic_air; +import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.magic_earth; +import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.magic_entropy; +import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.magic_fire; +import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.magic_order; +import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.magic_water; import java.util.ArrayList; diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java index 122fdb45bf..6a092cb544 100644 --- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java @@ -5,7 +5,12 @@ import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defin import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition; import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition; -import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.*; +import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition; +import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition; +import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition; +import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition; +import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition; +import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMScalarBosonDefinition; /** * Created by danie_000 on 16.11.2016. diff --git a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java index fae299ea75..17eb7ff845 100644 --- a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java @@ -1,13 +1,11 @@ package com.github.technus.tectech.loader; +import static gregtech.api.enums.Mods.OpenModularTurrets; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM; - -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; -import static gregtech.api.enums.Mods.OpenModularTurrets; - /** * Created by Tec on 30.07.2017. */ diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 3e93bff21b..b880847bd3 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -25,7 +25,6 @@ import net.minecraft.util.DamageSource; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat; import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompatEnabled; @@ -45,7 +44,6 @@ import com.github.technus.tectech.thing.casing.TT_Container_Casings; import com.github.technus.tectech.thing.metaTileEntity.Textures; import com.github.technus.tectech.thing.metaTileEntity.multi.em_collider.GT_MetaTileEntity_EM_collider; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ProgressManager; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java index 40972d1fc2..ab71e33b7f 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.technus.tectech.Reference; import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader; import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; @@ -18,7 +17,6 @@ import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.item.EuMeterGT; import com.gtnewhorizon.structurelib.StructureLibAPI; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.Dyes; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 415682e67f..900d607eee 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -1,7 +1,332 @@ package com.github.technus.tectech.loader.thing; import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT; -import static com.github.technus.tectech.thing.CustomItemList.*; +import static com.github.technus.tectech.thing.CustomItemList.DATApipe; +import static com.github.technus.tectech.thing.CustomItemList.DATApipeBlock; +import static com.github.technus.tectech.thing.CustomItemList.EMpipe; +import static com.github.technus.tectech.thing.CustomItemList.EMpipeBlock; +import static com.github.technus.tectech.thing.CustomItemList.LASERpipe; +import static com.github.technus.tectech.thing.CustomItemList.LASERpipeBlock; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_LuV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UEV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UHV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UIV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UMV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UXV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.Machine_DataReader; +import static com.github.technus.tectech.thing.CustomItemList.Machine_DebugGenny; +import static com.github.technus.tectech.thing.CustomItemList.Machine_DebugPollutor; +import static com.github.technus.tectech.thing.CustomItemList.Machine_DebugWriter; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Annihilation; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Collider; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Computer; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_DataBank; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Decay; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EMCrafter; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EMToEssentia; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EMToMatter; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EMjunction; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EMmachine; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EssentiaToEM; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Infuser; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_MatterToEM; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Microwave; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Research; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Scanner; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Stabilizer; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Switch; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_TeslaCoil; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Transformer; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Wormhole; +import static com.github.technus.tectech.thing.CustomItemList.Machine_OwnerDetector; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_EV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_HV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_LV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_MV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_EV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_HV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_LV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_MV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_EV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_HV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_LV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_MV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_EV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_HV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_LV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_MV; +import static com.github.technus.tectech.thing.CustomItemList.ParametrizerTXT_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.ParametrizerX_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.Parametrizer_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.UncertaintyX_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.Uncertainty_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.UnusedStuff; +import static com.github.technus.tectech.thing.CustomItemList.capacitor_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.dataInAss_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.dataIn_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.dataOutAss_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.dataOut_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_HV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_avr_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel9001; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel9001; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_MAX; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_MAX; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_MAX; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_in_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_in_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_in_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_in_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_in_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_in_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_muffler_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_muffler_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_muffler_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_muffler_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_muffler_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_muffler_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_out_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_out_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_out_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_out_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_out_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_out_UXV; +import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeData; +import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeMaintenance; +import static com.github.technus.tectech.thing.CustomItemList.holder_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.rack_Hatch; import static com.github.technus.tectech.util.CommonValues.V; import net.minecraft.init.Blocks; @@ -9,12 +334,60 @@ import net.minecraft.item.ItemStack; import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaDequantizer; import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaQuantizer; -import com.github.technus.tectech.thing.metaTileEntity.hatch.*; -import com.github.technus.tectech.thing.metaTileEntity.multi.*; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Capacitor; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_CreativeData; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_CreativeMaintenance; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoTunnel; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Holder; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputDataItems; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputDataItems; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputElemental; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OverflowElemental; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_ParamText; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Rack; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Uncertainty; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_WirelessMulti; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_EyeOfHarmony; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_annihilation; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_computer; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_dataBank; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_dequantizer; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_infuser; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_junction; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantizer; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_research; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_stabilizer; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_switch; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_transformer; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_wormhole; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_TM_microwave; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_TM_teslaCoil; import com.github.technus.tectech.thing.metaTileEntity.multi.em_collider.GT_MetaTileEntity_EM_collider; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine; -import com.github.technus.tectech.thing.metaTileEntity.pipe.*; -import com.github.technus.tectech.thing.metaTileEntity.single.*; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_PipeBlock_Data; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_PipeBlock_EM; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_PipeBlock_Energy; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Energy; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_BuckConverter; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DataReader; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugPollutor; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugPowerGenerator; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugStructureWriter; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_MicroController; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_OwnerDetector; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_TeslaCoil; /** * Created by danie_000 on 16.11.2016. diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index f2e1ead9d7..f226ec034b 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -4,17 +4,30 @@ import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.TecTech.tectechTexturePage1; import static gregtech.api.enums.Mods.OpenModularTurrets; -import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretbases.TurretBaseEM; import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadEM; import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.block.ReactorSimBlock; import com.github.technus.tectech.thing.block.TileEyeOfHarmony; -import com.github.technus.tectech.thing.casing.*; -import com.github.technus.tectech.thing.item.*; +import com.github.technus.tectech.thing.casing.GT_Block_CasingsBA0; +import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT; +import com.github.technus.tectech.thing.casing.SpacetimeCompressionFieldCasing; +import com.github.technus.tectech.thing.casing.StabilisationFieldCasing; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; +import com.github.technus.tectech.thing.casing.TimeAccelerationFieldCasing; +import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; +import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM; +import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM; +import com.github.technus.tectech.thing.item.EnderFluidLinkCover; +import com.github.technus.tectech.thing.item.EuMeterGT; +import com.github.technus.tectech.thing.item.ParametrizerMemoryCard; +import com.github.technus.tectech.thing.item.PowerPassUpgradeCover; +import com.github.technus.tectech.thing.item.TeslaCoilCapacitor; +import com.github.technus.tectech.thing.item.TeslaCoilComponent; +import com.github.technus.tectech.thing.item.TeslaCoilCover; +import com.github.technus.tectech.thing.item.TeslaStaff; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java index cfe4699a91..7de3238cff 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java @@ -1,6 +1,12 @@ package com.github.technus.tectech.mechanics.data; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java index cad3159b15..d4426f20fe 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java @@ -1,6 +1,11 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.definitions; -import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_CHARGE; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_CLASS_TYPE; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_COLORABLE; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_MASS; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_NOMENCLATURE; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_TIMESPAN_INFO; import static com.github.technus.tectech.util.TT_Utility.areBitsSet; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java index bdb4f847bc..931f7426eb 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java @@ -4,7 +4,11 @@ import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.NavigableSet; +import java.util.TreeSet; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java index 0db97d5229..2cdc864f12 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java @@ -7,7 +7,11 @@ import static com.github.technus.tectech.util.TT_Utility.packNBT; import static net.minecraft.util.StatCollector.translateToLocal; import java.lang.reflect.Array; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Set; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java index 04bf717daf..5f571ac510 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java @@ -1,7 +1,9 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps; import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_EPSILON; -import static com.github.technus.tectech.util.DoubleCount.*; +import static com.github.technus.tectech.util.DoubleCount.add; +import static com.github.technus.tectech.util.DoubleCount.sub; +import static com.github.technus.tectech.util.DoubleCount.ulpSigned; import java.util.Map; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java index a75306a3f3..bc5e2af118 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java @@ -4,8 +4,17 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__; -import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*; -import static com.github.technus.tectech.util.DoubleCount.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_AGE; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_AMOUNT; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_COLOR_VALUE; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_DEPTH_LEVEL; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_ENERGY; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_ENERGY_LEVEL; +import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.SCAN_GET_TIMESPAN_MULT; +import static com.github.technus.tectech.util.DoubleCount.add; +import static com.github.technus.tectech.util.DoubleCount.distribute; +import static com.github.technus.tectech.util.DoubleCount.div; +import static com.github.technus.tectech.util.DoubleCount.ulpSigned; import static java.lang.Math.max; import static java.lang.Math.min; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java index 067ce567ae..6f51a43627 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java @@ -5,12 +5,94 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd; import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE; -import static gregtech.api.enums.Materials.*; +import static gregtech.api.enums.Materials.Aluminium; +import static gregtech.api.enums.Materials.Americium; +import static gregtech.api.enums.Materials.Antimony; +import static gregtech.api.enums.Materials.Argon; +import static gregtech.api.enums.Materials.Arsenic; +import static gregtech.api.enums.Materials.Barium; +import static gregtech.api.enums.Materials.Beryllium; +import static gregtech.api.enums.Materials.Bismuth; +import static gregtech.api.enums.Materials.Boron; +import static gregtech.api.enums.Materials.Cadmium; +import static gregtech.api.enums.Materials.Caesium; +import static gregtech.api.enums.Materials.Calcium; +import static gregtech.api.enums.Materials.Carbon; +import static gregtech.api.enums.Materials.Cerium; +import static gregtech.api.enums.Materials.Chrome; +import static gregtech.api.enums.Materials.Cobalt; +import static gregtech.api.enums.Materials.Copper; +import static gregtech.api.enums.Materials.Deuterium; +import static gregtech.api.enums.Materials.Dysprosium; +import static gregtech.api.enums.Materials.Erbium; +import static gregtech.api.enums.Materials.Europium; +import static gregtech.api.enums.Materials.Fluorine; +import static gregtech.api.enums.Materials.Gadolinium; +import static gregtech.api.enums.Materials.Gallium; +import static gregtech.api.enums.Materials.Gold; +import static gregtech.api.enums.Materials.Helium; +import static gregtech.api.enums.Materials.Helium_3; +import static gregtech.api.enums.Materials.Holmium; +import static gregtech.api.enums.Materials.Hydrogen; +import static gregtech.api.enums.Materials.Indium; +import static gregtech.api.enums.Materials.Iridium; +import static gregtech.api.enums.Materials.Iron; +import static gregtech.api.enums.Materials.Lanthanum; +import static gregtech.api.enums.Materials.Lead; +import static gregtech.api.enums.Materials.Lithium; +import static gregtech.api.enums.Materials.Lutetium; +import static gregtech.api.enums.Materials.Magnesium; +import static gregtech.api.enums.Materials.Manganese; +import static gregtech.api.enums.Materials.Mercury; +import static gregtech.api.enums.Materials.Molybdenum; +import static gregtech.api.enums.Materials.Neodymium; +import static gregtech.api.enums.Materials.Nickel; +import static gregtech.api.enums.Materials.Niobium; +import static gregtech.api.enums.Materials.Nitrogen; +import static gregtech.api.enums.Materials.Osmium; +import static gregtech.api.enums.Materials.Oxygen; +import static gregtech.api.enums.Materials.Palladium; +import static gregtech.api.enums.Materials.Phosphorus; +import static gregtech.api.enums.Materials.Platinum; +import static gregtech.api.enums.Materials.Plutonium; +import static gregtech.api.enums.Materials.Plutonium241; +import static gregtech.api.enums.Materials.Potassium; +import static gregtech.api.enums.Materials.Praseodymium; +import static gregtech.api.enums.Materials.Promethium; +import static gregtech.api.enums.Materials.Radon; +import static gregtech.api.enums.Materials.Rubidium; +import static gregtech.api.enums.Materials.Samarium; +import static gregtech.api.enums.Materials.Scandium; +import static gregtech.api.enums.Materials.Silicon; +import static gregtech.api.enums.Materials.Silver; +import static gregtech.api.enums.Materials.Sodium; +import static gregtech.api.enums.Materials.Strontium; +import static gregtech.api.enums.Materials.Sulfur; +import static gregtech.api.enums.Materials.Tantalum; +import static gregtech.api.enums.Materials.Tellurium; +import static gregtech.api.enums.Materials.Terbium; +import static gregtech.api.enums.Materials.Thorium; +import static gregtech.api.enums.Materials.Thulium; +import static gregtech.api.enums.Materials.Tin; +import static gregtech.api.enums.Materials.Titanium; +import static gregtech.api.enums.Materials.Tritium; +import static gregtech.api.enums.Materials.Tungsten; +import static gregtech.api.enums.Materials.Uranium; +import static gregtech.api.enums.Materials.Uranium235; +import static gregtech.api.enums.Materials.Vanadium; +import static gregtech.api.enums.Materials.Ytterbium; +import static gregtech.api.enums.Materials.Yttrium; +import static gregtech.api.enums.Materials.Zinc; import static gregtech.api.enums.OrePrefixes.dust; import static java.lang.Math.abs; import static net.minecraft.util.StatCollector.translateToLocal; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.TreeMap; +import java.util.TreeSet; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java index 0c84fccc4b..67b041a1bc 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java @@ -1,9 +1,28 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive; import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_e; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_e_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_m; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_m_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_t; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_t_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Ve; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Ve_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vm; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vm_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vt; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vt_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_b; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_b_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_c; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_c_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_d; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_d_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_s; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_s_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_u; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_u_; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java index c8e5c21735..8e71fe3f59 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java @@ -2,7 +2,12 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Ve; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Ve_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vm; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vm_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vt; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vt_; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMScalarBosonDefinition.boson_H__; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java index d4e865faba..26b63841e1 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java @@ -1,8 +1,18 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_e; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_e_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_m; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_m_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_t; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_t_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Ve; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Ve_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vm; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vm_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vt; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.lepton_Vt_; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java index fbd432efb2..6c4a88bb58 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java @@ -1,8 +1,19 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.*; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_W; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_W_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Z; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_g__; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_m; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_m_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_t; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.lepton_t_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_b; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_b_; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_c; +import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.quark_c_; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay; diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java index f331692e8d..5e590740a0 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java @@ -2,7 +2,12 @@ package com.github.technus.tectech.mechanics.enderStorage; import static com.github.technus.tectech.Reference.MODID; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java b/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java index 810ac49570..7558db0a63 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java @@ -1,6 +1,13 @@ package com.github.technus.tectech.mechanics.spark; -import java.io.*; +import static gregtech.api.enums.Mods.Thaumcraft; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.util.Arrays; import java.util.HashSet; import java.util.Random; @@ -10,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import thaumcraft.client.fx.bolt.FXLightningBolt; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; @@ -18,8 +24,6 @@ import cpw.mods.fml.relauncher.SideOnly; import eu.usrv.yamcore.network.client.AbstractClientMessageHandler; import io.netty.buffer.ByteBuf; -import static gregtech.api.enums.Mods.Thaumcraft; - // TODO Re-work how sparks are distributed public class RendererMessage implements IMessage { diff --git a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java index 86c9867baf..78b027f801 100644 --- a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java +++ b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java @@ -5,7 +5,6 @@ import static gregtech.api.enums.Mods.NotEnoughItems; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInterModComms; public class IMCForNEI { diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_EyeOfHarmonyHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_EyeOfHarmonyHandler.java index fd964c90c4..7d8e982443 100644 --- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_EyeOfHarmonyHandler.java +++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_EyeOfHarmonyHandler.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.nei; import static com.github.technus.tectech.Reference.MODID; -import static net.minecraft.util.EnumChatFormatting.*; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java index 918016afbc..0ec0e3891c 100644 --- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java +++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java @@ -20,7 +20,10 @@ import org.lwjgl.opengl.GL11; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.*; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java index 91219a515d..364f245a64 100644 --- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java +++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java @@ -20,7 +20,10 @@ import org.lwjgl.opengl.GL11; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.*; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java index c1a521f0a3..5b2e1543e0 100644 --- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java @@ -18,7 +18,10 @@ import net.minecraftforge.common.util.ForgeDirection; import com.github.technus.tectech.Reference; import com.github.technus.tectech.compatibility.openmodularturrets.TT_turret_loader; -import com.github.technus.tectech.thing.block.*; +import com.github.technus.tectech.thing.block.QuantumGlassBlock; +import com.github.technus.tectech.thing.block.QuantumGlassRender; +import com.github.technus.tectech.thing.block.RenderEyeOfHarmony; +import com.github.technus.tectech.thing.block.TileEyeOfHarmony; import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM; import com.github.technus.tectech.thing.item.RenderEyeOfHarmonyItem; @@ -28,7 +31,6 @@ import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.Loader; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index 2818af8e78..98ae87a15b 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -8,7 +8,11 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Utility.getPlasmaFuelValueInEUPerLiterFromMaterial; import static java.lang.Math.min; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java index 9c2c638f34..2da0eb5758 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java @@ -4,7 +4,9 @@ import static com.github.technus.tectech.recipe.EyeOfHarmonyRecipe.processHelper import static com.github.technus.tectech.recipe.TT_recipe.GT_Recipe_MapTT.sEyeofHarmonyRecipes; import static java.lang.Math.pow; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java index cf5a12aa87..c76d67bfaf 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java @@ -5,10 +5,16 @@ import static com.google.common.math.LongMath.pow; import static gregtech.api.enums.GT_Values.RES_PATH_GUI; import static gregtech.api.util.GT_Utility.formatNumbers; import static java.lang.Math.min; -import static net.minecraft.util.EnumChatFormatting.*; +import static net.minecraft.util.EnumChatFormatting.BOLD; +import static net.minecraft.util.EnumChatFormatting.DARK_RED; +import static net.minecraft.util.EnumChatFormatting.RESET; import static net.minecraft.util.StatCollector.translateToLocal; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import java.util.function.Supplier; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java index 8b90abef82..7a4071480c 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java @@ -1,7 +1,7 @@ package com.github.technus.tectech.thing.block; import static com.github.technus.tectech.Reference.MODID; -import static java.lang.Math.*; +import static java.lang.Math.pow; import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java index bb32afbd8b..527cc8ca15 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java @@ -1,6 +1,14 @@ package com.github.technus.tectech.thing.block; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; import java.util.stream.IntStream; import net.minecraft.block.Block; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java index e101689a82..99bcc35024 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java @@ -1,7 +1,9 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.TecTech.creativeTabTecTech; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINECASINGS_BOTTOM_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINECASINGS_SIDE_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINECASINGS_TOP_TT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java index f0c12be8bc..da7d5efd01 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java @@ -1,6 +1,8 @@ package com.github.technus.tectech.thing.casing; -import static com.github.technus.tectech.util.CommonValues.*; +import static com.github.technus.tectech.util.CommonValues.COSMIC_MARK; +import static com.github.technus.tectech.util.CommonValues.THETA_MOVEMENT; +import static com.github.technus.tectech.util.CommonValues.V; import static gregtech.api.util.GT_Utility.formatNumbers; import static net.minecraft.util.EnumChatFormatting.AQUA; import static net.minecraft.util.EnumChatFormatting.GRAY; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java index f7329ee3d7..b0a890a599 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java @@ -1,7 +1,8 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; -import static net.minecraft.util.EnumChatFormatting.*; +import static net.minecraft.util.EnumChatFormatting.RESET; +import static net.minecraft.util.EnumChatFormatting.WHITE; import java.util.List; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java index 6dbd2b3ff8..d3d30f0357 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java @@ -1,7 +1,8 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; -import static net.minecraft.util.EnumChatFormatting.*; +import static net.minecraft.util.EnumChatFormatting.RESET; +import static net.minecraft.util.EnumChatFormatting.WHITE; import java.util.List; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java index 50241dd0df..1d86f4eeb5 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java @@ -1,7 +1,8 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; -import static net.minecraft.util.EnumChatFormatting.*; +import static net.minecraft.util.EnumChatFormatting.RESET; +import static net.minecraft.util.EnumChatFormatting.WHITE; import java.util.List; diff --git a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java index 91204927ca..190384e1ce 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java +++ b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java @@ -9,7 +9,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import gregtech.api.enums.Mods; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -31,6 +30,7 @@ import cpw.mods.fml.common.Optional; import dan200.computercraft.api.filesystem.IMount; import dan200.computercraft.api.filesystem.IWritableMount; import dan200.computercraft.api.media.IMedia; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java index ef8a0c9c92..e730caf1e7 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java @@ -3,7 +3,9 @@ package com.github.technus.tectech.thing.item; import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.TecTech.creativeTabEM; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; -import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.*; +import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_1k; +import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_ITEM; +import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT; import static cpw.mods.fml.relauncher.Side.CLIENT; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/item/RenderEyeOfHarmonyItem.java b/src/main/java/com/github/technus/tectech/thing/item/RenderEyeOfHarmonyItem.java index 35fc174310..191fcbc941 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/RenderEyeOfHarmonyItem.java +++ b/src/main/java/com/github/technus/tectech/thing/item/RenderEyeOfHarmonyItem.java @@ -1,6 +1,9 @@ package com.github.technus.tectech.thing.item; -import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.*; +import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.STAR_LAYER_0; +import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.STAR_LAYER_1; +import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.STAR_LAYER_2; +import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.starModel; import static java.lang.Math.pow; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java b/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java index 7e7304f8ca..e574e1ca89 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java +++ b/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java @@ -1,7 +1,12 @@ package com.github.technus.tectech.thing.item.gui; import static com.github.technus.tectech.Reference.MODID; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_BLEND; +import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.glBlendFunc; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; import java.util.Objects; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java index 04df5d23ad..08c7bbf0b1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java @@ -1,7 +1,47 @@ package com.github.technus.tectech.thing.metaTileEntity; import static gregtech.api.enums.Dyes.MACHINE_METAL; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Textures.BlockIcons.CustomIcon; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_8V_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_8V_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_8V_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_EV_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_EV_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_EV_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_HV_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_HV_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_HV_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_IV_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_IV_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_IV_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LV_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LV_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LV_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LuV_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LuV_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LuV_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MAX_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MAX_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MAX_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MV_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MV_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MV_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_UV_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_UV_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_UV_TOP; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_ZPM_BOTTOM; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_ZPM_SIDE; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_ZPM_TOP; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_IN; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_IN; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_IN_MULTI; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_ON_WIRELESS; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_OUT; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_OUT_MULTI; import gregtech.api.enums.Dyes; import gregtech.api.interfaces.IIconContainer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java index 1925aa5b72..e0216a5060 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -2,7 +2,11 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED; -import static com.github.technus.tectech.util.CommonValues.*; +import static com.github.technus.tectech.util.CommonValues.DECAY_AT; +import static com.github.technus.tectech.util.CommonValues.MOVE_AT; +import static com.github.technus.tectech.util.CommonValues.OVERFLOW_AT; +import static com.github.technus.tectech.util.CommonValues.TEC_MARK_EM; +import static com.github.technus.tectech.util.CommonValues.V; import static gregtech.api.enums.Dyes.MACHINE_METAL; import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java index 0504cbb081..9bc7cd60d5 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java @@ -1,7 +1,9 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; -import static com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DataConnector.*; +import static com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DataConnector.EM_D_ACTIVE; +import static com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DataConnector.EM_D_CONN; +import static com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DataConnector.EM_D_SIDES; import static com.github.technus.tectech.util.CommonValues.MOVE_AT; import static gregtech.api.enums.Dyes.MACHINE_METAL; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java index ec31e5ffca..65441e4149 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java @@ -20,7 +20,6 @@ import net.minecraft.util.EnumChatFormatting; import org.apache.commons.lang3.reflect.FieldUtils; -import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.gui.TecTechUITextures; import com.github.technus.tectech.util.CommonValues; @@ -33,7 +32,6 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.ItemList; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java index 7a01feac3d..ebfe18d7d7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java @@ -2,7 +2,13 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_BLEND; +import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.glBlendFunc; +import static org.lwjgl.opengl.GL11.glColor4f; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java index 75ed7fe8a6..1eec70c086 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java @@ -1,7 +1,11 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; -import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.*; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_WIRELESS_MULTI_16A; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_WIRELESS_MULTI_4A; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_WIRELESS_MULTI_64A; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.BLUE; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.BOLD; +import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.GRAY; import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.enums.GT_Values.V; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 4453a8a1ac..e33cd2e56a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -4,16 +4,35 @@ import static com.github.technus.tectech.TecTech.eyeOfHarmonyRecipeStorage; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.eyeOfHarmonyRenderBlock; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsBA0; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_Utility.formatNumbers; -import static java.lang.Math.*; -import static net.minecraft.util.EnumChatFormatting.*; - -import java.util.*; +import static java.lang.Math.abs; +import static java.lang.Math.exp; +import static java.lang.Math.max; +import static java.lang.Math.pow; +import static java.lang.Math.random; +import static net.minecraft.util.EnumChatFormatting.BLUE; +import static net.minecraft.util.EnumChatFormatting.DARK_RED; +import static net.minecraft.util.EnumChatFormatting.GOLD; +import static net.minecraft.util.EnumChatFormatting.GRAY; +import static net.minecraft.util.EnumChatFormatting.GREEN; +import static net.minecraft.util.EnumChatFormatting.RED; +import static net.minecraft.util.EnumChatFormatting.RESET; +import static net.minecraft.util.EnumChatFormatting.UNDERLINE; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index 3c47c91e5b..6a25a3779c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -3,11 +3,16 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_NEUTRAL; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT; import static com.github.technus.tectech.util.CommonValues.V; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static net.minecraft.util.StatCollector.translateToLocal; @@ -26,7 +31,11 @@ import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Rack; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.*; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java index 833fd7112f..5b79ac05fa 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java @@ -2,7 +2,12 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_NEUTRAL; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; import static com.github.technus.tectech.util.CommonValues.V; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index e460737c2d..684dc949ee 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -13,7 +13,8 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static mcp.mobius.waila.api.SpecialChars.*; +import static mcp.mobius.waila.api.SpecialChars.GREEN; +import static mcp.mobius.waila.api.SpecialChars.RED; import static mcp.mobius.waila.api.SpecialChars.RESET; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; @@ -59,7 +60,11 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.IGT_HatchAdder; /** * Created by danie_000 on 17.12.2016. diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index f165903f08..046b2e9bc7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -5,7 +5,9 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting.crafter; import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine; -import static com.github.technus.tectech.util.CommonValues.*; +import static com.github.technus.tectech.util.CommonValues.TEC_MARK_SHORT; +import static com.github.technus.tectech.util.CommonValues.V; +import static com.github.technus.tectech.util.CommonValues.VN; import static com.github.technus.tectech.util.TT_Utility.areBitsSet; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -34,7 +36,11 @@ import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.*; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index 6db7bcb5ce..d5b97d3afc 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -3,7 +3,13 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_NEUTRAL; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; import static com.github.technus.tectech.util.CommonValues.V; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index 7bf8a119c9..ff8f3c088a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -5,7 +5,8 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM.HatchElement.DynamoMulti; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM.HatchElement.EnergyMulti; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static gregtech.api.GregTech_API.sBlockCasings1; import static gregtech.api.enums.GT_HatchElement.Dynamo; import static gregtech.api.enums.GT_HatchElement.Energy; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 6521249766..fe64fa7470 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -2,7 +2,10 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import static com.github.technus.tectech.loader.MainLoader.microwaving; import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.GregTech_API.sBlockCasings4; @@ -21,7 +24,11 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import com.github.technus.tectech.Reference; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.*; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 3fcb54d809..6f7fc069ac 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -1,21 +1,41 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.*; +import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.generateTeslaNodeMap; +import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.powerTeslaNodeMap; +import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.teslaSimpleNodeSetAdd; +import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.teslaSimpleNodeSetRemove; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsBA0; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM.HatchElement.DynamoMulti; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM.HatchElement.EnergyMulti; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM.HatchElement.Param; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_NEUTRAL; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WTF; import static com.github.technus.tectech.util.CommonValues.V; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.Dynamo; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static java.lang.Math.min; import static net.minecraft.util.StatCollector.translateToLocal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -72,7 +92,14 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 0fc4df1266..5d06e75a09 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -3,10 +3,22 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.loader.TecTechConfig.POWERLESS_MODE; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.util.CommonValues.*; +import static com.github.technus.tectech.util.CommonValues.MOVE_AT; +import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT; +import static com.github.technus.tectech.util.CommonValues.MULTI_PURGE_1_AT; +import static com.github.technus.tectech.util.CommonValues.MULTI_PURGE_2_AT; +import static com.github.technus.tectech.util.CommonValues.RECIPE_AT; +import static com.github.technus.tectech.util.CommonValues.TEC_MARK_GENERAL; +import static com.github.technus.tectech.util.CommonValues.V; +import static com.github.technus.tectech.util.CommonValues.VN; import static com.github.technus.tectech.util.DoubleCount.div; import static com.github.technus.tectech.util.TT_Utility.getTier; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static java.lang.Math.min; @@ -33,7 +45,17 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; import com.github.technus.tectech.thing.gui.TecTechUITextures; -import com.github.technus.tectech.thing.metaTileEntity.hatch.*; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DataConnector; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_ElementalContainer; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputElemental; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OverflowElemental; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Uncertainty; import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; import com.github.technus.tectech.util.TT_Utility; import com.google.common.collect.Iterables; @@ -52,7 +74,12 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.api.widget.Widget; import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; -import com.gtnewhorizons.modularui.common.widget.*; +import com.gtnewhorizons.modularui.common.widget.ButtonWidget; +import com.gtnewhorizons.modularui.common.widget.DrawableWidget; +import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn; +import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; +import com.gtnewhorizons.modularui.common.widget.SlotWidget; +import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; import cpw.mods.fml.relauncher.Side; @@ -66,8 +93,22 @@ import gregtech.api.interfaces.modularui.IBindPlayerInventoryUI; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.BaseTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; -import gregtech.api.util.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.util.GT_HatchElementBuilder; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.IGT_HatchAdder; import gregtech.common.GT_Pollution; /** diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java index 14d789fd57..7c7481bf26 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java @@ -5,7 +5,10 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; import static com.github.technus.tectech.util.DoubleCount.add; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java index de95c88386..429583cfea 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java @@ -2,9 +2,14 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; import static com.github.technus.tectech.util.CommonValues.V; -import static com.github.technus.tectech.util.DoubleCount.*; +import static com.github.technus.tectech.util.DoubleCount.div; +import static com.github.technus.tectech.util.DoubleCount.mul; +import static com.github.technus.tectech.util.DoubleCount.sub; import java.util.Arrays; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java index 22ffa72b15..5a17bfbf34 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java @@ -1,7 +1,12 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine; import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; import static com.github.technus.tectech.util.CommonValues.V; import static com.github.technus.tectech.util.DoubleCount.mul; import static com.github.technus.tectech.util.DoubleCount.sub; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java index e0237836e0..0b64391da7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java @@ -2,7 +2,12 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_NEUTRAL; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; @@ -19,7 +24,11 @@ import net.minecraftforge.common.util.ForgeDirection; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.*; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java index a348354186..3572b04d9d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java @@ -1,6 +1,8 @@ package com.github.technus.tectech.thing.metaTileEntity.single; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; import static com.github.technus.tectech.util.CommonValues.VN; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java index 619adf6c8c..e6533b690d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java @@ -3,8 +3,6 @@ package com.github.technus.tectech.thing.metaTileEntity.single; import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; import static com.github.technus.tectech.util.CommonValues.V; -import java.util.*; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java index 14d169d358..63513d6842 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java @@ -1,6 +1,10 @@ package com.github.technus.tectech.thing.metaTileEntity.single; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; import static com.github.technus.tectech.util.CommonValues.TRANSFER_AT; import static com.github.technus.tectech.util.CommonValues.VN; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java index d18972306f..df26a700f6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java @@ -1,6 +1,10 @@ package com.github.technus.tectech.thing.metaTileEntity.single; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_MULTI_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_MULTI_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.util.CommonValues; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index 260a02d3a4..b72d035d6d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -1,7 +1,14 @@ package com.github.technus.tectech.thing.metaTileEntity.single; -import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.*; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; +import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.generateTeslaNodeMap; +import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.powerTeslaNodeMap; +import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.teslaSimpleNodeSetAdd; +import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.teslaSimpleNodeSetRemove; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_MULTI_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.TESLA_TRANSCEIVER_TOP_BA; import static com.github.technus.tectech.util.CommonValues.V; import static java.lang.Math.round; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/util/Converter.java b/src/main/java/com/github/technus/tectech/util/Converter.java index 6d3661e148..53ef4761ab 100644 --- a/src/main/java/com/github/technus/tectech/util/Converter.java +++ b/src/main/java/com/github/technus/tectech/util/Converter.java @@ -1,6 +1,10 @@ package com.github.technus.tectech.util; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; public final class Converter { diff --git a/src/main/java/com/github/technus/tectech/util/TT_Utility.java b/src/main/java/com/github/technus/tectech/util/TT_Utility.java index cd26bbdf70..fb796b870a 100644 --- a/src/main/java/com/github/technus/tectech/util/TT_Utility.java +++ b/src/main/java/com/github/technus/tectech/util/TT_Utility.java @@ -6,7 +6,13 @@ import java.io.FileOutputStream; import java.lang.reflect.Array; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.Formatter; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.UUID; import java.util.function.Function; import net.minecraft.entity.player.EntityPlayer; |