diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:40:55 -0800 |
---|---|---|
committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:40:55 -0800 |
commit | f32d404a051f6ad9d181792d6b489ed6e4a8f80f (patch) | |
tree | b565946594dfbee83591b92db22a5bbaa2391b14 /src/main | |
parent | 45657b6c6964b9e8f296e7a5752e86daf1cc4fc5 (diff) | |
download | GT5-Unofficial-f32d404a051f6ad9d181792d6b489ed6e4a8f80f.tar.gz GT5-Unofficial-f32d404a051f6ad9d181792d6b489ed6e4a8f80f.tar.bz2 GT5-Unofficial-f32d404a051f6ad9d181792d6b489ed6e4a8f80f.zip |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main')
253 files changed, 16104 insertions, 19075 deletions
diff --git a/src/main/java/com/github/technus/tectech/Reference.java b/src/main/java/com/github/technus/tectech/Reference.java index 99f944adec..2db595d5c2 100644 --- a/src/main/java/com/github/technus/tectech/Reference.java +++ b/src/main/java/com/github/technus/tectech/Reference.java @@ -1,6 +1,7 @@ package com.github.technus.tectech; public final class Reference { + public static final String MODID = "tectech"; public static final String NAME = "TecTech - Tec Technology!"; public static final String VERSION = "GRADLETOKEN_VERSION"; diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 158f10da25..0a1aef7763 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -2,6 +2,16 @@ package com.github.technus.tectech; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.Collection; +import java.util.Iterator; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; + +import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; + import com.github.technus.tectech.loader.MainLoader; import com.github.technus.tectech.loader.TecTechConfig; import com.github.technus.tectech.loader.gui.CreativeTabEM; @@ -23,6 +33,7 @@ import com.github.technus.tectech.nei.IMCForNEI; import com.github.technus.tectech.proxy.CommonProxy; 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; @@ -32,24 +43,22 @@ import eu.usrv.yamcore.auxiliary.IngameErrorLog; import eu.usrv.yamcore.auxiliary.LogHelper; import gregtech.GT_Mod; import gregtech.common.GT_Proxy; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.Iterator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; @Mod( modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);" + "required-after:YAMCore@[0.5.70,);" - + "required-after:structurelib;" + "after:ComputerCraft;" - + "after:OpenComputers;" + "required-after:gregtech;" - + "after:dreamcraft;" + "after:appliedenergistics2;" - + "after:CoFHCore;" + "after:Thaumcraft;") + + "required-after:structurelib;" + + "after:ComputerCraft;" + + "after:OpenComputers;" + + "required-after:gregtech;" + + "after:dreamcraft;" + + "after:appliedenergistics2;" + + "after:CoFHCore;" + + "after:Thaumcraft;") public class TecTech { + @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE) public static CommonProxy proxy; @@ -93,8 +102,10 @@ public class TecTech { public void PreLoad(FMLPreInitializationEvent PreEvent) { LOGGER.setDebugOutput(true); - configTecTech = - new TecTechConfig(PreEvent.getModConfigurationDirectory(), Reference.COLLECTIONNAME, Reference.MODID); + configTecTech = new TecTechConfig( + PreEvent.getModConfigurationDirectory(), + Reference.COLLECTIONNAME, + Reference.MODID); if (!configTecTech.LoadConfig()) { LOGGER.error(Reference.MODID + " could not load its config file. Things are going to be weird!"); @@ -133,6 +144,7 @@ public class TecTech { field.setAccessible(true); modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); field.set(GT_Mod.gregtechproxy, new Collection<Object>() { + @Override public int size() { return 0; @@ -151,6 +163,7 @@ public class TecTech { @Override public Iterator<Object> iterator() { return new Iterator<Object>() { + @Override public boolean hasNext() { return false; 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 1c7a56cb5c..8df15c2f86 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 @@ -4,6 +4,14 @@ import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDef import static com.google.common.math.LongMath.pow; import static gregtech.api.util.GT_ModHandler.getModItem; +import java.lang.reflect.Method; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; import com.github.technus.tectech.recipe.TT_recipeAdder; @@ -13,6 +21,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviou import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_ElectromagneticSeparator; 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.interfaces.IItemContainer; @@ -23,17 +32,12 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import java.lang.reflect.Method; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; /** * Created by Tec on 06.08.2017. */ public class DreamCraftRecipeLoader { + // region reflect a bit @SuppressWarnings("rawtypes") private Class CUSTOM_ITEM_LIST; @@ -45,8 +49,8 @@ public class DreamCraftRecipeLoader { return (IItemContainer) Enum.valueOf(CUSTOM_ITEM_LIST, name); } - private void addAssemblerRecipeWithCleanroom( - ItemStack[] items, FluidStack fluid, ItemStack output, int time, int eut) { + private void addAssemblerRecipeWithCleanroom(ItemStack[] items, FluidStack fluid, ItemStack output, int time, + int eut) { try { ADD_ASSEMBLER_RECIPE.invoke(GT_Values.RA, items, fluid, output, time, eut, true); } catch (Exception e) { @@ -59,16 +63,14 @@ public class DreamCraftRecipeLoader { // region reflect a bit try { CUSTOM_ITEM_LIST = Class.forName("com.dreammaster.gthandler.CustomItemList"); - ADD_ASSEMBLER_RECIPE = GT_Values.RA - .getClass() - .getMethod( - "addAssemblerRecipe", - ItemStack[].class, - FluidStack.class, - ItemStack.class, - int.class, - int.class, - boolean.class); + ADD_ASSEMBLER_RECIPE = GT_Values.RA.getClass().getMethod( + "addAssemblerRecipe", + ItemStack[].class, + FluidStack.class, + ItemStack.class, + int.class, + int.class, + boolean.class); } catch (Exception e) { throw new Error(e); } @@ -83,7 +85,8 @@ public class DreamCraftRecipeLoader { // Quantum Glass GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {CustomItemList.eM_Containment.get(1), GT_ModHandler.getIC2Item("reinforcedGlass", 1L)}, + new ItemStack[] { CustomItemList.eM_Containment.get(1), + GT_ModHandler.getIC2Item("reinforcedGlass", 1L) }, getOrDefault("Trinium", Materials.Osmium).getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, @@ -93,10 +96,8 @@ public class DreamCraftRecipeLoader { // Data addAssemblerRecipeWithCleanroom( - new ItemStack[] { - ItemList.Circuit_Parts_GlassFiber.get(8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8) - }, + new ItemStack[] { ItemList.Circuit_Parts_GlassFiber.get(8), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8) }, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1), 200, @@ -104,7 +105,7 @@ public class DreamCraftRecipeLoader { // Data Casing addAssemblerRecipeWithCleanroom( - new ItemStack[] {CustomItemList.DATApipe.get(1), ItemList.Casing_LuV.get(1)}, + new ItemStack[] { CustomItemList.DATApipe.get(1), ItemList.Casing_LuV.get(1) }, null, CustomItemList.DATApipeBlock.get(1), 20, @@ -112,14 +113,12 @@ public class DreamCraftRecipeLoader { // Tunnel addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.DATApipe.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2), - ItemList.Field_Generator_MV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1) - }, + new ItemStack[] { CustomItemList.DATApipe.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2), + ItemList.Field_Generator_MV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1) }, Materials.Osmium.getMolten(288), CustomItemList.EMpipe.get(1), 400, @@ -127,7 +126,7 @@ public class DreamCraftRecipeLoader { // Tunnel Casing addAssemblerRecipeWithCleanroom( - new ItemStack[] {CustomItemList.EMpipe.get(1), ItemList.Casing_LuV.get(1)}, + new ItemStack[] { CustomItemList.EMpipe.get(1), ItemList.Casing_LuV.get(1) }, null, CustomItemList.EMpipeBlock.get(1), 20, @@ -135,11 +134,8 @@ public class DreamCraftRecipeLoader { // Laser addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.DATApipe.get(1), - GT_ModHandler.getIC2Item("reinforcedGlass", 1L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 2) - }, + new ItemStack[] { CustomItemList.DATApipe.get(1), GT_ModHandler.getIC2Item("reinforcedGlass", 1L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 2) }, null, CustomItemList.LASERpipe.get(1), 100, @@ -147,7 +143,7 @@ public class DreamCraftRecipeLoader { // Laser Casing addAssemblerRecipeWithCleanroom( - new ItemStack[] {CustomItemList.LASERpipe.get(1), ItemList.Casing_LuV.get(1)}, + new ItemStack[] { CustomItemList.LASERpipe.get(1), ItemList.Casing_LuV.get(1) }, null, CustomItemList.LASERpipeBlock.get(1), 20, @@ -159,14 +155,12 @@ public class DreamCraftRecipeLoader { // High Power Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) }, Materials.TungstenSteel.getMolten(576), CustomItemList.eM_Power.get(1), 100, @@ -174,27 +168,25 @@ public class DreamCraftRecipeLoader { // Computer Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Power.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, + new ItemStack[] { CustomItemList.eM_Power.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) }, Materials.Aluminium.getMolten(1296), CustomItemList.eM_Computer_Casing.get(1), 200, 122880); // Computer Vent Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - ItemList.Electric_Motor_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, getOrDefault("SuperconductorIV", Materials.Superconductor), 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + ItemList.Electric_Motor_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + getOrDefault("SuperconductorIV", Materials.Superconductor), + 1) }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1), 100, @@ -202,52 +194,48 @@ public class DreamCraftRecipeLoader { // Advanced Computer Casing addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), - GT_OreDictUnificator.get( - OrePrefixes.wireGt02, getOrDefault("SuperconductorLuV", Materials.Superconductor), 4) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), + GT_OreDictUnificator.get( + OrePrefixes.wireGt02, + getOrDefault("SuperconductorLuV", Materials.Superconductor), + 4) }, Materials.Iridium.getMolten(1296), CustomItemList.eM_Computer_Bus.get(1), 200, 122880); // Molecular Casing - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Power.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, getOrDefault("Trinium", Materials.Osmium), 12), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), - ItemList.Field_Generator_IV.get(1) - }, - Materials.Osmium.getMolten(1296), - CustomItemList.eM_Containment.get(1), - 800, - 500000); + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { CustomItemList.eM_Power.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6), + GT_OreDictUnificator + .get(OrePrefixes.foil, getOrDefault("Trinium", Materials.Osmium), 12), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), + ItemList.Field_Generator_IV.get(1) }, + Materials.Osmium.getMolten(1296), + CustomItemList.eM_Containment.get(1), + 800, + 500000); // Hollow Casing GT_Values.RA.addAssemblylineRecipe( CustomItemList.eM_Containment.get(1), 7500, - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 2), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Plutonium, 4), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Uranium, 16), - GT_OreDictUnificator.get(OrePrefixes.screw, getOrDefault("Quantium", Materials.Europium), 16), - }, - new FluidStack[] { - getOrDefault("Trinium", Materials.Osmium).getMolten(1296), - Materials.Osmium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Argon.getGas(1000), - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 2), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Plutonium, 4), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Uranium, 16), + GT_OreDictUnificator + .get(OrePrefixes.screw, getOrDefault("Quantium", Materials.Europium), 16), }, + new FluidStack[] { getOrDefault("Trinium", Materials.Osmium).getMolten(1296), + Materials.Osmium.getMolten(1296), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + Materials.Argon.getGas(1000), }, CustomItemList.eM_Hollow.get(2), 200, 200000); @@ -256,19 +244,13 @@ public class DreamCraftRecipeLoader { GT_Values.RA.addAssemblylineRecipe( CustomItemList.eM_Hollow.get(1), 7500, - new ItemStack[] { - CustomItemList.eM_Hollow.get(1), - ItemList.Casing_Fusion_Coil.get(2), - ItemList.Casing_Coil_NaquadahAlloy.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 64), - }, - new FluidStack[] { - Materials.Glass.getMolten(2304), - Materials.Silicone.getMolten(1872), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - getOrDefault("Trinium", Materials.Osmium).getMolten(1296), - }, + new ItemStack[] { CustomItemList.eM_Hollow.get(1), ItemList.Casing_Fusion_Coil.get(2), + ItemList.Casing_Coil_NaquadahAlloy.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 64), }, + new FluidStack[] { Materials.Glass.getMolten(2304), Materials.Silicone.getMolten(1872), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + getOrDefault("Trinium", Materials.Osmium).getMolten(1296), }, CustomItemList.eM_Coil.get(4), 800, 200000); @@ -280,18 +262,14 @@ public class DreamCraftRecipeLoader { 2048, 2000000, 4, - new Object[] { - ItemList.OilDrill4.get(1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - ItemList.Electric_Motor_UHV.get(4), - ItemList.Electric_Pump_UHV.get(4), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4), - ItemList.Sensor_UHV.get(3), - ItemList.Field_Generator_UHV.get(3), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 12) - }, - new FluidStack[] {new FluidStack(solderUEV, 1296), Materials.Neutronium.getMolten(576)}, + new Object[] { ItemList.OilDrill4.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + ItemList.Electric_Motor_UHV.get(4), ItemList.Electric_Pump_UHV.get(4), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4), + ItemList.Sensor_UHV.get(3), ItemList.Field_Generator_UHV.get(3), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 12) }, + new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.Neutronium.getMolten(576) }, ItemList.OilDrillInfinite.get(1), 6000, 2000000); @@ -303,16 +281,12 @@ public class DreamCraftRecipeLoader { 2048, 8_000_000, 1, - new Object[] { - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 32, 0) - }, - new FluidStack[] { - Materials.DraconiumAwakened.getMolten(576), - }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 32, 0) }, + new FluidStack[] { Materials.DraconiumAwakened.getMolten(576), }, ItemList.Casing_Coil_Infinity.get(1), 60 * 20, 8_000_000); @@ -325,17 +299,13 @@ public class DreamCraftRecipeLoader { 2048 * 2, 32_000_000, 1, - new Object[] { - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - GT_OreDictUnificator.get("wireGt02Hypogen", 8L), - getModItem("miscutils", "itemScrewHypogen", 8, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - }, - new FluidStack[] { - Materials.Infinity.getMolten(576), - }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + GT_OreDictUnificator.get("wireGt02Hypogen", 8L), + getModItem("miscutils", "itemScrewHypogen", 8, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), }, + new FluidStack[] { Materials.Infinity.getMolten(576), }, ItemList.Casing_Coil_Hypogen.get(1), 60 * 20, 8000000 * 4); @@ -347,21 +317,17 @@ public class DreamCraftRecipeLoader { 8_192, 128_000_000, 1, - new Object[] { - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L}, - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 8), - getModItem("eternalsingularity", "eternal_singularity", 1L), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), - }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 8), + getModItem("eternalsingularity", "eternal_singularity", 1L), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), }, ItemList.Casing_Coil_Eternal.get(1), 60 * 20, 8_000_000 * 16); @@ -369,10 +335,8 @@ public class DreamCraftRecipeLoader { // Tesla Base GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NickelZincFerrite, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NickelZincFerrite, 1) }, null, CustomItemList.tM_TeslaBase.get(1), 50, @@ -380,21 +344,12 @@ public class DreamCraftRecipeLoader { GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaBase.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PhP", - "PFP", - "PwP", - 'P', - OrePrefixes.plate.get(Materials.NickelZincFerrite), - 'F', - OrePrefixes.frameGt.get(Materials.NickelZincFerrite) - }); + new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.plate.get(Materials.NickelZincFerrite), 'F', + OrePrefixes.frameGt.get(Materials.NickelZincFerrite) }); // Tesla Toroid GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1) }, null, CustomItemList.tM_TeslaToroid.get(1), 50, @@ -402,91 +357,68 @@ public class DreamCraftRecipeLoader { GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaToroid.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PhP", - "PFP", - "PwP", - 'P', - OrePrefixes.foil.get(Materials.Aluminium), - 'F', - OrePrefixes.frameGt.get(Materials.Aluminium) - }); + new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.foil.get(Materials.Aluminium), 'F', + OrePrefixes.frameGt.get(Materials.Aluminium) }); // Tesla Secondary Windings GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(8, 0), - getItemContainer("MicaInsulatorFoil").get(12) - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(8, 0), + getItemContainer("MicaInsulatorFoil").get(12) }, Materials.Silver.getMolten(144), CustomItemList.tM_TeslaSecondary.get(1), 200, 120); // Tesla Primary Coils T0 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.RedstoneAlloy, 8), - getItemContainer("MicaInsulatorFoil").get(8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.RedstoneAlloy, 8), + getItemContainer("MicaInsulatorFoil").get(8) }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_0.get(1), 200, 30); // Tesla Primary Coils T1 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorMV, 8), - getItemContainer("MicaInsulatorFoil").get(12) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorMV, 8), + getItemContainer("MicaInsulatorFoil").get(12) }, Materials.Magnesium.getMolten(144), CustomItemList.tM_TeslaPrimary_1.get(1), 200, 120); // Tesla Primary Coils T2 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorHV, 8), - getItemContainer("MicaInsulatorFoil").get(16) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorHV, 8), + getItemContainer("MicaInsulatorFoil").get(16) }, Materials.Barium.getMolten(144), CustomItemList.tM_TeslaPrimary_2.get(1), 200, 480); // Tesla Primary Coils T3 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorEV, 8), - getItemContainer("MicaInsulatorFoil").get(20) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorEV, 8), + getItemContainer("MicaInsulatorFoil").get(20) }, Materials.Platinum.getMolten(144), CustomItemList.tM_TeslaPrimary_3.get(1), 200, 1920); // Tesla Primary Coils T4 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 8), - getItemContainer("MicaInsulatorFoil").get(24) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 8), + getItemContainer("MicaInsulatorFoil").get(24) }, Materials.Vanadium.getMolten(144), CustomItemList.tM_TeslaPrimary_4.get(1), 200, 7680); // Tesla Primary Coils T5 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8), - getItemContainer("MicaInsulatorFoil").get(28) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8), + getItemContainer("MicaInsulatorFoil").get(28) }, Materials.Indium.getMolten(144), CustomItemList.tM_TeslaPrimary_5.get(1), 200, 30720); // Tesla Primary Coils T6 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 8), - getItemContainer("MicaInsulatorFoil").get(32) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 8), + getItemContainer("MicaInsulatorFoil").get(32) }, Materials.Naquadah.getMolten(144), CustomItemList.tM_TeslaPrimary_6.get(1), 200, @@ -498,594 +430,490 @@ public class DreamCraftRecipeLoader { // Dynamo Hatches EV-UMV GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_dynamoMulti4_EV.get(1), 100, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_dynamoMulti16_EV.get(1), 200, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_dynamoMulti64_EV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_dynamoMulti4_IV.get(1), 100, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_LuV_IV.get(1), - CustomItemList.eM_dynamoMulti4_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) - }, + new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), CustomItemList.eM_dynamoMulti4_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_dynamoMulti16_IV.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_LuV_IV").get(1), - CustomItemList.eM_dynamoMulti16_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_LuV_IV").get(1), + CustomItemList.eM_dynamoMulti16_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_dynamoMulti64_IV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) }, Materials.Silver.getMolten(288), CustomItemList.eM_dynamoMulti4_LuV.get(1), 100, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_ZPM_LuV.get(1), - CustomItemList.eM_dynamoMulti4_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) - }, + new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(1), CustomItemList.eM_dynamoMulti4_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) }, Materials.Electrum.getMolten(288), CustomItemList.eM_dynamoMulti16_LuV.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_ZPM_LuV").get(1), - CustomItemList.eM_dynamoMulti16_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_ZPM_LuV").get(1), + CustomItemList.eM_dynamoMulti16_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) }, Materials.Tungsten.getMolten(288), CustomItemList.eM_dynamoMulti64_LuV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) }, Materials.Silver.getMolten(576), CustomItemList.eM_dynamoMulti4_ZPM.get(1), 100, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_UV_ZPM.get(1), - CustomItemList.eM_dynamoMulti4_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) - }, + new ItemStack[] { ItemList.Transformer_UV_ZPM.get(1), CustomItemList.eM_dynamoMulti4_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) }, Materials.Electrum.getMolten(576), CustomItemList.eM_dynamoMulti16_ZPM.get(1), 200, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UV_ZPM").get(1), - CustomItemList.eM_dynamoMulti16_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UV_ZPM").get(1), + CustomItemList.eM_dynamoMulti16_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) }, Materials.Tungsten.getMolten(576), CustomItemList.eM_dynamoMulti64_ZPM.get(1), 400, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) }, Materials.Silver.getMolten(1152), CustomItemList.eM_dynamoMulti4_UV.get(1), 100, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_MAX_UV.get(1), - CustomItemList.eM_dynamoMulti4_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) - }, + new ItemStack[] { ItemList.Transformer_MAX_UV.get(1), CustomItemList.eM_dynamoMulti4_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) }, Materials.Electrum.getMolten(1152), CustomItemList.eM_dynamoMulti16_UV.get(1), 200, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UHV_UV").get(1), - CustomItemList.eM_dynamoMulti16_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UHV_UV").get(1), + CustomItemList.eM_dynamoMulti16_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) }, Materials.Tungsten.getMolten(1152), CustomItemList.eM_dynamoMulti64_UV.get(1), 400, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) }, Materials.Silver.getMolten(2304), CustomItemList.eM_dynamoMulti4_UHV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UEV_UHV").get(1), - CustomItemList.eM_dynamoMulti4_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) - }, + new ItemStack[] { getItemContainer("Transformer_UEV_UHV").get(1), + CustomItemList.eM_dynamoMulti4_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) }, Materials.Electrum.getMolten(2304), CustomItemList.eM_dynamoMulti16_UHV.get(1), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UEV_UHV").get(1), - CustomItemList.eM_dynamoMulti16_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UEV_UHV").get(1), + CustomItemList.eM_dynamoMulti16_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) }, Materials.Tungsten.getMolten(2304), CustomItemList.eM_dynamoMulti64_UHV.get(1), 400, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hatch_Dynamo_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2) - }, + new ItemStack[] { getItemContainer("Hatch_Dynamo_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2) }, Materials.Silver.getMolten(4608), CustomItemList.eM_dynamoMulti4_UEV.get(1), 100, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UIV_UEV").get(1), - CustomItemList.eM_dynamoMulti4_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 4) - }, + new ItemStack[] { getItemContainer("Transformer_UIV_UEV").get(1), + CustomItemList.eM_dynamoMulti4_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 4) }, Materials.Electrum.getMolten(4608), CustomItemList.eM_dynamoMulti16_UEV.get(1), 200, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UIV_UEV").get(1), - CustomItemList.eM_dynamoMulti16_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UIV_UEV").get(1), + CustomItemList.eM_dynamoMulti16_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 6) }, Materials.Tungsten.getMolten(4608), CustomItemList.eM_dynamoMulti64_UEV.get(1), 400, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hatch_Dynamo_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2) - }, + new ItemStack[] { getItemContainer("Hatch_Dynamo_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2) }, Materials.Silver.getMolten(9216), CustomItemList.eM_dynamoMulti4_UIV.get(1), 100, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UMV_UIV").get(1), - CustomItemList.eM_dynamoMulti4_UIV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 4) - }, + new ItemStack[] { getItemContainer("Transformer_UMV_UIV").get(1), + CustomItemList.eM_dynamoMulti4_UIV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 4) }, Materials.Electrum.getMolten(9216), CustomItemList.eM_dynamoMulti16_UIV.get(1), 200, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UMV_UIV").get(1), - CustomItemList.eM_dynamoMulti16_UIV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UMV_UIV").get(1), + CustomItemList.eM_dynamoMulti16_UIV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6) }, Materials.Tungsten.getMolten(9216), CustomItemList.eM_dynamoMulti64_UIV.get(1), 400, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hatch_Dynamo_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2) - }, + new ItemStack[] { getItemContainer("Hatch_Dynamo_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2) }, Materials.Silver.getMolten(9216), CustomItemList.eM_dynamoMulti4_UMV.get(1), 100, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UXV_UMV").get(1), - CustomItemList.eM_dynamoMulti4_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4) - }, + new ItemStack[] { getItemContainer("Transformer_UXV_UMV").get(1), + CustomItemList.eM_dynamoMulti4_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4) }, Materials.Electrum.getMolten(9216), CustomItemList.eM_dynamoMulti16_UMV.get(1), 200, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UXV_UMV").get(1), - CustomItemList.eM_dynamoMulti16_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UXV_UMV").get(1), + CustomItemList.eM_dynamoMulti16_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6) }, Materials.Tungsten.getMolten(9216), CustomItemList.eM_dynamoMulti64_UMV.get(1), 400, 32000000); - // Energy Hatches EV-UIV + // Energy Hatches EV-UIV GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_energyMulti4_EV.get(1), 100, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_energyMulti16_EV.get(1), 200, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_energyMulti64_EV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_energyMulti4_IV.get(1), 100, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_LuV_IV.get(1), - CustomItemList.eM_energyMulti4_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) - }, + new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), CustomItemList.eM_energyMulti4_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_energyMulti16_IV.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_LuV_IV").get(1), - CustomItemList.eM_energyMulti16_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_LuV_IV").get(1), + CustomItemList.eM_energyMulti16_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_energyMulti64_IV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get( - OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2) }, Materials.Silver.getMolten(288), CustomItemList.eM_energyMulti4_LuV.get(1), 100, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_ZPM_LuV.get(1), - CustomItemList.eM_energyMulti4_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get( - OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 4) - }, + new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(1), CustomItemList.eM_energyMulti4_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 4) }, Materials.Electrum.getMolten(288), CustomItemList.eM_energyMulti16_LuV.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_ZPM_LuV").get(1), - CustomItemList.eM_energyMulti16_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get( - OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_ZPM_LuV").get(1), + CustomItemList.eM_energyMulti16_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 6) }, Materials.Tungsten.getMolten(288), CustomItemList.eM_energyMulti64_LuV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) }, Materials.Silver.getMolten(576), CustomItemList.eM_energyMulti4_ZPM.get(1), 100, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_UV_ZPM.get(1), - CustomItemList.eM_energyMulti4_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) - }, + new ItemStack[] { ItemList.Transformer_UV_ZPM.get(1), CustomItemList.eM_energyMulti4_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) }, Materials.Electrum.getMolten(576), CustomItemList.eM_energyMulti16_ZPM.get(1), 200, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UV_ZPM").get(1), - CustomItemList.eM_energyMulti16_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UV_ZPM").get(1), + CustomItemList.eM_energyMulti16_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) }, Materials.Tungsten.getMolten(576), CustomItemList.eM_energyMulti64_ZPM.get(1), 400, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) }, Materials.Silver.getMolten(1152), CustomItemList.eM_energyMulti4_UV.get(1), 100, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_MAX_UV.get(1), - CustomItemList.eM_energyMulti4_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) - }, + new ItemStack[] { ItemList.Transformer_MAX_UV.get(1), CustomItemList.eM_energyMulti4_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) }, Materials.Electrum.getMolten(1152), CustomItemList.eM_energyMulti16_UV.get(1), 200, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UHV_UV").get(1), - CustomItemList.eM_energyMulti16_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UHV_UV").get(1), + CustomItemList.eM_energyMulti16_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) }, Materials.Tungsten.getMolten(1152), CustomItemList.eM_energyMulti64_UV.get(1), 400, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) }, Materials.Silver.getMolten(2304), CustomItemList.eM_energyMulti4_UHV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UEV_UHV").get(1), - CustomItemList.eM_energyMulti4_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) - }, + new ItemStack[] { getItemContainer("Transformer_UEV_UHV").get(1), + CustomItemList.eM_energyMulti4_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) }, Materials.Electrum.getMolten(2304), CustomItemList.eM_energyMulti16_UHV.get(1), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UEV_UHV").get(1), - CustomItemList.eM_energyMulti16_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UEV_UHV").get(1), + CustomItemList.eM_energyMulti16_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) }, Materials.Tungsten.getMolten(2304), CustomItemList.eM_energyMulti64_UHV.get(1), 400, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hatch_Energy_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2) - }, + new ItemStack[] { getItemContainer("Hatch_Energy_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2) }, Materials.Silver.getMolten(4608), CustomItemList.eM_energyMulti4_UEV.get(1), 100, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UIV_UEV").get(1), - CustomItemList.eM_energyMulti4_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 4) - }, + new ItemStack[] { getItemContainer("Transformer_UIV_UEV").get(1), + CustomItemList.eM_energyMulti4_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 4) }, Materials.Electrum.getMolten(4608), CustomItemList.eM_energyMulti16_UEV.get(1), 200, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UIV_UEV").get(1), - CustomItemList.eM_energyMulti16_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UIV_UEV").get(1), + CustomItemList.eM_energyMulti16_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 6) }, Materials.Tungsten.getMolten(4608), CustomItemList.eM_energyMulti64_UEV.get(1), 400, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hatch_Energy_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2) - }, + new ItemStack[] { getItemContainer("Hatch_Energy_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2) }, Materials.Silver.getMolten(9216), CustomItemList.eM_energyMulti4_UIV.get(1), 100, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UMV_UIV").get(1), - CustomItemList.eM_energyMulti4_UIV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 4) - }, + new ItemStack[] { getItemContainer("Transformer_UMV_UIV").get(1), + CustomItemList.eM_energyMulti4_UIV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 4) }, Materials.Electrum.getMolten(9216), CustomItemList.eM_energyMulti16_UIV.get(1), 200, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UMV_UIV").get(1), - CustomItemList.eM_energyMulti16_UIV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UMV_UIV").get(1), + CustomItemList.eM_energyMulti16_UIV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6) }, Materials.Tungsten.getMolten(9216), CustomItemList.eM_energyMulti64_UIV.get(1), 400, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hatch_Energy_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2) - }, + new ItemStack[] { getItemContainer("Hatch_Energy_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2) }, Materials.Silver.getMolten(9216), CustomItemList.eM_energyMulti4_UMV.get(1), 100, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UXV_UMV").get(1), - CustomItemList.eM_energyMulti4_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4) - }, + new ItemStack[] { getItemContainer("Transformer_UXV_UMV").get(1), + CustomItemList.eM_energyMulti4_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4) }, Materials.Electrum.getMolten(9216), CustomItemList.eM_energyMulti16_UMV.get(1), 200, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UXV_UMV").get(1), - CustomItemList.eM_energyMulti16_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UXV_UMV").get(1), + CustomItemList.eM_energyMulti16_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6) }, Materials.Tungsten.getMolten(9216), CustomItemList.eM_energyMulti64_UMV.get(1), 400, @@ -1094,95 +922,79 @@ public class DreamCraftRecipeLoader { // Buck Converter IV-UIV if (Loader.isModLoaded("bartworks")) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_LuV_IV.get(1), - getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), - getModItem("bartworks", "BW_GlasBlocks", 2L, 2) - }, + new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), + getModItem("bartworks", "BW_GlasBlocks", 2L, 2) }, Materials.TungstenSteel.getMolten(288), CustomItemList.Machine_BuckConverter_IV.get(1), 100, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_ZPM_LuV.get(1), - getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get( - OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), - getModItem("bartworks", "BW_GlasBlocks", 2L, 3) - }, + new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get( + OrePrefixes.plate, + getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), + 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), + getModItem("bartworks", "BW_GlasBlocks", 2L, 3) }, new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288), CustomItemList.Machine_BuckConverter_LuV.get(1), 100, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_UV_ZPM.get(1), - getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), - getModItem("bartworks", "BW_GlasBlocks", 2L, 4) - }, + new ItemStack[] { ItemList.Transformer_UV_ZPM.get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), + getModItem("bartworks", "BW_GlasBlocks", 2L, 4) }, Materials.Iridium.getMolten(288), CustomItemList.Machine_BuckConverter_ZPM.get(1), 100, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_MAX_UV.get(1), - getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), - getModItem("bartworks", "BW_GlasBlocks", 2L, 5) - }, + new ItemStack[] { ItemList.Transformer_MAX_UV.get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), + getModItem("bartworks", "BW_GlasBlocks", 2L, 5) }, Materials.Osmium.getMolten(288), CustomItemList.Machine_BuckConverter_UV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UEV_UHV").get(1), - getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), - getModItem("bartworks", "BW_GlasBlocks", 4L, 5) - }, + new ItemStack[] { getItemContainer("Transformer_UEV_UHV").get(1), + getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), + getModItem("bartworks", "BW_GlasBlocks", 4L, 5) }, Materials.Neutronium.getMolten(288), CustomItemList.Machine_BuckConverter_UHV.get(1), 100, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UIV_UEV").get(1), - getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 2), - GT_OreDictUnificator.get( - OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4), - getModItem("bartworks", "BW_GlasBlocks", 8L, 5) - }, + new ItemStack[] { getItemContainer("Transformer_UIV_UEV").get(1), + getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4), + getModItem("bartworks", "BW_GlasBlocks", 8L, 5) }, getOrDefault("Bedrockium", Materials.Neutronium).getMolten(288), CustomItemList.Machine_BuckConverter_UEV.get(1), 100, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Transformer_UMV_UIV").get(1), - getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Optical, 2), - GT_OreDictUnificator.get( - OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 4), - getModItem("bartworks", "BW_GlasBlocks", 16L, 5) - }, + new ItemStack[] { getItemContainer("Transformer_UMV_UIV").get(1), + getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Optical, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 4), + getModItem("bartworks", "BW_GlasBlocks", 16L, 5) }, getOrDefault("BlackPlutonium", Materials.Neutronium).getMolten(288), CustomItemList.Machine_BuckConverter_UIV.get(1), 200, @@ -1190,105 +1002,81 @@ public class DreamCraftRecipeLoader { } // Laser Dynamo IV-UEV 256/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_IV.get(1), - ItemList.Electric_Pump_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_IV.get(1), + ItemList.Electric_Pump_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_IV.get(1), 1000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_LuV.get(1), - ItemList.Electric_Pump_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_LuV.get(1), + ItemList.Electric_Pump_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_LuV.get(1), 1000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_ZPM.get(1), - ItemList.Electric_Pump_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_ZPM.get(1), + ItemList.Electric_Pump_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_ZPM.get(1), 1000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_UV.get(1), - ItemList.Electric_Pump_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UV.get(1), + ItemList.Electric_Pump_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_UV.get(1), 1000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_UHV.get(1), - ItemList.Electric_Pump_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Bedrockium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UHV.get(1), + ItemList.Electric_Pump_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Bedrockium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_UHV.get(1), 1000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_UEV.get(1), - ItemList.Electric_Pump_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Draconium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UEV.get(1), + ItemList.Electric_Pump_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Draconium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_UEV.get(1), 1000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_UIV.get(1), - ItemList.Electric_Pump_UIV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NetherStar, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UIV.get(1), + ItemList.Electric_Pump_UIV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NetherStar, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_UIV.get(1), 1000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_UMV.get(1), - ItemList.Electric_Pump_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Quantium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UMV.get(1), + ItemList.Electric_Pump_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Quantium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_UMV.get(1), 1000, @@ -1296,105 +1084,81 @@ public class DreamCraftRecipeLoader { // Laser Dynamo IV-UEV 1024/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_IV.get(2), - ItemList.Electric_Pump_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_IV.get(2), + ItemList.Electric_Pump_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_IV.get(1), 2000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_LuV.get(2), - ItemList.Electric_Pump_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_LuV.get(2), + ItemList.Electric_Pump_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_LuV.get(1), 2000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_ZPM.get(2), - ItemList.Electric_Pump_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_ZPM.get(2), + ItemList.Electric_Pump_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_ZPM.get(1), 2000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_UV.get(2), - ItemList.Electric_Pump_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UV.get(2), + ItemList.Electric_Pump_UV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_UV.get(1), 2000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_UHV.get(2), - ItemList.Electric_Pump_UHV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Bedrockium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UHV.get(2), + ItemList.Electric_Pump_UHV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Bedrockium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_UHV.get(1), 2000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_UEV.get(2), - ItemList.Electric_Pump_UEV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Draconium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UEV.get(2), + ItemList.Electric_Pump_UEV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Draconium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_UEV.get(1), 2000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_UIV.get(2), - ItemList.Electric_Pump_UIV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NetherStar, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UIV.get(2), + ItemList.Electric_Pump_UIV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NetherStar, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_UIV.get(1), 2000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_UMV.get(2), - ItemList.Electric_Pump_UMV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Quantium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UMV.get(2), + ItemList.Electric_Pump_UMV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Quantium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_UMV.get(1), 2000, @@ -1402,105 +1166,81 @@ public class DreamCraftRecipeLoader { // Laser Dynamo IV-UEV 4096/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_IV.get(4), - ItemList.Electric_Pump_IV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_IV.get(4), + ItemList.Electric_Pump_IV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_IV.get(1), 4000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_LuV.get(4), - ItemList.Electric_Pump_LuV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_LuV.get(4), + ItemList.Electric_Pump_LuV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_LuV.get(1), 4000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_ZPM.get(4), - ItemList.Electric_Pump_ZPM.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_ZPM.get(4), + ItemList.Electric_Pump_ZPM.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_ZPM.get(1), 4000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UV.get(4), - ItemList.Electric_Pump_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UV.get(4), + ItemList.Electric_Pump_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_UV.get(1), 4000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UHV.get(4), - ItemList.Electric_Pump_UHV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Bedrockium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UHV.get(4), + ItemList.Electric_Pump_UHV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Bedrockium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_UHV.get(1), 4000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UEV.get(4), - ItemList.Electric_Pump_UEV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UEV.get(4), + ItemList.Electric_Pump_UEV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_UEV.get(1), 4000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UIV.get(4), - ItemList.Electric_Pump_UIV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UIV.get(4), + ItemList.Electric_Pump_UIV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_UIV.get(1), 4000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UMV.get(4), - ItemList.Electric_Pump_UMV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UMV.get(4), + ItemList.Electric_Pump_UMV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_UMV.get(1), 4000, @@ -1508,105 +1248,81 @@ public class DreamCraftRecipeLoader { // Laser Dynamo IV-UEV 16384/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_IV.get(8), - ItemList.Electric_Pump_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_IV.get(8), + ItemList.Electric_Pump_IV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_IV.get(1), 8000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_LuV.get(8), - ItemList.Electric_Pump_LuV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_LuV.get(8), + ItemList.Electric_Pump_LuV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_LuV.get(1), 8000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_ZPM.get(8), - ItemList.Electric_Pump_ZPM.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_ZPM.get(8), + ItemList.Electric_Pump_ZPM.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_ZPM.get(1), 8000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_UV.get(8), - ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_UV.get(8), + ItemList.Electric_Pump_UV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_UV.get(1), 8000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_UHV.get(8), - ItemList.Electric_Pump_UHV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Bedrockium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_UHV.get(8), + ItemList.Electric_Pump_UHV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Bedrockium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_UHV.get(1), 8000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_UEV.get(8), - ItemList.Electric_Pump_UEV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_UEV.get(8), + ItemList.Electric_Pump_UEV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_UEV.get(1), 8000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_UIV.get(8), - ItemList.Electric_Pump_UIV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_UIV.get(8), + ItemList.Electric_Pump_UIV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_UIV.get(1), 8000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UMV.get(8), - ItemList.Electric_Pump_UMV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UMV.get(8), + ItemList.Electric_Pump_UMV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_UMV.get(1), 8000, @@ -1614,105 +1330,81 @@ public class DreamCraftRecipeLoader { // Laser Dynamo IV-UEV 65536/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_IV.get(16), - ItemList.Electric_Pump_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_IV.get(16), + ItemList.Electric_Pump_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_IV.get(1), 16000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_LuV.get(16), - ItemList.Electric_Pump_LuV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_LuV.get(16), + ItemList.Electric_Pump_LuV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_LuV.get(1), 16000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_ZPM.get(16), - ItemList.Electric_Pump_ZPM.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_ZPM.get(16), + ItemList.Electric_Pump_ZPM.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_ZPM.get(1), 16000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_UV.get(16), - ItemList.Electric_Pump_UV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UV.get(16), + ItemList.Electric_Pump_UV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_UV.get(1), 16000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_UHV.get(16), - ItemList.Electric_Pump_UHV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Bedrockium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UHV.get(16), + ItemList.Electric_Pump_UHV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Bedrockium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_UHV.get(1), 16000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_UEV.get(16), - ItemList.Electric_Pump_UEV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UEV.get(16), + ItemList.Electric_Pump_UEV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_UEV.get(1), 16000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_UIV.get(16), - ItemList.Electric_Pump_UIV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UIV.get(16), + ItemList.Electric_Pump_UIV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_UIV.get(1), 16000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_UMV.get(16), - ItemList.Electric_Pump_UMV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UMV.get(16), + ItemList.Electric_Pump_UMV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_UMV.get(1), 16000, @@ -1720,105 +1412,81 @@ public class DreamCraftRecipeLoader { // Laser Dynamo IV-UEV 262144/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_IV.get(32), - ItemList.Electric_Pump_IV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_IV.get(32), + ItemList.Electric_Pump_IV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_IV.get(1), 32000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_LuV.get(32), - ItemList.Electric_Pump_LuV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_LuV.get(32), + ItemList.Electric_Pump_LuV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_LuV.get(1), 32000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_ZPM.get(32), - ItemList.Electric_Pump_ZPM.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_ZPM.get(32), + ItemList.Electric_Pump_ZPM.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_ZPM.get(1), 32000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_UV.get(32), - ItemList.Electric_Pump_UV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UV.get(32), + ItemList.Electric_Pump_UV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_UV.get(1), 32000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_UHV.get(32), - ItemList.Electric_Pump_UHV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Bedrockium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UHV.get(32), + ItemList.Electric_Pump_UHV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Bedrockium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_UHV.get(1), 32000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_UEV.get(32), - ItemList.Electric_Pump_UEV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UEV.get(32), + ItemList.Electric_Pump_UEV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_UEV.get(1), 32000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_UIV.get(32), - ItemList.Electric_Pump_UIV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UIV.get(32), + ItemList.Electric_Pump_UIV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_UIV.get(1), 32000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UMV.get(32), - ItemList.Electric_Pump_UMV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UMV.get(32), + ItemList.Electric_Pump_UMV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_UMV.get(1), 32000, @@ -1826,105 +1494,81 @@ public class DreamCraftRecipeLoader { // Laser Dynamo IV-UEV 1048576/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_IV.get(64), - ItemList.Electric_Pump_IV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_IV.get(64), + ItemList.Electric_Pump_IV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_IV.get(1), 64000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_LuV.get(64), - ItemList.Electric_Pump_LuV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_LuV.get(64), + ItemList.Electric_Pump_LuV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_LuV.get(1), 64000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_ZPM.get(64), - ItemList.Electric_Pump_ZPM.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_ZPM.get(64), + ItemList.Electric_Pump_ZPM.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_ZPM.get(1), 64000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_UV.get(64), - ItemList.Electric_Pump_UV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UV.get(64), + ItemList.Electric_Pump_UV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_UV.get(1), 64000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_UHV.get(64), - ItemList.Electric_Pump_UHV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UHV.get(64), + ItemList.Electric_Pump_UHV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_UHV.get(1), 64000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_UEV.get(64), - ItemList.Electric_Pump_UEV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UEV.get(64), + ItemList.Electric_Pump_UEV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_UEV.get(1), 64000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_UIV.get(64), - ItemList.Electric_Pump_UIV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NetherStar, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UIV.get(64), + ItemList.Electric_Pump_UIV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NetherStar, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_UIV.get(1), 64000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_UMV.get(64), - ItemList.Electric_Pump_UMV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Quantium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UMV.get(64), + ItemList.Electric_Pump_UMV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Quantium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_UMV.get(1), 64000, @@ -1932,105 +1576,81 @@ public class DreamCraftRecipeLoader { // Laser Target IV-UEV 256/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_IV.get(1), - ItemList.Electric_Pump_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_IV.get(1), + ItemList.Electric_Pump_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_IV.get(1), 1000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_LuV.get(1), - ItemList.Electric_Pump_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_LuV.get(1), + ItemList.Electric_Pump_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_LuV.get(1), 1000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_ZPM.get(1), - ItemList.Electric_Pump_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_ZPM.get(1), + ItemList.Electric_Pump_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_ZPM.get(1), 1000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_UV.get(1), - ItemList.Electric_Pump_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UV.get(1), + ItemList.Electric_Pump_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_UV.get(1), 1000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_UHV.get(1), - ItemList.Electric_Pump_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Bedrockium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UHV.get(1), + ItemList.Electric_Pump_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Bedrockium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_UHV.get(1), 1000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_UEV.get(1), - ItemList.Electric_Pump_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Draconium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UEV.get(1), + ItemList.Electric_Pump_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Draconium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_UEV.get(1), 1000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_UIV.get(1), - ItemList.Electric_Pump_UIV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NetherStar, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UIV.get(1), + ItemList.Electric_Pump_UIV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NetherStar, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_UIV.get(1), 1000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_UMV.get(1), - ItemList.Electric_Pump_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Quantium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UMV.get(1), + ItemList.Electric_Pump_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Quantium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_UMV.get(1), 1000, @@ -2038,105 +1658,81 @@ public class DreamCraftRecipeLoader { // Laser Target IV-UEV 1024/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_IV.get(2), - ItemList.Electric_Pump_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_IV.get(2), + ItemList.Electric_Pump_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_IV.get(1), 2000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_LuV.get(2), - ItemList.Electric_Pump_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_LuV.get(2), + ItemList.Electric_Pump_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_LuV.get(1), 2000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_ZPM.get(2), - ItemList.Electric_Pump_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_ZPM.get(2), + ItemList.Electric_Pump_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_ZPM.get(1), 2000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_UV.get(2), - ItemList.Electric_Pump_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UV.get(2), + ItemList.Electric_Pump_UV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_UV.get(1), 2000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_UHV.get(2), - ItemList.Electric_Pump_UHV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Bedrockium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UHV.get(2), + ItemList.Electric_Pump_UHV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Bedrockium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_UHV.get(1), 2000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_UEV.get(2), - ItemList.Electric_Pump_UEV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Draconium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UEV.get(2), + ItemList.Electric_Pump_UEV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Draconium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_UEV.get(1), 2000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_UIV.get(2), - ItemList.Electric_Pump_UIV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NetherStar, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UIV.get(2), + ItemList.Electric_Pump_UIV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NetherStar, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_UIV.get(1), 2000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_UMV.get(2), - ItemList.Electric_Pump_UMV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Quantium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UMV.get(2), + ItemList.Electric_Pump_UMV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Quantium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_UMV.get(1), 2000, @@ -2144,105 +1740,81 @@ public class DreamCraftRecipeLoader { // Laser Target IV-UEV 4096/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_IV.get(4), - ItemList.Electric_Pump_IV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_IV.get(4), + ItemList.Electric_Pump_IV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_IV.get(1), 4000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_LuV.get(4), - ItemList.Electric_Pump_LuV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_LuV.get(4), + ItemList.Electric_Pump_LuV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_LuV.get(1), 4000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_ZPM.get(4), - ItemList.Electric_Pump_ZPM.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_ZPM.get(4), + ItemList.Electric_Pump_ZPM.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_ZPM.get(1), 4000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_UV.get(4), - ItemList.Electric_Pump_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_UV.get(4), + ItemList.Electric_Pump_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_UV.get(1), 4000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_UHV.get(4), - ItemList.Electric_Pump_UHV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Bedrockium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_UHV.get(4), + ItemList.Electric_Pump_UHV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Bedrockium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_UHV.get(1), 4000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_UEV.get(4), - ItemList.Electric_Pump_UEV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_UEV.get(4), + ItemList.Electric_Pump_UEV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_UEV.get(1), 4000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_UIV.get(4), - ItemList.Electric_Pump_UIV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_UIV.get(4), + ItemList.Electric_Pump_UIV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_UIV.get(1), 4000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_UMV.get(4), - ItemList.Electric_Pump_UMV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UMV.get(4), + ItemList.Electric_Pump_UMV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_UMV.get(1), 4000, @@ -2250,105 +1822,81 @@ public class DreamCraftRecipeLoader { // Laser Target IV-UEV 16384/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_IV.get(8), - ItemList.Electric_Pump_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_IV.get(8), + ItemList.Electric_Pump_IV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_IV.get(1), 8000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_LuV.get(8), - ItemList.Electric_Pump_LuV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_LuV.get(8), + ItemList.Electric_Pump_LuV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_LuV.get(1), 8000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_ZPM.get(8), - ItemList.Electric_Pump_ZPM.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_ZPM.get(8), + ItemList.Electric_Pump_ZPM.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_ZPM.get(1), 8000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_UV.get(8), - ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UV.get(8), + ItemList.Electric_Pump_UV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_UV.get(1), 8000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_UHV.get(8), - ItemList.Electric_Pump_UHV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Bedrockium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UHV.get(8), + ItemList.Electric_Pump_UHV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Bedrockium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_UHV.get(1), 8000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_UEV.get(8), - ItemList.Electric_Pump_UEV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UEV.get(8), + ItemList.Electric_Pump_UEV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_UEV.get(1), 8000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_UIV.get(8), - ItemList.Electric_Pump_UIV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UIV.get(8), + ItemList.Electric_Pump_UIV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_UIV.get(1), 8000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_UMV.get(8), - ItemList.Electric_Pump_UMV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UMV.get(8), + ItemList.Electric_Pump_UMV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_UMV.get(1), 8000, @@ -2356,105 +1904,81 @@ public class DreamCraftRecipeLoader { // Laser Target IV-UEV 65536/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_IV.get(16), - ItemList.Electric_Pump_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_IV.get(16), + ItemList.Electric_Pump_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_IV.get(1), 16000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_LuV.get(16), - ItemList.Electric_Pump_LuV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_LuV.get(16), + ItemList.Electric_Pump_LuV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_LuV.get(1), 16000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_ZPM.get(16), - ItemList.Electric_Pump_ZPM.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_ZPM.get(16), + ItemList.Electric_Pump_ZPM.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_ZPM.get(1), 16000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_UV.get(16), - ItemList.Electric_Pump_UV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UV.get(16), + ItemList.Electric_Pump_UV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_UV.get(1), 16000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_UHV.get(16), - ItemList.Electric_Pump_UHV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Bedrockium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UHV.get(16), + ItemList.Electric_Pump_UHV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Bedrockium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_UHV.get(1), 16000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_UEV.get(16), - ItemList.Electric_Pump_UEV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UEV.get(16), + ItemList.Electric_Pump_UEV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_UEV.get(1), 16000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_UIV.get(16), - ItemList.Electric_Pump_UIV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UIV.get(16), + ItemList.Electric_Pump_UIV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_UIV.get(1), 16000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_UMV.get(16), - ItemList.Electric_Pump_UMV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UMV.get(16), + ItemList.Electric_Pump_UMV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_UMV.get(1), 16000, @@ -2462,105 +1986,81 @@ public class DreamCraftRecipeLoader { // Laser Target IV-UEV 262144/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_IV.get(32), - ItemList.Electric_Pump_IV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_IV.get(32), + ItemList.Electric_Pump_IV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_IV.get(1), 32000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_LuV.get(32), - ItemList.Electric_Pump_LuV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_LuV.get(32), + ItemList.Electric_Pump_LuV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_LuV.get(1), 32000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_ZPM.get(32), - ItemList.Electric_Pump_ZPM.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_ZPM.get(32), + ItemList.Electric_Pump_ZPM.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_ZPM.get(1), 32000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_UV.get(32), - ItemList.Electric_Pump_UV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UV.get(32), + ItemList.Electric_Pump_UV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_UV.get(1), 32000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_UHV.get(32), - ItemList.Electric_Pump_UHV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Bedrockium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UHV.get(32), + ItemList.Electric_Pump_UHV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Bedrockium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_UHV.get(1), 32000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_UEV.get(32), - ItemList.Electric_Pump_UEV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UEV.get(32), + ItemList.Electric_Pump_UEV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_UEV.get(1), 32000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_UIV.get(32), - ItemList.Electric_Pump_UIV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UIV.get(32), + ItemList.Electric_Pump_UIV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_UIV.get(1), 32000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_UMV.get(32), - ItemList.Electric_Pump_UMV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UMV.get(32), + ItemList.Electric_Pump_UMV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_UMV.get(1), 32000, @@ -2568,105 +2068,81 @@ public class DreamCraftRecipeLoader { // Laser Target IV-UEV 1048576/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_IV.get(64), - ItemList.Electric_Pump_IV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_IV.get(64), + ItemList.Electric_Pump_IV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_IV.get(1), 64000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_LuV.get(64), - ItemList.Electric_Pump_LuV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_LuV.get(64), + ItemList.Electric_Pump_LuV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_LuV.get(1), 64000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_ZPM.get(64), - ItemList.Electric_Pump_ZPM.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_ZPM.get(64), + ItemList.Electric_Pump_ZPM.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_ZPM.get(1), 64000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_UV.get(64), - ItemList.Electric_Pump_UV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UV.get(64), + ItemList.Electric_Pump_UV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_UV.get(1), 64000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_UHV.get(64), - ItemList.Electric_Pump_UHV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UHV.get(64), + ItemList.Electric_Pump_UHV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_UHV.get(1), 64000, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UEV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_UEV.get(64), - ItemList.Electric_Pump_UEV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { getItemContainer("Hull_UEV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UEV.get(64), + ItemList.Electric_Pump_UEV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_UEV.get(1), 64000, 8000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UIV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_UIV.get(64), - ItemList.Electric_Pump_UIV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NetherStar, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { getItemContainer("Hull_UIV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UIV.get(64), + ItemList.Electric_Pump_UIV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NetherStar, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_UIV.get(1), 64000, 32000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_UMV.get(64), - ItemList.Electric_Pump_UMV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Quantium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UMV.get(64), + ItemList.Electric_Pump_UMV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Quantium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_UMV.get(1), 64000, @@ -2674,24 +2150,18 @@ public class DreamCraftRecipeLoader { // Data Input addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Hatch_Input_Bus_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), - CustomItemList.DATApipe.get(2) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), ItemList.Hatch_Input_Bus_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + CustomItemList.DATApipe.get(2) }, Materials.Iridium.getMolten(1296), CustomItemList.dataIn_Hatch.get(1), 200, 122880); // Data Output addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Hatch_Output_Bus_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), - CustomItemList.DATApipe.get(2) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), ItemList.Hatch_Output_Bus_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + CustomItemList.DATApipe.get(2) }, Materials.Iridium.getMolten(1296), CustomItemList.dataOut_Hatch.get(1), 200, @@ -2699,12 +2169,9 @@ public class DreamCraftRecipeLoader { // Rack addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Computer_Bus.get(1), - ItemList.Hatch_Input_Bus_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - CustomItemList.DATApipe.get(4) - }, + new ItemStack[] { CustomItemList.eM_Computer_Bus.get(1), ItemList.Hatch_Input_Bus_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + CustomItemList.DATApipe.get(4) }, Materials.Iridium.getMolten(1296), CustomItemList.rack_Hatch.get(1), 800, @@ -2714,91 +2181,63 @@ public class DreamCraftRecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Input_Bus_ZPM.get(1), 10000, - new Object[] { - ItemList.Hatch_Input_Bus_ZPM.get(1), - CustomItemList.eM_Computer_Bus.get(1), - ItemList.Emitter_ZPM.get(8), - ItemList.Robot_Arm_ZPM.get(1), - ItemList.Electric_Motor_ZPM.get(2), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 16)}, - CustomItemList.DATApipe.get(2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(500), - Materials.Iridium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000) - }, + new Object[] { ItemList.Hatch_Input_Bus_ZPM.get(1), CustomItemList.eM_Computer_Bus.get(1), + ItemList.Emitter_ZPM.get(8), ItemList.Robot_Arm_ZPM.get(1), ItemList.Electric_Motor_ZPM.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1 }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 16) }, + CustomItemList.DATApipe.get(2), }, + new FluidStack[] { Materials.UUMatter.getFluid(500), Materials.Iridium.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000) }, CustomItemList.holder_Hatch.get(1), 1200, 100000); // Parameterizer GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), - CustomItemList.DATApipe.get(4), - ItemList.Cover_Screen.get(1), - new ItemStack(Blocks.stone_button, 16), - GT_Utility.getIntegratedCircuit(1), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + CustomItemList.DATApipe.get(4), ItemList.Cover_Screen.get(1), + new ItemStack(Blocks.stone_button, 16), GT_Utility.getIntegratedCircuit(1), }, Materials.Iridium.getMolten(2592), CustomItemList.Parametrizer_Hatch.get(1), 800, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - CustomItemList.DATApipe.get(6), - ItemList.Cover_Screen.get(1), - new ItemStack(Blocks.stone_button, 32), - GT_Utility.getIntegratedCircuit(2), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + CustomItemList.DATApipe.get(6), ItemList.Cover_Screen.get(1), + new ItemStack(Blocks.stone_button, 32), GT_Utility.getIntegratedCircuit(2), }, Materials.Iridium.getMolten(2592), CustomItemList.ParametrizerX_Hatch.get(1), 800, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), - CustomItemList.DATApipe.get(8), - ItemList.Cover_Screen.get(2), - new ItemStack(Blocks.stone_button, 64), - GT_Utility.getIntegratedCircuit(3), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), CustomItemList.DATApipe.get(8), + ItemList.Cover_Screen.get(2), new ItemStack(Blocks.stone_button, 64), + GT_Utility.getIntegratedCircuit(3), }, Materials.Iridium.getMolten(2592), CustomItemList.ParametrizerTXT_Hatch.get(1), 800, 122880); // Uncertainty addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - CustomItemList.DATApipe.get(16), - ItemList.Cover_Screen.get(1), - new ItemStack(Blocks.stone_button, 16), - GT_Utility.getIntegratedCircuit(4), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + CustomItemList.DATApipe.get(16), ItemList.Cover_Screen.get(1), + new ItemStack(Blocks.stone_button, 16), GT_Utility.getIntegratedCircuit(4), }, Materials.Iridium.getMolten(2592), CustomItemList.Uncertainty_Hatch.get(1), 1200, 122880); addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), - CustomItemList.DATApipe.get(32), - ItemList.Cover_Screen.get(1), - new ItemStack(Blocks.stone_button, 16), - GT_Utility.getIntegratedCircuit(5), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), + CustomItemList.DATApipe.get(32), ItemList.Cover_Screen.get(1), + new ItemStack(Blocks.stone_button, 16), GT_Utility.getIntegratedCircuit(5), }, Materials.Iridium.getMolten(2592), CustomItemList.UncertaintyX_Hatch.get(1), 1200, @@ -2806,36 +2245,27 @@ public class DreamCraftRecipeLoader { // Elemental Input addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Input_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2), - ItemList.Sensor_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Input_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2), + ItemList.Sensor_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_in_UV.get(1), 800, 500000); // Elemental Output addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Output_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2), - ItemList.Emitter_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Output_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2), + ItemList.Emitter_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_out_UV.get(1), 800, 500000); // Overflow addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Muffler_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1), - ItemList.Field_Generator_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Muffler_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1), + ItemList.Field_Generator_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_muffler_UV.get(1), 800, @@ -2843,21 +2273,17 @@ public class DreamCraftRecipeLoader { // Capacitor Hatch GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Input_Bus_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Gold, 4), - }, + new ItemStack[] { ItemList.Hatch_Input_Bus_HV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Gold, 4), }, Materials.Silver.getMolten(576), CustomItemList.capacitor_Hatch.get(1), 800, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Output_Bus_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Gold, 4), - }, + new ItemStack[] { ItemList.Hatch_Output_Bus_HV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Gold, 4), }, Materials.Silver.getMolten(576), CustomItemList.capacitor_Hatch.get(1), 800, @@ -2869,13 +2295,10 @@ public class DreamCraftRecipeLoader { // Tesla Tower GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_ModHandler.getIC2Item("teslaCoil", 1), - CustomItemList.tM_TeslaSecondary.get(4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), - ItemList.Upgrade_Overclocker.get(4), - }, + new ItemStack[] { GT_ModHandler.getIC2Item("teslaCoil", 1), CustomItemList.tM_TeslaSecondary.get(4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + ItemList.Upgrade_Overclocker.get(4), }, Materials.Silver.getMolten(576), CustomItemList.Machine_Multi_TeslaCoil.get(1), 800, @@ -2883,13 +2306,11 @@ public class DreamCraftRecipeLoader { // Microwave Grinder GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Machine_HV_Microwave.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), - ItemList.Upgrade_Overclocker.get(4), - }, + new ItemStack[] { ItemList.Machine_HV_Microwave.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), + ItemList.Upgrade_Overclocker.get(4), }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1), 800, @@ -2897,13 +2318,13 @@ public class DreamCraftRecipeLoader { // Active Transformer GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_ZPM_LuV").get(1), - getItemContainer("HighEnergyFlowCircuit").get(1), - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, getOrDefault("SuperconductorLuV", Materials.Superconductor), 16), - ItemList.valueOf("Circuit_Chip_UHPIC").get(2), - }, + new ItemStack[] { getItemContainer("WetTransformer_ZPM_LuV").get(1), + getItemContainer("HighEnergyFlowCircuit").get(1), + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + getOrDefault("SuperconductorLuV", Materials.Superconductor), + 16), + ItemList.valueOf("Circuit_Chip_UHPIC").get(2), }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1), 400, @@ -2911,13 +2332,11 @@ public class DreamCraftRecipeLoader { // Network Switch GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 64), - CustomItemList.DATApipe.get(4), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 64), + CustomItemList.DATApipe.get(4), }, Materials.Iridium.getMolten(1296), CustomItemList.Machine_Multi_Switch.get(1), 800, @@ -2927,20 +2346,14 @@ public class DreamCraftRecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Tool_DataOrb.get(1), 20000, - new Object[] { - CustomItemList.Machine_Multi_Switch.get(1), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 2}, - ItemList.Tool_DataOrb.get(1), - ItemList.Cover_Screen.get(1), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 8)}, - CustomItemList.DATApipe.get(8), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Iridium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Hydrogen.getGas(1000), - }, + new Object[] { CustomItemList.Machine_Multi_Switch.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 2 }, + ItemList.Tool_DataOrb.get(1), ItemList.Cover_Screen.get(1), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 8) }, + CustomItemList.DATApipe.get(8), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Iridium.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Hydrogen.getGas(1000), }, CustomItemList.Machine_Multi_Computer.get(1), 12000, 100000); @@ -2949,22 +2362,14 @@ public class DreamCraftRecipeLoader { GT_Values.RA.addAssemblylineRecipe( getItemContainer("ScannerZPM").get(1), 80000, - new Object[] { - CustomItemList.Machine_Multi_Switch.get(1), - ItemList.Sensor_ZPM.get(8), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4}, - ItemList.Field_Generator_ZPM.get(1), - ItemList.Electric_Motor_ZPM.get(2), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 32)}, - CustomItemList.DATApipe.get(16), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Iridium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new Object[] { CustomItemList.Machine_Multi_Switch.get(1), ItemList.Sensor_ZPM.get(8), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4 }, + ItemList.Field_Generator_ZPM.get(1), ItemList.Electric_Motor_ZPM.get(2), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 32) }, + CustomItemList.DATApipe.get(16), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Iridium.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_Research.get(1), 12000, 100000); @@ -2976,20 +2381,13 @@ public class DreamCraftRecipeLoader { 32, 500000, 4, - new Object[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), - ItemList.Robot_Arm_LuV.get(2), - ItemList.Electric_Piston_LuV.get(2), - new Object[] {"circuitSuperconductor", 2}, - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 4), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new Object[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), + ItemList.Robot_Arm_LuV.get(2), ItemList.Electric_Piston_LuV.get(2), + new Object[] { "circuitSuperconductor", 2 }, + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 4), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EMjunction.get(1), 12000, 100000); @@ -3001,19 +2399,12 @@ public class DreamCraftRecipeLoader { 32, 500000, 6, - new Object[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), - ItemList.Emitter_UV.get(2), - new Object[] {"circuitSuperconductor", 1}, - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new Object[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), + ItemList.Emitter_UV.get(2), new Object[] { "circuitSuperconductor", 1 }, + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_MatterToEM.get(1), 12000, 100000); @@ -3025,19 +2416,12 @@ public class DreamCraftRecipeLoader { 32, 500000, 6, - new Object[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), - ItemList.Sensor_UV.get(2), - new Object[] {"circuitSuperconductor", 1}, - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new Object[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), + ItemList.Sensor_UV.get(2), new Object[] { "circuitSuperconductor", 1 }, + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EMToMatter.get(1), 12000, 100000); @@ -3049,19 +2433,12 @@ public class DreamCraftRecipeLoader { 32, 500000, 8, - new Object[] { - CustomItemList.Machine_Multi_MatterToEM.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 4), - ItemList.Emitter_UV.get(2), - new Object[] {"circuitSuperconductor", 1}, - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(2000), - Materials.Void.getMolten(2592), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - Materials.Osmium.getMolten(1296), - }, + new Object[] { CustomItemList.Machine_Multi_MatterToEM.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 4), + ItemList.Emitter_UV.get(2), new Object[] { "circuitSuperconductor", 1 }, + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 2), }, + new FluidStack[] { Materials.UUMatter.getFluid(2000), Materials.Void.getMolten(2592), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EssentiaToEM.get(1), 24000, 500000); @@ -3073,19 +2450,12 @@ public class DreamCraftRecipeLoader { 32, 500000, 8, - new Object[] { - CustomItemList.Machine_Multi_EMToMatter.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 4), - ItemList.Sensor_UV.get(2), - new Object[] {"circuitSuperconductor", 1}, - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(2000), - Materials.Void.getMolten(2592), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - Materials.Osmium.getMolten(1296), - }, + new Object[] { CustomItemList.Machine_Multi_EMToMatter.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 4), + ItemList.Sensor_UV.get(2), new Object[] { "circuitSuperconductor", 1 }, + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 2), }, + new FluidStack[] { Materials.UUMatter.getFluid(2000), Materials.Void.getMolten(2592), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EMToEssentia.get(1), 24000, 500000); @@ -3097,21 +2467,14 @@ public class DreamCraftRecipeLoader { 128, 500000, 16, - new Object[] { - CustomItemList.Machine_Multi_EMjunction.get(1), - CustomItemList.eM_Computer_Bus.get(4), - ItemList.Field_Generator_UV.get(4), - ItemList.Sensor_UV.get(4), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, - getItemContainer("MysteriousCrystalLens").get(4), - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 4), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(2000), - Materials.Neutronium.getMolten(2592), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - Materials.Osmiridium.getMolten(1296), - }, + new Object[] { CustomItemList.Machine_Multi_EMjunction.get(1), CustomItemList.eM_Computer_Bus.get(4), + ItemList.Field_Generator_UV.get(4), ItemList.Sensor_UV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, + getItemContainer("MysteriousCrystalLens").get(4), + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 4), }, + new FluidStack[] { Materials.UUMatter.getFluid(2000), Materials.Neutronium.getMolten(2592), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), + Materials.Osmiridium.getMolten(1296), }, CustomItemList.Machine_Multi_Scanner.get(1), 24000, 500000); @@ -3120,17 +2483,11 @@ public class DreamCraftRecipeLoader { GT_Values.RA.addAssemblylineRecipe( CustomItemList.Machine_Multi_Transformer.get(1), 7500, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - CustomItemList.eM_Coil.get(8), - CustomItemList.eM_Power.get(8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NeodymiumMagnetic, 16), - }, - new FluidStack[] { - Materials.Electrum.getMolten(2592), - Materials.Europium.getMolten(1872), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Coil.get(8), + CustomItemList.eM_Power.get(8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NeodymiumMagnetic, 16), }, + new FluidStack[] { Materials.Electrum.getMolten(2592), Materials.Europium.getMolten(1872), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), }, CustomItemList.Machine_Multi_Infuser.get(1), 8000, 200000); @@ -3151,58 +2508,29 @@ public class DreamCraftRecipeLoader { 16, 50000, 2, - new Object[] { - ItemList.Hull_MAX.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2L), - ItemList.Circuit_Chip_QPIC.get(2L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 2L}, - ItemList.UHV_Coil.get(2L), - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - ItemList.Electric_Pump_UHV.get(1L) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), - new FluidStack(solderIndalloy, 40 * 144) - }, + new Object[] { ItemList.Hull_MAX.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2L), + ItemList.Circuit_Chip_QPIC.get(2L), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 2L }, ItemList.UHV_Coil.get(2L), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + ItemList.Electric_Pump_UHV.get(1L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), + new FluidStack(solderIndalloy, 40 * 144) }, ItemList.Hatch_Energy_MAX.get(1L), 1000, 2000000); @@ -3213,58 +2541,29 @@ public class DreamCraftRecipeLoader { 32, 100000, 4, - new Object[] { - ItemList.Hull_MAX.get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 8L), - ItemList.Circuit_Chip_QPIC.get(2L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 2L}, - ItemList.UHV_Coil.get(2L), - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - new ItemStack[] { - ItemList.Reactor_Coolant_He_6.get(1L), - ItemList.Reactor_Coolant_NaK_6.get(1L), - ItemList.Reactor_Coolant_Sp_2.get(1L) - }, - ItemList.Electric_Pump_UHV.get(1L) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), - new FluidStack(solderIndalloy, 40 * 144) - }, + new Object[] { ItemList.Hull_MAX.get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 8L), + ItemList.Circuit_Chip_QPIC.get(2L), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 2L }, ItemList.UHV_Coil.get(2L), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), + ItemList.Reactor_Coolant_Sp_2.get(1L) }, + ItemList.Electric_Pump_UHV.get(1L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), + new FluidStack(solderIndalloy, 40 * 144) }, ItemList.Hatch_Dynamo_MAX.get(1L), 1000, 2000000); @@ -3276,22 +2575,14 @@ public class DreamCraftRecipeLoader { 32, 100000, 4, - new Object[] { - getItemContainer("Hull_UEV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 2L), - ItemList.Circuit_Chip_QPIC.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 2L}, - ItemList.UHV_Coil.get(4L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UEV.get(1L) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000), - new FluidStack(solderUEV, 20 * 144), - Materials.UUMatter.getFluid(8000L) - }, + new Object[] { getItemContainer("Hull_UEV").get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 2L), + ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 2L }, + ItemList.UHV_Coil.get(4L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Electric_Pump_UEV.get(1L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000), + new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(8000L) }, getItemContainer("Hatch_Energy_UEV").get(1L), 1000, 8000000); @@ -3302,22 +2593,14 @@ public class DreamCraftRecipeLoader { 64, 200000, 8, - new Object[] { - getItemContainer("Hull_UEV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUEVBase, 8L), - ItemList.Circuit_Chip_QPIC.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 2L}, - ItemList.UHV_Coil.get(4L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UEV.get(1L) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000), - new FluidStack(solderUEV, 20 * 144), - Materials.UUMatter.getFluid(8000L) - }, + new Object[] { getItemContainer("Hull_UEV").get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUEVBase, 8L), + ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 2L }, + ItemList.UHV_Coil.get(4L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Electric_Pump_UEV.get(1L) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000), + new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(8000L) }, getItemContainer("Hatch_Dynamo_UEV").get(1L), 1000, 8000000); @@ -3329,25 +2612,16 @@ public class DreamCraftRecipeLoader { 64, 200_000, 8, - new Object[] { - getItemContainer("Hull_UIV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUIV, 2L), - ItemList.Circuit_Chip_QPIC.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 2L}, - ItemList.UHV_Coil.get(8L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UIV.get(1L) - }, - new FluidStack[] { - Materials.SuperCoolant.getFluid(16_000L), - new FluidStack(solderUEV, 20 * 144), - Materials.UUMatter.getFluid(16_000L) - }, + new Object[] { getItemContainer("Hull_UIV").get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUIV, 2L), + ItemList.Circuit_Chip_QPIC.get(4L), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L }, ItemList.UHV_Coil.get(8L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Electric_Pump_UIV.get(1L) }, + new FluidStack[] { Materials.SuperCoolant.getFluid(16_000L), new FluidStack(solderUEV, 20 * 144), + Materials.UUMatter.getFluid(16_000L) }, getItemContainer("Hatch_Energy_UIV").get(1L), 1000, 32_000_000); @@ -3358,25 +2632,16 @@ public class DreamCraftRecipeLoader { 128, 400_000, 16, - new Object[] { - getItemContainer("Hull_UIV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUIVBase, 8L), - ItemList.Circuit_Chip_QPIC.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 2L}, - ItemList.UHV_Coil.get(8L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UIV.get(1L) - }, - new FluidStack[] { - Materials.SuperCoolant.getFluid(16_000L), - new FluidStack(solderUEV, 20 * 144), - Materials.UUMatter.getFluid(16_000L) - }, + new Object[] { getItemContainer("Hull_UIV").get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUIVBase, 8L), + ItemList.Circuit_Chip_QPIC.get(4L), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L }, ItemList.UHV_Coil.get(8L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Electric_Pump_UIV.get(1L) }, + new FluidStack[] { Materials.SuperCoolant.getFluid(16_000L), new FluidStack(solderUEV, 20 * 144), + Materials.UUMatter.getFluid(16_000L) }, getItemContainer("Hatch_Dynamo_UIV").get(1L), 1000, 32_000_000); @@ -3388,28 +2653,17 @@ public class DreamCraftRecipeLoader { 128, 400000, 16, - new Object[] { - getItemContainer("Hull_UMV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUMV, 2L), - ItemList.Circuit_Chip_QPIC.get(4L), - getItemContainer("PikoCircuit").get(2), - ItemList.UHV_Coil.get(16L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UMV.get(1L) - }, - new FluidStack[] { - Materials.SuperCoolant.getFluid(32_000L), - new FluidStack(solderUEV, 40 * 144), - Materials.UUMatter.getFluid(32000L) - }, + new Object[] { getItemContainer("Hull_UMV").get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUMV, 2L), + ItemList.Circuit_Chip_QPIC.get(4L), getItemContainer("PikoCircuit").get(2), + ItemList.UHV_Coil.get(16L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Electric_Pump_UMV.get(1L) }, + new FluidStack[] { Materials.SuperCoolant.getFluid(32_000L), new FluidStack(solderUEV, 40 * 144), + Materials.UUMatter.getFluid(32000L) }, getItemContainer("Hatch_Energy_UMV").get(1L), 1000, 128_000_000); @@ -3420,28 +2674,17 @@ public class DreamCraftRecipeLoader { 256, 800000, 32, - new Object[] { - getItemContainer("Hull_UMV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUMVBase, 8L), - ItemList.Circuit_Chip_QPIC.get(4L), - getItemContainer("PikoCircuit").get(2), - ItemList.UHV_Coil.get(16L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UMV.get(1L) - }, - new FluidStack[] { - Materials.SuperCoolant.getFluid(32_000L), - new FluidStack(solderUEV, 40 * 144), - Materials.UUMatter.getFluid(32000L) - }, + new Object[] { getItemContainer("Hull_UMV").get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUMVBase, 8L), + ItemList.Circuit_Chip_QPIC.get(4L), getItemContainer("PikoCircuit").get(2), + ItemList.UHV_Coil.get(16L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Electric_Pump_UMV.get(1L) }, + new FluidStack[] { Materials.SuperCoolant.getFluid(32_000L), new FluidStack(solderUEV, 40 * 144), + Materials.UUMatter.getFluid(32000L) }, getItemContainer("Hatch_Dynamo_UMV").get(1L), 1000, 128_000_000); @@ -3453,29 +2696,17 @@ public class DreamCraftRecipeLoader { 256, 800000, 32, - new Object[] { - getItemContainer("Hull_UXV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUMV, 4L), - ItemList.Circuit_Chip_QPIC.get(16L), - getItemContainer("QuantumCircuit").get(2), - ItemList.UHV_Coil.get(32L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UMV.get(4L) - }, - new FluidStack[] { - Materials.SuperCoolant.getFluid(64_000L), - new FluidStack(solderUEV, 80 * 144), - Materials.UUMatter.getFluid(64000L) - }, + new Object[] { getItemContainer("Hull_UXV").get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUMV, 4L), + ItemList.Circuit_Chip_QPIC.get(16L), getItemContainer("QuantumCircuit").get(2), + ItemList.UHV_Coil.get(32L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UMV.get(4L) }, + new FluidStack[] { Materials.SuperCoolant.getFluid(64_000L), new FluidStack(solderUEV, 80 * 144), + Materials.UUMatter.getFluid(64000L) }, getItemContainer("Hatch_Energy_UXV").get(1L), 1000, 512_000_000); @@ -3486,29 +2717,17 @@ public class DreamCraftRecipeLoader { 256, 800000, 32, - new Object[] { - getItemContainer("Hull_UXV").get(1L), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUMVBase, 16L), - ItemList.Circuit_Chip_QPIC.get(16L), - getItemContainer("QuantumCircuit").get(2), - ItemList.UHV_Coil.get(32L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UMV.get(4L) - }, - new FluidStack[] { - Materials.SuperCoolant.getFluid(64_000L), - new FluidStack(solderUEV, 80 * 144), - Materials.UUMatter.getFluid(64000L) - }, + new Object[] { getItemContainer("Hull_UXV").get(1L), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUMVBase, 16L), + ItemList.Circuit_Chip_QPIC.get(16L), getItemContainer("QuantumCircuit").get(2), + ItemList.UHV_Coil.get(32L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UMV.get(4L) }, + new FluidStack[] { Materials.SuperCoolant.getFluid(64_000L), new FluidStack(solderUEV, 80 * 144), + Materials.UUMatter.getFluid(64000L) }, getItemContainer("Hatch_Dynamo_UXV").get(1L), 1000, 512_000_000); @@ -3520,32 +2739,23 @@ public class DreamCraftRecipeLoader { 64, 50000, 4, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 2), - ItemList.Circuit_Wetwaresupercomputer.get(2L), - new ItemStack[] { - ItemList.Circuit_Parts_InductorASMD.get(16L), ItemList.Circuit_Parts_InductorXSMD.get(4L) - }, - new ItemStack[] { - ItemList.Circuit_Parts_CapacitorASMD.get(16L), ItemList.Circuit_Parts_CapacitorXSMD.get(4L) - }, - new ItemStack[] { - ItemList.Circuit_Parts_ResistorASMD.get(16L), ItemList.Circuit_Parts_ResistorXSMD.get(4L) - }, - new ItemStack[] { - ItemList.Circuit_Parts_TransistorASMD.get(16L), ItemList.Circuit_Parts_TransistorXSMD.get(4L) - }, - new ItemStack[] {ItemList.Circuit_Parts_DiodeASMD.get(16L), ItemList.Circuit_Parts_DiodeXSMD.get(4L) - }, - ItemList.Circuit_Chip_Ram.get(48L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64L), - new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 2880), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000), - Materials.Radon.getGas(2500L), - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 2), + ItemList.Circuit_Wetwaresupercomputer.get(2L), + new ItemStack[] { ItemList.Circuit_Parts_InductorASMD.get(16L), + ItemList.Circuit_Parts_InductorXSMD.get(4L) }, + new ItemStack[] { ItemList.Circuit_Parts_CapacitorASMD.get(16L), + ItemList.Circuit_Parts_CapacitorXSMD.get(4L) }, + new ItemStack[] { ItemList.Circuit_Parts_ResistorASMD.get(16L), + ItemList.Circuit_Parts_ResistorXSMD.get(4L) }, + new ItemStack[] { ItemList.Circuit_Parts_TransistorASMD.get(16L), + ItemList.Circuit_Parts_TransistorXSMD.get(4L) }, + new ItemStack[] { ItemList.Circuit_Parts_DiodeASMD.get(16L), + ItemList.Circuit_Parts_DiodeXSMD.get(4L) }, + ItemList.Circuit_Chip_Ram.get(48L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64L), + new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000), Materials.Radon.getGas(2500L), }, ItemList.Circuit_Wetwaremainframe.get(1L), 2000, 300000); @@ -3557,30 +2767,20 @@ public class DreamCraftRecipeLoader { 128, 500000, 8, - new Object[] { - ItemList.Circuit_Board_Bio_Ultra.get(2L), - ItemList.Circuit_Biowarecomputer.get(2L), - new ItemStack[] { - ItemList.Circuit_Parts_TransistorASMD.get(16L), ItemList.Circuit_Parts_TransistorXSMD.get(4L) - }, - new ItemStack[] { - ItemList.Circuit_Parts_ResistorASMD.get(16L), ItemList.Circuit_Parts_ResistorXSMD.get(4L) - }, - new ItemStack[] { - ItemList.Circuit_Parts_CapacitorASMD.get(16L), ItemList.Circuit_Parts_CapacitorXSMD.get(4L) - }, - new ItemStack[] {ItemList.Circuit_Parts_DiodeASMD.get(16L), ItemList.Circuit_Parts_DiodeXSMD.get(4L) - }, - ItemList.Circuit_Chip_NOR.get(32L), - ItemList.Circuit_Chip_Ram.get(64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 32L), - new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, - }, - new FluidStack[] { - new FluidStack(solderUEV, 1440), - Materials.BioMediumSterilized.getFluid(1440L), - Materials.SuperCoolant.getFluid(10_000L), - }, + new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(2L), ItemList.Circuit_Biowarecomputer.get(2L), + new ItemStack[] { ItemList.Circuit_Parts_TransistorASMD.get(16L), + ItemList.Circuit_Parts_TransistorXSMD.get(4L) }, + new ItemStack[] { ItemList.Circuit_Parts_ResistorASMD.get(16L), + ItemList.Circuit_Parts_ResistorXSMD.get(4L) }, + new ItemStack[] { ItemList.Circuit_Parts_CapacitorASMD.get(16L), + ItemList.Circuit_Parts_CapacitorXSMD.get(4L) }, + new ItemStack[] { ItemList.Circuit_Parts_DiodeASMD.get(16L), + ItemList.Circuit_Parts_DiodeXSMD.get(4L) }, + ItemList.Circuit_Chip_NOR.get(32L), ItemList.Circuit_Chip_Ram.get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 32L), + new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, }, + new FluidStack[] { new FluidStack(solderUEV, 1440), Materials.BioMediumSterilized.getFluid(1440L), + Materials.SuperCoolant.getFluid(10_000L), }, ItemList.Circuit_Biowaresupercomputer.get(1L), 4000, 500000); @@ -3592,33 +2792,24 @@ public class DreamCraftRecipeLoader { 256, 1000000, 16, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 4L), - ItemList.Circuit_Biowaresupercomputer.get(2L), - new ItemStack[] { - ItemList.Circuit_Parts_InductorASMD.get(24L), ItemList.Circuit_Parts_InductorXSMD.get(6L) - }, - new ItemStack[] { - ItemList.Circuit_Parts_TransistorASMD.get(24L), ItemList.Circuit_Parts_TransistorXSMD.get(6L) - }, - new ItemStack[] { - ItemList.Circuit_Parts_ResistorASMD.get(24L), ItemList.Circuit_Parts_ResistorXSMD.get(6L) - }, - new ItemStack[] { - ItemList.Circuit_Parts_CapacitorASMD.get(24L), ItemList.Circuit_Parts_CapacitorXSMD.get(6L) - }, - new ItemStack[] {ItemList.Circuit_Parts_DiodeASMD.get(24L), ItemList.Circuit_Parts_DiodeXSMD.get(6L) - }, - ItemList.Circuit_Chip_Ram.get(64L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 64), - new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64) - }, - new FluidStack[] { - new FluidStack(solderUEV, 2880), - Materials.BioMediumSterilized.getFluid(2880L), - Materials.SuperCoolant.getFluid(20_000L), - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 4L), + ItemList.Circuit_Biowaresupercomputer.get(2L), + new ItemStack[] { ItemList.Circuit_Parts_InductorASMD.get(24L), + ItemList.Circuit_Parts_InductorXSMD.get(6L) }, + new ItemStack[] { ItemList.Circuit_Parts_TransistorASMD.get(24L), + ItemList.Circuit_Parts_TransistorXSMD.get(6L) }, + new ItemStack[] { ItemList.Circuit_Parts_ResistorASMD.get(24L), + ItemList.Circuit_Parts_ResistorXSMD.get(6L) }, + new ItemStack[] { ItemList.Circuit_Parts_CapacitorASMD.get(24L), + ItemList.Circuit_Parts_CapacitorXSMD.get(6L) }, + new ItemStack[] { ItemList.Circuit_Parts_DiodeASMD.get(24L), + ItemList.Circuit_Parts_DiodeXSMD.get(6L) }, + ItemList.Circuit_Chip_Ram.get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 64), + new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.BioMediumSterilized.getFluid(2880L), + Materials.SuperCoolant.getFluid(20_000L), }, ItemList.Circuit_Biomainframe.get(1L), 6000, 2000000); @@ -3630,24 +2821,16 @@ public class DreamCraftRecipeLoader { 256, 2_000_000, 16, - new Object[] { - ItemList.Circuit_Board_Optical.get(1L), - ItemList.Circuit_OpticalProcessor.get(2L), - 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", "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), - Materials.SuperCoolant.getFluid(10_000L), - new FluidStack(FluidRegistry.getFluid("oganesson"), 500) - }, + new Object[] { ItemList.Circuit_Board_Optical.get(1L), ItemList.Circuit_OpticalProcessor.get(2L), + 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", "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), + Materials.SuperCoolant.getFluid(10_000L), + new FluidStack(FluidRegistry.getFluid("oganesson"), 500) }, ItemList.Circuit_OpticalAssembly.get(1L), 20 * 20, 2_000_000); @@ -3659,26 +2842,17 @@ public class DreamCraftRecipeLoader { 512, 4_000_000, 32, - new Object[] { - ItemList.Circuit_Board_Optical.get(2L), - ItemList.Circuit_OpticalAssembly.get(2L), - 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", "gt.bwMetaGeneratedwireFine", 32L, 10101), // Fine Lumiium Wire - new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64), - }, - new FluidStack[] { - new FluidStack(solderUEV, 1440 * 2), - Materials.Radon.getPlasma(1440L * 2), - Materials.SuperCoolant.getFluid(10_000L * 2), - new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 2) - }, + new Object[] { ItemList.Circuit_Board_Optical.get(2L), ItemList.Circuit_OpticalAssembly.get(2L), + 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", "gt.bwMetaGeneratedwireFine", 32L, 10101), // Fine Lumiium + // Wire + new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64), }, + new FluidStack[] { new FluidStack(solderUEV, 1440 * 2), Materials.Radon.getPlasma(1440L * 2), + Materials.SuperCoolant.getFluid(10_000L * 2), + new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 2) }, ItemList.Circuit_OpticalComputer.get(1L), 200 * 20, 2_000_000); @@ -3690,27 +2864,19 @@ public class DreamCraftRecipeLoader { 1024, 8_000_000, 64, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), - ItemList.Circuit_OpticalComputer.get(2L), - ItemList.Circuit_Parts_InductorXSMD.get(32L), - ItemList.Circuit_Parts_TransistorXSMD.get(32L), - ItemList.Circuit_Parts_ResistorXSMD.get(32L), - ItemList.Circuit_Parts_CapacitorXSMD.get(32L), - ItemList.Circuit_Parts_DiodeXSMD.get(32L), - ItemList.Circuit_Chip_SoC2.get(64L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 64), - new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, - new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64) - }, - new FluidStack[] { - new FluidStack(solderUEV, 1440 * 4), - Materials.Radon.getPlasma(1440L * 4), - Materials.SuperCoolant.getFluid(10_000L * 4), - new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 4) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), + ItemList.Circuit_OpticalComputer.get(2L), ItemList.Circuit_Parts_InductorXSMD.get(32L), + ItemList.Circuit_Parts_TransistorXSMD.get(32L), ItemList.Circuit_Parts_ResistorXSMD.get(32L), + ItemList.Circuit_Parts_CapacitorXSMD.get(32L), ItemList.Circuit_Parts_DiodeXSMD.get(32L), + ItemList.Circuit_Chip_SoC2.get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 64), + new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, + new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 1440 * 4), Materials.Radon.getPlasma(1440L * 4), + Materials.SuperCoolant.getFluid(10_000L * 4), + new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 4) }, ItemList.Circuit_OpticalMainframe.get(1L), 300 * 20, 8_000_000); @@ -3722,25 +2888,17 @@ public class DreamCraftRecipeLoader { 1024, 4000000, 64, - new Object[] { - ItemList.Circuit_Board_Bio_Ultra.get(1L), - getItemContainer("PicoWafer").get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 2L}, - ItemList.Circuit_Parts_TransistorXSMD.get(48L), - ItemList.Circuit_Parts_ResistorXSMD.get(48L), - ItemList.Circuit_Parts_CapacitorXSMD.get(48L), - ItemList.Circuit_Parts_DiodeXSMD.get(48L), - ItemList.Circuit_Chip_PPIC.get(64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 16), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Osmium, 32), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Neutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) - }, - new FluidStack[] { - new FluidStack(solderUEV, 3744), - Materials.UUMatter.getFluid(8000L), - Materials.Osmium.getMolten(1152L) - }, + new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L), getItemContainer("PicoWafer").get(4L), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L }, + ItemList.Circuit_Parts_TransistorXSMD.get(48L), ItemList.Circuit_Parts_ResistorXSMD.get(48L), + ItemList.Circuit_Parts_CapacitorXSMD.get(48L), ItemList.Circuit_Parts_DiodeXSMD.get(48L), + ItemList.Circuit_Chip_PPIC.get(64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 16), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Osmium, 32), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Neutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 3744), Materials.UUMatter.getFluid(8000L), + Materials.Osmium.getMolten(1152L) }, getItemContainer("PikoCircuit").get(1L), 10000, 128_000_000); @@ -3751,24 +2909,16 @@ public class DreamCraftRecipeLoader { 2048, 8000000, 128, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), - getItemContainer("PikoCircuit").get(2L), - ItemList.Circuit_Parts_CapacitorXSMD.get(64L), - ItemList.Circuit_Parts_DiodeXSMD.get(64L), - ItemList.Circuit_Parts_TransistorXSMD.get(64L), - ItemList.Circuit_Parts_ResistorXSMD.get(64L), - ItemList.Circuit_Chip_QPIC.get(64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 64), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) - }, - new FluidStack[] { - new FluidStack(solderUEV, 3744), - Materials.UUMatter.getFluid(24000L), - Materials.Osmium.getMolten(2304L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), + getItemContainer("PikoCircuit").get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(64L), + ItemList.Circuit_Parts_DiodeXSMD.get(64L), ItemList.Circuit_Parts_TransistorXSMD.get(64L), + ItemList.Circuit_Parts_ResistorXSMD.get(64L), ItemList.Circuit_Chip_QPIC.get(64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 64), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 3744), Materials.UUMatter.getFluid(24000L), + Materials.Osmium.getMolten(2304L) }, getItemContainer("QuantumCircuit").get(1L), 20000, 512_000_000); @@ -3781,27 +2931,22 @@ public class DreamCraftRecipeLoader { 32768, 500_000_000, 64, - new ItemStack[] { - ItemList.Casing_Dim_Bridge.get(64), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.SpaceTime, 16L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 8L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 8L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L), - ItemList.Sensor_UMV.get(16L), - ItemList.Emitter_UMV.get(16L), - getModItem("eternalsingularity", "eternal_singularity", 16L) - }, - new FluidStack[] { - Materials.Neutronium.getMolten(32_768_000L), - Materials.SpaceTime.getMolten(4 * 36864L), - Materials.SuperconductorUMVBase.getMolten(4 * 36864L), - Materials.ExcitedDTEC.getFluid(4 * 36864L) - }, + new ItemStack[] { ItemList.Casing_Dim_Bridge.get(64), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.SpaceTime, 16L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 8L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 8L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L), + ItemList.Sensor_UMV.get(16L), ItemList.Emitter_UMV.get(16L), + getModItem("eternalsingularity", "eternal_singularity", 16L) }, + new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L), + Materials.SpaceTime.getMolten(4 * 36864L), + Materials.SuperconductorUMVBase.getMolten(4 * 36864L), + Materials.ExcitedDTEC.getFluid(4 * 36864L) }, getItemContainer("StargateShieldingFoil").get(1L), 72_000, 500_000_000); @@ -3812,30 +2957,24 @@ public class DreamCraftRecipeLoader { 32_768, 500_000_000, 64, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), - ItemList.Casing_Dim_Bridge.get(64), - ItemList.Casing_Dim_Bridge.get(64), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16L), - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L), - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L), - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Opal, 16L), - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Sapphire, 16L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), - ItemList.Electric_Motor_UMV.get(64L), - ItemList.Electric_Piston_UMV.get(64L), - ItemList.Field_Generator_UMV.get(16L), - getItemContainer("QuantumCircuit").get(1L).splitStack(32), - }, - new FluidStack[] { - Materials.Neutronium.getMolten(32_768_000L), - Materials.SpaceTime.getMolten(4 * 36864L), - Materials.SuperconductorUMVBase.getMolten(4 * 36864L), - Materials.ExcitedDTEC.getFluid(4 * 36864L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), + ItemList.Casing_Dim_Bridge.get(64), ItemList.Casing_Dim_Bridge.get(64), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16L), + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L), + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L), + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Opal, 16L), + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Sapphire, 16L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), + ItemList.Electric_Motor_UMV.get(64L), ItemList.Electric_Piston_UMV.get(64L), + ItemList.Field_Generator_UMV.get(16L), + getItemContainer("QuantumCircuit").get(1L).splitStack(32), }, + new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L), + Materials.SpaceTime.getMolten(4 * 36864L), + Materials.SuperconductorUMVBase.getMolten(4 * 36864L), + Materials.ExcitedDTEC.getFluid(4 * 36864L) }, getItemContainer("StargateChevron").get(1L), 72_000, 500_000_000); @@ -3846,30 +2985,26 @@ public class DreamCraftRecipeLoader { 32_768, 500_000_000, 64, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 64L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L), - getModItem("bartworks", "gt.bwMetaGeneratedstickLong", 64L, 39), - getModItem("miscutils", "itemRodLongQuantum", 64L), - getModItem("miscutils", "itemRodLongHypogen", 64L), - getModItem("miscutils", "itemRodLongCelestialTungsten", 64L), - getModItem("bartworks", "gt.bwMetaGeneratedstickLong", 64L, 10106), - getModItem("miscutils", "itemRodLongAstralTitanium", 64L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUMVBase, 64L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Sunnarium, 64L), - getModItem("miscutils", "itemRodLongAbyssalAlloy", 64L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 64L), - }, - new FluidStack[] { - Materials.Neutronium.getMolten(32_768_000L), - Materials.SpaceTime.getMolten(4 * 36864L), - Materials.SuperconductorUMVBase.getMolten(4 * 36864L), - Materials.ExcitedDTEC.getFluid(4 * 36864L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L), + getModItem("bartworks", "gt.bwMetaGeneratedstickLong", 64L, 39), + getModItem("miscutils", "itemRodLongQuantum", 64L), + getModItem("miscutils", "itemRodLongHypogen", 64L), + getModItem("miscutils", "itemRodLongCelestialTungsten", 64L), + getModItem("bartworks", "gt.bwMetaGeneratedstickLong", 64L, 10106), + getModItem("miscutils", "itemRodLongAstralTitanium", 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUMVBase, 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Sunnarium, 64L), + getModItem("miscutils", "itemRodLongAbyssalAlloy", 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 64L), }, + new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L), + Materials.SpaceTime.getMolten(4 * 36864L), + Materials.SuperconductorUMVBase.getMolten(4 * 36864L), + Materials.ExcitedDTEC.getFluid(4 * 36864L) }, getItemContainer("StargateFramePart").get(1L), 72_000, 500_000_000); @@ -3886,30 +3021,23 @@ public class DreamCraftRecipeLoader { 4096, 32_000_000, 1, - new Object[] { - ItemList.Casing_Dim_Bridge.get(4), - getModItem("gregtech", "gt.blockmachines", 16L, 12730), - getItemContainer("Hatch_Energy_UEV").get(4L), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 6), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 20L}, - ItemList.Field_Generator_UEV.get(4), - getModItem("eternalsingularity", "eternal_singularity", 4L), - getModItem("miscutils", "MU-metaitem.01", 1L, 32105), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 64L), - ItemList.Electric_Pump_UEV.get(4), - ItemList.ZPM3.get(1), - getModItem("IC2", "blockMachine2", 1, 0) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("oganesson"), 128000), - new FluidStack(solderUEV, 36864 * 2), - new FluidStack(FluidRegistry.getFluid("molten.californium"), 36864), - Materials.NaquadahEnriched.getMolten(36864L) - }, + new Object[] { ItemList.Casing_Dim_Bridge.get(4), + getModItem("gregtech", "gt.blockmachines", 16L, 12730), + getItemContainer("Hatch_Energy_UEV").get(4L), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 6), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 20L }, + ItemList.Field_Generator_UEV.get(4), + getModItem("eternalsingularity", "eternal_singularity", 4L), + getModItem("miscutils", "MU-metaitem.01", 1L, 32105), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 64L), + ItemList.Electric_Pump_UEV.get(4), ItemList.ZPM3.get(1), + getModItem("IC2", "blockMachine2", 1, 0) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 128000), + new FluidStack(solderUEV, 36864 * 2), + new FluidStack(FluidRegistry.getFluid("molten.californium"), 36864), + Materials.NaquadahEnriched.getMolten(36864L) }, ItemList.Machine_Multi_PlasmaForge.get(1), 72000, 32_000_000); @@ -3921,20 +3049,13 @@ public class DreamCraftRecipeLoader { 4096, 32_000_000, 1, - new Object[] { - ItemList.Casing_Dim_Trans.get(1), - ItemList.MicroTransmitter_UV.get(1), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 2L}, - getModItem("Avaritia", "Singularity", 2L, 0), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 6), - getModItem("dreamcraft", "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) - }, + new Object[] { ItemList.Casing_Dim_Trans.get(1), ItemList.MicroTransmitter_UV.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 2L }, + getModItem("Avaritia", "Singularity", 2L, 0), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 6), + getModItem("dreamcraft", "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), 240 * 20, 32_000_000); @@ -3946,23 +3067,16 @@ public class DreamCraftRecipeLoader { 2048, 32_000_000, 1, - 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("miscutils", "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), - getModItem("dreamcraft", "item.PicoWafer", 1, 0), - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("oganesson"), 1000), - new FluidStack(solderUEV, 576), - Materials.NaquadahEnriched.getMolten(288L) - }, + 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("miscutils", "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), + getModItem("dreamcraft", "item.PicoWafer", 1, 0), }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 1000), + new FluidStack(solderUEV, 576), Materials.NaquadahEnriched.getMolten(288L) }, ItemList.Casing_Dim_Injector.get(1), 20 * 20, 32_000_000); @@ -3974,17 +3088,11 @@ public class DreamCraftRecipeLoader { 2048, 32_000_000, 1, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), - getModItem("miscutils", "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) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), + getModItem("miscutils", "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) }, ItemList.Casing_Dim_Trans.get(1), 20 * 20, 32_000_000); @@ -3998,24 +3106,17 @@ public class DreamCraftRecipeLoader { 2048, 2_000_000, 64, - new Object[] { - getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7), - getModItem("IC2", "blockMachine2", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1}, - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1}, - getModItem("dreamcraft", "item.PicoWafer", 32, 0), - ItemList.Robot_Arm_UMV.get(4), - ItemList.Emitter_UMV.get(4), - ItemList.Sensor_UMV.get(4), - }, - new FluidStack[] { - oganesson != null ? new FluidStack(oganesson, 50000) : null, - Materials.Infinity.getMolten(144L * 512), - Materials.Cheese.getMolten(232000L), - }, + new Object[] { getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7), + getModItem("IC2", "blockMachine2", 1, 0), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + getModItem("dreamcraft", "item.PicoWafer", 32, 0), ItemList.Robot_Arm_UMV.get(4), + ItemList.Emitter_UMV.get(4), ItemList.Sensor_UMV.get(4), }, + new FluidStack[] { oganesson != null ? new FluidStack(oganesson, 50000) : null, + Materials.Infinity.getMolten(144L * 512), Materials.Cheese.getMolten(232000L), }, ItemList.Block_BedrockiumCompressed.get(1), 10000, 5000000); @@ -4027,20 +3128,13 @@ public class DreamCraftRecipeLoader { 128, 500000, 6, - new Object[] { - ItemList.Hatch_AutoMaintenance.get(1L), - ItemList.Robot_Arm_UV.get(1L), - ItemList.Electric_Pump_UV.get(1L), - ItemList.Conveyor_Module_UV.get(1L), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4L}, - ItemList.Energy_LapotronicOrb2.get(1L), - ItemList.Duct_Tape.get(64L), - ItemList.Duct_Tape.get(64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), - }, - new FluidStack[] { - Materials.Lubricant.getFluid(256000), new FluidStack(solderIndalloy, 1296), - }, + new Object[] { ItemList.Hatch_AutoMaintenance.get(1L), ItemList.Robot_Arm_UV.get(1L), + ItemList.Electric_Pump_UV.get(1L), ItemList.Conveyor_Module_UV.get(1L), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4L }, + ItemList.Energy_LapotronicOrb2.get(1L), ItemList.Duct_Tape.get(64L), + ItemList.Duct_Tape.get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), }, + new FluidStack[] { Materials.Lubricant.getFluid(256000), new FluidStack(solderIndalloy, 1296), }, CustomItemList.hatch_CreativeMaintenance.get(1), 6000, 500000); @@ -4052,22 +3146,17 @@ public class DreamCraftRecipeLoader { 16, 100000, 3, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 64L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, - ItemList.Energy_Cluster.get(8L), - ItemList.Field_Generator_UV.get(2), - ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Parts_DiodeASMD.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 32), - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 64L), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, + ItemList.Energy_Cluster.get(8L), ItemList.Field_Generator_UV.get(2), + ItemList.Circuit_Wafer_HPIC.get(64), ItemList.Circuit_Wafer_HPIC.get(64), + ItemList.Circuit_Parts_DiodeASMD.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 32), }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) }, ItemList.ZPM2.get(1), 3000, 400000); @@ -4078,26 +3167,18 @@ public class DreamCraftRecipeLoader { 64, 200000, 6, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - ItemList.ZPM2.get(8), - ItemList.Field_Generator_UHV.get(4), - ItemList.Circuit_Wafer_UHPIC.get(64), - ItemList.Circuit_Wafer_UHPIC.get(64), - ItemList.Circuit_Wafer_SoC2.get(32), - ItemList.Circuit_Parts_DiodeASMD.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64), - }, - new FluidStack[] { - new FluidStack(solderUEV, 4608), - Materials.Naquadria.getMolten(9216), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, ItemList.ZPM2.get(8), + ItemList.Field_Generator_UHV.get(4), ItemList.Circuit_Wafer_UHPIC.get(64), + ItemList.Circuit_Wafer_UHPIC.get(64), ItemList.Circuit_Wafer_SoC2.get(32), + ItemList.Circuit_Parts_DiodeASMD.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64), }, + new FluidStack[] { new FluidStack(solderUEV, 4608), Materials.Naquadria.getMolten(9216), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000) }, ItemList.ZPM3.get(1), 4000, 1600000); @@ -4110,24 +3191,18 @@ public class DreamCraftRecipeLoader { 512, 2000000, 1, - new Object[] { - GregtechItemList.Casing_Fusion_Internal.get(1), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 4), - ItemList.Field_Generator_UHV.get(2), - ItemList.Circuit_Wafer_QPIC.get(64), - GT_OreDictUnificator.get( - OrePrefixes.wireGt04, Materials.Longasssuperconductornameforuhvwire, 32), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(50000), - ALLOY.CINOBITE.getFluidStack(9216), - ALLOY.OCTIRON.getFluidStack(9216), - ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(9216), - }, + new Object[] { GregtechItemList.Casing_Fusion_Internal.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 4), + ItemList.Field_Generator_UHV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), + GT_OreDictUnificator + .get(OrePrefixes.wireGt04, Materials.Longasssuperconductornameforuhvwire, 32), }, + new FluidStack[] { Materials.UUMatter.getFluid(50000), ALLOY.CINOBITE.getFluidStack(9216), + ALLOY.OCTIRON.getFluidStack(9216), + ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(9216), }, GregtechItemList.FusionComputer_UV2.get(1), 6000, 2000000); @@ -4139,21 +3214,15 @@ public class DreamCraftRecipeLoader { 512, 2000000, 1, - new Object[] { - ItemList.Energy_LapotronicOrb2.get(16L), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 16L}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 8L}, - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), - ItemList.Emitter_UHV.get(1), - ItemList.Sensor_UHV.get(1), - ItemList.Casing_Fusion_Coil.get(1L), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(8000L), - ALLOY.CINOBITE.getFluidStack(2304), - ALLOY.OCTIRON.getFluidStack(2304), - ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(2304), - }, + new Object[] { ItemList.Energy_LapotronicOrb2.get(16L), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 8L }, + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), + ItemList.Emitter_UHV.get(1), ItemList.Sensor_UHV.get(1), + ItemList.Casing_Fusion_Coil.get(1L), }, + new FluidStack[] { Materials.UUMatter.getFluid(8000L), ALLOY.CINOBITE.getFluidStack(2304), + ALLOY.OCTIRON.getFluidStack(2304), + ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(2304), }, GregtechItemList.Casing_Fusion_Internal.get(1), 1200, 2000000); @@ -4165,21 +3234,14 @@ public class DreamCraftRecipeLoader { 512, 2000000, 1, - new Object[] { - new Object[] {OrePrefixes.circuit.get(Materials.Data), 16L}, - new Object[] {OrePrefixes.circuit.get(Materials.Elite), 8L}, - GT_OreDictUnificator.get(OrePrefixes.block, Materials.TungstenCarbide, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), - ItemList.Electric_Motor_UHV.get(2), - ItemList.Electric_Piston_UHV.get(1), - ItemList.Casing_Fusion2.get(1L), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000L), - ALLOY.CINOBITE.getFluidStack(576), - ALLOY.OCTIRON.getFluidStack(576), - ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(576), - }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Data), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8L }, + GT_OreDictUnificator.get(OrePrefixes.block, Materials.TungstenCarbide, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), + ItemList.Electric_Motor_UHV.get(2), ItemList.Electric_Piston_UHV.get(1), + ItemList.Casing_Fusion2.get(1L), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000L), ALLOY.CINOBITE.getFluidStack(576), + ALLOY.OCTIRON.getFluidStack(576), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(576), }, GregtechItemList.Casing_Fusion_External.get(1), 300, 2000000); @@ -4193,24 +3255,18 @@ public class DreamCraftRecipeLoader { 1024, 2_000_000, 8, - new Object[] { - getModItem("gregtech", "gt.blockmachines", 1, 10783), - getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L), - ItemList.Casing_Coil_AwakenedDraconium.get(8L), - ItemList.Electric_Motor_UHV.get(8L), - ItemList.Robot_Arm_UHV.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4}, - ItemList.Gravistar.get(4, new Object() {}), - getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), - getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 29), - getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 28), - }, - new FluidStack[] { - new FluidStack(solderIndalloy, 2880), - Materials.Void.getMolten(2880L), - Materials.DraconiumAwakened.getMolten(1440), - }, + new Object[] { getModItem("gregtech", "gt.blockmachines", 1, 10783), + getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L), + ItemList.Casing_Coil_AwakenedDraconium.get(8L), ItemList.Electric_Motor_UHV.get(8L), + ItemList.Robot_Arm_UHV.get(4L), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4 }, + ItemList.Gravistar.get(4, new Object() {}), + getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), + getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 29), + getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 28), }, + new FluidStack[] { new FluidStack(solderIndalloy, 2880), Materials.Void.getMolten(2880L), + Materials.DraconiumAwakened.getMolten(1440), }, getModItem("gregtech", "gt.blockmachines", 1, 5001), 1500, 8_000_000); @@ -4222,15 +3278,11 @@ public class DreamCraftRecipeLoader { 512, 1_000_000, 4, - new Object[] { - getModItem("DraconicEvolution", "draconicCore", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, - }, - new FluidStack[] { - Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), - }, + new Object[] { getModItem("DraconicEvolution", "draconicCore", 1, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, }, + new FluidStack[] { Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), }, getModItem("EMT", "EMTItems", 1, 16), 6000, 500_000); @@ -4242,15 +3294,11 @@ public class DreamCraftRecipeLoader { 1024, 4_000_000, 8, - new Object[] { - getModItem("DraconicEvolution", "draconicCore", 4, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1}, - }, - new FluidStack[] { - Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), - }, + new Object[] { getModItem("DraconicEvolution", "draconicCore", 4, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, }, + new FluidStack[] { Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), }, getModItem("EMT", "EMTItems", 1, 17), 12000, 2_000_000); @@ -4262,15 +3310,11 @@ public class DreamCraftRecipeLoader { 2048, 16_000_000, 16, - new Object[] { - getModItem("DraconicEvolution", "wyvernCore", 4, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L} - }, - new FluidStack[] { - Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), - }, + new Object[] { getModItem("DraconicEvolution", "wyvernCore", 4, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L } }, + new FluidStack[] { Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), }, getModItem("EMT", "EMTItems", 1, 18), 24000, 8_000_000); @@ -4281,15 +3325,11 @@ public class DreamCraftRecipeLoader { 4096, 64_000_000, 64, - new Object[] { - getModItem("DraconicEvolution", "awakenedCore", 8, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L), - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 1}, - }, - new FluidStack[] { - Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), - }, + new Object[] { getModItem("DraconicEvolution", "awakenedCore", 8, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L), + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, }, + new FluidStack[] { Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, getModItem("EMT", "EMTItems", 1, 19), 36000, 32_000_000); @@ -4300,380 +3340,440 @@ public class DreamCraftRecipeLoader { // Tesla Transceiver LV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); // Tesla Transceiver MV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); // Tesla Transceiver HV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); // Tesla Transceiver EV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); // Tesla Transceiver IV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); // Tesla Transceiver LV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); // Tesla Transceiver MV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); // Tesla Transceiver HV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); // Tesla Transceiver EV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); // Tesla Transceiver IV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); // Tesla Transceiver LV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); // Tesla Transceiver MV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); // Tesla Transceiver HV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); // Tesla Transceiver EV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); // Tesla Transceiver IV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); // Tesla Transceiver LV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); // Tesla Transceiver MV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); // Tesla Transceiver HV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); // Tesla Transceiver EV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); // Tesla Transceiver IV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, @@ -4685,20 +3785,16 @@ public class DreamCraftRecipeLoader { // Tesla Winding Components GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 32), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 32), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), }, Materials.Epoxid.getMolten(288), CustomItemList.teslaComponent.getWithDamage(1, 0), 320, 30); // Tesla Winding Components Ultimate (ADD BLOOD VARIANT) GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 4), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 4), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), }, Materials.Epoxid.getMolten(576), CustomItemList.teslaComponent.getWithDamage(1, 1), 320, @@ -4710,13 +3806,11 @@ public class DreamCraftRecipeLoader { // Optically Compatible Memory GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_ModHandler.getModItem("OpenComputers", "item", 1L, 39), // Memory tier 3.5 - ItemList.Circuit_Chip_Optical.get(1L), - CustomItemList.DATApipe.get(4L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 4L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8L), - GT_ModHandler.getModItem("supersolarpanel", "solarsplitter", 1L, 0) // Solar Light Splitter + new ItemStack[] { GT_ModHandler.getModItem("OpenComputers", "item", 1L, 39), // Memory tier 3.5 + ItemList.Circuit_Chip_Optical.get(1L), CustomItemList.DATApipe.get(4L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8L), + GT_ModHandler.getModItem("supersolarpanel", "solarsplitter", 1L, 0) // Solar Light Splitter }, new FluidStack(solderUEV, 288), ItemList.Optically_Compatible_Memory.get(2), @@ -4726,14 +3820,10 @@ public class DreamCraftRecipeLoader { // Optical Processor GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - ItemList.Optically_Perfected_CPU.get(1L), - ItemList.Optically_Compatible_Memory.get(2L), - ItemList.Circuit_Parts_CapacitorXSMD.get(16L), - ItemList.Circuit_Parts_DiodeXSMD.get(16L), - CustomItemList.DATApipe.get(4L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.EnrichedHolmium, 16) - }, + new ItemStack[] { ItemList.Optically_Perfected_CPU.get(1L), + ItemList.Optically_Compatible_Memory.get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(16L), + ItemList.Circuit_Parts_DiodeXSMD.get(16L), CustomItemList.DATApipe.get(4L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.EnrichedHolmium, 16) }, new FluidStack(solderUEV, 288), ItemList.Circuit_OpticalProcessor.get(1L), 20 * 20, @@ -4742,10 +3832,8 @@ public class DreamCraftRecipeLoader { // Parametrizer Memory Card GT_Values.RA.addCircuitAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 4), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 4), }, Materials.Plastic.getMolten(72), CustomItemList.parametrizerMemory.get(1), 200, @@ -4754,158 +3842,132 @@ public class DreamCraftRecipeLoader { // LV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 8), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 8), }, Materials.Epoxid.getMolten(72), CustomItemList.teslaCapacitor.getWithDamage(1, 0), 320, 30); // MV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 12), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 12), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 6), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 12), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 12), }, Materials.Epoxid.getMolten(144), CustomItemList.teslaCapacitor.getWithDamage(1, 1), 320, 120); // HV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 16), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 16), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 16), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 16), }, Materials.Epoxid.getMolten(216), CustomItemList.teslaCapacitor.getWithDamage(1, 2), 320, 480); // EV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 10), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 20), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 20), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 10), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 20), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 20), }, Materials.Epoxid.getMolten(288), CustomItemList.teslaCapacitor.getWithDamage(1, 3), 320, 1920); // IV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 12), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 24), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 24), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 12), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 24), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 24), }, Materials.Epoxid.getMolten(360), CustomItemList.teslaCapacitor.getWithDamage(1, 4), 320, 7680); // LuV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.HSSG, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 14), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 28), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 28), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.HSSG, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 14), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 28), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 28), }, Materials.Epoxid.getMolten(432), CustomItemList.teslaCapacitor.getWithDamage(1, 5), 320, 30720); // ZPM Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 16), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 32), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 32), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.BatteryAlloy, 16), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 32), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 32), }, Materials.Epoxid.getMolten(504), CustomItemList.teslaCapacitor.getWithDamage(1, 6), 320, 122880); // Tesla Cover GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 0), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.Lead.getMolten(288), CustomItemList.teslaCover.getWithDamage(1, 0), 320, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 0), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.Tin.getMolten(144), CustomItemList.teslaCover.getWithDamage(1, 0), 320, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 0), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.SolderingAlloy.getMolten(72), CustomItemList.teslaCover.getWithDamage(1, 0), 320, 480); // Ultimate Tesla Cover GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.Lead.getMolten(288), CustomItemList.teslaCover.getWithDamage(1, 1), 320, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.Tin.getMolten(144), CustomItemList.teslaCover.getWithDamage(1, 1), 320, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.SolderingAlloy.getMolten(72), CustomItemList.teslaCover.getWithDamage(1, 1), 320, @@ -4913,12 +3975,8 @@ public class DreamCraftRecipeLoader { // Ender Fluid Link Cover GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 4), - ItemList.Sensor_LuV.get(1), - ItemList.Emitter_LuV.get(1), - ItemList.Electric_Pump_LuV.get(1), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 4), + ItemList.Sensor_LuV.get(1), ItemList.Emitter_LuV.get(1), ItemList.Electric_Pump_LuV.get(1), }, Materials.Chrome.getMolten(288), CustomItemList.enderLinkFluidCover.getWithDamage(1, 0), 320, @@ -4926,7 +3984,7 @@ public class DreamCraftRecipeLoader { // Power Pass Upgrade Cover GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {CustomItemList.Machine_Multi_Transformer.get(1), GT_Utility.getIntegratedCircuit(1)}, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.powerPassUpgradeCover.getWithDamage(1, 0), 320, @@ -5015,22 +4073,20 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 4L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 8L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.CosmicNeutronium, 32L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 4L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.CosmicNeutronium, 32L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Motor_UHV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5045,16 +4101,14 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - ItemList.Electric_Motor_UHV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 16L), - new Object[] {OrePrefixes.ring.get(Materials.AnySyntheticRubber), 32L}, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { ItemList.Electric_Motor_UHV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 16L), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 32L }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Pump_UHV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5069,15 +4123,13 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - ItemList.Electric_Motor_UHV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L), - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40L} - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { ItemList.Electric_Motor_UHV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40L } }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Conveyor_Module_UHV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5092,18 +4144,15 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 8L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CosmicNeutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 6L), - ItemList.Electric_Motor_UHV.get(2L), - ItemList.Electric_Piston_UHV.get(1L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 2L}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 8L}, - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 6L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CosmicNeutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 6L), + ItemList.Electric_Motor_UHV.get(2L), ItemList.Electric_Piston_UHV.get(1L), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 8L }, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 6L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Robot_Arm_UHV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5117,17 +4166,15 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new ItemStack[] { - ItemList.Electric_Motor_UHV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 6L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 8L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CosmicNeutronium, 2L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 4L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 4L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new ItemStack[] { ItemList.Electric_Motor_UHV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CosmicNeutronium, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 4L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Piston_UHV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5142,19 +4189,16 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), - ItemList.Electric_Motor_UHV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 8L), - ItemList.Gravistar.get(8L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 7L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), + ItemList.Electric_Motor_UHV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 8L), + ItemList.Gravistar.get(8L), new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 7L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Emitter_UHV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5169,19 +4213,16 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), - ItemList.Electric_Motor_UHV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 8L), - ItemList.Gravistar.get(8L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 7L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), + ItemList.Electric_Motor_UHV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 8L), + ItemList.Gravistar.get(8L), new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 7L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Sensor_UHV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5196,23 +4237,20 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 6L), - ItemList.Gravistar.get(4L), - ItemList.Emitter_UHV.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L}, - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 6L), + ItemList.Gravistar.get(4L), ItemList.Emitter_UHV.get(4L), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Field_Generator_UHV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5250,22 +4288,20 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 8L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 16L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Infinity, 32L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 8L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 16L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Infinity, 32L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Motor_UEV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5280,16 +4316,14 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - ItemList.Electric_Motor_UEV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 4L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16L), - new Object[] {OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L}, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 4L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { ItemList.Electric_Motor_UEV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16L), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Pump_UEV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5304,16 +4338,14 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - ItemList.Electric_Motor_UEV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 2L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L), - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L}, - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L} - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { ItemList.Electric_Motor_UEV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 2L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L }, + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L } }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Conveyor_Module_UEV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5328,18 +4360,15 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 8L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Infinity, 2L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 6L), - ItemList.Electric_Motor_UEV.get(2L), - ItemList.Electric_Piston_UEV.get(1L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 2L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 8L}, - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 6L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Infinity, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 6L), + ItemList.Electric_Motor_UEV.get(2L), ItemList.Electric_Piston_UEV.get(1L), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 8L }, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 6L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Robot_Arm_UEV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5353,17 +4382,15 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new ItemStack[] { - ItemList.Electric_Motor_UEV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 6L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Infinity, 8L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Infinity, 2L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 4L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 4L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new ItemStack[] { ItemList.Electric_Motor_UEV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Infinity, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Infinity, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 4L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Piston_UEV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5378,19 +4405,16 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), - ItemList.Electric_Motor_UEV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Infinity, 16L), - ItemList.Gravistar.get(16L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 7L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), + ItemList.Electric_Motor_UEV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Infinity, 16L), + ItemList.Gravistar.get(16L), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 7L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Emitter_UEV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5405,19 +4429,16 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), - ItemList.Electric_Motor_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 8L), - ItemList.Gravistar.get(16), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 7L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), + ItemList.Electric_Motor_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 8L), ItemList.Gravistar.get(16), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 7L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Sensor_UEV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5432,23 +4453,19 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 6L), - ItemList.Gravistar.get(8L), - ItemList.Emitter_UEV.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 6L), ItemList.Gravistar.get(8L), + ItemList.Emitter_UEV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Field_Generator_UEV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5487,22 +4504,20 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 16L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 16L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 32L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 16L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 16L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 32L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Motor_UIV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5517,16 +4532,14 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - ItemList.Electric_Motor_UIV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.DraconiumAwakened, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 4L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 16L), - new Object[] {OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L}, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TranscendentMetal, 4L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { ItemList.Electric_Motor_UIV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.DraconiumAwakened, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 16L), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TranscendentMetal, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Pump_UIV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5541,16 +4554,14 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - ItemList.Electric_Motor_UIV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 2L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L), - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L}, - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L} - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { ItemList.Electric_Motor_UIV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 2L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L }, + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L } }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Conveyor_Module_UIV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5565,18 +4576,15 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 8L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.TranscendentMetal, 2L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 6L), - ItemList.Electric_Motor_UIV.get(2L), - ItemList.Electric_Piston_UIV.get(1L), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 2L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 8L}, - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 6L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.TranscendentMetal, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 6L), + ItemList.Electric_Motor_UIV.get(2L), ItemList.Electric_Piston_UIV.get(1L), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 8L }, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 6L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Robot_Arm_UIV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5591,17 +4599,15 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new ItemStack[] { - ItemList.Electric_Motor_UIV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 64L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 8L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.TranscendentMetal, 2L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 4L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 4L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new ItemStack[] { ItemList.Electric_Motor_UIV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 64L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.TranscendentMetal, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 4L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Electric_Piston_UIV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5616,19 +4622,16 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), - ItemList.Electric_Motor_UIV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 16L), - ItemList.Gravistar.get(32L), - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L}, - getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), - getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), - getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), - getModItem("miscutils", "itemFoilPikyonium64B", 64, 0), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 7L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), + ItemList.Electric_Motor_UIV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 16L), + ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.Nano), 4L }, + getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), + getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), + getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), + getModItem("miscutils", "itemFoilPikyonium64B", 64, 0), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 7L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Emitter_UIV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5643,19 +4646,16 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), - ItemList.Electric_Motor_UIV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 8L), - ItemList.Gravistar.get(32), - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L}, - getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), - getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), - getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), - getModItem("miscutils", "itemFoilPikyonium64B", 64, 0), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 7L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), + ItemList.Electric_Motor_UIV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 8L), + ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.Nano), 4L }, + getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), + getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), + getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), + getModItem("miscutils", "itemFoilPikyonium64B", 64, 0), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 7L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Sensor_UIV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5670,23 +4670,20 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L), - ItemList.Gravistar.get(16L), - ItemList.Emitter_UIV.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4}, - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8L) - }, - new FluidStack[] {fluid_0, fluid_1}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L), + ItemList.Gravistar.get(16L), ItemList.Emitter_UIV.get(4L), + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4 }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8L) }, + new FluidStack[] { fluid_0, fluid_1 }, ItemList.Field_Generator_UIV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5730,22 +4727,20 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 32L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 16L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 32L), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2, fluid_3}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 32L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 16L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 32L), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 }, ItemList.Electric_Motor_UMV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5760,16 +4755,14 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - ItemList.Electric_Motor_UMV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Infinity, 2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 16L), - new Object[] {OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L}, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.SpaceTime, 4L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2, fluid_3}, + new Object[] { ItemList.Electric_Motor_UMV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Infinity, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 16L), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.SpaceTime, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 }, ItemList.Electric_Pump_UMV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5784,16 +4777,14 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - ItemList.Electric_Motor_UMV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 64L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L), - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L}, - new Object[] {OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L} - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2, fluid_3}, + new Object[] { ItemList.Electric_Motor_UMV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 64L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L }, + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L } }, + new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 }, ItemList.Conveyor_Module_UMV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5808,18 +4799,15 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 8L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.SpaceTime, 2L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 6L), - ItemList.Electric_Motor_UMV.get(2L), - ItemList.Electric_Piston_UMV.get(1L), - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 2L}, - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 8L}, - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 6L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2, fluid_3}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.SpaceTime, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 6L), + ItemList.Electric_Motor_UMV.get(2L), ItemList.Electric_Piston_UMV.get(1L), + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8L }, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 6L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 }, ItemList.Robot_Arm_UMV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5834,17 +4822,15 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new ItemStack[] { - ItemList.Electric_Motor_UMV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6L), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 64L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SpaceTime, 8L), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.SpaceTime, 2L), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 4L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 4L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2, fluid_3}, + new ItemStack[] { ItemList.Electric_Motor_UMV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6L), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 64L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SpaceTime, 8L), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.SpaceTime, 2L), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 4L), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 4L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 }, ItemList.Electric_Piston_UMV.get(1), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5859,19 +4845,16 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), - ItemList.Electric_Motor_UMV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SpaceTime, 16L), - ItemList.Gravistar.get(64), - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4L}, - getModItem("miscutils", "itemFoilCelestialTungsten", 64, 0), - getModItem("miscutils", "itemFoilQuantum", 64, 0), - getModItem("miscutils", "itemFoilAstralTitanium", 64, 0), - getModItem("miscutils", "itemFoilTitansteel", 64, 0), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), + ItemList.Electric_Motor_UMV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SpaceTime, 16L), + ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L }, + getModItem("miscutils", "itemFoilCelestialTungsten", 64, 0), + getModItem("miscutils", "itemFoilQuantum", 64, 0), + getModItem("miscutils", "itemFoilAstralTitanium", 64, 0), + getModItem("miscutils", "itemFoilTitansteel", 64, 0), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Emitter_UMV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5886,19 +4869,16 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), - ItemList.Electric_Motor_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 8L), - ItemList.Gravistar.get(64), - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4L}, - getModItem("miscutils", "itemFoilCelestialTungsten", 64, 0), - getModItem("miscutils", "itemFoilQuantum", 64, 0), - getModItem("miscutils", "itemFoilAstralTitanium", 64, 0), - getModItem("miscutils", "itemFoilTitansteel", 64, 0), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), + ItemList.Electric_Motor_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 8L), + ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L }, + getModItem("miscutils", "itemFoilCelestialTungsten", 64, 0), + getModItem("miscutils", "itemFoilQuantum", 64, 0), + getModItem("miscutils", "itemFoilAstralTitanium", 64, 0), + getModItem("miscutils", "itemFoilTitansteel", 64, 0), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Sensor_UMV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5913,23 +4893,20 @@ public class DreamCraftRecipeLoader { comp_per_second, research_eu_per_tick, research_amperage, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6L), - ItemList.Gravistar.get(32L), - ItemList.Emitter_UMV.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 4}, - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8L) - }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6L), + ItemList.Gravistar.get(32L), ItemList.Emitter_UMV.get(4L), + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4 }, + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8L) }, + new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Field_Generator_UMV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5952,28 +4929,24 @@ public class DreamCraftRecipeLoader { 16_384, // comp/s (int) TierEU.RECIPE_MAX, // eu/t 32, // amperage - new Object[] { - ItemList.Quantum_Tank_IV.get(16), // 1234 - getModItem("bartworks", "gt.bwMetaGeneratedplateDense", 6, 10111), // Og plates - getModItem("bartworks", "gt.bwMetaGeneratedscrew", 24, 10111), // Og screws - getModItem("GraviSuite", "itemSimpleItem", 64, 3), // gravi engine - getModItem("bartworks", "gt.bwMetaGeneratedfoil", 64, 10112), // Shirbon foil - getModItem("miscutils", "itemGearHypogen", 16, 0), // Hypogen gears - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 16L), // SpaceTime gears - GT_OreDictUnificator.get( - OrePrefixes.gearGt, Materials.TranscendentMetal, 16L), // Trans metal gears - getModItem("eternalsingularity", "eternal_singularity", 16L), // Eternal singularities - getItemContainer("PikoCircuit").get(16L), // Pico Circuits - getModItem("GoodGenerator", "huiCircuit", 4, 4), // Paradox circuits - ItemList.Energy_Module.get(4L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 16L), - ItemList.EnergisedTesseract.get(4), - getModItem("dreamcraft", "item.ChromaticLens", 4) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", 1440), - FluidUtils.getFluidStack("molten.metastable oganesson", 720) - }, + new Object[] { ItemList.Quantum_Tank_IV.get(16), // 1234 + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", 6, 10111), // Og plates + getModItem("bartworks", "gt.bwMetaGeneratedscrew", 24, 10111), // Og screws + getModItem("GraviSuite", "itemSimpleItem", 64, 3), // gravi engine + getModItem("bartworks", "gt.bwMetaGeneratedfoil", 64, 10112), // Shirbon foil + getModItem("miscutils", "itemGearHypogen", 16, 0), // Hypogen gears + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 16L), // SpaceTime gears + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 16L), // Trans + // metal + // gears + getModItem("eternalsingularity", "eternal_singularity", 16L), // Eternal singularities + getItemContainer("PikoCircuit").get(16L), // Pico Circuits + getModItem("GoodGenerator", "huiCircuit", 4, 4), // Paradox circuits + ItemList.Energy_Module.get(4L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 16L), + ItemList.EnergisedTesseract.get(4), getModItem("dreamcraft", "item.ChromaticLens", 4) }, + new FluidStack[] { FluidUtils.getFluidStack("time", 1440), + FluidUtils.getFluidStack("molten.metastable oganesson", 720) }, CustomItemList.EOH_Temporal_Boundary_Casing.get(1), 10_000, (int) TierEU.RECIPE_UXV); @@ -5981,8 +4954,9 @@ public class DreamCraftRecipeLoader { // EOH Spacetime Compression { - final ItemStack ME_Singularity = - getModItem("extracells", "storage.physical.advanced.singularity", 1); // ME Digital singularity. + final ItemStack ME_Singularity = getModItem("extracells", "storage.physical.advanced.singularity", 1); // ME + // Digital + // singularity. final ItemStack baseCasing = CustomItemList.EOH_Reinforced_Spacetime_Casing.get(1); int baseCompPerSec = 16_384; @@ -6012,21 +4986,17 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - baseCasing, - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper - ME_Singularity, - getModItem("bartworks", "gt.bwMetaGeneratedplateDense", (absoluteTier + 1) * 2, 10112), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("molten.shirabon", (int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { baseCasing, + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper + ME_Singularity, + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", (absoluteTier + 1) * 2, 10112), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + FluidUtils.getFluidStack("molten.shirabon", (int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier0.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6039,23 +5009,20 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - baseCasing, - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.WhiteDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { baseCasing, + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper + ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.WhiteDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier1.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6068,24 +5035,20 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - baseCasing, - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.WhiteDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { baseCasing, + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.WhiteDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier2.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6101,25 +5064,20 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - baseCasing, - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.WhiteDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { baseCasing, + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.WhiteDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier3.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6132,26 +5090,20 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - baseCasing, - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.BlackDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { baseCasing, + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.BlackDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier4.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6164,27 +5116,21 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - baseCasing, - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.BlackDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { baseCasing, + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.BlackDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier5.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6200,28 +5146,21 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - baseCasing, - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.BlackDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { baseCasing, + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.BlackDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier6.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6234,29 +5173,21 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.BlackDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.BlackDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier7.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6269,33 +5200,22 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, - Materials.MagnetohydrodynamicallyConstrainedStarMatter, - (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), - Materials.MagnetohydrodynamicallyConstrainedStarMatter.getMolten( - (int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.MagnetohydrodynamicallyConstrainedStarMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier))), + Materials.MagnetohydrodynamicallyConstrainedStarMatter + .getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier8.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6310,27 +5230,21 @@ public class DreamCraftRecipeLoader { 16_384, // comp/s (int) TierEU.RECIPE_MAX, // eu/t 32, // amperage - new Object[] { - getModItem("gregtech", "gt.blockmachines", 16, 11107), - getModItem("bartworks", "gt.bwMetaGeneratedplateDense", 6, 10111), - getModItem("bartworks", "gt.bwMetaGeneratedscrew", 24, 10111), - getModItem("GraviSuite", "itemSimpleItem", 64, 3), // gravi engine - getModItem("bartworks", "gt.bwMetaGeneratedfoil", 64, 10112), - getModItem("miscutils", "itemGearHypogen", 16, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 16L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 16L), - getModItem("eternalsingularity", "eternal_singularity", 16L), - getItemContainer("PikoCircuit").get(16L), - getModItem("GoodGenerator", "huiCircuit", 4, 4), - ItemList.Energy_Cluster.get(1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 16L), - ItemList.EnergisedTesseract.get(4), - getModItem("dreamcraft", "item.ChromaticLens", 4) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", 1440), - FluidUtils.getFluidStack("molten.metastable oganesson", 720) - }, + new Object[] { getModItem("gregtech", "gt.blockmachines", 16, 11107), + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", 6, 10111), + getModItem("bartworks", "gt.bwMetaGeneratedscrew", 24, 10111), + getModItem("GraviSuite", "itemSimpleItem", 64, 3), // gravi engine + getModItem("bartworks", "gt.bwMetaGeneratedfoil", 64, 10112), + getModItem("miscutils", "itemGearHypogen", 16, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 16L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 16L), + getModItem("eternalsingularity", "eternal_singularity", 16L), + getItemContainer("PikoCircuit").get(16L), getModItem("GoodGenerator", "huiCircuit", 4, 4), + ItemList.Energy_Cluster.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 16L), + ItemList.EnergisedTesseract.get(4), getModItem("dreamcraft", "item.ChromaticLens", 4) }, + new FluidStack[] { FluidUtils.getFluidStack("time", 1440), + FluidUtils.getFluidStack("molten.metastable oganesson", 720) }, CustomItemList.EOH_Temporal_Boundary_Casing.get(1), 10_000, (int) TierEU.RECIPE_UXV); @@ -6338,8 +5252,9 @@ public class DreamCraftRecipeLoader { // EOH Temporal Compression { - final ItemStack ME_Singularity = - getModItem("extracells", "storage.physical.advanced.singularity", 1); // ME Digital singularity. + final ItemStack ME_Singularity = getModItem("extracells", "storage.physical.advanced.singularity", 1); // ME + // Digital + // singularity. int baseCompPerSec = 16_384; @@ -6368,21 +5283,18 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper - ME_Singularity, - getModItem("bartworks", "gt.bwMetaGeneratedplateDense", (absoluteTier + 1) * 2, 10112), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("molten.shirabon", (int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper + ME_Singularity, + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", (absoluteTier + 1) * 2, 10112), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + FluidUtils.getFluidStack("molten.shirabon", (int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6395,23 +5307,21 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.WhiteDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper + ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.WhiteDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier1.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6424,24 +5334,21 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.WhiteDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 8), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.WhiteDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier2.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6457,25 +5364,21 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.WhiteDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.WhiteDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier3.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6488,26 +5391,21 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.BlackDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.BlackDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier4.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6520,27 +5418,22 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.BlackDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 9), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.BlackDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier5.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6556,28 +5449,22 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.BlackDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.BlackDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier6.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6590,29 +5477,22 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, Materials.BlackDwarfMatter, (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.BlackDwarfMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + Materials.BlackDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.SpacetimeCompressionFieldGeneratorTier7.get(1), set * 16_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6625,33 +5505,23 @@ public class DreamCraftRecipeLoader { set * baseCompPerSec, // comp/s (int) TierEU.RECIPE_MAX, // eu/t set * 16, // amperage - new Object[] { - CustomItemList.EOH_Temporal_Boundary_Casing.get(1), - getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), - getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel UV - getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest - getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - ME_Singularity, - GT_OreDictUnificator.get( - OrePrefixes.plateDense, - Materials.MagnetohydrodynamicallyConstrainedStarMatter, - (absoluteTier + 1) * 2), - getItemContainer("QuantumCircuit").get(absoluteTier + 1) - }, - new FluidStack[] { - FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), - Materials.MagnetohydrodynamicallyConstrainedStarMatter.getMolten( - (int) (1_440 * pow(2L, absoluteTier))), - new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), - }, + new Object[] { CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + getModItem("gregtech", "gt.blockmachines", pow(2L, set - 1) * 16, 11107), // time accel + // UV + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 3 * tier, 10), // Spacetime ripper + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + Materials.MagnetohydrodynamicallyConstrainedStarMatter, + (absoluteTier + 1) * 2), + getItemContainer("QuantumCircuit").get(absoluteTier + 1) }, + new FluidStack[] { FluidUtils.getFluidStack("time", (int) (2_880 * pow(2L, absoluteTier))), + Materials.MagnetohydrodynamicallyConstrainedStarMatter + .getMolten((int) (1_440 * pow(2L, absoluteTier))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier))), }, CustomItemList.TimeAccelerationFieldGeneratorTier8.get(1), (absoluteTier + 1) * 4_000 * 20, (int) TierEU.RECIPE_UMV); @@ -6673,92 +5543,57 @@ public class DreamCraftRecipeLoader { int compPerSecond = 2000; int totalComputation = 500_000; - ItemStack[] energyHatches = { - ItemList.Hatch_Energy_ULV.get(1), - ItemList.Hatch_Energy_LV.get(1), - ItemList.Hatch_Energy_MV.get(1), - ItemList.Hatch_Energy_HV.get(1), - ItemList.Hatch_Energy_EV.get(1), - ItemList.Hatch_Energy_IV.get(1), - ItemList.Hatch_Energy_LuV.get(1), - ItemList.Hatch_Energy_ZPM.get(1), - ItemList.Hatch_Energy_UV.get(1), - ItemList.Hatch_Energy_MAX.get(1), - getItemContainer("Hatch_Energy_UEV").get(1L), - getItemContainer("Hatch_Energy_UIV").get(1L), - getItemContainer("Hatch_Energy_UMV").get(1L), - getItemContainer("Hatch_Energy_UXV").get(1L) - }; - - ItemStack[] dynamoHatches = { - ItemList.Hatch_Dynamo_ULV.get(1), - ItemList.Hatch_Dynamo_LV.get(1), - ItemList.Hatch_Dynamo_MV.get(1), - ItemList.Hatch_Dynamo_HV.get(1), - ItemList.Hatch_Dynamo_EV.get(1), - ItemList.Hatch_Dynamo_IV.get(1), - ItemList.Hatch_Dynamo_LuV.get(1), - ItemList.Hatch_Dynamo_ZPM.get(1), - ItemList.Hatch_Dynamo_UV.get(1), - ItemList.Hatch_Dynamo_MAX.get(1), - getItemContainer("Hatch_Dynamo_UEV").get(1L), - getItemContainer("Hatch_Dynamo_UIV").get(1L), - getItemContainer("Hatch_Dynamo_UMV").get(1L), - getItemContainer("Hatch_Dynamo_UXV").get(1L) + ItemStack[] energyHatches = { ItemList.Hatch_Energy_ULV.get(1), ItemList.Hatch_Energy_LV.get(1), + ItemList.Hatch_Energy_MV.get(1), ItemList.Hatch_Energy_HV.get(1), ItemList.Hatch_Energy_EV.get(1), + ItemList.Hatch_Energy_IV.get(1), ItemList.Hatch_Energy_LuV.get(1), ItemList.Hatch_Energy_ZPM.get(1), + ItemList.Hatch_Energy_UV.get(1), ItemList.Hatch_Energy_MAX.get(1), + getItemContainer("Hatch_Energy_UEV").get(1L), getItemContainer("Hatch_Energy_UIV").get(1L), + getItemContainer("Hatch_Energy_UMV").get(1L), getItemContainer("Hatch_Energy_UXV").get(1L) }; + + ItemStack[] dynamoHatches = { ItemList.Hatch_Dynamo_ULV.get(1), ItemList.Hatch_Dynamo_LV.get(1), + ItemList.Hatch_Dynamo_MV.get(1), ItemList.Hatch_Dynamo_HV.get(1), ItemList.Hatch_Dynamo_EV.get(1), + ItemList.Hatch_Dynamo_IV.get(1), ItemList.Hatch_Dynamo_LuV.get(1), ItemList.Hatch_Dynamo_ZPM.get(1), + ItemList.Hatch_Dynamo_UV.get(1), ItemList.Hatch_Dynamo_MAX.get(1), + getItemContainer("Hatch_Dynamo_UEV").get(1L), getItemContainer("Hatch_Dynamo_UIV").get(1L), + getItemContainer("Hatch_Dynamo_UMV").get(1L), getItemContainer("Hatch_Dynamo_UXV").get(1L) }; + + Object[] circuitsTierPlusTwo = { new Object[] { OrePrefixes.circuit.get(Materials.Good), 1L }, // MV + new Object[] { OrePrefixes.circuit.get(Materials.Advanced), 1L }, // HV + new Object[] { OrePrefixes.circuit.get(Materials.Data), 1L }, // EV + new Object[] { OrePrefixes.circuit.get(Materials.Elite), 1L }, // IV + new Object[] { OrePrefixes.circuit.get(Materials.Master), 1L }, // LuV + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1L }, // ZPM + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 1L }, // UV + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, // UHV + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, // UEV + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, // UIV + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1L }, // UMV + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1L }, // UXV + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4L }, // MAX (Technically not MAX, can be + // changed once MAX circuits become + // craftable) + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 16L }, // MAX (Technically not MAX, can be + // changed once MAX circuits become + // craftable) }; - Object[] circuitsTierPlusTwo = { - new Object[] {OrePrefixes.circuit.get(Materials.Good), 1L}, // MV - new Object[] {OrePrefixes.circuit.get(Materials.Advanced), 1L}, // HV - new Object[] {OrePrefixes.circuit.get(Materials.Data), 1L}, // EV - new Object[] {OrePrefixes.circuit.get(Materials.Elite), 1L}, // IV - new Object[] {OrePrefixes.circuit.get(Materials.Master), 1L}, // LuV - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 1L}, // ZPM - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1L}, // UV - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, // UHV - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, // UEV - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L}, // UIV - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 1L}, // UMV - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1L}, // UXV - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 4L - }, // MAX (Technically not MAX, can be changed once MAX circuits become craftable) - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 16L - }, // MAX (Technically not MAX, can be changed once MAX circuits become craftable) - }; - - ItemStack[] wirelessHatches = { - ItemList.Wireless_Hatch_Energy_ULV.get(1), - ItemList.Wireless_Hatch_Energy_LV.get(1), - ItemList.Wireless_Hatch_Energy_MV.get(1), - ItemList.Wireless_Hatch_Energy_HV.get(1), - ItemList.Wireless_Hatch_Energy_EV.get(1), - ItemList.Wireless_Hatch_Energy_IV.get(1), - ItemList.Wireless_Hatch_Energy_LuV.get(1), - ItemList.Wireless_Hatch_Energy_ZPM.get(1), - ItemList.Wireless_Hatch_Energy_UV.get(1), - ItemList.Wireless_Hatch_Energy_UHV.get(1), - ItemList.Wireless_Hatch_Energy_UEV.get(1), - ItemList.Wireless_Hatch_Energy_UIV.get(1), - ItemList.Wireless_Hatch_Energy_UMV.get(1), - ItemList.Wireless_Hatch_Energy_UXV.get(1), - }; - - ItemStack[] wirelessDynamos = { - ItemList.Wireless_Dynamo_Energy_ULV.get(1), - ItemList.Wireless_Dynamo_Energy_LV.get(1), - ItemList.Wireless_Dynamo_Energy_MV.get(1), - ItemList.Wireless_Dynamo_Energy_HV.get(1), - ItemList.Wireless_Dynamo_Energy_EV.get(1), - ItemList.Wireless_Dynamo_Energy_IV.get(1), - ItemList.Wireless_Dynamo_Energy_LuV.get(1), - ItemList.Wireless_Dynamo_Energy_ZPM.get(1), - ItemList.Wireless_Dynamo_Energy_UV.get(1), - ItemList.Wireless_Dynamo_Energy_UHV.get(1), - ItemList.Wireless_Dynamo_Energy_UEV.get(1), - ItemList.Wireless_Dynamo_Energy_UIV.get(1), - ItemList.Wireless_Dynamo_Energy_UMV.get(1), - ItemList.Wireless_Dynamo_Energy_UXV.get(1), - }; + ItemStack[] wirelessHatches = { ItemList.Wireless_Hatch_Energy_ULV.get(1), + ItemList.Wireless_Hatch_Energy_LV.get(1), ItemList.Wireless_Hatch_Energy_MV.get(1), + ItemList.Wireless_Hatch_Energy_HV.get(1), ItemList.Wireless_Hatch_Energy_EV.get(1), + ItemList.Wireless_Hatch_Energy_IV.get(1), ItemList.Wireless_Hatch_Energy_LuV.get(1), + ItemList.Wireless_Hatch_Energy_ZPM.get(1), ItemList.Wireless_Hatch_Energy_UV.get(1), + ItemList.Wireless_Hatch_Energy_UHV.get(1), ItemList.Wireless_Hatch_Energy_UEV.get(1), + ItemList.Wireless_Hatch_Energy_UIV.get(1), ItemList.Wireless_Hatch_Energy_UMV.get(1), + ItemList.Wireless_Hatch_Energy_UXV.get(1), }; + + ItemStack[] wirelessDynamos = { ItemList.Wireless_Dynamo_Energy_ULV.get(1), + ItemList.Wireless_Dynamo_Energy_LV.get(1), ItemList.Wireless_Dynamo_Energy_MV.get(1), + ItemList.Wireless_Dynamo_Energy_HV.get(1), ItemList.Wireless_Dynamo_Energy_EV.get(1), + ItemList.Wireless_Dynamo_Energy_IV.get(1), ItemList.Wireless_Dynamo_Energy_LuV.get(1), + ItemList.Wireless_Dynamo_Energy_ZPM.get(1), ItemList.Wireless_Dynamo_Energy_UV.get(1), + ItemList.Wireless_Dynamo_Energy_UHV.get(1), ItemList.Wireless_Dynamo_Energy_UEV.get(1), + ItemList.Wireless_Dynamo_Energy_UIV.get(1), ItemList.Wireless_Dynamo_Energy_UMV.get(1), + ItemList.Wireless_Dynamo_Energy_UXV.get(1), }; // ------------------------ Wireless EU hatches ------------------------ @@ -6770,18 +5605,13 @@ public class DreamCraftRecipeLoader { compPerSecond, researchEuPerTick, researchAmperage, - new Object[] { - energyHatches[i], - getModItem("GoodGenerator", "compactFusionCoil", 1), - ItemList.Casing_Coil_Superconductor.get(1), - CustomItemList.Machine_Multi_Transformer.get(1), - CustomItemList.eM_Power.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 1), - circuitsTierPlusTwo[i], - ItemList.EnergisedTesseract.get(1) - }, - new FluidStack[] {new FluidStack(solderUEV, 1296), Materials.ExcitedDTEC.getFluid(500L)}, + new Object[] { energyHatches[i], getModItem("GoodGenerator", "compactFusionCoil", 1), + ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), + CustomItemList.eM_Power.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 1), + circuitsTierPlusTwo[i], ItemList.EnergisedTesseract.get(1) }, + new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.ExcitedDTEC.getFluid(500L) }, wirelessHatches[i], recipeDurationTicks, recipeEuPerTick); @@ -6797,18 +5627,13 @@ public class DreamCraftRecipeLoader { compPerSecond, researchEuPerTick, researchAmperage, - new Object[] { - dynamoHatches[i], - getModItem("GoodGenerator", "compactFusionCoil", 1), - ItemList.Casing_Coil_Superconductor.get(1), - CustomItemList.Machine_Multi_Transformer.get(1), - CustomItemList.eM_Power.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 1), - circuitsTierPlusTwo[i], - ItemList.EnergisedTesseract.get(1) - }, - new FluidStack[] {new FluidStack(solderUEV, 1296), Materials.ExcitedDTEC.getFluid(500L)}, + new Object[] { dynamoHatches[i], getModItem("GoodGenerator", "compactFusionCoil", 1), + ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), + CustomItemList.eM_Power.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 1), + circuitsTierPlusTwo[i], ItemList.EnergisedTesseract.get(1) }, + new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.ExcitedDTEC.getFluid(500L) }, wirelessDynamos[i], recipeDurationTicks, recipeEuPerTick); @@ -6816,32 +5641,26 @@ public class DreamCraftRecipeLoader { } private void registerMachineEMBehaviours() { - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(5), ItemList.Machine_IV_Centrifuge.get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(6), - getItemContainer("CentrifugeLuV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(7), - getItemContainer("CentrifugeZPM").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(8), - getItemContainer("CentrifugeUV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(9), - getItemContainer("CentrifugeUHV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(10), - getItemContainer("CentrifugeUEV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(11), - getItemContainer("CentrifugeUIV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(12), - getItemContainer("CentrifugeUMV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(5), ItemList.Machine_IV_Centrifuge.get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(6), getItemContainer("CentrifugeLuV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(7), getItemContainer("CentrifugeZPM").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(8), getItemContainer("CentrifugeUV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(9), getItemContainer("CentrifugeUHV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(10), getItemContainer("CentrifugeUEV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(11), getItemContainer("CentrifugeUIV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(12), getItemContainer("CentrifugeUMV").get(1)); GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_ElectromagneticSeparator(5), ItemList.Machine_IV_ElectromagneticSeparator.get(1)); + () -> new Behaviour_ElectromagneticSeparator(5), + ItemList.Machine_IV_ElectromagneticSeparator.get(1)); GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_ElectromagneticSeparator(6), getItemContainer("ElectromagneticSeparatorLuV").get(1)); @@ -6864,24 +5683,21 @@ public class DreamCraftRecipeLoader { () -> new Behaviour_ElectromagneticSeparator(12), getItemContainer("ElectromagneticSeparatorUMV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(5), ItemList.Machine_IV_Recycler.get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(6), getItemContainer("RecyclerLuV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(7), getItemContainer("RecyclerZPM").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(8), getItemContainer("RecyclerUV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(9), getItemContainer("RecyclerUHV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(10), - getItemContainer("RecyclerUEV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(11), - getItemContainer("RecyclerUIV").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(12), - getItemContainer("RecyclerUMV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(5), ItemList.Machine_IV_Recycler.get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(6), getItemContainer("RecyclerLuV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(7), getItemContainer("RecyclerZPM").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(8), getItemContainer("RecyclerUV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(9), getItemContainer("RecyclerUHV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(10), getItemContainer("RecyclerUEV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(11), getItemContainer("RecyclerUIV").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(12), getItemContainer("RecyclerUMV").get(1)); } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java index e444e08fb1..15e36dc4a9 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java @@ -3,44 +3,63 @@ package com.github.technus.tectech.compatibility.dreamcraft; import static gregtech.api.GregTech_API.METATILEENTITIES; import static net.minecraft.util.StatCollector.translateToLocal; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_TT_Transformer; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_WetTransformer; import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.ITexture; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import net.minecraft.util.EnumChatFormatting; public class NoDreamCraftMachineLoader implements Runnable { + public static final String imagination = EnumChatFormatting.RESET + "You just need " - + EnumChatFormatting.DARK_PURPLE + "I" - + EnumChatFormatting.LIGHT_PURPLE + "m" - + EnumChatFormatting.DARK_RED + "a" - + EnumChatFormatting.RED + "g" - + EnumChatFormatting.YELLOW + "i" - + EnumChatFormatting.GREEN + "n" - + EnumChatFormatting.AQUA + "a" - + EnumChatFormatting.DARK_AQUA + "t" - + EnumChatFormatting.BLUE + "i" - + EnumChatFormatting.DARK_BLUE + "o" - + EnumChatFormatting.DARK_PURPLE + "n" - + EnumChatFormatting.RESET + " to use this."; + + EnumChatFormatting.DARK_PURPLE + + "I" + + EnumChatFormatting.LIGHT_PURPLE + + "m" + + EnumChatFormatting.DARK_RED + + "a" + + EnumChatFormatting.RED + + "g" + + EnumChatFormatting.YELLOW + + "i" + + EnumChatFormatting.GREEN + + "n" + + EnumChatFormatting.AQUA + + "a" + + EnumChatFormatting.DARK_AQUA + + "t" + + EnumChatFormatting.BLUE + + "i" + + EnumChatFormatting.DARK_BLUE + + "o" + + EnumChatFormatting.DARK_PURPLE + + "n" + + EnumChatFormatting.RESET + + " to use this."; @Override public void run() { try { - CustomItemList.WetTransformer_LV_ULV.set(new GT_MetaTileEntity_WetTransformer( - 12000, "wettransformer.tier.00", "Ultra Low Voltage Power Transformer", 0) - .getStackForm(1L)); // LV -> ULV (Use Soft Mallet to invert) + CustomItemList.WetTransformer_LV_ULV.set( + new GT_MetaTileEntity_WetTransformer( + 12000, + "wettransformer.tier.00", + "Ultra Low Voltage Power Transformer", + 0).getStackForm(1L)); // LV -> ULV (Use Soft Mallet to invert) } catch (IllegalArgumentException e) { System.out.println(METATILEENTITIES[12000].getClass().getCanonicalName()); TecTech.LOGGER.error(e); @@ -52,13 +71,19 @@ public class NoDreamCraftMachineLoader implements Runnable { new GT_MetaTileEntity_WetTransformer(12001, "wetransformer.tier.01", "Low Voltage Power Transformer", 1) .getStackForm(1L)); // MV -> LV (Use Soft Mallet to invert) - CustomItemList.WetTransformer_HV_MV.set(new GT_MetaTileEntity_WetTransformer( - 12002, "wettransformer.tier.02", "Medium Voltage Power Transformer", 2) - .getStackForm(1L)); // HV -> MV (Use Soft Mallet to invert) + CustomItemList.WetTransformer_HV_MV.set( + new GT_MetaTileEntity_WetTransformer( + 12002, + "wettransformer.tier.02", + "Medium Voltage Power Transformer", + 2).getStackForm(1L)); // HV -> MV (Use Soft Mallet to invert) - CustomItemList.WetTransformer_EV_HV.set(new GT_MetaTileEntity_WetTransformer( - 12003, "wettransformer.tier.03", "High Voltage Power Transformer", 3) - .getStackForm(1L)); // EV -> HV (Use Soft Mallet to invert) + CustomItemList.WetTransformer_EV_HV.set( + new GT_MetaTileEntity_WetTransformer( + 12003, + "wettransformer.tier.03", + "High Voltage Power Transformer", + 3).getStackForm(1L)); // EV -> HV (Use Soft Mallet to invert) CustomItemList.WetTransformer_IV_EV.set( new GT_MetaTileEntity_WetTransformer(12004, "wettransformer.tier.04", "Extreme Power Transformer", 4) @@ -72,33 +97,51 @@ public class NoDreamCraftMachineLoader implements Runnable { new GT_MetaTileEntity_WetTransformer(12006, "wettransformer.tier.06", "Ludicrous Power Transformer", 6) .getStackForm(1L)); // ZPM -> LuV (Use Soft Mallet to invert) - CustomItemList.WetTransformer_UV_ZPM.set(new GT_MetaTileEntity_WetTransformer( - 12007, "wettransformer.tier.07", "ZPM Voltage Power Transformer", 7) - .getStackForm(1L)); // UV -> ZPM (Use Soft Mallet to invert) + CustomItemList.WetTransformer_UV_ZPM.set( + new GT_MetaTileEntity_WetTransformer( + 12007, + "wettransformer.tier.07", + "ZPM Voltage Power Transformer", + 7).getStackForm(1L)); // UV -> ZPM (Use Soft Mallet to invert) CustomItemList.WetTransformer_UHV_UV.set( new GT_MetaTileEntity_WetTransformer(12008, "wettransformer.tier.08", "Ultimate Power Transformer", 8) .getStackForm(1L)); // UHV -> UV (Use Soft Mallet to invert) - CustomItemList.WetTransformer_UEV_UHV.set(new GT_MetaTileEntity_WetTransformer( - 12009, "wettransformer.tier.09", "Highly Ultimate Power Transformer", 9) - .getStackForm(1L)); // UEV -> UHV (Use Soft Mallet to invert) - - CustomItemList.WetTransformer_UIV_UEV.set(new GT_MetaTileEntity_WetTransformer( - 12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer", 10) - .getStackForm(1L)); // UIV -> UEV (Use Soft Mallet to invert) - - CustomItemList.WetTransformer_UMV_UIV.set(new GT_MetaTileEntity_WetTransformer( - 12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer", 11) - .getStackForm(1L)); // UMV -> UIV (Use Soft Mallet to invert) - - CustomItemList.WetTransformer_UXV_UMV.set(new GT_MetaTileEntity_WetTransformer( - 12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer", 12) - .getStackForm(1L)); // UXV -> UMV (Use Soft Mallet to invert) - - CustomItemList.WetTransformer_MAXV_UXV.set(new GT_MetaTileEntity_WetTransformer( - 12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", 13) - .getStackForm(1L)); // MAX -> UXV (Use Soft Mallet to invert) + CustomItemList.WetTransformer_UEV_UHV.set( + new GT_MetaTileEntity_WetTransformer( + 12009, + "wettransformer.tier.09", + "Highly Ultimate Power Transformer", + 9).getStackForm(1L)); // UEV -> UHV (Use Soft Mallet to invert) + + CustomItemList.WetTransformer_UIV_UEV.set( + new GT_MetaTileEntity_WetTransformer( + 12010, + "wettransformer.tier.10", + "Extremely Ultimate Power Transformer", + 10).getStackForm(1L)); // UIV -> UEV (Use Soft Mallet to invert) + + CustomItemList.WetTransformer_UMV_UIV.set( + new GT_MetaTileEntity_WetTransformer( + 12011, + "wettransformer.tier.11", + "Insanely Ultimate Power Transformer", + 11).getStackForm(1L)); // UMV -> UIV (Use Soft Mallet to invert) + + CustomItemList.WetTransformer_UXV_UMV.set( + new GT_MetaTileEntity_WetTransformer( + 12012, + "wettransformer.tier.12", + "Mega Ultimate Power Transformer", + 12).getStackForm(1L)); // UXV -> UMV (Use Soft Mallet to invert) + + CustomItemList.WetTransformer_MAXV_UXV.set( + new GT_MetaTileEntity_WetTransformer( + 12013, + "wettransformer.tier.13", + "Extended Mega Ultimate Power Transformer", + 13).getStackForm(1L)); // MAX -> UXV (Use Soft Mallet to invert) try { MetaTileEntity temp; @@ -200,8 +243,8 @@ public class NoDreamCraftMachineLoader implements Runnable { if (Loader.isModLoaded(Reference.GTPLUSPLUS)) { Class clazz = Class.forName( "gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp"); - Constructor<MetaTileEntity> constructor = - clazz.getConstructor(int.class, String.class, String.class, int.class, String.class); + Constructor<MetaTileEntity> constructor = clazz + .getConstructor(int.class, String.class, String.class, int.class, String.class); temp = constructor.newInstance( 11989, diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java index 62c399aa26..c3758674f5 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java @@ -4,13 +4,16 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.getBestUnstableIsotope; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.getFirstStableIsotope; +import java.lang.reflect.Method; + +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; import gregtech.api.enums.OrePrefixes; -import java.lang.reflect.Method; -import net.minecraftforge.fluids.FluidStack; public class GtppAtomLoader { + // region reflect a bit private Class<?> ELEMENT; private Object ELEMENT_INSTANCE; @@ -18,8 +21,7 @@ public class GtppAtomLoader { private String getUnlocalizedName(String elementName) { try { - return (String) - getUnlocalizedName.invoke(ELEMENT.getField(elementName).get(ELEMENT_INSTANCE)); + return (String) getUnlocalizedName.invoke(ELEMENT.getField(elementName).get(ELEMENT_INSTANCE)); } catch (Exception e) { throw new Error(e); } @@ -36,7 +38,10 @@ public class GtppAtomLoader { private void generate(String elementName, boolean generateAll, boolean generateBlastRecipes) { try { generate.invoke( - null, ELEMENT.getField(elementName).get(ELEMENT_INSTANCE), generateAll, generateBlastRecipes); + null, + ELEMENT.getField(elementName).get(ELEMENT_INSTANCE), + generateAll, + generateBlastRecipes); } catch (Exception e) { throw new Error(e); } @@ -59,7 +64,10 @@ public class GtppAtomLoader { clazz = Class.forName("gtPlusPlus.core.material.MaterialGenerator"); generate = clazz.getMethod( - "generate", Class.forName("gtPlusPlus.core.material.Material"), boolean.class, boolean.class); + "generate", + Class.forName("gtPlusPlus.core.material.Material"), + boolean.class, + boolean.class); } catch (Exception e) { throw new Error(e); } diff --git a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java index ff610f70da..6b3d313eb3 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java @@ -1,20 +1,11 @@ package com.github.technus.tectech.compatibility.openComputers; -import com.github.technus.avrClone.AvrCore; -import com.github.technus.avrClone.instructions.ExecutionEvent; -import com.github.technus.avrClone.instructions.InstructionRegistry; -import com.github.technus.avrClone.instructions.exceptions.DebugEvent; -import com.github.technus.avrClone.instructions.exceptions.DelayEvent; -import com.github.technus.avrClone.memory.EepromMemory; -import com.github.technus.avrClone.memory.RemovableMemory; -import com.github.technus.avrClone.memory.program.ProgramMemory; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.util.Converter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; + import li.cil.oc.Settings; import li.cil.oc.api.Driver; import li.cil.oc.api.driver.Item; @@ -24,13 +15,27 @@ import li.cil.oc.api.machine.ExecutionResult; import li.cil.oc.api.machine.Machine; import li.cil.oc.api.machine.Signal; import li.cil.oc.common.SaveHandler; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import org.apache.commons.compress.utils.IOUtils; +import com.github.technus.avrClone.AvrCore; +import com.github.technus.avrClone.instructions.ExecutionEvent; +import com.github.technus.avrClone.instructions.InstructionRegistry; +import com.github.technus.avrClone.instructions.exceptions.DebugEvent; +import com.github.technus.avrClone.instructions.exceptions.DelayEvent; +import com.github.technus.avrClone.memory.EepromMemory; +import com.github.technus.avrClone.memory.RemovableMemory; +import com.github.technus.avrClone.memory.program.ProgramMemory; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.util.Converter; + @Architecture.Name("AVR 32Bit Clone") @Architecture.NoMemoryRequirements public class AvrArchitecture implements Architecture { + private final Machine machine; private AvrCore core; private boolean debugRun; @@ -97,7 +102,7 @@ public class AvrArchitecture implements Architecture { public ExecutionResult runThreaded(boolean isSynchronizedReturn) { if (core.awoken) { delay = 0; - for (int load = 0; load < 512; ) { + for (int load = 0; load < 512;) { load += core.getInstruction().getCost(core); ExecutionEvent executionEvent = core.cpuCycleForce(); if (executionEvent != null) { @@ -145,8 +150,7 @@ public class AvrArchitecture implements Architecture { byte[] instructions = SaveHandler.load(avr, this.machine.node().address() + "_instructionsMemory"); byte[] param0 = SaveHandler.load(avr, this.machine.node().address() + "_param0Memory"); byte[] param1 = SaveHandler.load(avr, this.machine.node().address() + "_param1Memory"); - if (instructions != null - && param0 != null + if (instructions != null && param0 != null && param1 != null && instructions.length > 0 && param0.length > 0 @@ -176,8 +180,7 @@ public class AvrArchitecture implements Architecture { TecTech.LOGGER.error("Failed to decompress param1 memory from disk."); e.printStackTrace(); } - if (instr != null - && par0 != null + if (instr != null && par0 != null && par1 != null && instr.length == par0.length && instr.length == par1.length) { @@ -217,7 +220,10 @@ public class AvrArchitecture implements Architecture { gzos.write(Converter.writeInts(programMemory.instructions)); gzos.close(); SaveHandler.scheduleSave( - machine.host(), avr, machine.node().address() + "_instructionsMemory", baos.toByteArray()); + machine.host(), + avr, + machine.node().address() + "_instructionsMemory", + baos.toByteArray()); } catch (IOException e) { TecTech.LOGGER.error("Failed to compress instructions memory to disk"); e.printStackTrace(); @@ -228,7 +234,10 @@ public class AvrArchitecture implements Architecture { gzos.write(Converter.writeInts(programMemory.param0)); gzos.close(); SaveHandler.scheduleSave( - machine.host(), avr, machine.node().address() + "_param0Memory", baos.toByteArray()); + machine.host(), + avr, + machine.node().address() + "_param0Memory", + baos.toByteArray()); } catch (IOException e) { TecTech.LOGGER.error("Failed to compress param0 memory to disk"); e.printStackTrace(); @@ -239,7 +248,10 @@ public class AvrArchitecture implements Architecture { gzos.write(Converter.writeInts(programMemory.param1)); gzos.close(); SaveHandler.scheduleSave( - machine.host(), avr, machine.node().address() + "_param1Memory", baos.toByteArray()); + machine.host(), + avr, + machine.node().address() + "_param1Memory", + baos.toByteArray()); } catch (IOException e) { TecTech.LOGGER.error("Failed to compress param1 memory to disk"); e.printStackTrace(); @@ -258,7 +270,10 @@ public class AvrArchitecture implements Architecture { gzos.write(Converter.writeInts(core.dataMemory)); gzos.close(); SaveHandler.scheduleSave( - machine.host(), avr, machine.node().address() + "_dataMemory", baos.toByteArray()); + machine.host(), + avr, + machine.node().address() + "_dataMemory", + baos.toByteArray()); } catch (IOException e) { TecTech.LOGGER.error("Failed to compress data memory to disk"); e.printStackTrace(); diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java index 1d77c71ce8..4323c3bbae 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java @@ -1,17 +1,20 @@ package com.github.technus.tectech.compatibility.openmodularturrets; +import net.minecraft.item.Item; +import net.minecraftforge.client.MinecraftForgeClient; + import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadEM; import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadItemRenderEM; import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadRenderEM; import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM; import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileRenderEM; import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.item.Item; -import net.minecraftforge.client.MinecraftForgeClient; public class TT_turret_loader implements Runnable { + @Override public void run() { TurretHeadRenderEM turretHeadRenderEM = new TurretHeadRenderEM(); diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java index fd2ed56162..2f7dee1eae 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java @@ -2,20 +2,23 @@ package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turre import static com.github.technus.tectech.TecTech.creativeTabTecTech; -import com.github.technus.tectech.Reference; -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import openmodularturrets.blocks.turretbases.BlockAbstractTurretBase; import openmodularturrets.handler.ConfigHandler; +import com.github.technus.tectech.Reference; +import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM; +import cpw.mods.fml.common.registry.GameRegistry; + /** * Created by Tec on 27/07/2017. */ public class TurretBaseEM extends BlockAbstractTurretBase { + private final int MaxCharge = ConfigHandler.getBaseTierFiveMaxCharge(); private final int MaxIO = ConfigHandler.getBaseTierFiveMaxIo(); public static TurretBaseEM INSTANCE; diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java index ce5e7c60a8..f141c52091 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java @@ -2,18 +2,21 @@ package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turre import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.util.CommonValues; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import com.github.technus.tectech.util.CommonValues; + /** * Created by Tec on 28/07/2017. */ public class TurretBaseItemEM extends ItemBlock { + public TurretBaseItemEM(Block block) { super(block); } diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java index 0b242505ab..205610f1c0 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java @@ -2,8 +2,6 @@ package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turre import static com.github.technus.tectech.TecTech.creativeTabTecTech; -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -11,12 +9,17 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import openmodularturrets.tileentity.turretbase.TurretBase; +import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; +import cpw.mods.fml.common.registry.GameRegistry; + /** * Created by Tec on 27/07/2017. */ public class TurretHeadEM extends Block implements ITileEntityProvider { + public static TurretHeadEM INSTANCE; public TurretHeadEM() { diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java index 068e0fbb0f..46dfa94e57 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java @@ -5,17 +5,20 @@ import static net.minecraft.util.StatCollector.translateToLocal; import java.text.DecimalFormat; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; + import openmodularturrets.handler.ConfigHandler; /** * Created by Tec on 28/07/2017. */ public class TurretHeadItemEM extends ItemBlock { + private static final DecimalFormat df = new DecimalFormat("0.0"); public TurretHeadItemEM(Block block) { @@ -28,25 +31,38 @@ public class TurretHeadItemEM extends ItemBlock { list.add(""); list.add(EnumChatFormatting.GOLD + "--" + translateToLocal("tooltip.info") + "--"); list.add(translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + '5'); - list.add(translateToLocal("tooltip.range") + ": " + EnumChatFormatting.WHITE - + ConfigHandler.getLaserTurretSettings().getRange()); - list.add(translateToLocal("tooltip.accuracy") + ": " + EnumChatFormatting.WHITE - + translateToLocal("turret.accuracy.high")); + list.add( + translateToLocal("tooltip.range") + ": " + + EnumChatFormatting.WHITE + + ConfigHandler.getLaserTurretSettings().getRange()); + list.add( + translateToLocal("tooltip.accuracy") + ": " + + EnumChatFormatting.WHITE + + translateToLocal("turret.accuracy.high")); list.add( translateToLocal("tooltip.ammo") + ": " + EnumChatFormatting.WHITE + translateToLocal("turret.ammo.4")); - list.add(translateToLocal("tooltip.tierRequired") + ": " + EnumChatFormatting.WHITE - + translateToLocal("base.tier.5")); + list.add( + translateToLocal("tooltip.tierRequired") + ": " + + EnumChatFormatting.WHITE + + translateToLocal("base.tier.5")); list.add(""); list.add(EnumChatFormatting.DARK_PURPLE + "--" + translateToLocal("tooltip.damage.label") + "--"); - list.add(translateToLocal("tooltip.damage.stat") + ": " + EnumChatFormatting.WHITE - + (float) ConfigHandler.getLaserTurretSettings().getDamage() / 2.0F + ' ' - + translateToLocal("tooltip.health")); + list.add( + translateToLocal("tooltip.damage.stat") + ": " + + EnumChatFormatting.WHITE + + (float) ConfigHandler.getLaserTurretSettings().getDamage() / 2.0F + + ' ' + + translateToLocal("tooltip.health")); list.add(translateToLocal("tooltip.aoe") + ": " + EnumChatFormatting.WHITE + '0'); - list.add(translateToLocal("tooltip.firerate") + ": " + EnumChatFormatting.WHITE - + df.format( - 20.0F / (float) ConfigHandler.getLaserTurretSettings().getFireRate())); - list.add(translateToLocal("tooltip.energy.stat") + ": " + EnumChatFormatting.WHITE - + ConfigHandler.getLaserTurretSettings().getPowerUsage() + " RF"); + list.add( + translateToLocal("tooltip.firerate") + ": " + + EnumChatFormatting.WHITE + + df.format(20.0F / (float) ConfigHandler.getLaserTurretSettings().getFireRate())); + list.add( + translateToLocal("tooltip.energy.stat") + ": " + + EnumChatFormatting.WHITE + + ConfigHandler.getLaserTurretSettings().getPowerUsage() + + " RF"); list.add(""); list.add(EnumChatFormatting.DARK_GRAY + translateToLocal("flavour.turret.4")); } diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java index b44a939df3..b2f0854340 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java @@ -1,15 +1,19 @@ package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads; -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; + import openmodularturrets.client.render.models.ModelLaserTurret; + import org.lwjgl.opengl.GL11; +import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; + /** * Created by Tec on 30.07.2017. */ public class TurretHeadItemRenderEM implements IItemRenderer { + private final TurretHeadRenderEM turretRenderer; private final TileTurretHeadEM turretTileEntity; private final ModelLaserTurret model; diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java index f407257eab..d73d9b29be 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java @@ -5,4 +5,5 @@ import openmodularturrets.client.render.renderers.blockitem.LaserTurretRenderer; /** * Created by Tec on 28/07/2017. */ -public class TurretHeadRenderEM extends LaserTurretRenderer {} +public class TurretHeadRenderEM extends LaserTurretRenderer { +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java index b985f00b01..45592244c3 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java @@ -1,14 +1,10 @@ package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; -import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition; -import gregtech.api.GregTech_API; -import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; + import openmodularturrets.entity.projectiles.LaserProjectile; import openmodularturrets.entity.projectiles.damagesources.NormalDamageSource; import openmodularturrets.handler.ConfigHandler; @@ -16,10 +12,18 @@ import openmodularturrets.tileentity.turretbase.TurretBase; import openmodularturrets.util.PlayerUtil; import openmodularturrets.util.TurretHeadUtil; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; +import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition; + +import gregtech.api.GregTech_API; +import gregtech.api.util.GT_Utility; + /** * Created by Bass on 27/07/2017. */ public class projectileEM extends LaserProjectile { + public float gravity = 0; private TurretBase turretBase; @@ -62,8 +66,8 @@ public class projectileEM extends LaserProjectile { if (projectileContent.getDefinition().getCharge() == 0) { gravity = massFactor / 100f; } else { - gravity = Math.min( - 0.0025F / Math.abs(projectileContent.getDefinition().getCharge()), massFactor / 100f); + gravity = Math + .min(0.0025F / Math.abs(projectileContent.getDefinition().getCharge()), massFactor / 100f); } } } @@ -82,10 +86,11 @@ public class projectileEM extends LaserProjectile { switch (movingobjectposition.typeOfHit) { case BLOCK: Block hitBlock = worldObj.getBlock( - movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); + movingobjectposition.blockX, + movingobjectposition.blockY, + movingobjectposition.blockZ); if (hitBlock != null) { - if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS - && antiMatter + if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter && hitBlock.getMaterial().isSolid()) { GT_Utility.sendSoundToPlayers( worldObj, @@ -100,8 +105,7 @@ public class projectileEM extends LaserProjectile { movingobjectposition.blockX + 0.5D, movingobjectposition.blockY + 0.5D, movingobjectposition.blockZ + 0.5D, - TecTech.configTecTech.TURRET_EXPLOSION_FACTOR - * (strange ? 10 : 1) + TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * (strange ? 10 : 1) * massFactor * (isAmped ? ampLevel * .1f + 1 : 1) * (ticksExisted / 250f), @@ -112,8 +116,7 @@ public class projectileEM extends LaserProjectile { } break; case ENTITY: - float damage = (strange ? 10 : 1) - * TecTech.configTecTech.TURRET_DAMAGE_FACTOR + float damage = (strange ? 10 : 1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped ? ampLevel * .1f + 1 : 1); @@ -121,8 +124,8 @@ public class projectileEM extends LaserProjectile { EntityPlayer player = (EntityPlayer) movingobjectposition.entityHit; if (canDamagePlayer(player)) { movingobjectposition.entityHit.setFire((strange ? 10 : 1) * 2); - movingobjectposition.entityHit.attackEntityFrom( - new NormalDamageSource("laser"), damage); + movingobjectposition.entityHit + .attackEntityFrom(new NormalDamageSource("laser"), damage); if (antiMatter) { movingobjectposition.entityHit.hurtResistantTime = 0; } @@ -155,8 +158,7 @@ public class projectileEM extends LaserProjectile { movingobjectposition.entityHit.posX, movingobjectposition.entityHit.posY, movingobjectposition.entityHit.posZ, - (strange ? 10 : 1) - * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR + (strange ? 10 : 1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped ? ampLevel * .1f + 1 : 1) * (ticksExisted / 250f), @@ -170,10 +172,9 @@ public class projectileEM extends LaserProjectile { } public boolean canDamagePlayer(EntityPlayer entityPlayer) { - return ConfigHandler.turretDamageTrustedPlayers - || this.turretBase.getTrustedPlayer(entityPlayer.getUniqueID()) == null - && !PlayerUtil.getPlayerUIDUnstable(this.turretBase.getOwner()) - .equals(entityPlayer.getUniqueID()); + return ConfigHandler.turretDamageTrustedPlayers || this.turretBase.getTrustedPlayer(entityPlayer.getUniqueID()) + == null + && !PlayerUtil.getPlayerUIDUnstable(this.turretBase.getOwner()).equals(entityPlayer.getUniqueID()); } @Override diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java index ce656f8c8f..3c4ff2bcca 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java @@ -1,23 +1,27 @@ package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles; -import com.github.technus.tectech.Reference; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import com.github.technus.tectech.Reference; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + /** * Created by Tec on 29.07.2017. */ @SideOnly(Side.CLIENT) public class projectileRenderEM extends Render { - private static final ResourceLocation textures = - new ResourceLocation(Reference.MODID + ":textures/entity/projectileEM.png"); + + private static final ResourceLocation textures = new ResourceLocation( + Reference.MODID + ":textures/entity/projectileEM.png"); private void render(projectileEM entity, double par2, double par4, double par6, float par9) { bindEntityTexture(entity); @@ -29,7 +33,10 @@ public class projectileRenderEM extends Render { 1.0F, 0.0F); GL11.glRotatef( - entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * par9, 0.0F, 0.0F, 1.0F); + entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * par9, + 0.0F, + 0.0F, + 1.0F); Tessellator var18 = Tessellator.instance; byte b0 = 0; float f2 = 0.0F; diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java index b8b843844f..631e7306cb 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java @@ -2,24 +2,27 @@ package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.t import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT; -import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM; -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM; -import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; -import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import openmodularturrets.entity.projectiles.TurretProjectile; import openmodularturrets.handler.ConfigHandler; import openmodularturrets.tileentity.turrets.TurretHead; import openmodularturrets.util.TurretHeadUtil; +import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM; +import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM; +import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; +import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; +import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; + /** * Created by Bass on 27/07/2017. */ public class TileTurretHeadEM extends TurretHead { + private EMInstanceStackMap hatchContentPointer; @Override @@ -62,8 +65,8 @@ public class TileTurretHeadEM extends TurretHead { @Override public Item getAmmo() { - return DebugElementalInstanceContainer_EM - .INSTANCE; // Placeholder item that cannot be achieved, yet still usable for debug + return DebugElementalInstanceContainer_EM.INSTANCE; // Placeholder item that cannot be achieved, yet still + // usable for debug } @Override 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 4e048fd51a..badc773669 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,17 +1,21 @@ package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import openmodularturrets.tileentity.turretbase.TurretBaseTierFiveTileEntity; + import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental; + import cpw.mods.fml.common.Optional; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import openmodularturrets.tileentity.turretbase.TurretBaseTierFiveTileEntity; /** * Created by Bass on 27/07/2017. */ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity { + public TileTurretBaseEM(int MaxEnergyStorage, int MaxIO) { super(MaxEnergyStorage, MaxIO); } diff --git a/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java index 635c1de419..752418ff5f 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java @@ -2,6 +2,11 @@ package com.github.technus.tectech.compatibility.spartakcore; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + 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; @@ -10,6 +15,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviou import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_ElectromagneticSeparator; 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 gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -17,20 +23,18 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; /** * Created by Spartak1997 on 28.07.2019. */ public class SpartakCoreRecipeLoader { + public void run(EMTransformationRegistry transformationInfo) { // Quantum Glass GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {CustomItemList.eM_Containment.get(1), GT_ModHandler.getIC2Item("reinforcedGlass", 1L)}, + new ItemStack[] { CustomItemList.eM_Containment.get(1), + GT_ModHandler.getIC2Item("reinforcedGlass", 1L) }, Materials.Osmium.getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, @@ -40,10 +44,8 @@ public class SpartakCoreRecipeLoader { // Data GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Parts_GlassFiber.get(8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8) - }, + new ItemStack[] { ItemList.Circuit_Parts_GlassFiber.get(8), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8) }, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1), 200, @@ -53,14 +55,11 @@ public class SpartakCoreRecipeLoader { // Tunnel GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.DATApipe.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), - ItemList.Field_Generator_MV.get(1), - ItemList.Circuit_Quantummainframe.get(1) - }, + new ItemStack[] { CustomItemList.DATApipe.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), + ItemList.Field_Generator_MV.get(1), ItemList.Circuit_Quantummainframe.get(1) }, Materials.Osmium.getMolten(288), CustomItemList.EMpipe.get(1), 400, @@ -68,11 +67,8 @@ public class SpartakCoreRecipeLoader { // Laser GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.DATApipe.get(1), - GT_ModHandler.getIC2Item("reinforcedGlass", 1L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 2) - }, + new ItemStack[] { CustomItemList.DATApipe.get(1), GT_ModHandler.getIC2Item("reinforcedGlass", 1L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 2) }, null, CustomItemList.LASERpipe.get(1), 100, @@ -84,14 +80,12 @@ public class SpartakCoreRecipeLoader { // High Power Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) }, Materials.TungstenSteel.getMolten(576), CustomItemList.eM_Power.get(1), 100, @@ -99,41 +93,39 @@ public class SpartakCoreRecipeLoader { // Computer Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Power.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, + new ItemStack[] { CustomItemList.eM_Power.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) }, Materials.Aluminium.getMolten(1296), CustomItemList.eM_Computer_Casing.get(1), 200, 122880); // Computer Vent Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - ItemList.Electric_Motor_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, getOrDefault("SuperconductorIV", Materials.Superconductor), 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + ItemList.Electric_Motor_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + getOrDefault("SuperconductorIV", Materials.Superconductor), + 1) }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1), 100, 1920); // Advanced Computer Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), - GT_OreDictUnificator.get( - OrePrefixes.wireGt02, getOrDefault("SuperconductorLuV", Materials.Superconductor), 4) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), + GT_OreDictUnificator.get( + OrePrefixes.wireGt02, + getOrDefault("SuperconductorLuV", Materials.Superconductor), + 4) }, Materials.Iridium.getMolten(1296), CustomItemList.eM_Computer_Bus.get(1), 200, @@ -141,14 +133,12 @@ public class SpartakCoreRecipeLoader { // Molecular Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Power.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 12), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), - ItemList.Field_Generator_IV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Power.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 12), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), + ItemList.Field_Generator_IV.get(1) }, Materials.Osmium.getMolten(1296), CustomItemList.eM_Containment.get(1), 800, @@ -161,21 +151,17 @@ public class SpartakCoreRecipeLoader { 32, 500000, 6, - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 2), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Plutonium, 4), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8), - GT_OreDictUnificator.get( - OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Americium), 16), - GT_OreDictUnificator.get(OrePrefixes.screw, getOrDefault("Quantium", Materials.Neutronium), 16), - }, - new FluidStack[] { - getOrDefault("Trinium", Materials.Americium).getMolten(1296), - Materials.Osmium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Argon.getGas(1000), - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 2), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Plutonium, 4), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Americium), 16), + GT_OreDictUnificator + .get(OrePrefixes.screw, getOrDefault("Quantium", Materials.Neutronium), 16), }, + new FluidStack[] { getOrDefault("Trinium", Materials.Americium).getMolten(1296), + Materials.Osmium.getMolten(1296), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + Materials.Argon.getGas(1000), }, CustomItemList.eM_Hollow.get(2), 200, 2000000); @@ -187,19 +173,13 @@ public class SpartakCoreRecipeLoader { 128, 1000000, 16, - new ItemStack[] { - CustomItemList.eM_Hollow.get(1), - ItemList.Casing_Fusion_Coil.get(4), - ItemList.Casing_Coil_NaquadahAlloy.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 64), - }, - new FluidStack[] { - Materials.Glass.getMolten(2304), - Materials.Silicone.getMolten(1872), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - getOrDefault("Trinium", Materials.Osmium).getMolten(1296), - }, + new ItemStack[] { CustomItemList.eM_Hollow.get(1), ItemList.Casing_Fusion_Coil.get(4), + ItemList.Casing_Coil_NaquadahAlloy.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 64), }, + new FluidStack[] { Materials.Glass.getMolten(2304), Materials.Silicone.getMolten(1872), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + getOrDefault("Trinium", Materials.Osmium).getMolten(1296), }, CustomItemList.eM_Coil.get(4), 800, 2000000); @@ -210,311 +190,251 @@ public class SpartakCoreRecipeLoader { // Dynamo Hatches IV-UHV GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_dynamoMulti4_IV.get(1), 100, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_dynamoMulti16_IV.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_dynamoMulti64_IV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) }, Materials.Silver.getMolten(288), CustomItemList.eM_dynamoMulti4_LuV.get(1), 100, 7860); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) }, Materials.Electrum.getMolten(288), CustomItemList.eM_dynamoMulti16_LuV.get(1), 200, 7860); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) }, Materials.Tungsten.getMolten(288), CustomItemList.eM_dynamoMulti64_LuV.get(1), 400, 7860); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) }, Materials.Silver.getMolten(576), CustomItemList.eM_dynamoMulti4_ZPM.get(1), 100, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) }, Materials.Electrum.getMolten(576), CustomItemList.eM_dynamoMulti16_ZPM.get(1), 200, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) }, Materials.Tungsten.getMolten(576), CustomItemList.eM_dynamoMulti64_ZPM.get(1), 400, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) }, Materials.Silver.getMolten(1152), CustomItemList.eM_dynamoMulti4_UV.get(1), 100, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) }, Materials.Electrum.getMolten(1152), CustomItemList.eM_dynamoMulti16_UV.get(1), 200, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) }, Materials.Tungsten.getMolten(1152), CustomItemList.eM_dynamoMulti64_UV.get(1), 400, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) }, Materials.Silver.getMolten(2304), CustomItemList.eM_dynamoMulti4_UHV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) }, Materials.Electrum.getMolten(2304), CustomItemList.eM_dynamoMulti16_UHV.get(1), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) }, Materials.Tungsten.getMolten(2304), CustomItemList.eM_dynamoMulti64_UHV.get(1), 400, 500000); - // Energy Hatches 4A-64A IV-UHV + // Energy Hatches 4A-64A IV-UHV GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_energyMulti4_IV.get(1), 100, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_energyMulti16_IV.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_energyMulti64_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) }, Materials.Silver.getMolten(288), CustomItemList.eM_energyMulti4_LuV.get(1), 100, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) }, Materials.Electrum.getMolten(288), CustomItemList.eM_energyMulti16_LuV.get(1), 200, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) }, Materials.Tungsten.getMolten(288), CustomItemList.eM_energyMulti64_LuV.get(1), 400, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) }, Materials.Silver.getMolten(576), CustomItemList.eM_energyMulti4_ZPM.get(1), 100, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) }, Materials.Electrum.getMolten(576), CustomItemList.eM_energyMulti16_ZPM.get(1), 200, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) }, Materials.Tungsten.getMolten(576), CustomItemList.eM_energyMulti64_ZPM.get(1), 400, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) }, Materials.Silver.getMolten(1152), CustomItemList.eM_energyMulti4_UV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) }, Materials.Electrum.getMolten(1152), CustomItemList.eM_energyMulti16_UV.get(1), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) }, Materials.Tungsten.getMolten(1152), CustomItemList.eM_energyMulti64_UV.get(1), 400, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) }, Materials.Silver.getMolten(2304), CustomItemList.eM_energyMulti4_UHV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) }, Materials.Electrum.getMolten(2304), CustomItemList.eM_energyMulti16_UHV.get(1), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) }, Materials.Tungsten.getMolten(2304), CustomItemList.eM_energyMulti64_UHV.get(1), 400, @@ -522,53 +442,41 @@ public class SpartakCoreRecipeLoader { // Laser Dynamo IV-UV 256/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_IV.get(1), - ItemList.Electric_Pump_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_IV.get(1), + ItemList.Electric_Pump_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_IV.get(1), 1000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_LuV.get(1), - ItemList.Electric_Pump_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_LuV.get(1), + ItemList.Electric_Pump_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_LuV.get(1), 1000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_ZPM.get(1), - ItemList.Electric_Pump_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_ZPM.get(1), + ItemList.Electric_Pump_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_ZPM.get(1), 1000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_UV.get(1), - ItemList.Electric_Pump_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UV.get(1), + ItemList.Electric_Pump_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_UV.get(1), 1000, @@ -576,53 +484,41 @@ public class SpartakCoreRecipeLoader { // Laser Dynamo IV-UV 1024/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_IV.get(2), - ItemList.Electric_Pump_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_IV.get(2), + ItemList.Electric_Pump_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_IV.get(1), 2000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_LuV.get(2), - ItemList.Electric_Pump_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_LuV.get(2), + ItemList.Electric_Pump_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_LuV.get(1), 2000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_ZPM.get(2), - ItemList.Electric_Pump_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_ZPM.get(2), + ItemList.Electric_Pump_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_ZPM.get(1), 2000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_UV.get(2), - ItemList.Electric_Pump_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UV.get(2), + ItemList.Electric_Pump_UV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_UV.get(1), 2000, @@ -630,53 +526,41 @@ public class SpartakCoreRecipeLoader { // Laser Dynamo IV-UV 4096/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_IV.get(4), - ItemList.Electric_Pump_IV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_IV.get(4), + ItemList.Electric_Pump_IV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_IV.get(1), 4000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_LuV.get(4), - ItemList.Electric_Pump_LuV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_LuV.get(4), + ItemList.Electric_Pump_LuV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_LuV.get(1), 4000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_ZPM.get(4), - ItemList.Electric_Pump_ZPM.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_ZPM.get(4), + ItemList.Electric_Pump_ZPM.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_ZPM.get(1), 4000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UV.get(4), - ItemList.Electric_Pump_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UV.get(4), + ItemList.Electric_Pump_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_UV.get(1), 4000, @@ -684,53 +568,41 @@ public class SpartakCoreRecipeLoader { // Laser Dynamo IV-UV 16384/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_IV.get(8), - ItemList.Electric_Pump_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_IV.get(8), + ItemList.Electric_Pump_IV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_IV.get(1), 8000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_LuV.get(8), - ItemList.Electric_Pump_LuV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_LuV.get(8), + ItemList.Electric_Pump_LuV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_LuV.get(1), 8000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_ZPM.get(8), - ItemList.Electric_Pump_ZPM.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_ZPM.get(8), + ItemList.Electric_Pump_ZPM.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_ZPM.get(1), 8000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_UV.get(8), - ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_UV.get(8), + ItemList.Electric_Pump_UV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_UV.get(1), 8000, @@ -738,53 +610,41 @@ public class SpartakCoreRecipeLoader { // Laser Dynamo IV-UV 65536/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_IV.get(16), - ItemList.Electric_Pump_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_IV.get(16), + ItemList.Electric_Pump_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_IV.get(1), 16000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_LuV.get(16), - ItemList.Electric_Pump_LuV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_LuV.get(16), + ItemList.Electric_Pump_LuV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_LuV.get(1), 16000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_ZPM.get(16), - ItemList.Electric_Pump_ZPM.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_ZPM.get(16), + ItemList.Electric_Pump_ZPM.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_ZPM.get(1), 16000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_UV.get(16), - ItemList.Electric_Pump_UV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UV.get(16), + ItemList.Electric_Pump_UV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_UV.get(1), 16000, @@ -792,53 +652,41 @@ public class SpartakCoreRecipeLoader { // Laser Dynamo IV-UV 262144/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_IV.get(32), - ItemList.Electric_Pump_IV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_IV.get(32), + ItemList.Electric_Pump_IV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_IV.get(1), 32000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_LuV.get(32), - ItemList.Electric_Pump_LuV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_LuV.get(32), + ItemList.Electric_Pump_LuV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_LuV.get(1), 32000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_ZPM.get(32), - ItemList.Electric_Pump_ZPM.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_ZPM.get(32), + ItemList.Electric_Pump_ZPM.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_ZPM.get(1), 32000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_UV.get(32), - ItemList.Electric_Pump_UV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UV.get(32), + ItemList.Electric_Pump_UV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_UV.get(1), 32000, @@ -846,53 +694,41 @@ public class SpartakCoreRecipeLoader { // Laser Dynamo IV-UV 1048576/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_IV.get(64), - ItemList.Electric_Pump_IV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_IV.get(64), + ItemList.Electric_Pump_IV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_IV.get(1), 64000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_LuV.get(64), - ItemList.Electric_Pump_LuV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_LuV.get(64), + ItemList.Electric_Pump_LuV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_LuV.get(1), 64000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_ZPM.get(64), - ItemList.Electric_Pump_ZPM.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_ZPM.get(64), + ItemList.Electric_Pump_ZPM.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_ZPM.get(1), 64000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_UV.get(64), - ItemList.Electric_Pump_UV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UV.get(64), + ItemList.Electric_Pump_UV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_UV.get(1), 64000, @@ -900,53 +736,41 @@ public class SpartakCoreRecipeLoader { // Laser Target IV-UV 256/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_IV.get(1), - ItemList.Electric_Pump_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_IV.get(1), + ItemList.Electric_Pump_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_IV.get(1), 1000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_LuV.get(1), - ItemList.Electric_Pump_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_LuV.get(1), + ItemList.Electric_Pump_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_LuV.get(1), 1000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_ZPM.get(1), - ItemList.Electric_Pump_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_ZPM.get(1), + ItemList.Electric_Pump_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_ZPM.get(1), 1000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_UV.get(1), - ItemList.Electric_Pump_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UV.get(1), + ItemList.Electric_Pump_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_UV.get(1), 1000, @@ -954,53 +778,41 @@ public class SpartakCoreRecipeLoader { // Laser Target IV-UV 1024/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_IV.get(2), - ItemList.Electric_Pump_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_IV.get(2), + ItemList.Electric_Pump_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_IV.get(1), 2000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_LuV.get(2), - ItemList.Electric_Pump_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_LuV.get(2), + ItemList.Electric_Pump_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_LuV.get(1), 2000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_ZPM.get(2), - ItemList.Electric_Pump_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_ZPM.get(2), + ItemList.Electric_Pump_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_ZPM.get(1), 2000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_UV.get(2), - ItemList.Electric_Pump_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UV.get(2), + ItemList.Electric_Pump_UV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_UV.get(1), 2000, @@ -1008,53 +820,41 @@ public class SpartakCoreRecipeLoader { // Laser Target IV-UV 4096/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_IV.get(4), - ItemList.Electric_Pump_IV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_IV.get(4), + ItemList.Electric_Pump_IV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_IV.get(1), 4000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_LuV.get(4), - ItemList.Electric_Pump_LuV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_LuV.get(4), + ItemList.Electric_Pump_LuV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_LuV.get(1), 4000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_ZPM.get(4), - ItemList.Electric_Pump_ZPM.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_ZPM.get(4), + ItemList.Electric_Pump_ZPM.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_ZPM.get(1), 4000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_UV.get(4), - ItemList.Electric_Pump_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_UV.get(4), + ItemList.Electric_Pump_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_UV.get(1), 4000, @@ -1062,53 +862,41 @@ public class SpartakCoreRecipeLoader { // Laser Target IV-UV 16384/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_IV.get(8), - ItemList.Electric_Pump_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_IV.get(8), + ItemList.Electric_Pump_IV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_IV.get(1), 8000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_LuV.get(8), - ItemList.Electric_Pump_LuV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_LuV.get(8), + ItemList.Electric_Pump_LuV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_LuV.get(1), 8000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_ZPM.get(8), - ItemList.Electric_Pump_ZPM.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_ZPM.get(8), + ItemList.Electric_Pump_ZPM.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_ZPM.get(1), 8000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_UV.get(8), - ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UV.get(8), + ItemList.Electric_Pump_UV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_UV.get(1), 8000, @@ -1116,53 +904,41 @@ public class SpartakCoreRecipeLoader { // Laser Target IV-UV 65536/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_IV.get(16), - ItemList.Electric_Pump_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_IV.get(16), + ItemList.Electric_Pump_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_IV.get(1), 16000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_LuV.get(16), - ItemList.Electric_Pump_LuV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_LuV.get(16), + ItemList.Electric_Pump_LuV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_LuV.get(1), 16000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_ZPM.get(16), - ItemList.Electric_Pump_ZPM.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_ZPM.get(16), + ItemList.Electric_Pump_ZPM.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_ZPM.get(1), 16000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_UV.get(16), - ItemList.Electric_Pump_UV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UV.get(16), + ItemList.Electric_Pump_UV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_UV.get(1), 16000, @@ -1170,53 +946,41 @@ public class SpartakCoreRecipeLoader { // Laser Target IV-UV 262144/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_IV.get(32), - ItemList.Electric_Pump_IV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_IV.get(32), + ItemList.Electric_Pump_IV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_IV.get(1), 32000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_LuV.get(32), - ItemList.Electric_Pump_LuV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_LuV.get(32), + ItemList.Electric_Pump_LuV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_LuV.get(1), 32000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_ZPM.get(32), - ItemList.Electric_Pump_ZPM.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_ZPM.get(32), + ItemList.Electric_Pump_ZPM.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_ZPM.get(1), 32000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_UV.get(32), - ItemList.Electric_Pump_UV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UV.get(32), + ItemList.Electric_Pump_UV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_UV.get(1), 32000, @@ -1224,53 +988,41 @@ public class SpartakCoreRecipeLoader { // Laser Target IV-UV 1048576/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_IV.get(64), - ItemList.Electric_Pump_IV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_IV.get(64), + ItemList.Electric_Pump_IV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_IV.get(1), 64000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_LuV.get(64), - ItemList.Electric_Pump_LuV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_LuV.get(64), + ItemList.Electric_Pump_LuV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_LuV.get(1), 64000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_ZPM.get(64), - ItemList.Electric_Pump_ZPM.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_ZPM.get(64), + ItemList.Electric_Pump_ZPM.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_ZPM.get(1), 64000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_UV.get(64), - ItemList.Electric_Pump_UV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UV.get(64), + ItemList.Electric_Pump_UV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_UV.get(1), 64000, @@ -1278,24 +1030,16 @@ public class SpartakCoreRecipeLoader { // Data Input GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Hatch_Input_Bus_LuV.get(1), - ItemList.Circuit_Crystalcomputer.get(1), - CustomItemList.DATApipe.get(2) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), ItemList.Hatch_Input_Bus_LuV.get(1), + ItemList.Circuit_Crystalcomputer.get(1), CustomItemList.DATApipe.get(2) }, Materials.Iridium.getMolten(1296), CustomItemList.dataIn_Hatch.get(1), 200, 122880); // Data Output GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Hatch_Output_Bus_LuV.get(1), - ItemList.Circuit_Crystalcomputer.get(1), - CustomItemList.DATApipe.get(2) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), ItemList.Hatch_Output_Bus_LuV.get(1), + ItemList.Circuit_Crystalcomputer.get(1), CustomItemList.DATApipe.get(2) }, Materials.Iridium.getMolten(1296), CustomItemList.dataOut_Hatch.get(1), 200, @@ -1303,12 +1047,8 @@ public class SpartakCoreRecipeLoader { // Rack GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Bus.get(1), - ItemList.Hatch_Input_Bus_ZPM.get(1), - ItemList.Circuit_Crystalcomputer.get(2), - CustomItemList.DATApipe.get(4) - }, + new ItemStack[] { CustomItemList.eM_Computer_Bus.get(1), ItemList.Hatch_Input_Bus_ZPM.get(1), + ItemList.Circuit_Crystalcomputer.get(2), CustomItemList.DATApipe.get(4) }, Materials.Iridium.getMolten(1296), CustomItemList.rack_Hatch.get(1), 800, @@ -1318,48 +1058,32 @@ public class SpartakCoreRecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Input_Bus_ZPM.get(1), 10000, - new Object[] { - ItemList.Hatch_Input_Bus_ZPM.get(1), - CustomItemList.eM_Computer_Bus.get(1), - ItemList.Emitter_ZPM.get(8), - ItemList.Robot_Arm_ZPM.get(1), - ItemList.Electric_Motor_ZPM.get(2), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 1)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 16)}, - CustomItemList.DATApipe.get(2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(500), - Materials.Iridium.getMolten(1000), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000) - }, + new Object[] { ItemList.Hatch_Input_Bus_ZPM.get(1), CustomItemList.eM_Computer_Bus.get(1), + ItemList.Emitter_ZPM.get(8), ItemList.Robot_Arm_ZPM.get(1), ItemList.Electric_Motor_ZPM.get(2), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 1) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 16) }, + CustomItemList.DATApipe.get(2), }, + new FluidStack[] { Materials.UUMatter.getFluid(500), Materials.Iridium.getMolten(1000), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000) }, CustomItemList.holder_Hatch.get(1), 1200, 100000); // Parameterizer GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Circuit_Masterquantumcomputer.get(1), - CustomItemList.DATApipe.get(4), - ItemList.Cover_Screen.get(1), - new ItemStack(Blocks.stone_button, 16), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + ItemList.Circuit_Masterquantumcomputer.get(1), CustomItemList.DATApipe.get(4), + ItemList.Cover_Screen.get(1), new ItemStack(Blocks.stone_button, 16), }, Materials.Iridium.getMolten(2592), CustomItemList.Parametrizer_Hatch.get(1), 800, 122880); // Uncertainty GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Circuit_Ultimatecrystalcomputer.get(1), - CustomItemList.DATApipe.get(16), - ItemList.Cover_Screen.get(1), - new ItemStack(Blocks.stone_button, 16), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + ItemList.Circuit_Ultimatecrystalcomputer.get(1), CustomItemList.DATApipe.get(16), + ItemList.Cover_Screen.get(1), new ItemStack(Blocks.stone_button, 16), }, Materials.Iridium.getMolten(2592), CustomItemList.Uncertainty_Hatch.get(1), 1200, @@ -1367,36 +1091,27 @@ public class SpartakCoreRecipeLoader { // Elemental Input GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Input_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2), - ItemList.Sensor_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Input_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2), + ItemList.Sensor_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_in_UV.get(1), 800, 500000); // Elemental Output GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Output_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2), - ItemList.Emitter_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Output_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2), + ItemList.Emitter_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_out_UV.get(1), 800, 500000); // Overflow GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Muffler_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1), - ItemList.Field_Generator_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Muffler_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1), + ItemList.Field_Generator_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_muffler_UV.get(1), 800, @@ -1408,13 +1123,11 @@ public class SpartakCoreRecipeLoader { // Microwave Grinder GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Machine_HV_Microwave.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), - ItemList.Upgrade_Overclocker.get(4), - }, + new ItemStack[] { ItemList.Machine_HV_Microwave.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), + ItemList.Upgrade_Overclocker.get(4), }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1), 800, @@ -1422,13 +1135,11 @@ public class SpartakCoreRecipeLoader { // Network Switch GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 64), - CustomItemList.DATApipe.get(4), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 64), + CustomItemList.DATApipe.get(4), }, Materials.Iridium.getMolten(1296), CustomItemList.Machine_Multi_Switch.get(1), 800, @@ -1438,23 +1149,16 @@ public class SpartakCoreRecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Tool_DataOrb.get(1), 20000, - new Object[] { - CustomItemList.Machine_Multi_Switch.get(1), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2)}, - ItemList.Tool_DataOrb.get(1), - ItemList.Cover_Screen.get(1), - new ItemStack[] { - GT_OreDictUnificator.get( - OrePrefixes.wireGt04, getOrDefault("SuperconductorUV", Materials.Superconductor), 8) - }, - CustomItemList.DATApipe.get(8), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Iridium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Hydrogen.getGas(1000), - }, + new Object[] { CustomItemList.Machine_Multi_Switch.get(1), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2) }, + ItemList.Tool_DataOrb.get(1), ItemList.Cover_Screen.get(1), + new ItemStack[] { GT_OreDictUnificator.get( + OrePrefixes.wireGt04, + getOrDefault("SuperconductorUV", Materials.Superconductor), + 8) }, + CustomItemList.DATApipe.get(8), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Iridium.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Hydrogen.getGas(1000), }, CustomItemList.Machine_Multi_Computer.get(1), 12000, 100000); @@ -1463,22 +1167,14 @@ public class SpartakCoreRecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Machine_IV_Scanner.get(1), 80000, - new Object[] { - CustomItemList.Machine_Multi_Switch.get(1), - ItemList.Sensor_ZPM.get(8), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 4)}, - ItemList.Field_Generator_ZPM.get(1), - ItemList.Electric_Motor_ZPM.get(2), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 32)}, - CustomItemList.DATApipe.get(16), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Iridium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new Object[] { CustomItemList.Machine_Multi_Switch.get(1), ItemList.Sensor_ZPM.get(8), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 4) }, + ItemList.Field_Generator_ZPM.get(1), ItemList.Electric_Motor_ZPM.get(2), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 32) }, + CustomItemList.DATApipe.get(16), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Iridium.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_Research.get(1), 12000, 100000); @@ -1490,20 +1186,13 @@ public class SpartakCoreRecipeLoader { 32, 500000, 4, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), - ItemList.Robot_Arm_LuV.get(2), - ItemList.Electric_Piston_LuV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 4), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), + ItemList.Robot_Arm_LuV.get(2), ItemList.Electric_Piston_LuV.get(2), + ItemList.Circuit_Wetwaresupercomputer.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 4), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EMjunction.get(1), 12000, 100000); @@ -1515,19 +1204,12 @@ public class SpartakCoreRecipeLoader { 32, 500000, 6, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), - ItemList.Emitter_UV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), + ItemList.Emitter_UV.get(2), ItemList.Circuit_Wetwaresupercomputer.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_MatterToEM.get(1), 12000, 100000); @@ -1539,19 +1221,12 @@ public class SpartakCoreRecipeLoader { 32, 500000, 6, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), - ItemList.Sensor_UV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4), + ItemList.Sensor_UV.get(2), ItemList.Circuit_Wetwaresupercomputer.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EMToMatter.get(1), 12000, 100000); @@ -1563,17 +1238,11 @@ public class SpartakCoreRecipeLoader { 512, 2000000, 32, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - CustomItemList.eM_Coil.get(8), - CustomItemList.eM_Power.get(8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NeodymiumMagnetic, 16), - }, - new FluidStack[] { - Materials.Electrum.getMolten(2592), - Materials.Neutronium.getMolten(1872), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Coil.get(8), + CustomItemList.eM_Power.get(8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NeodymiumMagnetic, 16), }, + new FluidStack[] { Materials.Electrum.getMolten(2592), Materials.Neutronium.getMolten(1872), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), }, CustomItemList.Machine_Multi_Infuser.get(1), 8000, 2000000); @@ -1583,8 +1252,8 @@ public class SpartakCoreRecipeLoader { } private void register_machine_EM_behaviours() { - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(5), ItemList.Machine_IV_Centrifuge.get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(5), ItemList.Machine_IV_Centrifuge.get(1)); try { GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_Centrifuge(6), @@ -1608,24 +1277,25 @@ public class SpartakCoreRecipeLoader { () -> new Behaviour_Centrifuge(12), ItemList.valueOf("Machine_UV_Centrifuge").get(64)); } catch (IllegalArgumentException | NullPointerException e) { - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(6), ItemList.Machine_IV_Centrifuge.get(2)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(7), ItemList.Machine_IV_Centrifuge.get(4)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(8), ItemList.Machine_IV_Centrifuge.get(8)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(9), ItemList.Machine_IV_Centrifuge.get(16)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(10), ItemList.Machine_IV_Centrifuge.get(32)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(11), ItemList.Machine_IV_Centrifuge.get(48)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(12), ItemList.Machine_IV_Centrifuge.get(64)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(6), ItemList.Machine_IV_Centrifuge.get(2)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(7), ItemList.Machine_IV_Centrifuge.get(4)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(8), ItemList.Machine_IV_Centrifuge.get(8)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(9), ItemList.Machine_IV_Centrifuge.get(16)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(10), ItemList.Machine_IV_Centrifuge.get(32)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(11), ItemList.Machine_IV_Centrifuge.get(48)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(12), ItemList.Machine_IV_Centrifuge.get(64)); } GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_ElectromagneticSeparator(5), ItemList.Machine_IV_ElectromagneticSeparator.get(1)); + () -> new Behaviour_ElectromagneticSeparator(5), + ItemList.Machine_IV_ElectromagneticSeparator.get(1)); try { GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_ElectromagneticSeparator(6), @@ -1672,8 +1342,8 @@ public class SpartakCoreRecipeLoader { ItemList.Machine_IV_ElectromagneticSeparator.get(64)); } - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(5), ItemList.Machine_IV_Recycler.get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(5), ItemList.Machine_IV_Recycler.get(1)); try { GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_Recycler(6), @@ -1681,12 +1351,10 @@ public class SpartakCoreRecipeLoader { GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_Recycler(7), ItemList.valueOf("Machine_ZPM_Recycler").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(8), - ItemList.valueOf("Machine_UV_Recycler").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(9), - ItemList.valueOf("Machine_UV_Recycler").get(4)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(8), ItemList.valueOf("Machine_UV_Recycler").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(9), ItemList.valueOf("Machine_UV_Recycler").get(4)); GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_Recycler(10), ItemList.valueOf("Machine_UV_Recycler").get(16)); @@ -1697,20 +1365,20 @@ public class SpartakCoreRecipeLoader { () -> new Behaviour_Recycler(12), ItemList.valueOf("Machine_UV_Recycler").get(64)); } catch (IllegalArgumentException | NullPointerException e) { - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(6), ItemList.Machine_IV_Recycler.get(2)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(7), ItemList.Machine_IV_Recycler.get(4)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(8), ItemList.Machine_IV_Recycler.get(8)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(9), ItemList.Machine_IV_Recycler.get(16)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(10), ItemList.Machine_IV_Recycler.get(32)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(11), ItemList.Machine_IV_Recycler.get(48)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(12), ItemList.Machine_IV_Recycler.get(64)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(6), ItemList.Machine_IV_Recycler.get(2)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(7), ItemList.Machine_IV_Recycler.get(4)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(8), ItemList.Machine_IV_Recycler.get(8)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(9), ItemList.Machine_IV_Recycler.get(16)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(10), ItemList.Machine_IV_Recycler.get(32)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(11), ItemList.Machine_IV_Recycler.get(48)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(12), ItemList.Machine_IV_Recycler.get(64)); } } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java index 197e59dc1e..26e70e095b 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java @@ -20,6 +20,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefini * Created by Tec on 06.05.2017. */ public final class EMComplexAspectDefinition extends EMComplexTemplate { + private final int hash; private final double mass; @@ -158,7 +159,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate { @Override public EMDecay[] getEnergyInducedDecay(long energyLevel) { - return new EMDecay[] {new EMDecay(0.75F, aspectStacks), deadEnd}; + return new EMDecay[] { new EMDecay(0.75F, aspectStacks), deadEnd }; } @Override @@ -210,13 +211,13 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate { registry.registerDefinitionClass( nbtType, new EMIndirectType( - (definitionsRegistry, nbt) -> - new EMComplexAspectDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), + (definitionsRegistry, nbt) -> new EMComplexAspectDefinition( + EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), EMComplexAspectDefinition.class, "tt.keyword.Aspect")); if (DEBUG_MODE) { - TecTech.LOGGER.info( - "Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + getClassTypeStatic()); + TecTech.LOGGER + .info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + getClassTypeStatic()); } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java index 26a425bcc8..e9bb84aaa1 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java @@ -12,9 +12,13 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.reg * Created by Tec on 06.05.2017. */ public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate { - public static final EMPrimalAspectDefinition - magic_air = new EMPrimalAspectDefinition("tt.keyword.Air", "a`", 1e1D, 45, "a`"), - magic_earth = new EMPrimalAspectDefinition("tt.keyword.Earth", "e`", 1e9D, 44, "e`"), + + public static final EMPrimalAspectDefinition magic_air = new EMPrimalAspectDefinition( + "tt.keyword.Air", + "a`", + 1e1D, + 45, + "a`"), magic_earth = new EMPrimalAspectDefinition("tt.keyword.Earth", "e`", 1e9D, 44, "e`"), magic_fire = new EMPrimalAspectDefinition("tt.keyword.Fire", "f`", 1e3D, 43, "f`"), magic_water = new EMPrimalAspectDefinition("tt.keyword.Water", "w`", 1e7D, 42, "w`"), magic_order = new EMPrimalAspectDefinition("tt.keyword.Order", "o`", 1e5D, 40, "o`"), diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java index e3d7835692..22afee562c 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java @@ -1,13 +1,15 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations; +import java.util.HashMap; + import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; -import java.util.HashMap; /** * Created by Tec on 21.05.2017. */ public class AspectDefinitionCompat { + public static AspectDefinitionCompat aspectDefinitionCompat; private final HashMap<IEMDefinition, String> defToAspect = new HashMap<>(); private final HashMap<String, IEMDefinition> aspectToDef = new HashMap<>(); 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 aa01486ec3..3acc856d6e 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 @@ -2,17 +2,20 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.tran import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.*; +import java.util.ArrayList; + +import thaumcraft.api.aspects.Aspect; + import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; -import java.util.ArrayList; -import thaumcraft.api.aspects.Aspect; /** * Created by Tec on 21.05.2017. */ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat { + @Override public void run(EMDefinitionsRegistry registry) { getDefToAspect().put(magic_air, "aer"); @@ -39,30 +42,25 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat list.remove(aspect); } else if (getAspectToDef().containsKey(content[0].getTag()) && getAspectToDef().containsKey(content[1].getTag())) { - try { - EMComplexAspectDefinition newAspect; - if (content[0].getTag().equals(content[1].getTag())) { - newAspect = new EMComplexAspectDefinition(getAspectToDef() - .get(content[0].getTag()) - .getStackForm(2)); - } else { - newAspect = new EMComplexAspectDefinition( - getAspectToDef() - .get(content[0].getTag()) - .getStackForm(1), - getAspectToDef() - .get(content[1].getTag()) - .getStackForm(1)); + try { + EMComplexAspectDefinition newAspect; + if (content[0].getTag().equals(content[1].getTag())) { + newAspect = new EMComplexAspectDefinition( + getAspectToDef().get(content[0].getTag()).getStackForm(2)); + } else { + newAspect = new EMComplexAspectDefinition( + getAspectToDef().get(content[0].getTag()).getStackForm(1), + getAspectToDef().get(content[1].getTag()).getStackForm(1)); + } + getAspectToDef().put(aspect.getTag(), newAspect); + getDefToAspect().put(newAspect, aspect.getTag()); + registry.registerForDisplay(newAspect); + } catch (EMException e) { + /**/ + } finally { + list.remove(aspect); + } } - getAspectToDef().put(aspect.getTag(), newAspect); - getDefToAspect().put(newAspect, aspect.getTag()); - registry.registerForDisplay(newAspect); - } catch (EMException e) { - /**/ - } finally { - list.remove(aspect); - } - } } } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java index 7908be7bc0..480bd3b7a8 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java @@ -1,13 +1,15 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi; +import net.minecraft.tileentity.TileEntity; + import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; -import net.minecraft.tileentity.TileEntity; /** * Created by Tec on 21.05.2017. */ public class EssentiaCompat { + public static EssentiaCompat essentiaContainerCompat; public <T extends GT_MetaTileEntity_MultiblockBase_EM> boolean check(T meta, TileEntity te) { diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java index ab60922b9a..05d85f9209 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java @@ -2,19 +2,22 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import net.minecraft.tileentity.TileEntity; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.common.tiles.TileEssentiaReservoir; import thaumcraft.common.tiles.TileJarFillable; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; + /** * Created by Tec on 21.05.2017. */ public class EssentiaCompatEnabled extends EssentiaCompat { + @Override public <T extends GT_MetaTileEntity_MultiblockBase_EM> boolean check(T meta, TileEntity te) { return te instanceof TileEssentiaReservoir || te instanceof TileJarFillable; @@ -25,9 +28,7 @@ public class EssentiaCompatEnabled extends EssentiaCompat { TileEntity tile = meta.getBaseMetaTileEntity() .getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing()); return tile != null && !tile.isInvalid() && tile instanceof TileEssentiaReservoir - || tile instanceof TileJarFillable - ? tile - : null; + || tile instanceof TileJarFillable ? tile : null; } @Override diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java index 3a1ec00999..cca35ad12e 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java @@ -12,6 +12,14 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; + +import thaumcraft.api.aspects.Aspect; + import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; import com.github.technus.tectech.thing.block.QuantumGlassBlock; @@ -21,74 +29,65 @@ import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.Aspect; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region structure // use multi A energy inputs, use less power the longer it runs private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.emtoessentia.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.1"), // 2 - Elemental Input Hatch - translateToLocal( - "gt.blockmachines.multimachine.em.emtoessentia.hint.2"), // 3 - Elemental Overflow Hatches or Elemental - // Casing - translateToLocal( - "gt.blockmachines.multimachine.em.emtoessentia.hint.3"), // General - Some sort of Essentia Storage + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.0"), // 1 - Classic Hatches or High + // Power Casing + translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.1"), // 2 - Elemental Input Hatch + translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.2"), // 3 - Elemental Overflow Hatches + // or Elemental + // Casing + translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.3"), // General - Some sort of Essentia + // Storage }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_essentiaDequantizer> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_essentiaDequantizer>builder() - .addShape("main", new String[][] { - {"DDD", "D~D", "DDD"}, - {"E E", " * ", "E E"}, - {"ABA", "BCB", "ABA"}, - {"FFF", "FBF", "FFF"}, - {"BEB", "EGE", "BEB"} - }) - .addElement('A', ofBlock(sBlockCasingsTT, 0)) - .addElement('B', ofBlock(sBlockCasingsTT, 4)) - .addElement('C', ofBlock(sBlockCasingsTT, 8)) - .addElement( - 'D', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_essentiaDequantizer::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'F', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_essentiaDequantizer::addElementalMufflerToMachineList, - textureOffset + 4, - 3, - sBlockCasingsTT, - 4)) - .addElement( - 'G', - ofHatchAdder( - GT_MetaTileEntity_EM_essentiaDequantizer::addElementalInputToMachineList, - textureOffset + 4, - 2)) - .addElement('*', ofTileAdder(essentiaContainerCompat::check, StructureLibAPI.getBlockHint(), 12)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_essentiaDequantizer> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_essentiaDequantizer>builder() + .addShape( + "main", + new String[][] { { "DDD", "D~D", "DDD" }, { "E E", " * ", "E E" }, { "ABA", "BCB", "ABA" }, + { "FFF", "FBF", "FFF" }, { "BEB", "EGE", "BEB" } }) + .addElement('A', ofBlock(sBlockCasingsTT, 0)).addElement('B', ofBlock(sBlockCasingsTT, 4)) + .addElement('C', ofBlock(sBlockCasingsTT, 8)) + .addElement( + 'D', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_essentiaDequantizer::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'F', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_essentiaDequantizer::addElementalMufflerToMachineList, + textureOffset + 4, + 3, + sBlockCasingsTT, + 4)) + .addElement( + 'G', + ofHatchAdder( + GT_MetaTileEntity_EM_essentiaDequantizer::addElementalInputToMachineList, + textureOffset + 4, + 2)) + .addElement('*', ofTileAdder(essentiaContainerCompat::check, StructureLibAPI.getBlockHint(), 12)).build(); private String outputEssentiaName = ""; // endregion @@ -166,17 +165,17 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.emtoessentia.name")) // Machine Type: Essentia Dequantizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.emtoessentia.desc.0")) // Controller block of the + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.name")) // Machine Type: + // Essentia + // Dequantizer + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.desc.0")) // Controller block + // of the // Essentia Dequantizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.emtoessentia.desc.1")) // Transforms elemental matter + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.desc.1")) // Transforms + // elemental matter // back into essentia .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(3, 3, 5, false) + .addSeparator().beginStructureBlock(3, 3, 5, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.ElementalInput"), translateToLocal("tt.keyword.Structure.BackCenter"), @@ -189,12 +188,16 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ translateToLocal("tt.keyword.Structure.EssentiaStorage"), translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Essentia Storage: Any High Power Casing on the front side - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Energy Hatch: Any High Power Casing on the front side - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Maintenance Hatch: Any High Power Casing on the front side + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Energy Hatch: + // Any High Power + // Casing on the + // front side + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Maintenance + // Hatch: Any + // High Power + // Casing on + // the front + // side .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java index f1e28c4b27..8e346cd971 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java @@ -11,6 +11,10 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; + import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; @@ -22,71 +26,65 @@ import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region structure // use multi A energy inputs, use less power the longer it runs private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.essentiatoem.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.1"), // 2 - Elemental Output Hatch - translateToLocal( - "gt.blockmachines.multimachine.em.essentiatoem.hint.2"), // 3 - Elemental Overflow Hatches or Elemental - // Casing - translateToLocal( - "gt.blockmachines.multimachine.em.essentiatoem.hint.3"), // General - Some sort of Essentia Storage + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.0"), // 1 - Classic Hatches or High + // Power Casing + translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.1"), // 2 - Elemental Output Hatch + translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.2"), // 3 - Elemental Overflow Hatches + // or Elemental + // Casing + translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.3"), // General - Some sort of Essentia + // Storage }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_essentiaQuantizer> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_essentiaQuantizer>builder() - .addShape("main", new String[][] { - {"FFF", "F~F", "FFF"}, - {"E E", " * ", "E E"}, - {"BAB", "ACA", "BAB"}, - {"DDD", "DBD", "DDD"}, - {"EBE", "BGB", "EBE"} - }) - .addElement('A', ofBlock(sBlockCasingsTT, 0)) - .addElement('B', ofBlock(sBlockCasingsTT, 4)) - .addElement('C', ofBlock(sBlockCasingsTT, 8)) - .addElement( - 'D', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_essentiaQuantizer::addElementalMufflerToMachineList, - textureOffset + 4, - 3, - sBlockCasingsTT, - 4)) - .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'F', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_essentiaQuantizer::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'G', - ofHatchAdder( - GT_MetaTileEntity_EM_essentiaQuantizer::addElementalOutputToMachineList, - textureOffset + 4, - 2)) - .addElement('*', ofTileAdder(essentiaContainerCompat::check, StructureLibAPI.getBlockHint(), 12)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_essentiaQuantizer> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_essentiaQuantizer>builder() + .addShape( + "main", + new String[][] { { "FFF", "F~F", "FFF" }, { "E E", " * ", "E E" }, { "BAB", "ACA", "BAB" }, + { "DDD", "DBD", "DDD" }, { "EBE", "BGB", "EBE" } }) + .addElement('A', ofBlock(sBlockCasingsTT, 0)).addElement('B', ofBlock(sBlockCasingsTT, 4)) + .addElement('C', ofBlock(sBlockCasingsTT, 8)) + .addElement( + 'D', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_essentiaQuantizer::addElementalMufflerToMachineList, + textureOffset + 4, + 3, + sBlockCasingsTT, + 4)) + .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'F', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_essentiaQuantizer::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'G', + ofHatchAdder( + GT_MetaTileEntity_EM_essentiaQuantizer::addElementalOutputToMachineList, + textureOffset + 4, + 2)) + .addElement('*', ofTileAdder(essentiaContainerCompat::check, StructureLibAPI.getBlockHint(), 12)).build(); // endregion public GT_MetaTileEntity_EM_essentiaQuantizer(int aID, String aName, String aNameRegional) { @@ -115,8 +113,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu mEfficiencyIncrease = 10000; eAmpereFlow = 1; outputEM = new EMInstanceStackMap[] { - new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT)) - }; + new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT)) }; if (definition instanceof EMPrimalAspectDefinition) { mEUt = (int) -V[8]; } else { @@ -140,17 +137,16 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.essentiatoem.name")) // Machine Type: Essentia Quantizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.essentiatoem.desc.0")) // Controller block of the + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.name")) // Machine Type: + // Essentia Quantizer + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.desc.0")) // Controller block + // of the // Essentia Quantizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.essentiatoem.desc.1")) // Transforms essentia into + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.desc.1")) // Transforms + // essentia into // their elemental form .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(3, 3, 5, false) + .addSeparator().beginStructureBlock(3, 3, 5, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.ElementalOutput"), translateToLocal("tt.keyword.Structure.BackCenter"), @@ -163,12 +159,16 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu translateToLocal("tt.keyword.Structure.EssentiaStorage"), translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Essentia Storage: Any High Power Casing on the front side - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Energy Hatch: Any High Power Casing on the front side - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Maintenance Hatch: Any High Power Casing on the front side + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Energy Hatch: + // Any High Power + // Casing on the + // front side + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Maintenance + // Hatch: Any + // High Power + // Casing on + // the front + // side .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } diff --git a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java index a07f3fc224..3eab82ff29 100644 --- a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java +++ b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java @@ -1,20 +1,25 @@ package com.github.technus.tectech.font; -import com.ibm.icu.text.ArabicShaping; -import com.ibm.icu.text.ArabicShapingException; -import com.ibm.icu.text.Bidi; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.io.IOException; import java.io.InputStream; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import com.ibm.icu.text.ArabicShaping; +import com.ibm.icu.text.ArabicShapingException; +import com.ibm.icu.text.Bidi; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class TecTechFontRender extends FontRenderer { + public static final TecTechFontRender INSTANCE = new TecTechFontRender(); private static final float DISTANCE_L = .125F; @@ -129,9 +134,8 @@ public class TecTechFontRender extends FontRenderer { ++i; } else { - j = - "\u00C0\u00C1\u00C2\u00C8\u00CA\u00CB\u00CD\u00D3\u00D4\u00D5\u00DA\u00DF\u00E3\u00F5\u011F\u0130\u0131\u0152\u0153\u015E\u015F\u0174\u0175\u017E\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00C7\u00FC\u00E9\u00E2\u00E4\u00E0\u00E5\u00E7\u00EA\u00EB\u00E8\u00EF\u00EE\u00EC\u00C4\u00C5\u00C9\u00E6\u00C6\u00F4\u00F6\u00F2\u00FB\u00F9\u00FF\u00D6\u00DC\u00F8\u00A3\u00D8\u00D7\u0192\u00E1\u00ED\u00F3\u00FA\u00F1\u00D1\u00AA\u00BA\u00BF\u00AE\u00AC\u00BD\u00BC\u00A1\u00AB\u00BB\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255D\u255C\u255B\u2510\u2514\u2534\u252C\u251C\u2500\u253C\u255E\u255F\u255A\u2554\u2569\u2566\u2560\u2550\u256C\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256B\u256A\u2518\u250C\u2588\u2584\u258C\u2590\u2580\u03B1\u03B2\u0393\u03C0\u03A3\u03C3\u03BC\u03C4\u03A6\u0398\u03A9\u03B4\u221E\u2205\u2208\u2229\u2261\u00B1\u2265\u2264\u2320\u2321\u00F7\u2248\u00B0\u2219\u00B7\u221A\u207F\u00B2\u25A0\u0000" - .indexOf(c0); + j = "\u00C0\u00C1\u00C2\u00C8\u00CA\u00CB\u00CD\u00D3\u00D4\u00D5\u00DA\u00DF\u00E3\u00F5\u011F\u0130\u0131\u0152\u0153\u015E\u015F\u0174\u0175\u017E\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00C7\u00FC\u00E9\u00E2\u00E4\u00E0\u00E5\u00E7\u00EA\u00EB\u00E8\u00EF\u00EE\u00EC\u00C4\u00C5\u00C9\u00E6\u00C6\u00F4\u00F6\u00F2\u00FB\u00F9\u00FF\u00D6\u00DC\u00F8\u00A3\u00D8\u00D7\u0192\u00E1\u00ED\u00F3\u00FA\u00F1\u00D1\u00AA\u00BA\u00BF\u00AE\u00AC\u00BD\u00BC\u00A1\u00AB\u00BB\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255D\u255C\u255B\u2510\u2514\u2534\u252C\u251C\u2500\u253C\u255E\u255F\u255A\u2554\u2569\u2566\u2560\u2550\u256C\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256B\u256A\u2518\u250C\u2588\u2584\u258C\u2590\u2580\u03B1\u03B2\u0393\u03C0\u03A3\u03C3\u03BC\u03C4\u03A6\u0398\u03A9\u03B4\u221E\u2205\u2208\u2229\u2261\u00B1\u2265\u2264\u2320\u2321\u00F7\u2248\u00B0\u2219\u00B7\u221A\u207F\u00B2\u25A0\u0000" + .indexOf(c0); if (this.randomStyle && j != -1) { do { k = this.fontRandom.nextInt(this.charWidth.length); @@ -206,14 +210,10 @@ public class TecTechFontRender extends FontRenderer { } private float renderCharAtPos(int p_78278_1_, char p_78278_2_, boolean p_78278_3_) { - return p_78278_2_ == ' ' - ? 4.0F + return p_78278_2_ == ' ' ? 4.0F : ("\u00C0\u00C1\u00C2\u00C8\u00CA\u00CB\u00CD\u00D3\u00D4\u00D5\u00DA\u00DF\u00E3\u00F5\u011F\u0130\u0131\u0152\u0153\u015E\u015F\u0174\u0175\u017E\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00C7\u00FC\u00E9\u00E2\u00E4\u00E0\u00E5\u00E7\u00EA\u00EB\u00E8\u00EF\u00EE\u00EC\u00C4\u00C5\u00C9\u00E6\u00C6\u00F4\u00F6\u00F2\u00FB\u00F9\u00FF\u00D6\u00DC\u00F8\u00A3\u00D8\u00D7\u0192\u00E1\u00ED\u00F3\u00FA\u00F1\u00D1\u00AA\u00BA\u00BF\u00AE\u00AC\u00BD\u00BC\u00A1\u00AB\u00BB\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255D\u255C\u255B\u2510\u2514\u2534\u252C\u251C\u2500\u253C\u255E\u255F\u255A\u2554\u2569\u2566\u2560\u2550\u256C\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256B\u256A\u2518\u250C\u2588\u2584\u258C\u2590\u2580\u03B1\u03B2\u0393\u03C0\u03A3\u03C3\u03BC\u03C4\u03A6\u0398\u03A9\u03B4\u221E\u2205\u2208\u2229\u2261\u00B1\u2265\u2264\u2320\u2321\u00F7\u2248\u00B0\u2219\u00B7\u221A\u207F\u00B2\u25A0\u0000" - .indexOf(p_78278_2_) - != -1 - && !this.unicodeFlag - ? this.renderDefaultChar(p_78278_1_, p_78278_3_) - : this.renderUnicodeChar(p_78278_2_, p_78278_3_)); + .indexOf(p_78278_2_) != -1 && !this.unicodeFlag ? this.renderDefaultChar(p_78278_1_, p_78278_3_) + : this.renderUnicodeChar(p_78278_2_, p_78278_3_)); } @Override 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 773361bd0f..122fdb45bf 100644 --- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java @@ -11,6 +11,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitiv * Created by danie_000 on 16.11.2016. */ public class ElementalLoader { + public void run(EMDefinitionsRegistry registry) { // =================================================================================================== // Definition init 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 00a702f112..0ba5565ab7 100644 --- a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java @@ -2,6 +2,7 @@ package com.github.technus.tectech.loader; 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; @@ -9,6 +10,7 @@ import cpw.mods.fml.common.registry.EntityRegistry; * Created by Tec on 30.07.2017. */ public class EntityLoader implements Runnable { + @Override public void run() { if (Loader.isModLoaded("openmodularturrets")) { 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 1cd0ee24cb..43a711bf60 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -11,6 +11,15 @@ import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTile import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static gregtech.api.enums.GT_Values.W; +import java.util.Collection; +import java.util.HashMap; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +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; @@ -30,6 +39,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.transformations 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; @@ -39,15 +49,9 @@ import gregtech.api.enums.Materials; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import java.util.Collection; -import java.util.HashMap; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; public final class MainLoader { + public static DamageSource microwaving, elementalPollution, subspace; private MainLoader() {} @@ -117,16 +121,15 @@ public final class MainLoader { ProgressManager.pop(progressBarLoad); } - public static void postLoad( - EMDefinitionsRegistry definitionsRegistry, EMTransformationRegistry transformationInfo) { + public static void postLoad(EMDefinitionsRegistry definitionsRegistry, + EMTransformationRegistry transformationInfo) { ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 4); progressBarPostLoad.step("Dreamcraft Compatibility"); if (Loader.isModLoaded(Reference.DREAMCRAFT)) { try { Class<?> clazz = Class.forName("com.dreammaster.gthandler.casings.GT_Container_CasingsNH"); - TT_Container_Casings.sBlockCasingsNH = - (Block) clazz.getField("sBlockCasingsNH").get(null); + TT_Container_Casings.sBlockCasingsNH = (Block) clazz.getField("sBlockCasingsNH").get(null); if (TT_Container_Casings.sBlockCasingsNH == null) { throw new NullPointerException("sBlockCasingsNH Is not set at this time"); @@ -254,11 +257,10 @@ public final class MainLoader { if (DEBUG_MODE) { LOGGER.info("Found Plasma of " + material.mName); } - if (material.mElement != null - && (material.mElement.mProtons >= Materials.Iron.mElement.mProtons - || -material.mElement.mProtons >= Materials.Iron.mElement.mProtons - || material.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons - || -material.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons)) { + if (material.mElement != null && (material.mElement.mProtons >= Materials.Iron.mElement.mProtons + || -material.mElement.mProtons >= Materials.Iron.mElement.mProtons + || material.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons + || -material.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons)) { if (DEBUG_MODE) { LOGGER.info("Attempting to bind " + material.mName); } @@ -303,10 +305,9 @@ public final class MainLoader { if (aLiquid == null || GT_Recipe.GT_Recipe_Map.sTurbineFuels == null) return 0; FluidStack tLiquid; Collection<GT_Recipe> tRecipeList = GT_Recipe.GT_Recipe_Map.sPlasmaFuels.mRecipeList; - if (tRecipeList != null) - for (GT_Recipe tFuel : tRecipeList) - if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null) - if (aLiquid.isFluidEqual(tLiquid)) return tFuel.mSpecialValue; + if (tRecipeList != null) for (GT_Recipe tFuel : tRecipeList) + if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null) + if (aLiquid.isFluidEqual(tLiquid)) return tFuel.mSpecialValue; return 0; } diff --git a/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java index 738d7bfc45..105452f3d2 100644 --- a/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java +++ b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java @@ -9,6 +9,7 @@ import com.github.technus.tectech.mechanics.pipe.PipeActivityMessage; import com.github.technus.tectech.mechanics.spark.RendererMessage; public class NetworkDispatcher extends eu.usrv.yamcore.network.PacketDispatcher { + public static NetworkDispatcher INSTANCE; public NetworkDispatcher() { @@ -32,7 +33,8 @@ public class NetworkDispatcher extends eu.usrv.yamcore.network.PacketDispatcher registerMessage(EnderLinkCoverMessage.ServerHandler.class, EnderLinkCoverMessage.EnderLinkCoverQuery.class); registerMessage( - EnderLinkCoverMessage.ServerUpdateHandler.class, EnderLinkCoverMessage.EnderLinkCoverUpdate.class); + EnderLinkCoverMessage.ServerUpdateHandler.class, + EnderLinkCoverMessage.EnderLinkCoverUpdate.class); registerMessage(EnderLinkCoverMessage.ClientHandler.class, EnderLinkCoverMessage.EnderLinkCoverData.class); } } diff --git a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java index c27fd95bd3..4f3e632365 100644 --- a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java +++ b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java @@ -1,9 +1,11 @@ package com.github.technus.tectech.loader; -import eu.usrv.yamcore.config.ConfigManager; import java.io.File; +import eu.usrv.yamcore.config.ConfigManager; + public class TecTechConfig extends ConfigManager { + public TecTechConfig(File pConfigBaseDirectory, String pModCollectionDirectory, String pModID) { super(pConfigBaseDirectory, pModCollectionDirectory, pModID); } @@ -83,10 +85,10 @@ public class TecTechConfig extends ConfigManager { */ @Override protected void Init() { - DEBUG_MODE = _mainConfig.getBoolean( - "DebugMode", "debug", DEBUG_MODE, "Enables logging and other purely debug features"); - POWERLESS_MODE = - _mainConfig.getBoolean("PowerlessMode", "debug", POWERLESS_MODE, "Enables 0EU/t multi block machinery"); + DEBUG_MODE = _mainConfig + .getBoolean("DebugMode", "debug", DEBUG_MODE, "Enables logging and other purely debug features"); + POWERLESS_MODE = _mainConfig + .getBoolean("PowerlessMode", "debug", POWERLESS_MODE, "Enables 0EU/t multi block machinery"); DISABLE_MATERIAL_LOADING_FFS = _mainConfig.getBoolean( "DisableMaterialLoading", "debug", @@ -104,7 +106,10 @@ public class TecTechConfig extends ConfigManager { DISABLE_BLOCK_HARDNESS_NERF, "Set to true to disable the block hardness nerf"); EASY_SCAN = _mainConfig.getBoolean( - "EasyScan", "features", EASY_SCAN, "Enables tricorder to scan EM i/o hatches directly, too CHEEKY"); + "EasyScan", + "features", + EASY_SCAN, + "Enables tricorder to scan EM i/o hatches directly, too CHEEKY"); NERF_FUSION = _mainConfig.getBoolean( "NerfFusion", "features", diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java index cd73d1e420..b62a8fbf5b 100644 --- a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java +++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java @@ -1,12 +1,15 @@ package com.github.technus.tectech.loader.gui; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; public class CreativeTabEM extends CreativeTabs { + public CreativeTabEM(String name) { super(name); } diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java index c853af8ee3..0166c2302d 100644 --- a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java +++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java @@ -1,15 +1,19 @@ package com.github.technus.tectech.loader.gui; +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; public class CreativeTabTecTech extends CreativeTabs { + public CreativeTabTecTech(String name) { super(name); } diff --git a/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java b/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java index 51bece0d4d..637ac7b181 100644 --- a/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java +++ b/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java @@ -1,15 +1,17 @@ package com.github.technus.tectech.loader.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + import com.github.technus.tectech.thing.item.gui.ProgrammerScreen; import com.github.technus.tectech.thing.item.gui.ScanDisplayScreen; import cpw.mods.fml.common.network.IGuiHandler; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; /** * Created by danie_000 on 17.12.2017. */ public class ModGuiHandler implements IGuiHandler { + public static final int SCAN_DISPLAY_SCREEN_ID = 0; public static final int PROGRAMMER_DISPLAY_SCREEN_ID = 1; 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 a2d3edfa5e..fc8b32f0fc 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 @@ -2,6 +2,10 @@ package com.github.technus.tectech.loader.recipe; import static gregtech.api.enums.GT_Values.RA; +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; @@ -12,6 +16,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex. 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; @@ -20,14 +25,12 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; /** * Created by danie_000 on 16.11.2016. */ public class BaseRecipeLoader { + public static Materials getOrDefault(String name, Materials def) { Materials mat = Materials.get(name); return mat == Materials._NULL || mat == null ? def : mat; @@ -46,10 +49,8 @@ public class BaseRecipeLoader { for (int i = 0; i <= 15; i++) { RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(i + 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(i + 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1) }, Materials.Aluminium.getMolten(864), new ItemStack(StructureLibAPI.getBlockHint(), 1, i), 32, @@ -60,79 +61,40 @@ public class BaseRecipeLoader { GT_ModHandler.addCraftingRecipe( GT_ModHandler.getModItem(StructureLibAPI.MOD_ID, "item.structurelib.frontRotationTool", 1L, 0), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "fPR", - " RP", - "S h", - 'P', - OrePrefixes.plate.get(Materials.Cobalt), - 'R', - OrePrefixes.stick.get(Materials.Cobalt), - 'S', - OrePrefixes.stick.get(Materials.Wood), - }); + new Object[] { "fPR", " RP", "S h", 'P', OrePrefixes.plate.get(Materials.Cobalt), 'R', + OrePrefixes.stick.get(Materials.Cobalt), 'S', OrePrefixes.stick.get(Materials.Wood), }); // BLUEprint - // GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1), - // GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - // new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, + // GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1), + // GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, + // new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, // Dyes.dyeWhite}); // GT EU reader GT_ModHandler.addCraftingRecipe( new ItemStack(EuMeterGT.INSTANCE, 1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PGW", - "SCW", - "BRN", - 'P', - OrePrefixes.plateDouble.get(Materials.Steel), - 'G', - OrePrefixes.plate.get(Materials.Glass), - 'W', - OrePrefixes.cableGt01.get(Materials.Copper), - 'S', - OrePrefixes.stick.get(Materials.Brass), - 'C', - ItemList.Casing_Coil_Cupronickel.get(1), - 'B', - Dyes.dyeBlue, - 'R', - Dyes.dyeRed, - 'N', - Dyes.dyeBlack, - }); + new Object[] { "PGW", "SCW", "BRN", 'P', OrePrefixes.plateDouble.get(Materials.Steel), 'G', + OrePrefixes.plate.get(Materials.Glass), 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'S', + OrePrefixes.stick.get(Materials.Brass), 'C', ItemList.Casing_Coil_Cupronickel.get(1), 'B', + Dyes.dyeBlue, 'R', Dyes.dyeRed, 'N', Dyes.dyeBlack, }); // Owner detector GT_ModHandler.addCraftingRecipe( CustomItemList.Machine_OwnerDetector.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PPP", - "GEG", - "PPP", - 'P', - OrePrefixes.plate.get(Materials.IronMagnetic), - 'G', - OrePrefixes.plate.get(Materials.Glass), - 'E', - OrePrefixes.gem.get(Materials.EnderPearl) - }); + new Object[] { "PPP", "GEG", "PPP", 'P', OrePrefixes.plate.get(Materials.IronMagnetic), 'G', + OrePrefixes.plate.get(Materials.Glass), 'E', OrePrefixes.gem.get(Materials.EnderPearl) }); // Data Bank RA.addAssemblylineRecipe( ItemList.Hatch_DataAccess_EV.get(1), 20000, - new Object[] { - CustomItemList.Machine_Multi_Switch.get(1), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 2}, - ItemList.Tool_DataOrb.get(1), - ItemList.Cover_Screen.get(1), - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Hydrogen.getGas(1000), - }, + new Object[] { CustomItemList.Machine_Multi_Switch.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, ItemList.Tool_DataOrb.get(1), + ItemList.Cover_Screen.get(1), }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + Materials.Hydrogen.getGas(1000), }, CustomItemList.Machine_Multi_DataBank.get(1), 12000, 14000); diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java index cbe88a0a4c..b5997166a0 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java @@ -1,5 +1,10 @@ package com.github.technus.tectech.loader.recipe; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + 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; @@ -8,6 +13,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviou import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_ElectromagneticSeparator; 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 gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -15,19 +21,17 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; /** * Created by Tec on 06.08.2017. */ public class BloodyRecipeLoader { + public void run(EMTransformationRegistry transformationInfo) { // Quantum Glass GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {CustomItemList.eM_Containment.get(1), GT_ModHandler.getIC2Item("reinforcedGlass", 1L)}, + new ItemStack[] { CustomItemList.eM_Containment.get(1), + GT_ModHandler.getIC2Item("reinforcedGlass", 1L) }, Materials.Osmium.getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, @@ -37,10 +41,8 @@ public class BloodyRecipeLoader { // Data GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Parts_GlassFiber.get(8), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Silver, 6) - }, + new ItemStack[] { ItemList.Circuit_Parts_GlassFiber.get(8), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Silver, 6) }, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1), 200, @@ -48,14 +50,11 @@ public class BloodyRecipeLoader { // Tunnel GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.DATApipe.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), - ItemList.Field_Generator_MV.get(1), - ItemList.Circuit_Quantummainframe.get(1) - }, + new ItemStack[] { CustomItemList.DATApipe.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), + ItemList.Field_Generator_MV.get(1), ItemList.Circuit_Quantummainframe.get(1) }, Materials.Osmium.getMolten(288), CustomItemList.EMpipe.get(1), 400, @@ -63,11 +62,8 @@ public class BloodyRecipeLoader { // Laser GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.DATApipe.get(1), - GT_ModHandler.getIC2Item("reinforcedGlass", 1L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2) - }, + new ItemStack[] { CustomItemList.DATApipe.get(1), GT_ModHandler.getIC2Item("reinforcedGlass", 1L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2) }, null, CustomItemList.LASERpipe.get(1), 100, @@ -79,14 +75,12 @@ public class BloodyRecipeLoader { // High Power Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Cobalt, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Cobalt, 16), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) }, Materials.TungstenSteel.getMolten(576), CustomItemList.eM_Power.get(1), 100, @@ -94,39 +88,33 @@ public class BloodyRecipeLoader { // Computer Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Power.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, + new ItemStack[] { CustomItemList.eM_Power.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) }, Materials.Aluminium.getMolten(1296), CustomItemList.eM_Computer_Casing.get(1), 200, 122880); // Computer Vent Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - ItemList.Electric_Motor_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + ItemList.Electric_Motor_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1) }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1), 100, 1920); // Advanced Computer Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Cobalt, 32), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 4) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Cobalt, 32), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 4) }, Materials.Iridium.getMolten(1296), CustomItemList.eM_Computer_Bus.get(1), 200, @@ -134,14 +122,12 @@ public class BloodyRecipeLoader { // Molecular Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Power.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 16), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 12), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), - ItemList.Field_Generator_IV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Power.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 16), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 12), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), + ItemList.Field_Generator_IV.get(1) }, Materials.Osmium.getMolten(1296), CustomItemList.eM_Containment.get(1), 800, @@ -154,20 +140,14 @@ public class BloodyRecipeLoader { 32, 500000, 6, - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Plutonium, 2), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 16), - }, - new FluidStack[] { - Materials.Americium.getMolten(1296), - Materials.Osmium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Argon.getGas(576), - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Plutonium, 2), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 16), }, + new FluidStack[] { Materials.Americium.getMolten(1296), Materials.Osmium.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Argon.getGas(576), }, CustomItemList.eM_Hollow.get(2), 200, 2000000); @@ -179,29 +159,21 @@ public class BloodyRecipeLoader { 128, 1000000, 16, - new ItemStack[] { - CustomItemList.eM_Hollow.get(1), - ItemList.Casing_Fusion_Coil.get(4), - ItemList.Casing_Coil_NaquadahAlloy.get(4), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16), - }, - new FluidStack[] { - Materials.Glass.getMolten(2304), - Materials.Silicone.getMolten(1872), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Americium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.eM_Hollow.get(1), ItemList.Casing_Fusion_Coil.get(4), + ItemList.Casing_Coil_NaquadahAlloy.get(4), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16), }, + new FluidStack[] { Materials.Glass.getMolten(2304), Materials.Silicone.getMolten(1872), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + Materials.Americium.getMolten(1296), }, CustomItemList.eM_Coil.get(4), 800, 2000000); // Tesla Base GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NickelZincFerrite, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NickelZincFerrite, 1) }, null, CustomItemList.tM_TeslaBase.get(1), 50, @@ -209,21 +181,12 @@ public class BloodyRecipeLoader { GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaBase.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PhP", - "PFP", - "PwP", - 'P', - OrePrefixes.plate.get(Materials.NickelZincFerrite), - 'F', - OrePrefixes.frameGt.get(Materials.NickelZincFerrite) - }); + new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.plate.get(Materials.NickelZincFerrite), 'F', + OrePrefixes.frameGt.get(Materials.NickelZincFerrite) }); // Tesla Toroid GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1) }, null, CustomItemList.tM_TeslaToroid.get(1), 50, @@ -231,50 +194,43 @@ public class BloodyRecipeLoader { GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaToroid.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PhP", - "PFP", - "PwP", - 'P', - OrePrefixes.foil.get(Materials.Aluminium), - 'F', - OrePrefixes.frameGt.get(Materials.Aluminium) - }); + new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.foil.get(Materials.Aluminium), 'F', + OrePrefixes.frameGt.get(Materials.Aluminium) }); // Tesla Secondary Windings GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaSecondary.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {"WWW", "WwW", "WWW", 'W', CustomItemList.teslaComponent.getWithDamage(1, 0)}); + new Object[] { "WWW", "WwW", "WWW", 'W', CustomItemList.teslaComponent.getWithDamage(1, 0) }); // Tesla Primary Coils T0 GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaPrimary_0.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {"WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Tin)}); + new Object[] { "WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Tin) }); // Tesla Primary Coils T1 GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaPrimary_1.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {"WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Copper)}); + new Object[] { "WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Copper) }); // Tesla Primary Coils T2 GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaPrimary_2.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {"WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Silver)}); + new Object[] { "WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Silver) }); // Tesla Primary Coils T3 GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaPrimary_3.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {"WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Aluminium)}); + new Object[] { "WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Aluminium) }); // Tesla Primary Coils T4 GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaPrimary_4.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {"WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Platinum)}); + new Object[] { "WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Platinum) }); // Tesla Primary Coils T5 GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaPrimary_5.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {"WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Superconductor)}); + new Object[] { "WWW", "WwW", "WWW", 'W', OrePrefixes.wireGt02.get(Materials.Superconductor) }); // TODO Add Tesla Primary Coils T6 // endregion @@ -283,373 +239,301 @@ public class BloodyRecipeLoader { // Dynamo Hatches IV-UIV GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_dynamoMulti4_IV.get(1), 100, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_dynamoMulti16_IV.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_dynamoMulti64_IV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) }, Materials.Silver.getMolten(288), CustomItemList.eM_dynamoMulti4_LuV.get(1), 100, 7860); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) }, Materials.Electrum.getMolten(288), CustomItemList.eM_dynamoMulti16_LuV.get(1), 200, 7860); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) }, Materials.Tungsten.getMolten(288), CustomItemList.eM_dynamoMulti64_LuV.get(1), 400, 7860); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) }, Materials.Silver.getMolten(576), CustomItemList.eM_dynamoMulti4_ZPM.get(1), 100, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) }, Materials.Electrum.getMolten(576), CustomItemList.eM_dynamoMulti16_ZPM.get(1), 200, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) }, Materials.Tungsten.getMolten(576), CustomItemList.eM_dynamoMulti64_ZPM.get(1), 400, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) }, Materials.Silver.getMolten(1152), CustomItemList.eM_dynamoMulti4_UV.get(1), 100, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) }, Materials.Electrum.getMolten(1152), CustomItemList.eM_dynamoMulti16_UV.get(1), 200, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) }, Materials.Tungsten.getMolten(1152), CustomItemList.eM_dynamoMulti64_UV.get(1), 400, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) }, Materials.Silver.getMolten(2304), CustomItemList.eM_dynamoMulti4_UHV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) }, Materials.Electrum.getMolten(2304), CustomItemList.eM_dynamoMulti16_UHV.get(1), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) }, Materials.Tungsten.getMolten(2304), CustomItemList.eM_dynamoMulti64_UHV.get(1), 400, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_MAX.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_MAX.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8) }, Materials.Silver.getMolten(4608), CustomItemList.eM_dynamoMulti4_UEV.get(1), 500, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16) }, Materials.Electrum.getMolten(4608), CustomItemList.eM_dynamoMulti16_UEV.get(1), 1000, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 24) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 24) }, Materials.Tungsten.getMolten(4608), CustomItemList.eM_dynamoMulti64_UEV.get(1), 2000, 500000); - // Energy Hatches 4A-64A IV-UIV + // Energy Hatches 4A-64A IV-UIV GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_energyMulti4_IV.get(1), 100, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_energyMulti16_IV.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_energyMulti64_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) }, Materials.Silver.getMolten(288), CustomItemList.eM_energyMulti4_LuV.get(1), 100, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) }, Materials.Electrum.getMolten(288), CustomItemList.eM_energyMulti16_LuV.get(1), 200, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) }, Materials.Tungsten.getMolten(288), CustomItemList.eM_energyMulti64_LuV.get(1), 400, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) }, Materials.Silver.getMolten(576), CustomItemList.eM_energyMulti4_ZPM.get(1), 100, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) }, Materials.Electrum.getMolten(576), CustomItemList.eM_energyMulti16_ZPM.get(1), 200, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) }, Materials.Tungsten.getMolten(576), CustomItemList.eM_energyMulti64_ZPM.get(1), 400, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) }, Materials.Silver.getMolten(1152), CustomItemList.eM_energyMulti4_UV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4) }, Materials.Electrum.getMolten(1152), CustomItemList.eM_energyMulti16_UV.get(1), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6) }, Materials.Tungsten.getMolten(1152), CustomItemList.eM_energyMulti64_UV.get(1), 400, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) - }, + new ItemStack[] { ItemList.Hatch_Energy_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2) }, Materials.Silver.getMolten(2304), CustomItemList.eM_energyMulti4_UHV.get(1), 100, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4) }, Materials.Electrum.getMolten(2304), CustomItemList.eM_energyMulti16_UHV.get(1), 200, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6) }, Materials.Tungsten.getMolten(2304), CustomItemList.eM_energyMulti64_UHV.get(1), 400, 500000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Energy_MAX.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8) - }, + new ItemStack[] { ItemList.Hatch_Energy_MAX.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8) }, Materials.Silver.getMolten(4608), CustomItemList.eM_energyMulti4_UEV.get(1), 100, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti4_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16) - }, + new ItemStack[] { CustomItemList.eM_energyMulti4_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Superconductor, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16) }, Materials.Electrum.getMolten(4608), CustomItemList.eM_energyMulti16_UEV.get(1), 200, 2000000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_energyMulti16_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 24) - }, + new ItemStack[] { CustomItemList.eM_energyMulti16_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Superconductor, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 24) }, Materials.Tungsten.getMolten(4608), CustomItemList.eM_energyMulti64_UEV.get(1), 400, @@ -657,53 +541,41 @@ public class BloodyRecipeLoader { // Laser Dynamo IV-UV 256/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_IV.get(1), - ItemList.Electric_Pump_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_IV.get(1), + ItemList.Electric_Pump_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_IV.get(1), 1000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_LuV.get(1), - ItemList.Electric_Pump_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_LuV.get(1), + ItemList.Electric_Pump_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_LuV.get(1), 1000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_ZPM.get(1), - ItemList.Electric_Pump_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_ZPM.get(1), + ItemList.Electric_Pump_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_ZPM.get(1), 1000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Emitter_UV.get(1), - ItemList.Electric_Pump_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UV.get(1), + ItemList.Electric_Pump_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_dynamoTunnel1_UV.get(1), 1000, @@ -711,53 +583,41 @@ public class BloodyRecipeLoader { // Laser Dynamo IV-UV 1024/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_IV.get(2), - ItemList.Electric_Pump_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_IV.get(2), + ItemList.Electric_Pump_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_IV.get(1), 2000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_LuV.get(2), - ItemList.Electric_Pump_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_LuV.get(2), + ItemList.Electric_Pump_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_LuV.get(1), 2000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_ZPM.get(2), - ItemList.Electric_Pump_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_ZPM.get(2), + ItemList.Electric_Pump_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_ZPM.get(1), 2000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Emitter_UV.get(2), - ItemList.Electric_Pump_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UV.get(2), + ItemList.Electric_Pump_UV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_dynamoTunnel2_UV.get(1), 2000, @@ -765,53 +625,41 @@ public class BloodyRecipeLoader { // Laser Dynamo IV-UV 4096/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_IV.get(4), - ItemList.Electric_Pump_IV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_IV.get(4), + ItemList.Electric_Pump_IV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_IV.get(1), 4000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_LuV.get(4), - ItemList.Electric_Pump_LuV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_LuV.get(4), + ItemList.Electric_Pump_LuV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_LuV.get(1), 4000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_ZPM.get(4), - ItemList.Electric_Pump_ZPM.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_ZPM.get(4), + ItemList.Electric_Pump_ZPM.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_ZPM.get(1), 4000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Emitter_UV.get(4), - ItemList.Electric_Pump_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UV.get(4), + ItemList.Electric_Pump_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_dynamoTunnel3_UV.get(1), 4000, @@ -819,53 +667,41 @@ public class BloodyRecipeLoader { // Laser Dynamo IV-UV 16384/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_IV.get(8), - ItemList.Electric_Pump_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_IV.get(8), + ItemList.Electric_Pump_IV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_IV.get(1), 8000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_LuV.get(8), - ItemList.Electric_Pump_LuV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_LuV.get(8), + ItemList.Electric_Pump_LuV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_LuV.get(1), 8000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_ZPM.get(8), - ItemList.Electric_Pump_ZPM.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_ZPM.get(8), + ItemList.Electric_Pump_ZPM.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_ZPM.get(1), 8000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Emitter_UV.get(8), - ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_UV.get(8), + ItemList.Electric_Pump_UV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_dynamoTunnel4_UV.get(1), 8000, @@ -873,53 +709,41 @@ public class BloodyRecipeLoader { // Laser Dynamo IV-UV 65536/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_IV.get(16), - ItemList.Electric_Pump_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_IV.get(16), + ItemList.Electric_Pump_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_IV.get(1), 16000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_LuV.get(16), - ItemList.Electric_Pump_LuV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_LuV.get(16), + ItemList.Electric_Pump_LuV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_LuV.get(1), 16000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_ZPM.get(16), - ItemList.Electric_Pump_ZPM.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_ZPM.get(16), + ItemList.Electric_Pump_ZPM.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_ZPM.get(1), 16000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Emitter_UV.get(16), - ItemList.Electric_Pump_UV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UV.get(16), + ItemList.Electric_Pump_UV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_dynamoTunnel5_UV.get(1), 16000, @@ -927,53 +751,41 @@ public class BloodyRecipeLoader { // Laser Dynamo IV-UV 262144/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_IV.get(32), - ItemList.Electric_Pump_IV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_IV.get(32), + ItemList.Electric_Pump_IV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_IV.get(1), 32000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_LuV.get(32), - ItemList.Electric_Pump_LuV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_LuV.get(32), + ItemList.Electric_Pump_LuV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_LuV.get(1), 32000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_ZPM.get(32), - ItemList.Electric_Pump_ZPM.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_ZPM.get(32), + ItemList.Electric_Pump_ZPM.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_ZPM.get(1), 32000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Emitter_UV.get(32), - ItemList.Electric_Pump_UV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UV.get(32), + ItemList.Electric_Pump_UV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_dynamoTunnel6_UV.get(1), 32000, @@ -981,53 +793,41 @@ public class BloodyRecipeLoader { // Laser Dynamo IV-UV 1048576/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_IV.get(64), - ItemList.Electric_Pump_IV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_IV.get(64), + ItemList.Electric_Pump_IV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_IV.get(1), 64000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_LuV.get(64), - ItemList.Electric_Pump_LuV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_LuV.get(64), + ItemList.Electric_Pump_LuV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_LuV.get(1), 64000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_ZPM.get(64), - ItemList.Electric_Pump_ZPM.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_ZPM.get(64), + ItemList.Electric_Pump_ZPM.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_ZPM.get(1), 64000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Emitter_UV.get(64), - ItemList.Electric_Pump_UV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UV.get(64), + ItemList.Electric_Pump_UV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_dynamoTunnel7_UV.get(1), 64000, @@ -1035,53 +835,41 @@ public class BloodyRecipeLoader { // Laser Target IV-UV 256/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_IV.get(1), - ItemList.Electric_Pump_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_IV.get(1), + ItemList.Electric_Pump_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_IV.get(1), 1000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_LuV.get(1), - ItemList.Electric_Pump_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_LuV.get(1), + ItemList.Electric_Pump_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_LuV.get(1), 1000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_ZPM.get(1), - ItemList.Electric_Pump_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_ZPM.get(1), + ItemList.Electric_Pump_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_ZPM.get(1), 1000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), - ItemList.Sensor_UV.get(1), - ItemList.Electric_Pump_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UV.get(1), + ItemList.Electric_Pump_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 2), + GT_Utility.getIntegratedCircuit(1) }, null, CustomItemList.eM_energyTunnel1_UV.get(1), 1000, @@ -1089,53 +877,41 @@ public class BloodyRecipeLoader { // Laser Target IV-UV 1024/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_IV.get(2), - ItemList.Electric_Pump_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_IV.get(2), + ItemList.Electric_Pump_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_IV.get(1), 2000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_LuV.get(2), - ItemList.Electric_Pump_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_LuV.get(2), + ItemList.Electric_Pump_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_LuV.get(1), 2000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_ZPM.get(2), - ItemList.Electric_Pump_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_ZPM.get(2), + ItemList.Electric_Pump_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_ZPM.get(1), 2000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), - ItemList.Sensor_UV.get(2), - ItemList.Electric_Pump_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UV.get(2), + ItemList.Electric_Pump_UV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(2) }, null, CustomItemList.eM_energyTunnel2_UV.get(1), 2000, @@ -1143,53 +919,41 @@ public class BloodyRecipeLoader { // Laser Target IV-UV 4096/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_IV.get(4), - ItemList.Electric_Pump_IV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_IV.get(4), + ItemList.Electric_Pump_IV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_IV.get(1), 4000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_LuV.get(4), - ItemList.Electric_Pump_LuV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_LuV.get(4), + ItemList.Electric_Pump_LuV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_LuV.get(1), 4000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_ZPM.get(4), - ItemList.Electric_Pump_ZPM.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_ZPM.get(4), + ItemList.Electric_Pump_ZPM.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_ZPM.get(1), 4000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), - ItemList.Sensor_UV.get(4), - ItemList.Electric_Pump_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), - GT_Utility.getIntegratedCircuit(3) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_UV.get(4), + ItemList.Electric_Pump_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 4), + GT_Utility.getIntegratedCircuit(3) }, null, CustomItemList.eM_energyTunnel3_UV.get(1), 4000, @@ -1197,53 +961,41 @@ public class BloodyRecipeLoader { // Laser Target IV-UV 16384/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_IV.get(8), - ItemList.Electric_Pump_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_IV.get(8), + ItemList.Electric_Pump_IV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_IV.get(1), 8000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_LuV.get(8), - ItemList.Electric_Pump_LuV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_LuV.get(8), + ItemList.Electric_Pump_LuV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_LuV.get(1), 8000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_ZPM.get(8), - ItemList.Electric_Pump_ZPM.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_ZPM.get(8), + ItemList.Electric_Pump_ZPM.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_ZPM.get(1), 8000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), - ItemList.Sensor_UV.get(8), - ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UV.get(8), + ItemList.Electric_Pump_UV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(4) }, null, CustomItemList.eM_energyTunnel4_UV.get(1), 8000, @@ -1251,53 +1003,41 @@ public class BloodyRecipeLoader { // Laser Target IV-UV 65536/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_IV.get(16), - ItemList.Electric_Pump_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_IV.get(16), + ItemList.Electric_Pump_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_IV.get(1), 16000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_LuV.get(16), - ItemList.Electric_Pump_LuV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_LuV.get(16), + ItemList.Electric_Pump_LuV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_LuV.get(1), 16000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_ZPM.get(16), - ItemList.Electric_Pump_ZPM.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_ZPM.get(16), + ItemList.Electric_Pump_ZPM.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_ZPM.get(1), 16000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), - ItemList.Sensor_UV.get(16), - ItemList.Electric_Pump_UV.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UV.get(16), + ItemList.Electric_Pump_UV.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 8), + GT_Utility.getIntegratedCircuit(5) }, null, CustomItemList.eM_energyTunnel5_UV.get(1), 16000, @@ -1305,53 +1045,41 @@ public class BloodyRecipeLoader { // Laser Target IV-UV 262144/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_IV.get(32), - ItemList.Electric_Pump_IV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_IV.get(32), + ItemList.Electric_Pump_IV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_IV.get(1), 32000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_LuV.get(32), - ItemList.Electric_Pump_LuV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_LuV.get(32), + ItemList.Electric_Pump_LuV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_LuV.get(1), 32000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_ZPM.get(32), - ItemList.Electric_Pump_ZPM.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_ZPM.get(32), + ItemList.Electric_Pump_ZPM.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_ZPM.get(1), 32000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - ItemList.Sensor_UV.get(32), - ItemList.Electric_Pump_UV.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UV.get(32), + ItemList.Electric_Pump_UV.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(6) }, null, CustomItemList.eM_energyTunnel6_UV.get(1), 32000, @@ -1359,53 +1087,41 @@ public class BloodyRecipeLoader { // Laser Target IV-UV 1048576/t GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_IV.get(64), - ItemList.Electric_Pump_IV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_IV.get(64), + ItemList.Electric_Pump_IV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_IV.get(1), 64000, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_LuV.get(64), - ItemList.Electric_Pump_LuV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_LuV.get(64), + ItemList.Electric_Pump_LuV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.VanadiumGallium, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_LuV.get(1), 64000, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_ZPM.get(64), - ItemList.Electric_Pump_ZPM.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_ZPM.get(64), + ItemList.Electric_Pump_ZPM.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_ZPM.get(1), 64000, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), - ItemList.Sensor_UV.get(64), - ItemList.Electric_Pump_UV.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UV.get(64), + ItemList.Electric_Pump_UV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NaquadahAlloy, 16), + GT_Utility.getIntegratedCircuit(7) }, null, CustomItemList.eM_energyTunnel7_UV.get(1), 64000, @@ -1413,24 +1129,16 @@ public class BloodyRecipeLoader { // Data Input GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Hatch_Input_Bus_LuV.get(1), - ItemList.Circuit_Crystalcomputer.get(1), - CustomItemList.DATApipe.get(2) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), ItemList.Hatch_Input_Bus_LuV.get(1), + ItemList.Circuit_Crystalcomputer.get(1), CustomItemList.DATApipe.get(2) }, Materials.Iridium.getMolten(1296), CustomItemList.dataIn_Hatch.get(1), 200, 122880); // Data Output GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Hatch_Output_Bus_LuV.get(1), - ItemList.Circuit_Crystalcomputer.get(1), - CustomItemList.DATApipe.get(2) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), ItemList.Hatch_Output_Bus_LuV.get(1), + ItemList.Circuit_Crystalcomputer.get(1), CustomItemList.DATApipe.get(2) }, Materials.Iridium.getMolten(1296), CustomItemList.dataOut_Hatch.get(1), 200, @@ -1438,12 +1146,8 @@ public class BloodyRecipeLoader { // Rack GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Bus.get(1), - ItemList.Hatch_Input_Bus_ZPM.get(1), - ItemList.Circuit_Crystalcomputer.get(2), - CustomItemList.DATApipe.get(4) - }, + new ItemStack[] { CustomItemList.eM_Computer_Bus.get(1), ItemList.Hatch_Input_Bus_ZPM.get(1), + ItemList.Circuit_Crystalcomputer.get(2), CustomItemList.DATApipe.get(4) }, Materials.Iridium.getMolten(1296), CustomItemList.rack_Hatch.get(1), 800, @@ -1453,48 +1157,32 @@ public class BloodyRecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Input_Bus_ZPM.get(1), 10000, - new ItemStack[] { - ItemList.Hatch_Input_Bus_ZPM.get(1), - CustomItemList.eM_Computer_Bus.get(1), - ItemList.Emitter_ZPM.get(8), - ItemList.Robot_Arm_ZPM.get(1), - ItemList.Electric_Motor_ZPM.get(2), - ItemList.Circuit_Crystalmainframe.get(1), - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 16), - CustomItemList.DATApipe.get(2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(500), - Materials.Iridium.getMolten(1152), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000) - }, + new ItemStack[] { ItemList.Hatch_Input_Bus_ZPM.get(1), CustomItemList.eM_Computer_Bus.get(1), + ItemList.Emitter_ZPM.get(8), ItemList.Robot_Arm_ZPM.get(1), ItemList.Electric_Motor_ZPM.get(2), + ItemList.Circuit_Crystalmainframe.get(1), + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 16), + CustomItemList.DATApipe.get(2), }, + new FluidStack[] { Materials.UUMatter.getFluid(500), Materials.Iridium.getMolten(1152), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000) }, CustomItemList.holder_Hatch.get(1), 1200, 100000); // Parameterizer GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Circuit_Masterquantumcomputer.get(1), - CustomItemList.DATApipe.get(4), - ItemList.Cover_Screen.get(1), - new ItemStack(Blocks.stone_button, 16), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + ItemList.Circuit_Masterquantumcomputer.get(1), CustomItemList.DATApipe.get(4), + ItemList.Cover_Screen.get(1), new ItemStack(Blocks.stone_button, 16), }, Materials.Iridium.getMolten(2592), CustomItemList.Parametrizer_Hatch.get(1), 800, 122880); // Uncertainty GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - ItemList.Circuit_Ultimatecrystalcomputer.get(1), - CustomItemList.DATApipe.get(16), - ItemList.Cover_Screen.get(1), - new ItemStack(Blocks.stone_button, 16), - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + ItemList.Circuit_Ultimatecrystalcomputer.get(1), CustomItemList.DATApipe.get(16), + ItemList.Cover_Screen.get(1), new ItemStack(Blocks.stone_button, 16), }, Materials.Iridium.getMolten(2592), CustomItemList.Uncertainty_Hatch.get(1), 1200, @@ -1502,36 +1190,26 @@ public class BloodyRecipeLoader { // Elemental Input GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Input_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 8), - ItemList.Sensor_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Input_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 8), ItemList.Sensor_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_in_UV.get(1), 800, 500000); // Elemental Output GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Output_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 8), - ItemList.Emitter_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Output_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 8), + ItemList.Emitter_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_out_UV.get(1), 800, 500000); // Overflow GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - ItemList.Hatch_Muffler_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 4), - ItemList.Field_Generator_UV.get(1) - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), ItemList.Hatch_Muffler_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 4), + ItemList.Field_Generator_UV.get(1) }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_muffler_UV.get(1), 800, @@ -1539,21 +1217,17 @@ public class BloodyRecipeLoader { // Capacitor Hatch GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Input_Bus_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Gold, 4), - }, + new ItemStack[] { ItemList.Hatch_Input_Bus_HV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Gold, 4), }, Materials.Silver.getMolten(576), CustomItemList.capacitor_Hatch.get(1), 800, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Output_Bus_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Gold, 4), - }, + new ItemStack[] { ItemList.Hatch_Output_Bus_HV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Gold, 4), }, Materials.Silver.getMolten(576), CustomItemList.capacitor_Hatch.get(1), 800, @@ -1565,13 +1239,10 @@ public class BloodyRecipeLoader { // Tesla Coil GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_ModHandler.getIC2Item("teslaCoil", 1), - CustomItemList.tM_TeslaSecondary.get(4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), - ItemList.Upgrade_Overclocker.get(4), - }, + new ItemStack[] { GT_ModHandler.getIC2Item("teslaCoil", 1), CustomItemList.tM_TeslaSecondary.get(4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + ItemList.Upgrade_Overclocker.get(4), }, Materials.Silver.getMolten(576), CustomItemList.Machine_Multi_TeslaCoil.get(1), 800, @@ -1579,13 +1250,11 @@ public class BloodyRecipeLoader { // Microwave Grinder GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Machine_HV_Microwave.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), - ItemList.Upgrade_Overclocker.get(4), - }, + new ItemStack[] { ItemList.Machine_HV_Microwave.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), + ItemList.Upgrade_Overclocker.get(4), }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1), 800, @@ -1593,12 +1262,9 @@ public class BloodyRecipeLoader { // Active Transformer GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_ZPM_LuV.get(16), - ItemList.Circuit_Board_Elite.get(1), // ? - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16), - ItemList.Circuit_Chip_HPIC.get(2), - }, + new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(16), ItemList.Circuit_Board_Elite.get(1), // ? + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16), + ItemList.Circuit_Chip_HPIC.get(2), }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1), 400, @@ -1606,13 +1272,11 @@ public class BloodyRecipeLoader { // Network Switch GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - ItemList.Circuit_Ultimatecrystalcomputer.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Cobalt, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 32), - CustomItemList.DATApipe.get(4), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + ItemList.Circuit_Ultimatecrystalcomputer.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Cobalt, 32), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 32), + CustomItemList.DATApipe.get(4), }, Materials.Iridium.getMolten(1296), CustomItemList.Machine_Multi_Switch.get(1), 800, @@ -1622,20 +1286,13 @@ public class BloodyRecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Tool_DataOrb.get(1), 20000, - new ItemStack[] { - CustomItemList.Machine_Multi_Switch.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2), - ItemList.Tool_DataOrb.get(1), - ItemList.Cover_Screen.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 8), - CustomItemList.DATApipe.get(8), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Iridium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Hydrogen.getGas(1000), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Switch.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2), + ItemList.Tool_DataOrb.get(1), ItemList.Cover_Screen.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 8), + CustomItemList.DATApipe.get(8), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Iridium.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Hydrogen.getGas(1000), }, CustomItemList.Machine_Multi_Computer.get(1), 12000, 100000); @@ -1644,22 +1301,14 @@ public class BloodyRecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Tool_Scanner.get(1), 80000, - new ItemStack[] { - CustomItemList.Machine_Multi_Switch.get(1), - ItemList.Sensor_ZPM.get(8), - ItemList.Circuit_Crystalmainframe.get(4), - ItemList.Field_Generator_ZPM.get(1), - ItemList.Electric_Motor_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 32), - CustomItemList.DATApipe.get(16), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Iridium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Switch.get(1), ItemList.Sensor_ZPM.get(8), + ItemList.Circuit_Crystalmainframe.get(4), ItemList.Field_Generator_ZPM.get(1), + ItemList.Electric_Motor_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 32), + CustomItemList.DATApipe.get(16), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Iridium.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_Research.get(1), 12000, 100000); @@ -1671,20 +1320,13 @@ public class BloodyRecipeLoader { 32, 500000, 4, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Naquadah, 16), - ItemList.Robot_Arm_LuV.get(2), - ItemList.Electric_Piston_LuV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 4), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Naquadah, 16), + ItemList.Robot_Arm_LuV.get(2), ItemList.Electric_Piston_LuV.get(2), + ItemList.Circuit_Wetwaresupercomputer.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 4), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EMjunction.get(1), 12000, 100000); @@ -1696,19 +1338,12 @@ public class BloodyRecipeLoader { 32, 500000, 6, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 16), - ItemList.Emitter_UV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 16), ItemList.Emitter_UV.get(2), + ItemList.Circuit_Wetwaresupercomputer.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_MatterToEM.get(1), 12000, 100000); @@ -1720,19 +1355,12 @@ public class BloodyRecipeLoader { 32, 500000, 6, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 16), - ItemList.Sensor_UV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(1000), - Materials.Naquadah.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 16), ItemList.Sensor_UV.get(2), + ItemList.Circuit_Wetwaresupercomputer.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 2), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000), Materials.Naquadah.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EMToMatter.get(1), 12000, 100000); @@ -1744,19 +1372,12 @@ public class BloodyRecipeLoader { 32, 500000, 8, - new ItemStack[] { - CustomItemList.Machine_Multi_MatterToEM.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), - ItemList.Emitter_UV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 8), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(2000), - Materials.Void.getMolten(2592), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_MatterToEM.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), + ItemList.Emitter_UV.get(2), ItemList.Circuit_Wetwaresupercomputer.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 8), }, + new FluidStack[] { Materials.UUMatter.getFluid(2000), Materials.Void.getMolten(2592), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EssentiaToEM.get(1), 24000, 500000); @@ -1768,19 +1389,12 @@ public class BloodyRecipeLoader { 32, 500000, 8, - new ItemStack[] { - CustomItemList.Machine_Multi_EMToMatter.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), - ItemList.Sensor_UV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 8), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(2000), - Materials.Void.getMolten(2592), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - Materials.Osmium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_EMToMatter.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), + ItemList.Sensor_UV.get(2), ItemList.Circuit_Wetwaresupercomputer.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 8), }, + new FluidStack[] { Materials.UUMatter.getFluid(2000), Materials.Void.getMolten(2592), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), Materials.Osmium.getMolten(1296), }, CustomItemList.Machine_Multi_EMToEssentia.get(1), 24000, 500000); @@ -1792,21 +1406,14 @@ public class BloodyRecipeLoader { 128, 500000, 16, - new ItemStack[] { - CustomItemList.Machine_Multi_EMjunction.get(1), - CustomItemList.eM_Computer_Bus.get(4), - ItemList.Field_Generator_UV.get(4), - ItemList.Sensor_UV.get(4), - ItemList.Circuit_Wetwaresupercomputer.get(4), // ? - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 16), - }, - new FluidStack[] { - Materials.UUMatter.getFluid(2000), - Materials.Neutronium.getMolten(2592), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - Materials.Osmiridium.getMolten(1296), - }, + new ItemStack[] { CustomItemList.Machine_Multi_EMjunction.get(1), CustomItemList.eM_Computer_Bus.get(4), + ItemList.Field_Generator_UV.get(4), ItemList.Sensor_UV.get(4), + ItemList.Circuit_Wetwaresupercomputer.get(4), // ? + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Superconductor, 16), }, + new FluidStack[] { Materials.UUMatter.getFluid(2000), Materials.Neutronium.getMolten(2592), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), + Materials.Osmiridium.getMolten(1296), }, CustomItemList.Machine_Multi_Scanner.get(1), 24000, 500000); @@ -1818,17 +1425,11 @@ public class BloodyRecipeLoader { 512, 2000000, 32, - new ItemStack[] { - CustomItemList.Machine_Multi_Transformer.get(1), - CustomItemList.eM_Coil.get(8), - CustomItemList.eM_Power.get(8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NeodymiumMagnetic, 16), - }, - new FluidStack[] { - Materials.Electrum.getMolten(2592), - Materials.Neutronium.getMolten(1872), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - }, + new ItemStack[] { CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Coil.get(8), + CustomItemList.eM_Power.get(8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NeodymiumMagnetic, 16), }, + new FluidStack[] { Materials.Electrum.getMolten(2592), Materials.Neutronium.getMolten(1872), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), }, CustomItemList.Machine_Multi_Infuser.get(1), 8000, 2000000); @@ -1839,380 +1440,440 @@ public class BloodyRecipeLoader { // Tesla Transceiver LV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); // Tesla Transceiver MV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); // Tesla Transceiver HV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); // Tesla Transceiver EV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); // Tesla Transceiver IV 1A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_1by1_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); // Tesla Transceiver LV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); // Tesla Transceiver MV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); // Tesla Transceiver HV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); // Tesla Transceiver EV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); // Tesla Transceiver IV 4A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_2by2_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); // Tesla Transceiver LV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); // Tesla Transceiver MV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); // Tesla Transceiver HV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); // Tesla Transceiver EV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); // Tesla Transceiver IV 9A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_3by3_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); // Tesla Transceiver LV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); // Tesla Transceiver MV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); // Tesla Transceiver HV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_HV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); // Tesla Transceiver EV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_EV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); // Tesla Transceiver IV 16A GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.Tin.getMolten(288), CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Battery_Buffer_4by4_IV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, + new ItemStack[] { ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCover.getWithDamage(1, 0) }, Materials.SolderingAlloy.getMolten(144), CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, @@ -2224,20 +1885,16 @@ public class BloodyRecipeLoader { // Tesla Winding Components GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 32), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 32), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), }, Materials.Epoxid.getMolten(288), CustomItemList.teslaComponent.getWithDamage(1, 0), 320, 30); // Tesla Winding Components Ultimate GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), }, Materials.Epoxid.getMolten(576), CustomItemList.teslaComponent.getWithDamage(1, 1), 320, @@ -2249,154 +1906,130 @@ public class BloodyRecipeLoader { // LV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 8), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 8), }, Materials.Epoxid.getMolten(72), CustomItemList.teslaCapacitor.getWithDamage(1, 0), 320, 30); // MV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 12), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 12), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 6), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 12), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 12), }, Materials.Epoxid.getMolten(144), CustomItemList.teslaCapacitor.getWithDamage(1, 1), 320, 120); // HV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 16), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 16), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 16), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 16), }, Materials.Epoxid.getMolten(216), CustomItemList.teslaCapacitor.getWithDamage(1, 2), 320, 480); // EV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 10), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 20), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 20), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 10), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 20), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 20), }, Materials.Epoxid.getMolten(288), CustomItemList.teslaCapacitor.getWithDamage(1, 3), 320, 1920); // IV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 12), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 24), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 24), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 12), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 24), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 24), }, Materials.Epoxid.getMolten(360), CustomItemList.teslaCapacitor.getWithDamage(1, 4), 320, 7680); // LuV Tesla Capacitor GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.HSSG, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 14), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 28), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 28), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.HSSG, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 14), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 28), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 28), }, Materials.Epoxid.getMolten(432), CustomItemList.teslaCapacitor.getWithDamage(1, 5), 320, 30720); // ZPM Tesla Capacitor // GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ - // GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 4), - // GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 16), - // GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 32), - // GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 32), + // GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 4), + // GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 16), + // GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 32), + // GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 32), // }, Materials.Epoxid.getMolten(504), CustomItemList.teslaCapacitor.getWithDamage(1, 6), 320, 122880); // TODO Allow with the coils, useless alone and will only cause trouble // Tesla Cover GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 0), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.Lead.getMolten(288), CustomItemList.teslaCover.getWithDamage(1, 0), 320, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 0), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.Tin.getMolten(144), CustomItemList.teslaCover.getWithDamage(1, 0), 320, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 0), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.SolderingAlloy.getMolten(72), CustomItemList.teslaCover.getWithDamage(1, 0), 320, 480); // Ultimate Tesla Cover GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.Lead.getMolten(288), CustomItemList.teslaCover.getWithDamage(1, 1), 320, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.Tin.getMolten(144), CustomItemList.teslaCover.getWithDamage(1, 1), 320, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(4, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.SolderingAlloy.getMolten(72), CustomItemList.teslaCover.getWithDamage(1, 1), 320, @@ -2453,8 +2086,8 @@ public class BloodyRecipeLoader { } private void register_machine_EM_behaviours() { - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(5), ItemList.Machine_IV_Centrifuge.get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(5), ItemList.Machine_IV_Centrifuge.get(1)); try { GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_Centrifuge(6), @@ -2478,24 +2111,25 @@ public class BloodyRecipeLoader { () -> new Behaviour_Centrifuge(12), ItemList.valueOf("Machine_UV_Centrifuge").get(64)); } catch (IllegalArgumentException | NullPointerException e) { - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(6), ItemList.Machine_IV_Centrifuge.get(2)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(7), ItemList.Machine_IV_Centrifuge.get(4)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(8), ItemList.Machine_IV_Centrifuge.get(8)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(9), ItemList.Machine_IV_Centrifuge.get(16)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(10), ItemList.Machine_IV_Centrifuge.get(32)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(11), ItemList.Machine_IV_Centrifuge.get(48)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Centrifuge(12), ItemList.Machine_IV_Centrifuge.get(64)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(6), ItemList.Machine_IV_Centrifuge.get(2)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(7), ItemList.Machine_IV_Centrifuge.get(4)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(8), ItemList.Machine_IV_Centrifuge.get(8)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(9), ItemList.Machine_IV_Centrifuge.get(16)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(10), ItemList.Machine_IV_Centrifuge.get(32)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(11), ItemList.Machine_IV_Centrifuge.get(48)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Centrifuge(12), ItemList.Machine_IV_Centrifuge.get(64)); } GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_ElectromagneticSeparator(5), ItemList.Machine_IV_ElectromagneticSeparator.get(1)); + () -> new Behaviour_ElectromagneticSeparator(5), + ItemList.Machine_IV_ElectromagneticSeparator.get(1)); try { GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_ElectromagneticSeparator(6), @@ -2542,8 +2176,8 @@ public class BloodyRecipeLoader { ItemList.Machine_IV_ElectromagneticSeparator.get(64)); } - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(5), ItemList.Machine_IV_Recycler.get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(5), ItemList.Machine_IV_Recycler.get(1)); try { GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_Recycler(6), @@ -2551,12 +2185,10 @@ public class BloodyRecipeLoader { GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_Recycler(7), ItemList.valueOf("Machine_ZPM_Recycler").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(8), - ItemList.valueOf("Machine_UV_Recycler").get(1)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(9), - ItemList.valueOf("Machine_UV_Recycler").get(4)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(8), ItemList.valueOf("Machine_UV_Recycler").get(1)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(9), ItemList.valueOf("Machine_UV_Recycler").get(4)); GT_MetaTileEntity_EM_machine.registerBehaviour( () -> new Behaviour_Recycler(10), ItemList.valueOf("Machine_UV_Recycler").get(16)); @@ -2567,20 +2199,20 @@ public class BloodyRecipeLoader { () -> new Behaviour_Recycler(12), ItemList.valueOf("Machine_UV_Recycler").get(64)); } catch (IllegalArgumentException | NullPointerException e) { - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(6), ItemList.Machine_IV_Recycler.get(2)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(7), ItemList.Machine_IV_Recycler.get(4)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(8), ItemList.Machine_IV_Recycler.get(8)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(9), ItemList.Machine_IV_Recycler.get(16)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(10), ItemList.Machine_IV_Recycler.get(32)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(11), ItemList.Machine_IV_Recycler.get(48)); - GT_MetaTileEntity_EM_machine.registerBehaviour( - () -> new Behaviour_Recycler(12), ItemList.Machine_IV_Recycler.get(64)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(6), ItemList.Machine_IV_Recycler.get(2)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(7), ItemList.Machine_IV_Recycler.get(4)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(8), ItemList.Machine_IV_Recycler.get(8)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(9), ItemList.Machine_IV_Recycler.get(16)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(10), ItemList.Machine_IV_Recycler.get(32)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(11), ItemList.Machine_IV_Recycler.get(48)); + GT_MetaTileEntity_EM_machine + .registerBehaviour(() -> new Behaviour_Recycler(12), ItemList.Machine_IV_Recycler.get(64)); } } } diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ComponentLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ComponentLoader.java index 933229b537..610df445f8 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ComponentLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ComponentLoader.java @@ -4,6 +4,7 @@ import gregtech.api.enums.Materials; import gregtech.api.interfaces.IMaterialHandler; public class ComponentLoader implements IMaterialHandler { + public ComponentLoader() { Materials.add(this); } diff --git a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java index a5e68e2a0a..e9a36c1c8a 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java @@ -1,5 +1,7 @@ package com.github.technus.tectech.loader.thing; +import net.minecraft.item.ItemStack; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.cover.GT_Cover_TM_EnderFluidLink; import com.github.technus.tectech.thing.cover.GT_Cover_TM_PowerPassUpgrade; @@ -8,21 +10,22 @@ import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate; import com.github.technus.tectech.thing.item.EnderFluidLinkCover; import com.github.technus.tectech.thing.item.PowerPassUpgradeCover; import com.github.technus.tectech.thing.item.TeslaCoilCover; + import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.item.ItemStack; public class CoverLoader implements Runnable { + public void run() { final IIconContainer TESLA_OVERLAY = new Textures.BlockIcons.CustomIcon("iconsets/TESLA_OVERLAY"); - final IIconContainer TESLA_OVERLAY_ULTIMATE = - new Textures.BlockIcons.CustomIcon("iconsets/TESLA_OVERLAY_ULTIMATE"); - final IIconContainer ENDERFLUIDLINK_OVERLAY = - new Textures.BlockIcons.CustomIcon("iconsets/ENDERFLUIDLINK_OVERLAY"); - final IIconContainer POWERPASSUPGRADE_OVERLAY = - new Textures.BlockIcons.CustomIcon("iconsets/POWERPASSUPGRADE_OVERLAY"); + final IIconContainer TESLA_OVERLAY_ULTIMATE = new Textures.BlockIcons.CustomIcon( + "iconsets/TESLA_OVERLAY_ULTIMATE"); + final IIconContainer ENDERFLUIDLINK_OVERLAY = new Textures.BlockIcons.CustomIcon( + "iconsets/ENDERFLUIDLINK_OVERLAY"); + final IIconContainer POWERPASSUPGRADE_OVERLAY = new Textures.BlockIcons.CustomIcon( + "iconsets/POWERPASSUPGRADE_OVERLAY"); GregTech_API.registerCover( new ItemStack(TeslaCoilCover.INSTANCE, 1, 0), 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 416fb10f39..300b193dc6 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 @@ -4,6 +4,9 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor import static com.github.technus.tectech.thing.CustomItemList.*; import static com.github.technus.tectech.util.CommonValues.V; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.compatibility.dreamcraft.NoDreamCraftMachineLoader; import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaDequantizer; @@ -15,13 +18,12 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaT import com.github.technus.tectech.thing.metaTileEntity.pipe.*; import com.github.technus.tectech.thing.metaTileEntity.single.*; import cpw.mods.fml.common.Loader; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; /** * Created by danie_000 on 16.11.2016. */ public class MachineLoader implements Runnable { + @Override public void run() { // =================================================================================================== @@ -56,94 +58,115 @@ public class MachineLoader implements Runnable { // eM OUT // =================================================================================================== - eM_out_UV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15010, "hatch.emout.tier.08", "UV Elemental Output Hatch", 8) - .getStackForm(1L)); - - eM_out_UHV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15011, "hatch.emout.tier.09", "UHV Elemental Output Hatch", 9) - .getStackForm(1L)); - - eM_out_UEV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15012, "hatch.emout.tier.10", "UEV Elemental Output Hatch", 10) - .getStackForm(1L)); - - eM_out_UIV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15013, "hatch.emout.tier.11", "UIV Elemental Output Hatch", 11) - .getStackForm(1L)); - - eM_out_UMV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15014, "hatch.emout.tier.12", "UMV Elemental Output Hatch", 12) - .getStackForm(1L)); - - eM_out_UXV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15015, "hatch.emout.tier.13", "UXV Elemental Output Hatch", 13) - .getStackForm(1L)); + eM_out_UV.set( + new GT_MetaTileEntity_Hatch_OutputElemental( + 15010, + "hatch.emout.tier.08", + "UV Elemental Output Hatch", + 8).getStackForm(1L)); + + eM_out_UHV.set( + new GT_MetaTileEntity_Hatch_OutputElemental( + 15011, + "hatch.emout.tier.09", + "UHV Elemental Output Hatch", + 9).getStackForm(1L)); + + eM_out_UEV.set( + new GT_MetaTileEntity_Hatch_OutputElemental( + 15012, + "hatch.emout.tier.10", + "UEV Elemental Output Hatch", + 10).getStackForm(1L)); + + eM_out_UIV.set( + new GT_MetaTileEntity_Hatch_OutputElemental( + 15013, + "hatch.emout.tier.11", + "UIV Elemental Output Hatch", + 11).getStackForm(1L)); + + eM_out_UMV.set( + new GT_MetaTileEntity_Hatch_OutputElemental( + 15014, + "hatch.emout.tier.12", + "UMV Elemental Output Hatch", + 12).getStackForm(1L)); + + eM_out_UXV.set( + new GT_MetaTileEntity_Hatch_OutputElemental( + 15015, + "hatch.emout.tier.13", + "UXV Elemental Output Hatch", + 13).getStackForm(1L)); // =================================================================================================== // eM Waste OUT // =================================================================================================== - eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( + eM_muffler_UV.set( + new GT_MetaTileEntity_Hatch_OverflowElemental( 15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, - 1e10f * EM_COUNT_PER_MATERIAL_AMOUNT) - .getStackForm(1L)); + 1e10f * EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L)); - eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( + eM_muffler_UHV.set( + new GT_MetaTileEntity_Hatch_OverflowElemental( 15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, - 5e10f * EM_COUNT_PER_MATERIAL_AMOUNT) - .getStackForm(1L)); + 5e10f * EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L)); - eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( + eM_muffler_UEV.set( + new GT_MetaTileEntity_Hatch_OverflowElemental( 15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, - 25e10f * EM_COUNT_PER_MATERIAL_AMOUNT) - .getStackForm(1L)); + 25e10f * EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L)); - eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( + eM_muffler_UIV.set( + new GT_MetaTileEntity_Hatch_OverflowElemental( 15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, - 125e10f * EM_COUNT_PER_MATERIAL_AMOUNT) - .getStackForm(1L)); + 125e10f * EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L)); - eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( + eM_muffler_UMV.set( + new GT_MetaTileEntity_Hatch_OverflowElemental( 15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, - 125e11f * EM_COUNT_PER_MATERIAL_AMOUNT) - .getStackForm(1L)); + 125e11f * EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L)); - eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( + eM_muffler_UXV.set( + new GT_MetaTileEntity_Hatch_OverflowElemental( 15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, - 125e12f * EM_COUNT_PER_MATERIAL_AMOUNT) - .getStackForm(1L)); + 125e12f * EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L)); // =================================================================================================== // Microcontrollers // =================================================================================================== - eM_avr_HV.set(new GT_MetaTileEntity_MicroController(15030, "machine.avr.tier.08", "HV AVR Micro-controller", 3) - .getStackForm(1L)); + eM_avr_HV.set( + new GT_MetaTileEntity_MicroController(15030, "machine.avr.tier.08", "HV AVR Micro-controller", 3) + .getStackForm(1L)); - eM_avr_EV.set(new GT_MetaTileEntity_MicroController(15031, "machine.avr.tier.08", "EV AVR Micro-controller", 4) - .getStackForm(1L)); + eM_avr_EV.set( + new GT_MetaTileEntity_MicroController(15031, "machine.avr.tier.08", "EV AVR Micro-controller", 4) + .getStackForm(1L)); - eM_avr_IV.set(new GT_MetaTileEntity_MicroController(15032, "machine.avr.tier.08", "IV AVR Micro-controller", 5) - .getStackForm(1L)); + eM_avr_IV.set( + new GT_MetaTileEntity_MicroController(15032, "machine.avr.tier.08", "IV AVR Micro-controller", 5) + .getStackForm(1L)); eM_avr_LuV.set( new GT_MetaTileEntity_MicroController(15033, "machine.avr.tier.08", "LuV AVR Micro-controller", 6) @@ -153,8 +176,9 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_MicroController(15034, "machine.avr.tier.08", "ZPM AVR Micro-controller", 7) .getStackForm(1L)); - eM_avr_UV.set(new GT_MetaTileEntity_MicroController(15035, "machine.avr.tier.08", "UV AVR Micro-controller", 8) - .getStackForm(1L)); + eM_avr_UV.set( + new GT_MetaTileEntity_MicroController(15035, "machine.avr.tier.08", "UV AVR Micro-controller", 8) + .getStackForm(1L)); eM_avr_UHV.set( new GT_MetaTileEntity_MicroController(15036, "machine.avr.tier.09", "UHV AVR Micro-controller", 9) @@ -175,618 +199,1370 @@ public class MachineLoader implements Runnable { // =================================================================================================== // Multi AMP Power INPUTS // =================================================================================================== - eM_energyMulti4_EV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15109, "hatch.energymulti04.tier.04", "EV 4A Energy Hatch", 4, 4) - .getStackForm(1L)); - eM_energyMulti16_EV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15119, "hatch.energymulti16.tier.04", "EV 16A Energy Hatch", 4, 16) - .getStackForm(1L)); - eM_energyMulti64_EV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15129, "hatch.energymulti64.tier.04", "EV 64A Energy Hatch", 4, 64) - .getStackForm(1L)); - - eM_energyMulti4_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15100, "hatch.energymulti04.tier.05", "IV 4A Energy Hatch", 5, 4) - .getStackForm(1L)); - eM_energyMulti16_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15110, "hatch.energymulti16.tier.05", "IV 16A Energy Hatch", 5, 16) - .getStackForm(1L)); - eM_energyMulti64_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15120, "hatch.energymulti64.tier.05", "IV 64A Energy Hatch", 5, 64) - .getStackForm(1L)); - - eM_energyMulti4_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15101, "hatch.energymulti04.tier.06", "LuV 4A Energy Hatch", 6, 4) - .getStackForm(1L)); - eM_energyMulti16_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15111, "hatch.energymulti16.tier.06", "LuV 16A Energy Hatch", 6, 16) - .getStackForm(1L)); - eM_energyMulti64_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15121, "hatch.energymulti64.tier.06", "LuV 64A Energy Hatch", 6, 64) - .getStackForm(1L)); - - eM_energyMulti4_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15102, "hatch.energymulti04.tier.07", "ZPM 4A Energy Hatch", 7, 4) - .getStackForm(1L)); - eM_energyMulti16_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15112, "hatch.energymulti16.tier.07", "ZPM 16A Energy Hatch", 7, 16) - .getStackForm(1L)); - eM_energyMulti64_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15122, "hatch.energymulti64.tier.07", "ZPM 64A Energy Hatch", 7, 64) - .getStackForm(1L)); - - eM_energyMulti4_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15103, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch", 8, 4) - .getStackForm(1L)); - eM_energyMulti16_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15113, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch", 8, 16) - .getStackForm(1L)); - eM_energyMulti64_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15123, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch", 8, 64) - .getStackForm(1L)); - - eM_energyMulti4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15104, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch", 9, 4) - .getStackForm(1L)); - eM_energyMulti16_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15114, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch", 9, 16) - .getStackForm(1L)); - eM_energyMulti64_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15124, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch", 9, 64) - .getStackForm(1L)); - - eM_energyMulti4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15105, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch", 10, 4) - .getStackForm(1L)); - eM_energyMulti16_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15115, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch", 10, 16) - .getStackForm(1L)); - eM_energyMulti64_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15125, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch", 10, 64) - .getStackForm(1L)); - - eM_energyMulti4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15106, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch", 11, 4) - .getStackForm(1L)); - eM_energyMulti16_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15116, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch", 11, 16) - .getStackForm(1L)); - eM_energyMulti64_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15126, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch", 11, 64) - .getStackForm(1L)); - - eM_energyMulti4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15107, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch", 12, 4) - .getStackForm(1L)); - eM_energyMulti16_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15117, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch", 12, 16) - .getStackForm(1L)); - eM_energyMulti64_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15127, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch", 12, 64) - .getStackForm(1L)); - - eM_energyMulti4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15108, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch", 13, 4) - .getStackForm(1L)); - eM_energyMulti16_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15118, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch", 13, 16) - .getStackForm(1L)); - eM_energyMulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15128, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64) - .getStackForm(1L)); + eM_energyMulti4_EV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15109, + "hatch.energymulti04.tier.04", + "EV 4A Energy Hatch", + 4, + 4).getStackForm(1L)); + eM_energyMulti16_EV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15119, + "hatch.energymulti16.tier.04", + "EV 16A Energy Hatch", + 4, + 16).getStackForm(1L)); + eM_energyMulti64_EV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15129, + "hatch.energymulti64.tier.04", + "EV 64A Energy Hatch", + 4, + 64).getStackForm(1L)); + + eM_energyMulti4_IV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15100, + "hatch.energymulti04.tier.05", + "IV 4A Energy Hatch", + 5, + 4).getStackForm(1L)); + eM_energyMulti16_IV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15110, + "hatch.energymulti16.tier.05", + "IV 16A Energy Hatch", + 5, + 16).getStackForm(1L)); + eM_energyMulti64_IV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15120, + "hatch.energymulti64.tier.05", + "IV 64A Energy Hatch", + 5, + 64).getStackForm(1L)); + + eM_energyMulti4_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15101, + "hatch.energymulti04.tier.06", + "LuV 4A Energy Hatch", + 6, + 4).getStackForm(1L)); + eM_energyMulti16_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15111, + "hatch.energymulti16.tier.06", + "LuV 16A Energy Hatch", + 6, + 16).getStackForm(1L)); + eM_energyMulti64_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15121, + "hatch.energymulti64.tier.06", + "LuV 64A Energy Hatch", + 6, + 64).getStackForm(1L)); + + eM_energyMulti4_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15102, + "hatch.energymulti04.tier.07", + "ZPM 4A Energy Hatch", + 7, + 4).getStackForm(1L)); + eM_energyMulti16_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15112, + "hatch.energymulti16.tier.07", + "ZPM 16A Energy Hatch", + 7, + 16).getStackForm(1L)); + eM_energyMulti64_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15122, + "hatch.energymulti64.tier.07", + "ZPM 64A Energy Hatch", + 7, + 64).getStackForm(1L)); + + eM_energyMulti4_UV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15103, + "hatch.energymulti04.tier.08", + "UV 4A Energy Hatch", + 8, + 4).getStackForm(1L)); + eM_energyMulti16_UV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15113, + "hatch.energymulti16.tier.08", + "UV 16A Energy Hatch", + 8, + 16).getStackForm(1L)); + eM_energyMulti64_UV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15123, + "hatch.energymulti64.tier.08", + "UV 64A Energy Hatch", + 8, + 64).getStackForm(1L)); + + eM_energyMulti4_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15104, + "hatch.energymulti04.tier.09", + "UHV 4A Energy Hatch", + 9, + 4).getStackForm(1L)); + eM_energyMulti16_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15114, + "hatch.energymulti16.tier.09", + "UHV 16A Energy Hatch", + 9, + 16).getStackForm(1L)); + eM_energyMulti64_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15124, + "hatch.energymulti64.tier.09", + "UHV 64A Energy Hatch", + 9, + 64).getStackForm(1L)); + + eM_energyMulti4_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15105, + "hatch.energymulti04.tier.10", + "UEV 4A Energy Hatch", + 10, + 4).getStackForm(1L)); + eM_energyMulti16_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15115, + "hatch.energymulti16.tier.10", + "UEV 16A Energy Hatch", + 10, + 16).getStackForm(1L)); + eM_energyMulti64_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15125, + "hatch.energymulti64.tier.10", + "UEV 64A Energy Hatch", + 10, + 64).getStackForm(1L)); + + eM_energyMulti4_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15106, + "hatch.energymulti04.tier.11", + "UIV 4A Energy Hatch", + 11, + 4).getStackForm(1L)); + eM_energyMulti16_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15116, + "hatch.energymulti16.tier.11", + "UIV 16A Energy Hatch", + 11, + 16).getStackForm(1L)); + eM_energyMulti64_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15126, + "hatch.energymulti64.tier.11", + "UIV 64A Energy Hatch", + 11, + 64).getStackForm(1L)); + + eM_energyMulti4_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15107, + "hatch.energymulti04.tier.12", + "UMV 4A Energy Hatch", + 12, + 4).getStackForm(1L)); + eM_energyMulti16_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15117, + "hatch.energymulti16.tier.12", + "UMV 16A Energy Hatch", + 12, + 16).getStackForm(1L)); + eM_energyMulti64_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15127, + "hatch.energymulti64.tier.12", + "UMV 64A Energy Hatch", + 12, + 64).getStackForm(1L)); + + eM_energyMulti4_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15108, + "hatch.energymulti04.tier.13", + "UXV 4A Energy Hatch", + 13, + 4).getStackForm(1L)); + eM_energyMulti16_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15118, + "hatch.energymulti16.tier.13", + "UXV 16A Energy Hatch", + 13, + 16).getStackForm(1L)); + eM_energyMulti64_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyMulti( + 15128, + "hatch.energymulti64.tier.13", + "UXV 64A Energy Hatch", + 13, + 64).getStackForm(1L)); // =================================================================================================== // Multi AMP Laser INPUTS // =================================================================================================== - eM_energyTunnel1_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15130, "hatch.energytunnel1.tier.05", "IV 256A/t Laser Target Hatch", 5, 256) - .getStackForm(1L)); - eM_energyTunnel2_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15140, "hatch.energytunnel2.tier.05", "IV 1024A/t Laser Target Hatch", 5, 1024) - .getStackForm(1L)); - eM_energyTunnel3_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15150, "hatch.energytunnel3.tier.05", "IV 4096A/t Laser Target Hatch", 5, 4096) - .getStackForm(1L)); - eM_energyTunnel4_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15160, "hatch.energytunnel4.tier.05", "IV 16384A/t Laser Target Hatch", 5, 16384) - .getStackForm(1L)); - eM_energyTunnel5_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15170, "hatch.energytunnel5.tier.05", "IV 65536A/t Laser Target Hatch", 5, 65536) - .getStackForm(1L)); - eM_energyTunnel6_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15180, "hatch.energytunnel6.tier.05", "IV 262144A/t Laser Target Hatch", 5, 262144) - .getStackForm(1L)); - eM_energyTunnel7_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15190, "hatch.energytunnel7.tier.05", "IV 1048576A/t Laser Target Hatch", 5, 1048576) - .getStackForm(1L)); - - eM_energyTunnel1_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15131, "hatch.energytunnel1.tier.06", "LuV 256A/t Laser Target Hatch", 6, 256) - .getStackForm(1L)); - eM_energyTunnel2_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15141, "hatch.energytunnel2.tier.06", "LuV 1024A/t Laser Target Hatch", 6, 1024) - .getStackForm(1L)); - eM_energyTunnel3_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15151, "hatch.energytunnel3.tier.06", "LuV 4096A/t Laser Target Hatch", 6, 4096) - .getStackForm(1L)); - eM_energyTunnel4_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15161, "hatch.energytunnel4.tier.06", "LuV 16384A/t Laser Target Hatch", 6, 16384) - .getStackForm(1L)); - eM_energyTunnel5_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15171, "hatch.energytunnel5.tier.06", "LuV 65536A/t Laser Target Hatch", 6, 65536) - .getStackForm(1L)); - eM_energyTunnel6_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15181, "hatch.energytunnel6.tier.06", "LuV 262144A/t Laser Target Hatch", 6, 262144) - .getStackForm(1L)); - eM_energyTunnel7_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15191, "hatch.energytunnel7.tier.06", "LuV 1048576A/t Laser Target Hatch", 6, 1048576) - .getStackForm(1L)); - - eM_energyTunnel1_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15132, "hatch.energytunnel1.tier.07", "ZPM 256A/t Laser Target Hatch", 7, 256) - .getStackForm(1L)); - eM_energyTunnel2_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15142, "hatch.energytunnel2.tier.07", "ZPM 1024A/t Laser Target Hatch", 7, 1024) - .getStackForm(1L)); - eM_energyTunnel3_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15152, "hatch.energytunnel3.tier.07", "ZPM 4096A/t Laser Target Hatch", 7, 4096) - .getStackForm(1L)); - eM_energyTunnel4_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15162, "hatch.energytunnel4.tier.07", "ZPM 16384A/t Laser Target Hatch", 7, 16384) - .getStackForm(1L)); - eM_energyTunnel5_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15172, "hatch.energytunnel5.tier.07", "ZPM 65536A/t Laser Target Hatch", 7, 65536) - .getStackForm(1L)); - eM_energyTunnel6_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15182, "hatch.energytunnel6.tier.07", "ZPM 262144A/t Laser Target Hatch", 7, 262144) - .getStackForm(1L)); - eM_energyTunnel7_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15192, "hatch.energytunnel7.tier.07", "ZPM 1048576A/t Laser Target Hatch", 7, 1048576) - .getStackForm(1L)); - - eM_energyTunnel1_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15133, "hatch.energytunnel1.tier.08", "UV 256A/t Laser Target Hatch", 8, 256) - .getStackForm(1L)); - eM_energyTunnel2_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15143, "hatch.energytunnel2.tier.08", "UV 1024A/t Laser Target Hatch", 8, 1024) - .getStackForm(1L)); - eM_energyTunnel3_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15153, "hatch.energytunnel3.tier.08", "UV 4096A/t Laser Target Hatch", 8, 4096) - .getStackForm(1L)); - eM_energyTunnel4_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15163, "hatch.energytunnel4.tier.08", "UV 16384A/t Laser Target Hatch", 8, 16384) - .getStackForm(1L)); - eM_energyTunnel5_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15173, "hatch.energytunnel5.tier.08", "UV 65536A/t Laser Target Hatch", 8, 65536) - .getStackForm(1L)); - eM_energyTunnel6_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15183, "hatch.energytunnel6.tier.08", "UV 262144A/t Laser Target Hatch", 8, 262144) - .getStackForm(1L)); - eM_energyTunnel7_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15193, "hatch.energytunnel7.tier.08", "UV 1048576A/t Laser Target Hatch", 8, 1048576) - .getStackForm(1L)); - - eM_energyTunnel1_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15134, "hatch.energytunnel1.tier.09", "UHV 256A/t Laser Target Hatch", 9, 256) - .getStackForm(1L)); - eM_energyTunnel2_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15144, "hatch.energytunnel2.tier.09", "UHV 1024A/t Laser Target Hatch", 9, 1024) - .getStackForm(1L)); - eM_energyTunnel3_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15154, "hatch.energytunnel3.tier.09", "UHV 4096A/t Laser Target Hatch", 9, 4096) - .getStackForm(1L)); - eM_energyTunnel4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15164, "hatch.energytunnel4.tier.09", "UHV 16384A/t Laser Target Hatch", 9, 16384) - .getStackForm(1L)); - eM_energyTunnel5_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15174, "hatch.energytunnel5.tier.09", "UHV 65536A/t Laser Target Hatch", 9, 65536) - .getStackForm(1L)); - eM_energyTunnel6_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15184, "hatch.energytunnel6.tier.09", "UHV 262144A/t Laser Target Hatch", 9, 262144) - .getStackForm(1L)); - eM_energyTunnel7_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15194, "hatch.energytunnel7.tier.09", "UHV 1048576A/t Laser Target Hatch", 9, 1048576) - .getStackForm(1L)); - - eM_energyTunnel1_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15135, "hatch.energytunnel1.tier.10", "UEV 256A/t Laser Target Hatch", 10, 256) - .getStackForm(1L)); - eM_energyTunnel2_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15145, "hatch.energytunnel2.tier.10", "UEV 1024A/t Laser Target Hatch", 10, 1024) - .getStackForm(1L)); - eM_energyTunnel3_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15155, "hatch.energytunnel3.tier.10", "UEV 4096A/t Laser Target Hatch", 10, 4096) - .getStackForm(1L)); - eM_energyTunnel4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15165, "hatch.energytunnel4.tier.10", "UEV 16384A/t Laser Target Hatch", 10, 16384) - .getStackForm(1L)); - eM_energyTunnel5_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15175, "hatch.energytunnel5.tier.10", "UEV 65536A/t Laser Target Hatch", 10, 65536) - .getStackForm(1L)); - eM_energyTunnel6_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15185, "hatch.energytunnel6.tier.10", "UEV 262144A/t Laser Target Hatch", 10, 262144) - .getStackForm(1L)); - eM_energyTunnel7_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15195, "hatch.energytunnel7.tier.10", "UEV 1048576A/t Laser Target Hatch", 10, 1048576) - .getStackForm(1L)); - - eM_energyTunnel1_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15136, "hatch.energytunnel1.tier.11", "UIV 256A/t Laser Target Hatch", 11, 256) - .getStackForm(1L)); - eM_energyTunnel2_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15146, "hatch.energytunnel2.tier.11", "UIV 1024A/t Laser Target Hatch", 11, 1024) - .getStackForm(1L)); - eM_energyTunnel3_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15156, "hatch.energytunnel3.tier.11", "UIV 4096A/t Laser Target Hatch", 11, 4096) - .getStackForm(1L)); - eM_energyTunnel4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15166, "hatch.energytunnel4.tier.11", "UIV 16384A/t Laser Target Hatch", 11, 16384) - .getStackForm(1L)); - eM_energyTunnel5_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15176, "hatch.energytunnel5.tier.11", "UIV 65536A/t Laser Target Hatch", 11, 65536) - .getStackForm(1L)); - eM_energyTunnel6_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15186, "hatch.energytunnel6.tier.11", "UIV 262144A/t Laser Target Hatch", 11, 262144) - .getStackForm(1L)); - eM_energyTunnel7_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15196, "hatch.energytunnel7.tier.11", "UIV 1048576A/t Laser Target Hatch", 11, 1048576) - .getStackForm(1L)); - - eM_energyTunnel1_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15137, "hatch.energytunnel1.tier.12", "UMV 256A/t Laser Target Hatch", 12, 256) - .getStackForm(1L)); - eM_energyTunnel2_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15147, "hatch.energytunnel2.tier.12", "UMV 1024A/t Laser Target Hatch", 12, 1024) - .getStackForm(1L)); - eM_energyTunnel3_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15157, "hatch.energytunnel3.tier.12", "UMV 4096A/t Laser Target Hatch", 12, 4096) - .getStackForm(1L)); - eM_energyTunnel4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15167, "hatch.energytunnel4.tier.12", "UMV 16384A/t Laser Target Hatch", 12, 16384) - .getStackForm(1L)); - eM_energyTunnel5_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15177, "hatch.energytunnel5.tier.12", "UMV 65536A/t Laser Target Hatch", 12, 65536) - .getStackForm(1L)); - eM_energyTunnel6_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15187, "hatch.energytunnel6.tier.12", "UMV 262144A/t Laser Target Hatch", 12, 262144) - .getStackForm(1L)); - eM_energyTunnel7_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15197, "hatch.energytunnel7.tier.12", "UMV 1048576A/t Laser Target Hatch", 12, 1048576) - .getStackForm(1L)); - - eM_energyTunnel1_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15138, "hatch.energytunnel1.tier.13", "UXV 256A/t Laser Target Hatch", 13, 256) - .getStackForm(1L)); - eM_energyTunnel2_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15148, "hatch.energytunnel2.tier.13", "UXV 1024A/t Laser Target Hatch", 13, 1024) - .getStackForm(1L)); - eM_energyTunnel3_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15158, "hatch.energytunnel3.tier.13", "UXV 4096A/t Laser Target Hatch", 13, 4096) - .getStackForm(1L)); - eM_energyTunnel4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15168, "hatch.energytunnel4.tier.13", "UXV 16384A/t Laser Target Hatch", 13, 16384) - .getStackForm(1L)); - eM_energyTunnel5_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15178, "hatch.energytunnel5.tier.13", "UXV 65536A/t Laser Target Hatch", 13, 65536) - .getStackForm(1L)); - eM_energyTunnel6_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15188, "hatch.energytunnel6.tier.13", "UXV 262144A/t Laser Target Hatch", 13, 262144) - .getStackForm(1L)); - eM_energyTunnel7_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15198, "hatch.energytunnel7.tier.13", "UXV 1048576A/t Laser Target Hatch", 13, 1048576) - .getStackForm(1L)); - eM_energyTunnel9001.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15199, "hatch.energytunnel.tier.14", "Legendary Laser Target Hatch", 13, (int) V[13]) - .getStackForm(1L)); + eM_energyTunnel1_IV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15130, + "hatch.energytunnel1.tier.05", + "IV 256A/t Laser Target Hatch", + 5, + 256).getStackForm(1L)); + eM_energyTunnel2_IV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15140, + "hatch.energytunnel2.tier.05", + "IV 1024A/t Laser Target Hatch", + 5, + 1024).getStackForm(1L)); + eM_energyTunnel3_IV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15150, + "hatch.energytunnel3.tier.05", + "IV 4096A/t Laser Target Hatch", + 5, + 4096).getStackForm(1L)); + eM_energyTunnel4_IV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15160, + "hatch.energytunnel4.tier.05", + "IV 16384A/t Laser Target Hatch", + 5, + 16384).getStackForm(1L)); + eM_energyTunnel5_IV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15170, + "hatch.energytunnel5.tier.05", + "IV 65536A/t Laser Target Hatch", + 5, + 65536).getStackForm(1L)); + eM_energyTunnel6_IV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15180, + "hatch.energytunnel6.tier.05", + "IV 262144A/t Laser Target Hatch", + 5, + 262144).getStackForm(1L)); + eM_energyTunnel7_IV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15190, + "hatch.energytunnel7.tier.05", + "IV 1048576A/t Laser Target Hatch", + 5, + 1048576).getStackForm(1L)); + + eM_energyTunnel1_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15131, + "hatch.energytunnel1.tier.06", + "LuV 256A/t Laser Target Hatch", + 6, + 256).getStackForm(1L)); + eM_energyTunnel2_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15141, + "hatch.energytunnel2.tier.06", + "LuV 1024A/t Laser Target Hatch", + 6, + 1024).getStackForm(1L)); + eM_energyTunnel3_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15151, + "hatch.energytunnel3.tier.06", + "LuV 4096A/t Laser Target Hatch", + 6, + 4096).getStackForm(1L)); + eM_energyTunnel4_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15161, + "hatch.energytunnel4.tier.06", + "LuV 16384A/t Laser Target Hatch", + 6, + 16384).getStackForm(1L)); + eM_energyTunnel5_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15171, + "hatch.energytunnel5.tier.06", + "LuV 65536A/t Laser Target Hatch", + 6, + 65536).getStackForm(1L)); + eM_energyTunnel6_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15181, + "hatch.energytunnel6.tier.06", + "LuV 262144A/t Laser Target Hatch", + 6, + 262144).getStackForm(1L)); + eM_energyTunnel7_LuV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15191, + "hatch.energytunnel7.tier.06", + "LuV 1048576A/t Laser Target Hatch", + 6, + 1048576).getStackForm(1L)); + + eM_energyTunnel1_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15132, + "hatch.energytunnel1.tier.07", + "ZPM 256A/t Laser Target Hatch", + 7, + 256).getStackForm(1L)); + eM_energyTunnel2_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15142, + "hatch.energytunnel2.tier.07", + "ZPM 1024A/t Laser Target Hatch", + 7, + 1024).getStackForm(1L)); + eM_energyTunnel3_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15152, + "hatch.energytunnel3.tier.07", + "ZPM 4096A/t Laser Target Hatch", + 7, + 4096).getStackForm(1L)); + eM_energyTunnel4_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15162, + "hatch.energytunnel4.tier.07", + "ZPM 16384A/t Laser Target Hatch", + 7, + 16384).getStackForm(1L)); + eM_energyTunnel5_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15172, + "hatch.energytunnel5.tier.07", + "ZPM 65536A/t Laser Target Hatch", + 7, + 65536).getStackForm(1L)); + eM_energyTunnel6_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15182, + "hatch.energytunnel6.tier.07", + "ZPM 262144A/t Laser Target Hatch", + 7, + 262144).getStackForm(1L)); + eM_energyTunnel7_ZPM.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15192, + "hatch.energytunnel7.tier.07", + "ZPM 1048576A/t Laser Target Hatch", + 7, + 1048576).getStackForm(1L)); + + eM_energyTunnel1_UV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15133, + "hatch.energytunnel1.tier.08", + "UV 256A/t Laser Target Hatch", + 8, + 256).getStackForm(1L)); + eM_energyTunnel2_UV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15143, + "hatch.energytunnel2.tier.08", + "UV 1024A/t Laser Target Hatch", + 8, + 1024).getStackForm(1L)); + eM_energyTunnel3_UV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15153, + "hatch.energytunnel3.tier.08", + "UV 4096A/t Laser Target Hatch", + 8, + 4096).getStackForm(1L)); + eM_energyTunnel4_UV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15163, + "hatch.energytunnel4.tier.08", + "UV 16384A/t Laser Target Hatch", + 8, + 16384).getStackForm(1L)); + eM_energyTunnel5_UV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15173, + "hatch.energytunnel5.tier.08", + "UV 65536A/t Laser Target Hatch", + 8, + 65536).getStackForm(1L)); + eM_energyTunnel6_UV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15183, + "hatch.energytunnel6.tier.08", + "UV 262144A/t Laser Target Hatch", + 8, + 262144).getStackForm(1L)); + eM_energyTunnel7_UV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15193, + "hatch.energytunnel7.tier.08", + "UV 1048576A/t Laser Target Hatch", + 8, + 1048576).getStackForm(1L)); + + eM_energyTunnel1_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15134, + "hatch.energytunnel1.tier.09", + "UHV 256A/t Laser Target Hatch", + 9, + 256).getStackForm(1L)); + eM_energyTunnel2_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15144, + "hatch.energytunnel2.tier.09", + "UHV 1024A/t Laser Target Hatch", + 9, + 1024).getStackForm(1L)); + eM_energyTunnel3_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15154, + "hatch.energytunnel3.tier.09", + "UHV 4096A/t Laser Target Hatch", + 9, + 4096).getStackForm(1L)); + eM_energyTunnel4_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15164, + "hatch.energytunnel4.tier.09", + "UHV 16384A/t Laser Target Hatch", + 9, + 16384).getStackForm(1L)); + eM_energyTunnel5_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15174, + "hatch.energytunnel5.tier.09", + "UHV 65536A/t Laser Target Hatch", + 9, + 65536).getStackForm(1L)); + eM_energyTunnel6_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15184, + "hatch.energytunnel6.tier.09", + "UHV 262144A/t Laser Target Hatch", + 9, + 262144).getStackForm(1L)); + eM_energyTunnel7_UHV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15194, + "hatch.energytunnel7.tier.09", + "UHV 1048576A/t Laser Target Hatch", + 9, + 1048576).getStackForm(1L)); + + eM_energyTunnel1_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15135, + "hatch.energytunnel1.tier.10", + "UEV 256A/t Laser Target Hatch", + 10, + 256).getStackForm(1L)); + eM_energyTunnel2_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15145, + "hatch.energytunnel2.tier.10", + "UEV 1024A/t Laser Target Hatch", + 10, + 1024).getStackForm(1L)); + eM_energyTunnel3_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15155, + "hatch.energytunnel3.tier.10", + "UEV 4096A/t Laser Target Hatch", + 10, + 4096).getStackForm(1L)); + eM_energyTunnel4_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15165, + "hatch.energytunnel4.tier.10", + "UEV 16384A/t Laser Target Hatch", + 10, + 16384).getStackForm(1L)); + eM_energyTunnel5_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15175, + "hatch.energytunnel5.tier.10", + "UEV 65536A/t Laser Target Hatch", + 10, + 65536).getStackForm(1L)); + eM_energyTunnel6_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15185, + "hatch.energytunnel6.tier.10", + "UEV 262144A/t Laser Target Hatch", + 10, + 262144).getStackForm(1L)); + eM_energyTunnel7_UEV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15195, + "hatch.energytunnel7.tier.10", + "UEV 1048576A/t Laser Target Hatch", + 10, + 1048576).getStackForm(1L)); + + eM_energyTunnel1_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15136, + "hatch.energytunnel1.tier.11", + "UIV 256A/t Laser Target Hatch", + 11, + 256).getStackForm(1L)); + eM_energyTunnel2_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15146, + "hatch.energytunnel2.tier.11", + "UIV 1024A/t Laser Target Hatch", + 11, + 1024).getStackForm(1L)); + eM_energyTunnel3_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15156, + "hatch.energytunnel3.tier.11", + "UIV 4096A/t Laser Target Hatch", + 11, + 4096).getStackForm(1L)); + eM_energyTunnel4_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15166, + "hatch.energytunnel4.tier.11", + "UIV 16384A/t Laser Target Hatch", + 11, + 16384).getStackForm(1L)); + eM_energyTunnel5_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15176, + "hatch.energytunnel5.tier.11", + "UIV 65536A/t Laser Target Hatch", + 11, + 65536).getStackForm(1L)); + eM_energyTunnel6_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15186, + "hatch.energytunnel6.tier.11", + "UIV 262144A/t Laser Target Hatch", + 11, + 262144).getStackForm(1L)); + eM_energyTunnel7_UIV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15196, + "hatch.energytunnel7.tier.11", + "UIV 1048576A/t Laser Target Hatch", + 11, + 1048576).getStackForm(1L)); + + eM_energyTunnel1_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15137, + "hatch.energytunnel1.tier.12", + "UMV 256A/t Laser Target Hatch", + 12, + 256).getStackForm(1L)); + eM_energyTunnel2_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15147, + "hatch.energytunnel2.tier.12", + "UMV 1024A/t Laser Target Hatch", + 12, + 1024).getStackForm(1L)); + eM_energyTunnel3_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15157, + "hatch.energytunnel3.tier.12", + "UMV 4096A/t Laser Target Hatch", + 12, + 4096).getStackForm(1L)); + eM_energyTunnel4_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15167, + "hatch.energytunnel4.tier.12", + "UMV 16384A/t Laser Target Hatch", + 12, + 16384).getStackForm(1L)); + eM_energyTunnel5_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15177, + "hatch.energytunnel5.tier.12", + "UMV 65536A/t Laser Target Hatch", + 12, + 65536).getStackForm(1L)); + eM_energyTunnel6_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15187, + "hatch.energytunnel6.tier.12", + "UMV 262144A/t Laser Target Hatch", + 12, + 262144).getStackForm(1L)); + eM_energyTunnel7_UMV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15197, + "hatch.energytunnel7.tier.12", + "UMV 1048576A/t Laser Target Hatch", + 12, + 1048576).getStackForm(1L)); + + eM_energyTunnel1_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15138, + "hatch.energytunnel1.tier.13", + "UXV 256A/t Laser Target Hatch", + 13, + 256).getStackForm(1L)); + eM_energyTunnel2_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15148, + "hatch.energytunnel2.tier.13", + "UXV 1024A/t Laser Target Hatch", + 13, + 1024).getStackForm(1L)); + eM_energyTunnel3_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15158, + "hatch.energytunnel3.tier.13", + "UXV 4096A/t Laser Target Hatch", + 13, + 4096).getStackForm(1L)); + eM_energyTunnel4_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15168, + "hatch.energytunnel4.tier.13", + "UXV 16384A/t Laser Target Hatch", + 13, + 16384).getStackForm(1L)); + eM_energyTunnel5_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15178, + "hatch.energytunnel5.tier.13", + "UXV 65536A/t Laser Target Hatch", + 13, + 65536).getStackForm(1L)); + eM_energyTunnel6_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15188, + "hatch.energytunnel6.tier.13", + "UXV 262144A/t Laser Target Hatch", + 13, + 262144).getStackForm(1L)); + eM_energyTunnel7_UXV.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15198, + "hatch.energytunnel7.tier.13", + "UXV 1048576A/t Laser Target Hatch", + 13, + 1048576).getStackForm(1L)); + eM_energyTunnel9001.set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15199, + "hatch.energytunnel.tier.14", + "Legendary Laser Target Hatch", + 13, + (int) V[13]).getStackForm(1L)); // =================================================================================================== // Multi AMP Power OUTPUTS // =================================================================================================== - eM_dynamoMulti4_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15209, "hatch.dynamomulti04.tier.04", "EV 4A Dynamo Hatch", 4, 4) - .getStackForm(1L)); - eM_dynamoMulti16_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15219, "hatch.dynamomulti16.tier.04", "EV 16A Dynamo Hatch", 4, 16) - .getStackForm(1L)); - eM_dynamoMulti64_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15229, "hatch.dynamomulti64.tier.04", "EV 64A Dynamo Hatch", 4, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo Hatch", 5, 4) - .getStackForm(1L)); - eM_dynamoMulti16_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15210, "hatch.dynamomulti16.tier.05", "IV 16A Dynamo Hatch", 5, 16) - .getStackForm(1L)); - eM_dynamoMulti64_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15220, "hatch.dynamomulti64.tier.05", "IV 64A Dynamo Hatch", 5, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15201, "hatch.dynamomulti04.tier.06", "LuV 4A Dynamo Hatch", 6, 4) - .getStackForm(1L)); - eM_dynamoMulti16_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15211, "hatch.dynamomulti16.tier.06", "LuV 16A Dynamo Hatch", 6, 16) - .getStackForm(1L)); - eM_dynamoMulti64_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15221, "hatch.dynamomulti64.tier.06", "LuV 64A Dynamo Hatch", 6, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15202, "hatch.dynamomulti04.tier.07", "ZPM 4A Dynamo Hatch", 7, 4) - .getStackForm(1L)); - eM_dynamoMulti16_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15212, "hatch.dynamomulti16.tier.07", "ZPM 16A Dynamo Hatch", 7, 16) - .getStackForm(1L)); - eM_dynamoMulti64_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15222, "hatch.dynamomulti64.tier.07", "ZPM 64A Dynamo Hatch", 7, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15203, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch", 8, 4) - .getStackForm(1L)); - eM_dynamoMulti16_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15213, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch", 8, 16) - .getStackForm(1L)); - eM_dynamoMulti64_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15223, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch", 8, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15204, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch", 9, 4) - .getStackForm(1L)); - eM_dynamoMulti16_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15214, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch", 9, 16) - .getStackForm(1L)); - eM_dynamoMulti64_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15224, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch", 9, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15205, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch", 10, 4) - .getStackForm(1L)); - eM_dynamoMulti16_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15215, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch", 10, 16) - .getStackForm(1L)); - eM_dynamoMulti64_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15225, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch", 10, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15206, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch", 11, 4) - .getStackForm(1L)); - eM_dynamoMulti16_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15216, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch", 11, 16) - .getStackForm(1L)); - eM_dynamoMulti64_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15226, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch", 11, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15207, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch", 12, 4) - .getStackForm(1L)); - eM_dynamoMulti16_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15217, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch", 12, 16) - .getStackForm(1L)); - eM_dynamoMulti64_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15227, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch", 12, 64) - .getStackForm(1L)); - - eM_dynamoMulti4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15208, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch", 13, 4) - .getStackForm(1L)); - eM_dynamoMulti16_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15218, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch", 13, 16) - .getStackForm(1L)); - eM_dynamoMulti64_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15228, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, 64) - .getStackForm(1L)); + eM_dynamoMulti4_EV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15209, + "hatch.dynamomulti04.tier.04", + "EV 4A Dynamo Hatch", + 4, + 4).getStackForm(1L)); + eM_dynamoMulti16_EV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15219, + "hatch.dynamomulti16.tier.04", + "EV 16A Dynamo Hatch", + 4, + 16).getStackForm(1L)); + eM_dynamoMulti64_EV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15229, + "hatch.dynamomulti64.tier.04", + "EV 64A Dynamo Hatch", + 4, + 64).getStackForm(1L)); + + eM_dynamoMulti4_IV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15200, + "hatch.dynamomulti04.tier.05", + "IV 4A Dynamo Hatch", + 5, + 4).getStackForm(1L)); + eM_dynamoMulti16_IV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15210, + "hatch.dynamomulti16.tier.05", + "IV 16A Dynamo Hatch", + 5, + 16).getStackForm(1L)); + eM_dynamoMulti64_IV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15220, + "hatch.dynamomulti64.tier.05", + "IV 64A Dynamo Hatch", + 5, + 64).getStackForm(1L)); + + eM_dynamoMulti4_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15201, + "hatch.dynamomulti04.tier.06", + "LuV 4A Dynamo Hatch", + 6, + 4).getStackForm(1L)); + eM_dynamoMulti16_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15211, + "hatch.dynamomulti16.tier.06", + "LuV 16A Dynamo Hatch", + 6, + 16).getStackForm(1L)); + eM_dynamoMulti64_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15221, + "hatch.dynamomulti64.tier.06", + "LuV 64A Dynamo Hatch", + 6, + 64).getStackForm(1L)); + + eM_dynamoMulti4_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15202, + "hatch.dynamomulti04.tier.07", + "ZPM 4A Dynamo Hatch", + 7, + 4).getStackForm(1L)); + eM_dynamoMulti16_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15212, + "hatch.dynamomulti16.tier.07", + "ZPM 16A Dynamo Hatch", + 7, + 16).getStackForm(1L)); + eM_dynamoMulti64_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15222, + "hatch.dynamomulti64.tier.07", + "ZPM 64A Dynamo Hatch", + 7, + 64).getStackForm(1L)); + + eM_dynamoMulti4_UV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15203, + "hatch.dynamomulti04.tier.08", + "UV 4A Dynamo Hatch", + 8, + 4).getStackForm(1L)); + eM_dynamoMulti16_UV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15213, + "hatch.dynamomulti16.tier.08", + "UV 16A Dynamo Hatch", + 8, + 16).getStackForm(1L)); + eM_dynamoMulti64_UV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15223, + "hatch.dynamomulti64.tier.08", + "UV 64A Dynamo Hatch", + 8, + 64).getStackForm(1L)); + + eM_dynamoMulti4_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15204, + "hatch.dynamomulti04.tier.09", + "UHV 4A Dynamo Hatch", + 9, + 4).getStackForm(1L)); + eM_dynamoMulti16_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15214, + "hatch.dynamomulti16.tier.09", + "UHV 16A Dynamo Hatch", + 9, + 16).getStackForm(1L)); + eM_dynamoMulti64_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15224, + "hatch.dynamomulti64.tier.09", + "UHV 64A Dynamo Hatch", + 9, + 64).getStackForm(1L)); + + eM_dynamoMulti4_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15205, + "hatch.dynamomulti04.tier.10", + "UEV 4A Dynamo Hatch", + 10, + 4).getStackForm(1L)); + eM_dynamoMulti16_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15215, + "hatch.dynamomulti16.tier.10", + "UEV 16A Dynamo Hatch", + 10, + 16).getStackForm(1L)); + eM_dynamoMulti64_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15225, + "hatch.dynamomulti64.tier.10", + "UEV 64A Dynamo Hatch", + 10, + 64).getStackForm(1L)); + + eM_dynamoMulti4_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15206, + "hatch.dynamomulti04.tier.11", + "UIV 4A Dynamo Hatch", + 11, + 4).getStackForm(1L)); + eM_dynamoMulti16_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15216, + "hatch.dynamomulti16.tier.11", + "UIV 16A Dynamo Hatch", + 11, + 16).getStackForm(1L)); + eM_dynamoMulti64_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15226, + "hatch.dynamomulti64.tier.11", + "UIV 64A Dynamo Hatch", + 11, + 64).getStackForm(1L)); + + eM_dynamoMulti4_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15207, + "hatch.dynamomulti04.tier.12", + "UMV 4A Dynamo Hatch", + 12, + 4).getStackForm(1L)); + eM_dynamoMulti16_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15217, + "hatch.dynamomulti16.tier.12", + "UMV 16A Dynamo Hatch", + 12, + 16).getStackForm(1L)); + eM_dynamoMulti64_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15227, + "hatch.dynamomulti64.tier.12", + "UMV 64A Dynamo Hatch", + 12, + 64).getStackForm(1L)); + + eM_dynamoMulti4_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15208, + "hatch.dynamomulti04.tier.13", + "UXV 4A Dynamo Hatch", + 13, + 4).getStackForm(1L)); + eM_dynamoMulti16_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15218, + "hatch.dynamomulti16.tier.13", + "UXV 16A Dynamo Hatch", + 13, + 16).getStackForm(1L)); + eM_dynamoMulti64_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoMulti( + 15228, + "hatch.dynamomulti64.tier.13", + "UXV 64A Dynamo Hatch", + 13, + 64).getStackForm(1L)); // =================================================================================================== // Multi AMP Laser OUTPUTS // =================================================================================================== - eM_dynamoTunnel1_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15230, "hatch.dynamotunnel1.tier.05", "IV 256A/t Laser Source Hatch", 5, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15240, "hatch.dynamotunnel2.tier.05", "IV 1024A/t Laser Source Hatch", 5, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15250, "hatch.dynamotunnel3.tier.05", "IV 4096A/t Laser Source Hatch", 5, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15260, "hatch.dynamotunnel4.tier.05", "IV 16384A/t Laser Source Hatch", 5, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15270, "hatch.dynamotunnel5.tier.05", "IV 65536A/t Laser Source Hatch", 5, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15280, "hatch.dynamotunnel6.tier.05", "IV 262144A/t Laser Source Hatch", 5, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15290, "hatch.dynamotunnel7.tier.05", "IV 1048576A/t Laser Source Hatch", 5, 1048576) - .getStackForm(1L)); - - eM_dynamoTunnel1_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15231, "hatch.dynamotunnel1.tier.06", "LuV 256A/t Laser Source Hatch", 6, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15241, "hatch.dynamotunnel2.tier.06", "LuV 1024A/t Laser Source Hatch", 6, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15251, "hatch.dynamotunnel3.tier.06", "LuV 4096A/t Laser Source Hatch", 6, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15261, "hatch.dynamotunnel4.tier.06", "LuV 16384A/t Laser Source Hatch", 6, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15271, "hatch.dynamotunnel5.tier.06", "LuV 65536A/t Laser Source Hatch", 6, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15281, "hatch.dynamotunnel6.tier.06", "LuV 262144A/t Laser Source Hatch", 6, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15291, "hatch.dynamotunnel7.tier.06", "LuV 1048576A/t Laser Source Hatch", 6, 1048576) - .getStackForm(1L)); - - eM_dynamoTunnel1_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15232, "hatch.dynamotunnel1.tier.07", "ZPM 256A/t Laser Source Hatch", 7, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15242, "hatch.dynamotunnel2.tier.07", "ZPM 1024A/t Laser Source Hatch", 7, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15252, "hatch.dynamotunnel3.tier.07", "ZPM 4096A/t Laser Source Hatch", 7, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15262, "hatch.dynamotunnel4.tier.07", "ZPM 16384A/t Laser Source Hatch", 7, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15272, "hatch.dynamotunnel5.tier.07", "ZPM 65536A/t Laser Source Hatch", 7, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15282, "hatch.dynamotunnel6.tier.07", "ZPM 262144A/t Laser Source Hatch", 7, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15292, "hatch.dynamotunnel7.tier.07", "ZPM 1048576A/t Laser Source Hatch", 7, 1048576) - .getStackForm(1L)); - - eM_dynamoTunnel1_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15233, "hatch.dynamotunnel1.tier.08", "UV 256A/t Laser Source Hatch", 8, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15243, "hatch.dynamotunnel2.tier.08", "UV 1024A/t Laser Source Hatch", 8, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15253, "hatch.dynamotunnel3.tier.08", "UV 4096A/t Laser Source Hatch", 8, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15263, "hatch.dynamotunnel4.tier.08", "UV 16384A/t Laser Source Hatch", 8, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15273, "hatch.dynamotunnel5.tier.08", "UV 65536A/t Laser Source Hatch", 8, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15283, "hatch.dynamotunnel6.tier.08", "UV 262144A/t Laser Source Hatch", 8, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15293, "hatch.dynamotunnel7.tier.08", "UV 1048576A/t Laser Source Hatch", 8, 1048576) - .getStackForm(1L)); - - eM_dynamoTunnel1_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15234, "hatch.dynamotunnel1.tier.09", "UHV 256A/t Laser Source Hatch", 9, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15244, "hatch.dynamotunnel2.tier.09", "UHV 1024A/t Laser Source Hatch", 9, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15254, "hatch.dynamotunnel3.tier.09", "UHV 4096A/t Laser Source Hatch", 9, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15264, "hatch.dynamotunnel4.tier.09", "UHV 16384A/t Laser Source Hatch", 9, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15274, "hatch.dynamotunnel5.tier.09", "UHV 65536A/t Laser Source Hatch", 9, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15284, "hatch.dynamotunnel6.tier.09", "UHV 262144A/t Laser Source Hatch", 9, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15294, "hatch.dynamotunnel7.tier.09", "UHV 1048576A/t Laser Source Hatch", 9, 1048576) - .getStackForm(1L)); - - eM_dynamoTunnel1_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15235, "hatch.dynamotunnel1.tier.10", "UEV 256A/t Laser Source Hatch", 10, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15245, "hatch.dynamotunnel2.tier.10", "UEV 1024A/t Laser Source Hatch", 10, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15255, "hatch.dynamotunnel3.tier.10", "UEV 4096A/t Laser Source Hatch", 10, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15265, "hatch.dynamotunnel4.tier.10", "UEV 16384A/t Laser Source Hatch", 10, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15275, "hatch.dynamotunnel5.tier.10", "UEV 65536A/t Laser Source Hatch", 10, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15285, "hatch.dynamotunnel6.tier.10", "UEV 262144A/t Laser Source Hatch", 10, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15295, "hatch.dynamotunnel7.tier.10", "UEV 1048576A/t Laser Source Hatch", 10, 1048576) - .getStackForm(1L)); - - eM_dynamoTunnel1_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15236, "hatch.dynamotunnel1.tier.11", "UIV 256A/t Laser Source Hatch", 11, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15246, "hatch.dynamotunnel2.tier.11", "UIV 1024A/t Laser Source Hatch", 11, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15256, "hatch.dynamotunnel3.tier.11", "UIV 4096A/t Laser Source Hatch", 11, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15266, "hatch.dynamotunnel4.tier.11", "UIV 16384A/t Laser Source Hatch", 11, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15276, "hatch.dynamotunnel5.tier.11", "UIV 65536A/t Laser Source Hatch", 11, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15286, "hatch.dynamotunnel6.tier.11", "UIV 262144A/t Laser Source Hatch", 11, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15296, "hatch.dynamotunnel7.tier.11", "UIV 1048576A/t Laser Source Hatch", 11, 1048576) - .getStackForm(1L)); - - eM_dynamoTunnel1_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15237, "hatch.dynamotunnel1.tier.12", "UMV 256A/t Laser Source Hatch", 12, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15247, "hatch.dynamotunnel2.tier.12", "UMV 1024A/t Laser Source Hatch", 12, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15257, "hatch.dynamotunnel3.tier.12", "UMV 4096A/t Laser Source Hatch", 12, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15267, "hatch.dynamotunnel4.tier.12", "UMV 16384A/t Laser Source Hatch", 12, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15277, "hatch.dynamotunnel5.tier.12", "UMV 65536A/t Laser Source Hatch", 12, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15287, "hatch.dynamotunnel6.tier.12", "UMV 262144A/t Laser Source Hatch", 12, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15297, "hatch.dynamotunnel7.tier.12", "UMV 1048576A/t Laser Source Hatch", 12, 1048576) - .getStackForm(1L)); - - eM_dynamoTunnel1_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15238, "hatch.dynamotunnel1.tier.13", "UXV 256A/t Laser Source Hatch", 13, 256) - .getStackForm(1L)); - eM_dynamoTunnel2_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15248, "hatch.dynamotunnel2.tier.13", "UXV 1024A/t Laser Source Hatch", 13, 1024) - .getStackForm(1L)); - eM_dynamoTunnel3_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15258, "hatch.dynamotunnel3.tier.13", "UXV 4096A/t Laser Source Hatch", 13, 4096) - .getStackForm(1L)); - eM_dynamoTunnel4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15268, "hatch.dynamotunnel4.tier.13", "UXV 16384A/t Laser Source Hatch", 13, 16384) - .getStackForm(1L)); - eM_dynamoTunnel5_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15278, "hatch.dynamotunnel5.tier.13", "UXV 65536A/t Laser Source Hatch", 13, 65536) - .getStackForm(1L)); - eM_dynamoTunnel6_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15288, "hatch.dynamotunnel6.tier.13", "UXV 262144A/t Laser Source Hatch", 13, 262144) - .getStackForm(1L)); - eM_dynamoTunnel7_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15298, "hatch.dynamotunnel7.tier.13", "UXV 1048576A/t Laser Source Hatch", 13, 1048576) - .getStackForm(1L)); - eM_dynamoTunnel9001.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15299, "hatch.dynamotunnel.tier.14", "Legendary Laser Source Hatch", 13, (int) V[13]) - .getStackForm(1L)); + eM_dynamoTunnel1_IV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15230, + "hatch.dynamotunnel1.tier.05", + "IV 256A/t Laser Source Hatch", + 5, + 256).getStackForm(1L)); + eM_dynamoTunnel2_IV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15240, + "hatch.dynamotunnel2.tier.05", + "IV 1024A/t Laser Source Hatch", + 5, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_IV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15250, + "hatch.dynamotunnel3.tier.05", + "IV 4096A/t Laser Source Hatch", + 5, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_IV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15260, + "hatch.dynamotunnel4.tier.05", + "IV 16384A/t Laser Source Hatch", + 5, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_IV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15270, + "hatch.dynamotunnel5.tier.05", + "IV 65536A/t Laser Source Hatch", + 5, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_IV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15280, + "hatch.dynamotunnel6.tier.05", + "IV 262144A/t Laser Source Hatch", + 5, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_IV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15290, + "hatch.dynamotunnel7.tier.05", + "IV 1048576A/t Laser Source Hatch", + 5, + 1048576).getStackForm(1L)); + + eM_dynamoTunnel1_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15231, + "hatch.dynamotunnel1.tier.06", + "LuV 256A/t Laser Source Hatch", + 6, + 256).getStackForm(1L)); + eM_dynamoTunnel2_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15241, + "hatch.dynamotunnel2.tier.06", + "LuV 1024A/t Laser Source Hatch", + 6, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15251, + "hatch.dynamotunnel3.tier.06", + "LuV 4096A/t Laser Source Hatch", + 6, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15261, + "hatch.dynamotunnel4.tier.06", + "LuV 16384A/t Laser Source Hatch", + 6, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15271, + "hatch.dynamotunnel5.tier.06", + "LuV 65536A/t Laser Source Hatch", + 6, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15281, + "hatch.dynamotunnel6.tier.06", + "LuV 262144A/t Laser Source Hatch", + 6, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15291, + "hatch.dynamotunnel7.tier.06", + "LuV 1048576A/t Laser Source Hatch", + 6, + 1048576).getStackForm(1L)); + + eM_dynamoTunnel1_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15232, + "hatch.dynamotunnel1.tier.07", + "ZPM 256A/t Laser Source Hatch", + 7, + 256).getStackForm(1L)); + eM_dynamoTunnel2_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15242, + "hatch.dynamotunnel2.tier.07", + "ZPM 1024A/t Laser Source Hatch", + 7, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15252, + "hatch.dynamotunnel3.tier.07", + "ZPM 4096A/t Laser Source Hatch", + 7, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15262, + "hatch.dynamotunnel4.tier.07", + "ZPM 16384A/t Laser Source Hatch", + 7, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15272, + "hatch.dynamotunnel5.tier.07", + "ZPM 65536A/t Laser Source Hatch", + 7, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15282, + "hatch.dynamotunnel6.tier.07", + "ZPM 262144A/t Laser Source Hatch", + 7, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15292, + "hatch.dynamotunnel7.tier.07", + "ZPM 1048576A/t Laser Source Hatch", + 7, + 1048576).getStackForm(1L)); + + eM_dynamoTunnel1_UV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15233, + "hatch.dynamotunnel1.tier.08", + "UV 256A/t Laser Source Hatch", + 8, + 256).getStackForm(1L)); + eM_dynamoTunnel2_UV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15243, + "hatch.dynamotunnel2.tier.08", + "UV 1024A/t Laser Source Hatch", + 8, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_UV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15253, + "hatch.dynamotunnel3.tier.08", + "UV 4096A/t Laser Source Hatch", + 8, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_UV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15263, + "hatch.dynamotunnel4.tier.08", + "UV 16384A/t Laser Source Hatch", + 8, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_UV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15273, + "hatch.dynamotunnel5.tier.08", + "UV 65536A/t Laser Source Hatch", + 8, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_UV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15283, + "hatch.dynamotunnel6.tier.08", + "UV 262144A/t Laser Source Hatch", + 8, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_UV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15293, + "hatch.dynamotunnel7.tier.08", + "UV 1048576A/t Laser Source Hatch", + 8, + 1048576).getStackForm(1L)); + + eM_dynamoTunnel1_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15234, + "hatch.dynamotunnel1.tier.09", + "UHV 256A/t Laser Source Hatch", + 9, + 256).getStackForm(1L)); + eM_dynamoTunnel2_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15244, + "hatch.dynamotunnel2.tier.09", + "UHV 1024A/t Laser Source Hatch", + 9, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15254, + "hatch.dynamotunnel3.tier.09", + "UHV 4096A/t Laser Source Hatch", + 9, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15264, + "hatch.dynamotunnel4.tier.09", + "UHV 16384A/t Laser Source Hatch", + 9, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15274, + "hatch.dynamotunnel5.tier.09", + "UHV 65536A/t Laser Source Hatch", + 9, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15284, + "hatch.dynamotunnel6.tier.09", + "UHV 262144A/t Laser Source Hatch", + 9, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_UHV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15294, + "hatch.dynamotunnel7.tier.09", + "UHV 1048576A/t Laser Source Hatch", + 9, + 1048576).getStackForm(1L)); + + eM_dynamoTunnel1_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15235, + "hatch.dynamotunnel1.tier.10", + "UEV 256A/t Laser Source Hatch", + 10, + 256).getStackForm(1L)); + eM_dynamoTunnel2_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15245, + "hatch.dynamotunnel2.tier.10", + "UEV 1024A/t Laser Source Hatch", + 10, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15255, + "hatch.dynamotunnel3.tier.10", + "UEV 4096A/t Laser Source Hatch", + 10, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15265, + "hatch.dynamotunnel4.tier.10", + "UEV 16384A/t Laser Source Hatch", + 10, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15275, + "hatch.dynamotunnel5.tier.10", + "UEV 65536A/t Laser Source Hatch", + 10, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15285, + "hatch.dynamotunnel6.tier.10", + "UEV 262144A/t Laser Source Hatch", + 10, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_UEV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15295, + "hatch.dynamotunnel7.tier.10", + "UEV 1048576A/t Laser Source Hatch", + 10, + 1048576).getStackForm(1L)); + + eM_dynamoTunnel1_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15236, + "hatch.dynamotunnel1.tier.11", + "UIV 256A/t Laser Source Hatch", + 11, + 256).getStackForm(1L)); + eM_dynamoTunnel2_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15246, + "hatch.dynamotunnel2.tier.11", + "UIV 1024A/t Laser Source Hatch", + 11, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15256, + "hatch.dynamotunnel3.tier.11", + "UIV 4096A/t Laser Source Hatch", + 11, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15266, + "hatch.dynamotunnel4.tier.11", + "UIV 16384A/t Laser Source Hatch", + 11, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15276, + "hatch.dynamotunnel5.tier.11", + "UIV 65536A/t Laser Source Hatch", + 11, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15286, + "hatch.dynamotunnel6.tier.11", + "UIV 262144A/t Laser Source Hatch", + 11, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_UIV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15296, + "hatch.dynamotunnel7.tier.11", + "UIV 1048576A/t Laser Source Hatch", + 11, + 1048576).getStackForm(1L)); + + eM_dynamoTunnel1_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15237, + "hatch.dynamotunnel1.tier.12", + "UMV 256A/t Laser Source Hatch", + 12, + 256).getStackForm(1L)); + eM_dynamoTunnel2_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15247, + "hatch.dynamotunnel2.tier.12", + "UMV 1024A/t Laser Source Hatch", + 12, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15257, + "hatch.dynamotunnel3.tier.12", + "UMV 4096A/t Laser Source Hatch", + 12, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15267, + "hatch.dynamotunnel4.tier.12", + "UMV 16384A/t Laser Source Hatch", + 12, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15277, + "hatch.dynamotunnel5.tier.12", + "UMV 65536A/t Laser Source Hatch", + 12, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15287, + "hatch.dynamotunnel6.tier.12", + "UMV 262144A/t Laser Source Hatch", + 12, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_UMV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15297, + "hatch.dynamotunnel7.tier.12", + "UMV 1048576A/t Laser Source Hatch", + 12, + 1048576).getStackForm(1L)); + + eM_dynamoTunnel1_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15238, + "hatch.dynamotunnel1.tier.13", + "UXV 256A/t Laser Source Hatch", + 13, + 256).getStackForm(1L)); + eM_dynamoTunnel2_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15248, + "hatch.dynamotunnel2.tier.13", + "UXV 1024A/t Laser Source Hatch", + 13, + 1024).getStackForm(1L)); + eM_dynamoTunnel3_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15258, + "hatch.dynamotunnel3.tier.13", + "UXV 4096A/t Laser Source Hatch", + 13, + 4096).getStackForm(1L)); + eM_dynamoTunnel4_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15268, + "hatch.dynamotunnel4.tier.13", + "UXV 16384A/t Laser Source Hatch", + 13, + 16384).getStackForm(1L)); + eM_dynamoTunnel5_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15278, + "hatch.dynamotunnel5.tier.13", + "UXV 65536A/t Laser Source Hatch", + 13, + 65536).getStackForm(1L)); + eM_dynamoTunnel6_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15288, + "hatch.dynamotunnel6.tier.13", + "UXV 262144A/t Laser Source Hatch", + 13, + 262144).getStackForm(1L)); + eM_dynamoTunnel7_UXV.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15298, + "hatch.dynamotunnel7.tier.13", + "UXV 1048576A/t Laser Source Hatch", + 13, + 1048576).getStackForm(1L)); + eM_dynamoTunnel9001.set( + new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15299, + "hatch.dynamotunnel.tier.14", + "Legendary Laser Source Hatch", + 13, + (int) V[13]).getStackForm(1L)); // =================================================================================================== // MULTIBLOCKS @@ -824,9 +1600,11 @@ public class MachineLoader implements Runnable { Machine_Multi_EssentiaToEM.set( new GT_MetaTileEntity_EM_essentiaQuantizer(15323, "multimachine.em.essentiatoem", "Essentia Quantizer") .getStackForm(1L)); - Machine_Multi_EMToEssentia.set(new GT_MetaTileEntity_EM_essentiaDequantizer( - 15324, "multimachine.em.emtoessentia", "Essentia Dequantizer") - .getStackForm(1L)); + Machine_Multi_EMToEssentia.set( + new GT_MetaTileEntity_EM_essentiaDequantizer( + 15324, + "multimachine.em.emtoessentia", + "Essentia Dequantizer").getStackForm(1L)); Machine_Multi_Scanner.set( new GT_MetaTileEntity_EM_scanner(15330, "multimachine.em.scanner", "Elemental Scanner") @@ -854,8 +1632,8 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_EM_stabilizer(15380, "multimachine.em.stabilizer", "Elemental Stabilizer") .getStackForm(1L)); - Machine_Multi_Wormhole.set( - new GT_MetaTileEntity_EM_wormhole(15390, "multimachine.em.wormhole", "Wormhole").getStackForm(1L)); + Machine_Multi_Wormhole + .set(new GT_MetaTileEntity_EM_wormhole(15390, "multimachine.em.wormhole", "Wormhole").getStackForm(1L)); Machine_Multi_Decay.set( new GT_MetaTileEntity_EM_decay(15400, "multimachine.em.decay", "Decay Generator").getStackForm(1L)); @@ -870,8 +1648,20 @@ public class MachineLoader implements Runnable { // Hatches // =================================================================================================== - Parametrizer_Hatch.set(new GT_MetaTileEntity_Hatch_Param(15420, "hatch.param.tier.05", "Parametrizer", 5) - .getStackForm(1L)); // TODO refactor aName to hatch.param.tier.04 and aTier to 4, check recipe for NH + Parametrizer_Hatch.set( + new GT_MetaTileEntity_Hatch_Param(15420, "hatch.param.tier.05", "Parametrizer", 5).getStackForm(1L)); // TODO + // refactor + // aName + // to + // hatch.param.tier.04 + // and + // aTier + // to + // 4, + // check + // recipe + // for + // NH ParametrizerX_Hatch.set( new GT_MetaTileEntity_Hatch_Param(15421, "hatch.param.tier.07", "Parametrizer X", 7).getStackForm(1L)); ParametrizerTXT_Hatch.set( @@ -891,12 +1681,18 @@ public class MachineLoader implements Runnable { dataOut_Hatch.set( new GT_MetaTileEntity_Hatch_OutputData(15441, "hatch.dataout.tier.07", "Optical Master Connector", 7) .getStackForm(1L)); - dataInAss_Hatch.set(new GT_MetaTileEntity_Hatch_InputDataItems( - 15442, "hatch.datainass.tier.07", "Assembly line Slave Connector", 7) - .getStackForm(1L)); - dataOutAss_Hatch.set(new GT_MetaTileEntity_Hatch_OutputDataItems( - 15443, "hatch.dataoutass.tier.07", "Data Bank Master Connector", 7) - .getStackForm(1L)); + dataInAss_Hatch.set( + new GT_MetaTileEntity_Hatch_InputDataItems( + 15442, + "hatch.datainass.tier.07", + "Assembly line Slave Connector", + 7).getStackForm(1L)); + dataOutAss_Hatch.set( + new GT_MetaTileEntity_Hatch_OutputDataItems( + 15443, + "hatch.dataoutass.tier.07", + "Data Bank Master Connector", + 7).getStackForm(1L)); rack_Hatch.set( new GT_MetaTileEntity_Hatch_Rack(15450, "hatch.rack.tier.08", "Computer Rack", 8).getStackForm(1L)); @@ -954,18 +1750,24 @@ public class MachineLoader implements Runnable { Machine_BuckConverter_UHV.set( new GT_MetaTileEntity_BuckConverter(15489, "machine.tt.buck.09", "Highly Ultimate Buck Converter", 9) .getStackForm(1L)); - Machine_BuckConverter_UEV.set(new GT_MetaTileEntity_BuckConverter( - 15490, "machine.tt.buck.10", "Extremely Ultimate Buck Converter", 10) - .getStackForm(1L)); + Machine_BuckConverter_UEV.set( + new GT_MetaTileEntity_BuckConverter( + 15490, + "machine.tt.buck.10", + "Extremely Ultimate Buck Converter", + 10).getStackForm(1L)); Machine_BuckConverter_UIV.set( new GT_MetaTileEntity_BuckConverter(15491, "machine.tt.buck.11", "Insanely Ultimate Buck Converter", 11) .getStackForm(1L)); Machine_BuckConverter_UMV.set( new GT_MetaTileEntity_BuckConverter(15492, "machine.tt.buck.12", "Mega Ultimate Buck Converter", 12) .getStackForm(1L)); - Machine_BuckConverter_UXV.set(new GT_MetaTileEntity_BuckConverter( - 15493, "machine.tt.buck.13", "Extended Mega Ultimate Buck Converter", 13) - .getStackForm(1L)); + Machine_BuckConverter_UXV.set( + new GT_MetaTileEntity_BuckConverter( + 15493, + "machine.tt.buck.13", + "Extended Mega Ultimate Buck Converter", + 13).getStackForm(1L)); // =================================================================================================== // Tesla Transceiver @@ -1041,11 +1843,15 @@ public class MachineLoader implements Runnable { Machine_DebugPollutor.set( new GT_MetaTileEntity_DebugPollutor(15495, "debug.tt.pollutor", "Debug Pollution Generator", 14) .getStackForm(1)); - hatch_CreativeData.set(new GT_MetaTileEntity_Hatch_CreativeData(15496, "debug.tt.data", "Debug Data Hatch", 14) - .getStackForm(1)); - hatch_CreativeMaintenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance( - 15497, "debug.tt.maintenance", "Auto-Taping Maintenance Hatch", 14) - .getStackForm(1L)); + hatch_CreativeData.set( + new GT_MetaTileEntity_Hatch_CreativeData(15496, "debug.tt.data", "Debug Data Hatch", 14) + .getStackForm(1)); + hatch_CreativeMaintenance.set( + new GT_MetaTileEntity_Hatch_CreativeMaintenance( + 15497, + "debug.tt.maintenance", + "Auto-Taping Maintenance Hatch", + 14).getStackForm(1L)); Machine_DebugGenny.set( new GT_MetaTileEntity_DebugPowerGenerator(15498, "debug.tt.genny", "Debug Power Generator", 14) .getStackForm(1L)); 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 b817de7639..117f7309aa 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 @@ -12,6 +12,7 @@ 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 cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Textures; @@ -21,6 +22,7 @@ import gregtech.api.interfaces.ITexture; * Created by danie_000 on 16.11.2016. */ public class ThingsLoader implements Runnable { + @Override public void run() { diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java index 524ad51aa4..012b5f8b05 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java +++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java @@ -5,23 +5,11 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor import static com.github.technus.tectech.util.TT_Utility.crossProduct3D; import static com.github.technus.tectech.util.TT_Utility.normalize3D; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.loader.MainLoader; -import com.github.technus.tectech.loader.NetworkDispatcher; -import com.github.technus.tectech.mechanics.data.ChunkDataHandler; -import com.github.technus.tectech.mechanics.data.ChunkDataMessage; -import com.github.technus.tectech.mechanics.data.IChunkMetaDataHandler; -import com.github.technus.tectech.mechanics.data.PlayerDataMessage; -import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition; -import com.github.technus.tectech.util.TT_Utility; -import cpw.mods.fml.common.gameevent.TickEvent; -import gregtech.api.GregTech_API; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_Utility; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -35,16 +23,28 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.world.ChunkEvent; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.loader.MainLoader; +import com.github.technus.tectech.loader.NetworkDispatcher; +import com.github.technus.tectech.mechanics.data.ChunkDataHandler; +import com.github.technus.tectech.mechanics.data.ChunkDataMessage; +import com.github.technus.tectech.mechanics.data.IChunkMetaDataHandler; +import com.github.technus.tectech.mechanics.data.PlayerDataMessage; +import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition; +import com.github.technus.tectech.util.TT_Utility; + +import cpw.mods.fml.common.gameevent.TickEvent; +import gregtech.api.GregTech_API; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.util.GT_Utility; + public class AnomalyHandler implements IChunkMetaDataHandler { - private static final double SWAP_THRESHOLD = - EMAtomDefinition.getSomethingHeavy().getMass() - * 1000D - * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED; // can be const as it is computed later... + + private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D + * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED; // can be const as it is computed later... private static final int COUNT_DIV = 32; private static final double PER_PARTICLE = SWAP_THRESHOLD / COUNT_DIV; - private static final String INTENSITY = "intensity", - SPACE_CANCER = "space_cancer", - SPACE_CHARGE = "space_charge", + private static final String INTENSITY = "intensity", SPACE_CANCER = "space_cancer", SPACE_CHARGE = "space_charge", SPACE_MASS = "space_mass"; private static final int MEAN_DELAY = 50; private static final double CANCER_EFFECTIVENESS = 1 / EM_COUNT_PER_MATERIAL_AMOUNT; @@ -79,8 +79,8 @@ public class AnomalyHandler implements IChunkMetaDataHandler { ChunkDataHandler.ChunkHashMap chunkHashMap = data.get(dim); chunkHashMap.forEach((chunkCoordIntPair, compound) -> { if (compound.getDouble(INTENSITY) > SWAP_THRESHOLD) { - Chunk chunk = aEvent.world.getChunkFromChunkCoords( - chunkCoordIntPair.chunkXPos, chunkCoordIntPair.chunkZPos); + Chunk chunk = aEvent.world + .getChunkFromChunkCoords(chunkCoordIntPair.chunkXPos, chunkCoordIntPair.chunkZPos); if (chunk.isChunkLoaded) { worldDataArrayList.add(chunk); } @@ -93,9 +93,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler { ChunkCoordIntPair bCoords = b.getChunkCoordIntPair(); double newValue = (chunkHashMap.get(aCoords).getDouble(INTENSITY) - + chunkHashMap.get(bCoords).getDouble(INTENSITY)) - / 2 - - SWAP_THRESHOLD / 8; + + chunkHashMap.get(bCoords).getDouble(INTENSITY)) / 2 - SWAP_THRESHOLD / 8; float split = TecTech.RANDOM.nextFloat(); chunkHashMap.get(aCoords).setDouble(INTENSITY, newValue * split); @@ -114,8 +112,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler { } } if (playersWithCharge.size() > 0) { - outer: - for (EntityPlayer other : playersWithCharge) { + outer: for (EntityPlayer other : playersWithCharge) { double fieldOther = getCharge(other); for (EntityPlayer player : playersWithCharge) { if (other == player) { @@ -240,9 +237,12 @@ public class AnomalyHandler implements IChunkMetaDataHandler { EntityPlayer player = ((EntityPlayer) entityLivingBase); if (!player.capabilities.isCreativeMode) { player.setPositionAndUpdate( - entityLivingBase.posX + x, entityLivingBase.posY, entityLivingBase.posZ + z); + entityLivingBase.posX + x, + entityLivingBase.posY, + entityLivingBase.posZ + z); player.attackEntityFrom( - MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4))); + MainLoader.subspace, + 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4))); player.addPotionEffect(new PotionEffect(Potion.hunger.id, 1200)); player.addPotionEffect(new PotionEffect(Potion.weakness.id, 1000)); player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 800)); @@ -255,9 +255,12 @@ public class AnomalyHandler implements IChunkMetaDataHandler { } } else { entityLivingBase.setPositionAndUpdate( - entityLivingBase.posX + x, entityLivingBase.posY, entityLivingBase.posZ + z); + entityLivingBase.posX + x, + entityLivingBase.posY, + entityLivingBase.posZ + z); entityLivingBase.attackEntityFrom( - MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4))); + MainLoader.subspace, + 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4))); } } } @@ -268,7 +271,8 @@ public class AnomalyHandler implements IChunkMetaDataHandler { if (!player.capabilities.isCreativeMode) { player.setPositionAndUpdate(o.posX - x, o.posY, o.posZ - z); player.attackEntityFrom( - MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) -(explosionPower / 4))); + MainLoader.subspace, + 8 + TecTech.RANDOM.nextInt((int) -(explosionPower / 4))); player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 800)); player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 600)); player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 400)); @@ -290,12 +294,10 @@ public class AnomalyHandler implements IChunkMetaDataHandler { if (aEvent.side.isClient()) { EntityPlayer player = TecTech.proxy.getPlayer(); ChunkCoordIntPair pair = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ); - NBTTagCompound compound = - data.get(player.worldObj.provider.dimensionId).get(pair); + NBTTagCompound compound = data.get(player.worldObj.provider.dimensionId).get(pair); if (compound != null) { - for (int i = 0, badness = (int) Math.min(COUNT_DIV, compound.getDouble(INTENSITY) / PER_PARTICLE); - i < badness; - i++) { + for (int i = 0, badness = (int) Math.min(COUNT_DIV, compound.getDouble(INTENSITY) / PER_PARTICLE); i + < badness; i++) { TecTech.proxy.em_particle( player.worldObj, player.posX + TecTech.RANDOM.nextGaussian() * 64D, @@ -304,16 +306,14 @@ public class AnomalyHandler implements IChunkMetaDataHandler { } } - for (Map.Entry<ChunkCoordIntPair, NBTTagCompound> entry : - data.get(player.worldObj.provider.dimensionId).entrySet()) { + for (Map.Entry<ChunkCoordIntPair, NBTTagCompound> entry : data.get(player.worldObj.provider.dimensionId) + .entrySet()) { ChunkCoordIntPair chunkCoordIntPair = entry.getKey(); NBTTagCompound dat = entry.getValue(); if (Math.abs(chunkCoordIntPair.getCenterXPos() - player.posX) - + Math.abs(chunkCoordIntPair.getCenterZPosition() - player.posZ) - < 256) { - for (int i = 0, pow = (int) Math.min(COUNT_DIV, dat.getDouble(INTENSITY) / PER_PARTICLE); - i < pow; - i++) { + + Math.abs(chunkCoordIntPair.getCenterZPosition() - player.posZ) < 256) { + for (int i = 0, pow = (int) Math.min(COUNT_DIV, dat.getDouble(INTENSITY) / PER_PARTICLE); i + < pow; i++) { TecTech.proxy.em_particle( player.worldObj, chunkCoordIntPair.getCenterXPos() + TecTech.RANDOM.nextGaussian() * 32D, @@ -325,8 +325,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler { } else if (TecTech.RANDOM.nextInt(50) == 0) { EntityPlayer player = aEvent.player; ChunkCoordIntPair pair = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ); - NBTTagCompound compound = - data.get(player.worldObj.provider.dimensionId).get(pair); + NBTTagCompound compound = data.get(player.worldObj.provider.dimensionId).get(pair); NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player); boolean saveRequired = false; if (!player.capabilities.isCreativeMode) { @@ -348,8 +347,8 @@ public class AnomalyHandler implements IChunkMetaDataHandler { if (saveRequired) { TecTech.playerPersistence.saveData(player); - NetworkDispatcher.INSTANCE.sendTo( - new PlayerDataMessage.PlayerDataData(player), (EntityPlayerMP) player); + NetworkDispatcher.INSTANCE + .sendTo(new PlayerDataMessage.PlayerDataData(player), (EntityPlayerMP) player); } } } @@ -390,8 +389,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler { if (reaction != 0) { double distanceSq = otherPlayer.getDistanceSqToEntity(player); if (distanceSq >= 1) { - double effect = CHARGE_EFFECTIVENESS - * reaction + double effect = CHARGE_EFFECTIVENESS * reaction / (distanceSq * distanceSq * distanceSq); double dX = (player.posX - otherPlayer.posX) * effect; double dY = (player.posY - otherPlayer.posY) * effect; @@ -416,23 +414,20 @@ public class AnomalyHandler implements IChunkMetaDataHandler { if (reaction != 0) { double distanceSq = otherPlayer.getDistanceSqToEntity(player); if (distanceSq >= 1) { - double effect = - MASS_EFFECTIVENESS * reaction / (distanceSq * distanceSq * distanceSq); + double effect = MASS_EFFECTIVENESS * reaction + / (distanceSq * distanceSq * distanceSq); double effect1 = effect / mass; double effect2 = effect / massOther; - double[] dPos = new double[] { - player.posX - otherPlayer.posX, - player.posY - otherPlayer.posY, - player.posZ - otherPlayer.posZ - }; - double[] vel = new double[] {player.motionX, player.motionY, player.motionZ}; + double[] dPos = new double[] { player.posX - otherPlayer.posX, + player.posY - otherPlayer.posY, player.posZ - otherPlayer.posZ }; + double[] vel = new double[] { player.motionX, player.motionY, player.motionZ }; double[] out = new double[3]; crossProduct3D(dPos, vel, out); crossProduct3D(out, dPos, vel); normalize3D(vel, out); player.addVelocity(effect1 * out[0], effect1 * out[1], effect1 * out[2]); - otherPlayer.addVelocity( - effect2 * -out[0], effect2 * -out[1], effect2 * -out[2]); + otherPlayer + .addVelocity(effect2 * -out[0], effect2 * -out[1], effect2 * -out[2]); } } } diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java index 582d8d08a2..42d573c045 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java +++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java @@ -1,14 +1,17 @@ package com.github.technus.tectech.mechanics.anomaly; -import com.github.technus.tectech.TecTech; import java.util.ArrayList; import java.util.List; + import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ChatComponentText; +import com.github.technus.tectech.TecTech; + public class CancerCommand implements ICommand { + ArrayList<String> aliases = new ArrayList<>(); public CancerCommand() { diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java index 68d3de8769..cb223f1cca 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java +++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java @@ -1,14 +1,17 @@ package com.github.technus.tectech.mechanics.anomaly; -import com.github.technus.tectech.TecTech; import java.util.ArrayList; import java.util.List; + import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ChatComponentText; +import com.github.technus.tectech.TecTech; + public class ChargeCommand implements ICommand { + ArrayList<String> aliases = new ArrayList<>(); public ChargeCommand() { diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java index df841309ee..f518c4fe2e 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java +++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java @@ -1,14 +1,17 @@ package com.github.technus.tectech.mechanics.anomaly; -import com.github.technus.tectech.TecTech; import java.util.ArrayList; import java.util.List; + import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ChatComponentText; +import com.github.technus.tectech.TecTech; + public class MassCommand implements ICommand { + ArrayList<String> aliases = new ArrayList<>(); public MassCommand() { diff --git a/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java b/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java index ec2e5613a5..0b17256379 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java +++ b/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java @@ -8,6 +8,7 @@ import com.github.technus.avrClone.registerPackages.RegisterPackageSync; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity, SidedRedstone> { + public static final RSINT RSINT = new RSINT(); public SidedRedstone(int offset) { @@ -70,13 +71,14 @@ public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity, Side public void postSync(AvrCore core, IGregTechTileEntity iGregTechTileEntity) { int addr = this.getOffset(); for (byte i = 0; i < 6; i++) { - iGregTechTileEntity.setOutputRedstoneSignal( - i, (byte) core.getDataValue(addr)); // allows edge detection hack? + iGregTechTileEntity.setOutputRedstoneSignal(i, (byte) core.getDataValue(addr)); // allows edge detection + // hack? addr += 3; } } public enum Register implements IRegister<SidedRedstone> { + PIN0, PINT0, PORT0, @@ -114,12 +116,14 @@ public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity, Side } public enum RegisterBitsPCMSK implements IRegisterBit<SidedRedstone> { + PCINT0, PCINT1, PCINT2, PCINT3, PCINT4, PCINT5; + private final int bit, mask; RegisterBitsPCMSK() { @@ -144,12 +148,14 @@ public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity, Side } public enum RegisterBitsPCFR implements IRegisterBit<SidedRedstone> { + PCF0, PCF1, PCF2, PCF3, PCF4, PCF5; + private final int bit, mask; RegisterBitsPCFR() { @@ -174,10 +180,12 @@ public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity, Side } public enum RegisterBitsPCINT implements IRegisterBit<SidedRedstone> { + PCIF, PCEN, PCISC0, PCISC1; + private final int bit, mask; RegisterBitsPCINT() { @@ -202,12 +210,14 @@ public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity, Side } public enum RegisterBitsPNEW implements IRegisterBit<SidedRedstone> { + PNEW0, PNEW1, PNEW2, PNEW3, PNEW4, PNEW5; + private final int bit, mask; RegisterBitsPNEW() { @@ -232,12 +242,14 @@ public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity, Side } public enum RegisterBitsPOLD implements IRegisterBit<SidedRedstone> { + POLD0, POLD1, POLD2, POLD3, POLD4, POLD5; + private final int bit, mask; RegisterBitsPOLD() { @@ -262,6 +274,7 @@ public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity, Side } public static class RSINT implements IInterrupt<SidedRedstone> { + @Override public int getVector() { return 1; diff --git a/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java index 5fd397c6ab..2e37839169 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java +++ b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java @@ -1,14 +1,17 @@ package com.github.technus.tectech.mechanics.commands; -import com.github.technus.tectech.util.TT_Utility; import java.util.ArrayList; import java.util.List; + import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; +import com.github.technus.tectech.util.TT_Utility; + public class ConvertFloat implements ICommand { + ArrayList<String> aliases = new ArrayList<>(); public ConvertFloat() { @@ -22,10 +25,14 @@ public class ConvertFloat implements ICommand { if (args.length == 1) { try { float value = Float.parseFloat(args[0]); - sender.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD + TT_Utility.intBitsToShortString(Float.floatToIntBits(value)) - + " " + EnumChatFormatting.RESET - + EnumChatFormatting.BLUE + value)); + sender.addChatMessage( + new ChatComponentText( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + TT_Utility.intBitsToShortString(Float.floatToIntBits(value)) + + " " + + EnumChatFormatting.RESET + + EnumChatFormatting.BLUE + + value)); } catch (Exception e) { sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Invalid Float " + args[0])); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java index 052a6a8476..8ea7e6ea1a 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java +++ b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java @@ -1,14 +1,17 @@ package com.github.technus.tectech.mechanics.commands; -import com.github.technus.tectech.util.TT_Utility; import java.util.ArrayList; import java.util.List; + import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; +import com.github.technus.tectech.util.TT_Utility; + public class ConvertInteger implements ICommand { + ArrayList<String> aliases = new ArrayList<>(); public ConvertInteger() { @@ -22,10 +25,14 @@ public class ConvertInteger implements ICommand { if (args.length == 1) { try { int value = Integer.parseInt(args[0]); - sender.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD + TT_Utility.intBitsToShortString(value) - + " " + EnumChatFormatting.RESET - + EnumChatFormatting.BLUE + value)); + sender.addChatMessage( + new ChatComponentText( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + TT_Utility.intBitsToShortString(value) + + " " + + EnumChatFormatting.RESET + + EnumChatFormatting.BLUE + + value)); } catch (Exception e) { sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Invalid Integer " + args[0])); } 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 04a161a2cb..a11e0c2329 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,11 +1,7 @@ package com.github.technus.tectech.mechanics.data; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.*; + import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.ChunkCoordIntPair; @@ -14,7 +10,14 @@ import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ChunkDataHandler { + private final String BASE_TAG_NAME = "TecTechData"; private final HashMap<Integer, HashMap<ChunkCoordIntPair, NBTChunk>> dimensionWiseChunkData = new HashMap<>(); private final HashMap<String, HashMap<Integer, ChunkHashMap>> dimensionWiseMetaChunkData = new HashMap<>(); @@ -41,10 +44,9 @@ public class ChunkDataHandler { @SubscribeEvent public void handleChunkSaveEvent(ChunkDataEvent.Save event) { - HashMap<ChunkCoordIntPair, NBTChunk> dimensionData = - dimensionWiseChunkData.get(event.world.provider.dimensionId); - NBTChunk chunkData = - dimensionData != null ? dimensionData.get(event.getChunk().getChunkCoordIntPair()) : null; + HashMap<ChunkCoordIntPair, NBTChunk> dimensionData = dimensionWiseChunkData + .get(event.world.provider.dimensionId); + NBTChunk chunkData = dimensionData != null ? dimensionData.get(event.getChunk().getChunkCoordIntPair()) : null; if (chunkData == null) { event.getData().removeTag(BASE_TAG_NAME); } else { @@ -107,33 +109,35 @@ public class ChunkDataHandler { @SideOnly(Side.CLIENT) @SubscribeEvent public void onUnloadChunk(ChunkEvent.Unload aEvent) { - if (aEvent.world.isRemote - && !Minecraft.getMinecraft().isSingleplayer()) { // we need all data if running local server! - pullSyncHandlers.forEach(chunkMetaDataHandler -> dimensionWiseMetaChunkData - .get(chunkMetaDataHandler.getTagName()) - .get(aEvent.world.provider.dimensionId) - .remove(aEvent.getChunk().getChunkCoordIntPair())); + if (aEvent.world.isRemote && !Minecraft.getMinecraft().isSingleplayer()) { // we need all data if running local + // server! + pullSyncHandlers.forEach( + chunkMetaDataHandler -> dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()) + .get(aEvent.world.provider.dimensionId).remove(aEvent.getChunk().getChunkCoordIntPair())); } } @SideOnly(Side.CLIENT) @SubscribeEvent public void onClientTickEvent(TickEvent.ClientTickEvent aEvent) { - clientHandlers.forEach(chunkMetaDataHandler -> chunkMetaDataHandler.tickClient( - dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); + clientHandlers.forEach( + chunkMetaDataHandler -> chunkMetaDataHandler + .tickClient(dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); } @SideOnly(Side.CLIENT) @SubscribeEvent public void onRenderTickEvent(TickEvent.RenderTickEvent aEvent) { - renderHandlers.forEach(chunkMetaDataHandler -> chunkMetaDataHandler.tickRender( - dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); + renderHandlers.forEach( + chunkMetaDataHandler -> chunkMetaDataHandler + .tickRender(dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); } @SubscribeEvent public void onServerTickEvent(TickEvent.ServerTickEvent aEvent) { - serverHandlers.forEach(chunkMetaDataHandler -> chunkMetaDataHandler.tickServer( - dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); + serverHandlers.forEach( + chunkMetaDataHandler -> chunkMetaDataHandler + .tickServer(dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); } // Ticks only on server side (but must be present for client server) @@ -141,9 +145,7 @@ public class ChunkDataHandler { public void onWorldTickEvent(TickEvent.WorldTickEvent aEvent) { int dim = aEvent.world.provider.dimensionId; pushSyncHandlers.forEach(chunkMetaDataHandler -> { - ChunkHashMap data = dimensionWiseMetaChunkData - .get(chunkMetaDataHandler.getTagName()) - .get(dim); + ChunkHashMap data = dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()).get(dim); int cycle = chunkMetaDataHandler.pushPayloadSpreadPeriod(); int epoch = (int) (aEvent.world.getTotalWorldTime() % cycle); ArrayList<ChunkCoordIntPair> work; @@ -166,14 +168,16 @@ public class ChunkDataHandler { chunkMetaDataHandler.pushPayload(aEvent.world, work); work.clear(); }); - worldHandlers.forEach(chunkMetaDataHandler -> chunkMetaDataHandler.tickWorld( - dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); + worldHandlers.forEach( + chunkMetaDataHandler -> chunkMetaDataHandler + .tickWorld(dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); } @SubscribeEvent public void onPlayerTickEvent(TickEvent.PlayerTickEvent aEvent) { - playerHandlers.forEach(chunkMetaDataHandler -> chunkMetaDataHandler.tickPlayer( - dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); + playerHandlers.forEach( + chunkMetaDataHandler -> chunkMetaDataHandler + .tickPlayer(dimensionWiseMetaChunkData.get(chunkMetaDataHandler.getTagName()), aEvent)); } public void clearData() { @@ -190,23 +194,19 @@ public class ChunkDataHandler { dimensionWiseMetaChunkData.put(handler.getTagName(), new HashMap<>()); Class clazz = handler.getClass(); try { - if (clazz.getMethod("tickServer", HashMap.class, TickEvent.ServerTickEvent.class) - .getDeclaringClass() + if (clazz.getMethod("tickServer", HashMap.class, TickEvent.ServerTickEvent.class).getDeclaringClass() != IChunkMetaDataHandler.class) { serverHandlers.add(handler); } - if (clazz.getMethod("tickPlayer", HashMap.class, TickEvent.PlayerTickEvent.class) - .getDeclaringClass() + if (clazz.getMethod("tickPlayer", HashMap.class, TickEvent.PlayerTickEvent.class).getDeclaringClass() != IChunkMetaDataHandler.class) { playerHandlers.add(handler); } - if (clazz.getMethod("pushData", World.class, ChunkCoordIntPair.class) - .getDeclaringClass() + if (clazz.getMethod("pushData", World.class, ChunkCoordIntPair.class).getDeclaringClass() != IChunkMetaDataHandler.class) { pushSyncHandlers.add(handler); } - if (clazz.getMethod("tickWorld", HashMap.class, TickEvent.WorldTickEvent.class) - .getDeclaringClass() + if (clazz.getMethod("tickWorld", HashMap.class, TickEvent.WorldTickEvent.class).getDeclaringClass() != IChunkMetaDataHandler.class) { worldHandlers.add(handler); } @@ -219,13 +219,11 @@ public class ChunkDataHandler { != IChunkMetaDataHandler.class) { pullSyncHandlers.add(handler); } - if (clazz.getMethod("tickClient", HashMap.class, TickEvent.ClientTickEvent.class) - .getDeclaringClass() + if (clazz.getMethod("tickClient", HashMap.class, TickEvent.ClientTickEvent.class).getDeclaringClass() != IChunkMetaDataHandler.class) { clientHandlers.add(handler); } - if (clazz.getMethod("tickRender", HashMap.class, TickEvent.RenderTickEvent.class) - .getDeclaringClass() + if (clazz.getMethod("tickRender", HashMap.class, TickEvent.RenderTickEvent.class).getDeclaringClass() != IChunkMetaDataHandler.class) { renderHandlers.add(handler); } @@ -243,15 +241,13 @@ public class ChunkDataHandler { return dimensionWiseMetaChunkData.get(handler.getTagName()).get(world).get(chunk); } - public NBTTagCompound putChunkData( - IChunkMetaDataHandler handler, int world, ChunkCoordIntPair chunk, NBTTagCompound data) { + public NBTTagCompound putChunkData(IChunkMetaDataHandler handler, int world, ChunkCoordIntPair chunk, + NBTTagCompound data) { return dimensionWiseMetaChunkData.get(handler.getTagName()).get(world).put(chunk, data); } public NBTTagCompound createIfAbsentChunkData(IChunkMetaDataHandler handler, int world, ChunkCoordIntPair chunk) { - return dimensionWiseMetaChunkData - .get(handler.getTagName()) - .get(world) + return dimensionWiseMetaChunkData.get(handler.getTagName()).get(world) .computeIfAbsent(chunk, chunkCoordIntPair -> handler.createData()); } @@ -264,6 +260,7 @@ public class ChunkDataHandler { } public static final class ChunkHashMap implements Map<ChunkCoordIntPair, NBTTagCompound> { + private final HashMap<ChunkCoordIntPair, NBTChunk> storage; private final HashMap<ChunkCoordIntPair, NBTTagCompound> storageMeta = new HashMap<>(1024); private final HashSet<ChunkCoordIntPair> dirtyBoys = new HashSet<>(1024); @@ -367,6 +364,7 @@ public class ChunkDataHandler { } private static final class NBTChunk { + private final NBTTagCompound data; private boolean isLoaded; diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java index 1d1bc7a200..4f8b7a11d9 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java @@ -1,19 +1,22 @@ package com.github.technus.tectech.mechanics.data; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraftforge.event.world.ChunkEvent; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import eu.usrv.yamcore.network.client.AbstractClientMessageHandler; import eu.usrv.yamcore.network.server.AbstractServerMessageHandler; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraftforge.event.world.ChunkEvent; public class ChunkDataMessage implements IMessage { + int worldId; ChunkCoordIntPair chunk; NBTTagCompound data; @@ -46,6 +49,7 @@ public class ChunkDataMessage implements IMessage { } public static class ChunkDataQuery extends ChunkDataMessage { + public ChunkDataQuery() {} public ChunkDataQuery(ChunkEvent.Load aEvent, IChunkMetaDataHandler handler) { @@ -56,6 +60,7 @@ public class ChunkDataMessage implements IMessage { } public static class ChunkDataData extends ChunkDataMessage { + public ChunkDataData() {} public ChunkDataData(int worldId, ChunkCoordIntPair chunk, IChunkMetaDataHandler handler) { @@ -74,17 +79,19 @@ public class ChunkDataMessage implements IMessage { } public static class ClientHandler extends AbstractClientMessageHandler<ChunkDataData> { + @Override public IMessage handleClientMessage(EntityPlayer pPlayer, ChunkDataData pMessage, MessageContext pCtx) { if (TT_Utility.checkChunkExist(pPlayer.worldObj, pMessage.chunk)) { - TecTech.chunkDataHandler.putChunkData( - pMessage.handler, pMessage.worldId, pMessage.chunk, pMessage.data); + TecTech.chunkDataHandler + .putChunkData(pMessage.handler, pMessage.worldId, pMessage.chunk, pMessage.data); } return null; } } public static class ServerHandler extends AbstractServerMessageHandler<ChunkDataQuery> { + @Override public IMessage handleServerMessage(EntityPlayer pPlayer, ChunkDataQuery pMessage, MessageContext pCtx) { return new ChunkDataData(pMessage); diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/IChunkMetaDataHandler.java b/src/main/java/com/github/technus/tectech/mechanics/data/IChunkMetaDataHandler.java index 00e87848b3..e172b5da32 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/IChunkMetaDataHandler.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/IChunkMetaDataHandler.java @@ -1,16 +1,19 @@ package com.github.technus.tectech.mechanics.data; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.HashMap; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraftforge.event.world.ChunkEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public interface IChunkMetaDataHandler { + String getTagName(); void mergeData(NBTTagCompound target, NBTTagCompound loadedData); diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/PlayerDataMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerDataMessage.java index f6a36f2f01..2aa4d2544c 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/PlayerDataMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerDataMessage.java @@ -2,18 +2,22 @@ package com.github.technus.tectech.mechanics.data; import static java.nio.charset.Charset.forName; +import java.util.UUID; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.TecTech; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import eu.usrv.yamcore.network.client.AbstractClientMessageHandler; import eu.usrv.yamcore.network.server.AbstractServerMessageHandler; import io.netty.buffer.ByteBuf; -import java.util.UUID; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; public class PlayerDataMessage implements IMessage { + NBTTagCompound data; UUID uuid1, uuid2; @@ -41,6 +45,7 @@ public class PlayerDataMessage implements IMessage { } public static class PlayerDataQuery extends PlayerDataMessage { + public PlayerDataQuery() {} public PlayerDataQuery(EntityPlayer player) { @@ -50,6 +55,7 @@ public class PlayerDataMessage implements IMessage { } public static class PlayerDataData extends PlayerDataMessage { + public PlayerDataData() {} public PlayerDataData(EntityPlayer player) { @@ -66,6 +72,7 @@ public class PlayerDataMessage implements IMessage { } public static class ClientHandler extends AbstractClientMessageHandler<PlayerDataData> { + @Override public IMessage handleClientMessage(EntityPlayer pPlayer, PlayerDataData pMessage, MessageContext pCtx) { TecTech.playerPersistence.putDataOrSetToNewTag(pMessage.uuid1, pMessage.uuid2, pMessage.data); @@ -74,6 +81,7 @@ public class PlayerDataMessage implements IMessage { } public static class ServerHandler extends AbstractServerMessageHandler<PlayerDataQuery> { + @Override public IMessage handleServerMessage(EntityPlayer pPlayer, PlayerDataQuery pMessage, MessageContext pCtx) { return new PlayerDataData(pMessage); diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java index 1c220c0bc7..78367717e1 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java @@ -2,19 +2,23 @@ package com.github.technus.tectech.mechanics.data; import static java.nio.charset.Charset.forName; -import com.github.technus.tectech.loader.NetworkDispatcher; -import com.github.technus.tectech.util.TT_Utility; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import java.util.HashMap; import java.util.UUID; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.world.WorldServer; +import com.github.technus.tectech.loader.NetworkDispatcher; +import com.github.technus.tectech.util.TT_Utility; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; + public class PlayerPersistence { + private final HashMap<UUID, NBTTagCompound> map = new HashMap<>(); private final String extension; diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/WorldData.java b/src/main/java/com/github/technus/tectech/mechanics/data/WorldData.java index fb9bf22472..5da5516087 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/WorldData.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/WorldData.java @@ -1,11 +1,13 @@ package com.github.technus.tectech.mechanics.data; import java.util.Objects; + import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; public final class WorldData { + private final World world; private final Chunk chunk; private final ChunkCoordIntPair coordIntPair; diff --git a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java index e4936ec339..9cca6b2660 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java +++ b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java @@ -1,15 +1,18 @@ package com.github.technus.tectech.mechanics.dataTransport; -import com.gtnewhorizon.structurelib.util.Vec3Impl; import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; + import net.minecraft.nbt.NBTTagCompound; +import com.gtnewhorizon.structurelib.util.Vec3Impl; + /** * Created by Tec on 05.04.2017. */ public abstract class DataPacket<T> { + private static final byte MAX_HISTORY = 64; private Set<Vec3Impl> trace = new LinkedHashSet<>(); diff --git a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/InventoryDataPacket.java b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/InventoryDataPacket.java index af238edfe3..e6e24b9ac7 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/InventoryDataPacket.java +++ b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/InventoryDataPacket.java @@ -3,10 +3,12 @@ package com.github.technus.tectech.mechanics.dataTransport; import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class InventoryDataPacket extends DataPacket<ItemStack[]> { + public InventoryDataPacket(ItemStack[] content) { super(content); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java index 92a933d278..8dff99a42d 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java +++ b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java @@ -1,9 +1,11 @@ package com.github.technus.tectech.mechanics.dataTransport; -import com.gtnewhorizon.structurelib.util.Vec3Impl; import net.minecraft.nbt.NBTTagCompound; +import com.gtnewhorizon.structurelib.util.Vec3Impl; + public class QuantumDataPacket extends DataPacket<Long> { + public QuantumDataPacket(Long content) { super(content); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java index d607dfad73..5c6b78993c 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java @@ -4,6 +4,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core; * Created by danie_000 on 19.11.2016. */ public final class EMException extends RuntimeException { + public EMException(String message) { super(message); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java index d731078988..76eb46a413 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java @@ -6,6 +6,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance * Created by danie_000 on 25.01.2017. */ public interface IEMContainer { + EMInstanceStackMap getContentHandler(); void purgeOverflow(); diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java index 0826a5d253..7c27ce8482 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java @@ -1,5 +1,15 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.commands; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.command.ICommand; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; @@ -9,19 +19,12 @@ 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.item.DebugElementalInstanceContainer_EM; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; /** * Created by danie_000 on 30.12.2017. */ public class EMGive implements ICommand { + ArrayList<String> aliases = new ArrayList<>(); public EMGive() { @@ -36,8 +39,10 @@ public class EMGive implements ICommand { if (args.length < 3) { sender.addChatMessage(new ChatComponentText(getCommandUsage(sender))); } else { - TecTech.LOGGER.info("Spawninig EM for " + ((EntityPlayerMP) sender).getDisplayName() + " - " - + Arrays.toString(args)); + TecTech.LOGGER.info( + "Spawninig EM for " + ((EntityPlayerMP) sender).getDisplayName() + + " - " + + Arrays.toString(args)); ArrayList<String> list = new ArrayList<>(Arrays.asList(args)); String energy = list.remove(0); @@ -47,8 +52,9 @@ public class EMGive implements ICommand { EMInstanceStack instanceStack = new EMInstanceStack(def, 1, 0, Long.parseLong(energy)); sender.addChatMessage( - new ChatComponentText(instanceStack.getDefinition().getSymbol() + " - " - + instanceStack.getDefinition().getLocalizedName())); + new ChatComponentText( + instanceStack.getDefinition().getSymbol() + " - " + + instanceStack.getDefinition().getLocalizedName())); EMInstanceStackMap instanceMap = new EMInstanceStackMap(instanceStack); diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java index 22dd9b7dcb..7960defdbe 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java @@ -1,19 +1,22 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.commands; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType; -import com.github.technus.tectech.util.TT_Utility; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; + import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatComponentText; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType; +import com.github.technus.tectech.util.TT_Utility; + /** * Created by danie_000 on 30.12.2017. */ public class EMList implements ICommand { + ArrayList<String> aliases = new ArrayList<>(); public EMList() { @@ -36,28 +39,25 @@ public class EMList implements ICommand { private void listDefinitions(ICommandSender sender, String raw, String unlocalized, String localized) { sender.addChatMessage(new ChatComponentText(" Available Direct: tag - name symbol")); for (EMType directType : TecTech.definitionsRegistry.getDirectTypes().values()) { - if ("*".equals(raw) - || localized.equalsIgnoreCase(directType.getLocalizedName()) + if ("*".equals(raw) || localized.equalsIgnoreCase(directType.getLocalizedName()) || unlocalized.equalsIgnoreCase(directType.getUnlocalizedName())) { - directType - .getDefinitions() - .forEach((bind, definition) -> sender.addChatMessage(new ChatComponentText( - bind + " - " + definition.getLocalizedName() + " " + definition.getSymbol()))); + directType.getDefinitions().forEach( + (bind, definition) -> sender.addChatMessage( + new ChatComponentText( + bind + " - " + definition.getLocalizedName() + " " + definition.getSymbol()))); } } } private void listClasses(ICommandSender sender) { sender.addChatMessage(new ChatComponentText(" Available Direct: name (use as parameter to learn more")); - TecTech.definitionsRegistry - .getDirectTypes() - .forEach((aClass, emDirectType) -> - sender.addChatMessage(new ChatComponentText(emDirectType.getLocalizedName()))); + TecTech.definitionsRegistry.getDirectTypes().forEach( + (aClass, emDirectType) -> sender + .addChatMessage(new ChatComponentText(emDirectType.getLocalizedName()))); sender.addChatMessage(new ChatComponentText(" Available Indirect: tag - name")); - TecTech.definitionsRegistry - .getIndirectBinds() - .forEach((bind, emIndirectType) -> - sender.addChatMessage(new ChatComponentText(bind + " - " + emIndirectType.getLocalizedName()))); + TecTech.definitionsRegistry.getIndirectBinds().forEach( + (bind, emIndirectType) -> sender + .addChatMessage(new ChatComponentText(bind + " - " + emIndirectType.getLocalizedName()))); } @Override @@ -78,10 +78,8 @@ public class EMList implements ICommand { @Override public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) { if (args.length == 1) { - return TecTech.definitionsRegistry.getDirectTypes().values().stream() - .map(EMType::getLocalizedName) - .map(s -> s.replaceAll(" ", "_")) - .collect(Collectors.toList()); + return TecTech.definitionsRegistry.getDirectTypes().values().stream().map(EMType::getLocalizedName) + .map(s -> s.replaceAll(" ", "_")).collect(Collectors.toList()); } return null; } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java index 3efbe615eb..4dfe3ef7a8 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java @@ -12,6 +12,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstan * Created by danie_000 on 22.10.2016. */ public final class EMDecay { + public static final EMDecay[] NO_DECAY = null; // DECAY IMPOSSIBLE!!! // Do not use regular NULL java will not make it work with varargs!!! @@ -71,12 +72,14 @@ public final class EMDecay { // newEnergyLevel /= qtty; // lifeMult /= (float) qtty; for (EMDefinitionStack stack : getOutputStacks().valuesToArray()) { - decayResult.putUnify(new EMInstanceStack( - stack.getDefinition(), - mul(amountDecaying, stack.getAmount()), - lifeMult, - age /*new products*/, - (long) (newEnergyLevel / Math.max(1D, Math.abs(stack.getAmount()))))); // get instances from stack + decayResult.putUnify( + new EMInstanceStack( + stack.getDefinition(), + mul(amountDecaying, stack.getAmount()), + lifeMult, + age /* new products */, + (long) (newEnergyLevel / Math.max(1D, Math.abs(stack.getAmount()))))); // get instances from + // stack } return decayResult; } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java index dd37b2faaf..f29f161297 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java @@ -3,6 +3,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.decay; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; public class EMDecayResult { + private final EMInstanceStackMap output; private double massAffected; private double massDiff; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java index fbb72734f3..a0b933cfb4 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java @@ -1,14 +1,16 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.definitions; +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; -import net.minecraft.nbt.NBTTagCompound; /** * Created by danie_000 on 23.01.2017. */ public abstract class EMComplexTemplate implements IEMDefinition { + /** * Just empty array? */ @@ -49,8 +51,7 @@ public abstract class EMComplexTemplate implements IEMDefinition { int hash = -(getSubParticles().size() << 16); for (EMDefinitionStack stack : getSubParticles().valuesToArray()) { int amount = (int) stack.getAmount(); - hash += ((amount & 0x1) == 0 ? -amount : amount) - * (stack.getDefinition().hashCode() << 4); + hash += ((amount & 0x1) == 0 ? -amount : amount) * (stack.getDefinition().hashCode() << 4); } return hash; } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java index 7886580a0c..56742af21b 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java @@ -2,16 +2,17 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.definitions; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap; -import net.minecraft.nbt.NBTTagCompound; /** - * Created by danie_000 on 22.10.2016. - * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!! + * Created by danie_000 on 22.10.2016. EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!! */ public abstract class EMPrimitiveTemplate extends EMComplexTemplate { + private final String name; private final String symbol; // float-mass in eV/c^2 @@ -33,11 +34,11 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate { private final String bind; // no _ at end - normal particle - // _ at end - anti particle - // __ at end - self is antiparticle + // _ at end - anti particle + // __ at end - self is antiparticle - protected EMPrimitiveTemplate( - String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) { + protected EMPrimitiveTemplate(String name, String symbol, int generation, double mass, int charge, int color, + int ID, String bind) { this.name = name; this.symbol = symbol; this.generation = generation; @@ -49,13 +50,8 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate { } // - protected void init( - EMDefinitionsRegistry registry, - IEMDefinition antiParticle, - double rawLifeTime, - int naturalInstant, - int energeticInstant, - EMDecay... elementalDecaysArray) { + protected void init(EMDefinitionsRegistry registry, IEMDefinition antiParticle, double rawLifeTime, + int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) { anti = antiParticle; this.rawLifeTime = rawLifeTime; naturalDecayInstant = (byte) naturalInstant; @@ -107,7 +103,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate { } else if (naturalDecayInstant >= elementalDecays.length) { return EMDecay.NO_PRODUCT; } - return new EMDecay[] {elementalDecays[naturalDecayInstant]}; + return new EMDecay[] { elementalDecays[naturalDecayInstant] }; } @Override @@ -117,7 +113,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate { } else if (energeticDecayInstant >= elementalDecays.length) { return EMDecay.NO_PRODUCT; } - return new EMDecay[] {elementalDecays[energeticDecayInstant]}; + return new EMDecay[] { elementalDecays[energeticDecayInstant] }; } @Override 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 4d076712b4..cad3159b15 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 @@ -4,23 +4,26 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileE import static com.github.technus.tectech.util.TT_Utility.areBitsSet; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; + +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; import com.github.technus.tectech.util.TT_Utility; -import java.util.ArrayList; -import net.minecraft.nbt.NBTTagCompound; /** * Created by danie_000 on 11.11.2016. */ public interface IEMDefinition extends Comparable<IEMDefinition>, Cloneable { // IMMUTABLE + double STABLE_RAW_LIFE_TIME = 1.5e36D; double NO_DECAY_RAW_LIFE_TIME = -1D; long DEFAULT_ENERGY_LEVEL = 0; - double DEFAULT_ENERGY_REQUIREMENT = - 25000D; // legit cuz normal atoms should only emit a gamma if they don't have defined energy levels + double DEFAULT_ENERGY_REQUIREMENT = 25000D; // legit cuz normal atoms should only emit a gamma if they don't have + // defined energy levels // add text based creators for recipe formula input? // Nomenclature @@ -36,8 +39,8 @@ public interface IEMDefinition extends Comparable<IEMDefinition>, Cloneable { // String getSymbol(); - default void addScanShortSymbols( - ArrayList<String> lines, int capabilities, long energyLevel, EMDefinitionsRegistry registry) { + default void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel, + EMDefinitionsRegistry registry) { if (areBitsSet( SCAN_GET_NOMENCLATURE | SCAN_GET_CLASS_TYPE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) { @@ -45,37 +48,45 @@ public interface IEMDefinition extends Comparable<IEMDefinition>, Cloneable { // } } - default void addScanResults( - ArrayList<String> lines, int capabilities, long energyLevel, EMDefinitionsRegistry registry) { + default void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel, + EMDefinitionsRegistry registry) { if (TT_Utility.areBitsSet( - SCAN_GET_CLASS_TYPE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) { - lines.add(translateToLocal("tt.keyword.scan.class") + " = " - + registry.getTypes().get(getClass()).getLocalizedName()); + SCAN_GET_CLASS_TYPE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, + capabilities)) { + lines.add( + translateToLocal("tt.keyword.scan.class") + " = " + + registry.getTypes().get(getClass()).getLocalizedName()); if (areBitsSet(SCAN_GET_NOMENCLATURE, capabilities)) { lines.add(translateToLocal("tt.keyword.scan.name") + " = " + getLocalizedName()); lines.add(translateToLocal("tt.keyword.scan.symbol") + " = " + getSymbol()); } } if (areBitsSet(SCAN_GET_CHARGE, capabilities)) { - lines.add(translateToLocal("tt.keyword.scan.charge") + " = " + getCharge() / 3D + " " - + translateToLocal("tt.keyword.unit.charge")); + lines.add( + translateToLocal("tt.keyword.scan.charge") + " = " + + getCharge() / 3D + + " " + + translateToLocal("tt.keyword.unit.charge")); } if (areBitsSet(SCAN_GET_COLORABLE, capabilities)) { lines.add( - hasColor() - ? translateToLocal("tt.keyword.scan.colored") + hasColor() ? translateToLocal("tt.keyword.scan.colored") : translateToLocal("tt.keyword.scan.colorless")); } if (areBitsSet(SCAN_GET_MASS, capabilities)) { - lines.add(translateToLocal("tt.keyword.scan.mass") + " = " + getMass() + " " - + translateToLocal("tt.keyword.unit.mass")); + lines.add( + translateToLocal("tt.keyword.scan.mass") + " = " + + getMass() + + " " + + translateToLocal("tt.keyword.unit.mass")); } if (areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) { - lines.add((isTimeSpanHalfLife() - ? translateToLocal("tt.keyword.scan.half_life") - : translateToLocal("tt.keyword.scan.life_time")) - + " = " - + getRawTimeSpan(energyLevel) + " " + translateToLocal("tt.keyword.unit.time")); + lines.add( + (isTimeSpanHalfLife() ? translateToLocal("tt.keyword.scan.half_life") + : translateToLocal("tt.keyword.scan.life_time")) + " = " + + getRawTimeSpan(energyLevel) + + " " + + translateToLocal("tt.keyword.unit.time")); lines.add(" " + translateToLocal("tt.keyphrase.scan.at_current_energy_level")); } } 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 8866403d04..bdb4f847bc 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,14 +4,17 @@ 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 net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; -import java.util.*; -import net.minecraft.nbt.NBTTagCompound; public class EMDefinitionsRegistry { + private static final String TAG_NAME = "EM"; private final NavigableSet<IEMDefinition> stacksRegistered = new TreeSet<>(); @@ -24,8 +27,8 @@ public class EMDefinitionsRegistry { private final Map<Class<? extends IEMDefinition>, EMType> directTypes = new HashMap<>(); private final Map<Class<? extends IEMDefinition>, EMType> directTypesR = Collections.unmodifiableMap(directTypes); private final Map<Class<? extends IEMDefinition>, EMIndirectType> indirectTypes = new HashMap<>(); - private final Map<Class<? extends IEMDefinition>, EMIndirectType> indirectTypesR = - Collections.unmodifiableMap(indirectTypes); + private final Map<Class<? extends IEMDefinition>, EMIndirectType> indirectTypesR = Collections + .unmodifiableMap(indirectTypes); private final Map<String, EMType> binds = new HashMap<>(); private final Map<String, EMType> bindsR = Collections.unmodifiableMap(binds); @@ -84,8 +87,7 @@ public class EMDefinitionsRegistry { protected void addType(EMType emType) { if (types.put(emType.getClazz(), emType) != null) { - EMException e = - new EMException("Class collision! " + emType.getClazz().getName()); + EMException e = new EMException("Class collision! " + emType.getClazz().getName()); if (DEBUG_MODE) { e.printStackTrace(); } else { @@ -131,8 +133,7 @@ public class EMDefinitionsRegistry { if (emType != null) { directTypes.put(definition.getClass(), emType); } else { - EMException e = new EMException( - "Direct Type bind missing! " + definition.getClass().getName()); + EMException e = new EMException("Direct Type bind missing! " + definition.getClass().getName()); if (DEBUG_MODE) { e.printStackTrace(); } else { diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java index f970bfbbaa..97d5be06e0 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java @@ -3,18 +3,19 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.definitions.re import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__; -import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import java.util.function.BiFunction; + import net.minecraft.nbt.NBTTagCompound; +import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; + public class EMIndirectType extends EMType { + private final BiFunction<EMDefinitionsRegistry, NBTTagCompound, IEMDefinition> creator; - public EMIndirectType( - BiFunction<EMDefinitionsRegistry, NBTTagCompound, IEMDefinition> creator, - Class<? extends IEMDefinition> clazz, - String unlocalizedName) { + public EMIndirectType(BiFunction<EMDefinitionsRegistry, NBTTagCompound, IEMDefinition> creator, + Class<? extends IEMDefinition> clazz, String unlocalizedName) { super(clazz, unlocalizedName); this.creator = creator; } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java index 1af46f6ff0..999ad2d061 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java @@ -3,13 +3,15 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.definitions.re import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; + public class EMType { + private final Map<String, IEMDefinition> definitions = new HashMap<>(); private final Map<String, IEMDefinition> definitionsR = Collections.unmodifiableMap(definitions); private final Class<? extends IEMDefinition> clazz; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java index d830005760..9dce19c318 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java @@ -2,21 +2,24 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps; import static com.github.technus.tectech.util.TT_Utility.unpackNBT; -import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; import java.util.Collections; import java.util.NavigableMap; import java.util.TreeMap; + import net.minecraft.nbt.NBTTagCompound; +import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; +import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; + /** * Created by Tec on 12.05.2017. */ -public final class EMConstantStackMap /*IMMUTABLE*/ +public final class EMConstantStackMap /* IMMUTABLE */ extends EMStackMap<EMDefinitionStack> { // Target class for construction of definitions/recipes // Constructors + Clone, all make a whole new OBJ. + public static final EMConstantStackMap EMPTY = new EMConstantStackMap(); private EMConstantStackMap() { diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java index 2fe0f1ff95..7158a169b5 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java @@ -2,13 +2,15 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps; import static com.github.technus.tectech.util.TT_Utility.unpackNBT; +import java.util.NavigableMap; +import java.util.TreeMap; + +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; -import java.util.NavigableMap; -import java.util.TreeMap; -import net.minecraft.nbt.NBTTagCompound; /** * Created by danie_000 on 22.01.2017. @@ -16,6 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; public final class EMDefinitionStackMap extends EMStackMap<EMDefinitionStack> implements IEMMapWriteExact<EMDefinitionStack> { // Transient class for construction of definitions/recipes // Constructors + Clone, all make a whole new OBJ. + public EMDefinitionStackMap() {} public EMDefinitionStackMap(EMDefinitionStack... in) { diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java index 8b3ffcd454..3d76571933 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java @@ -5,6 +5,14 @@ import static com.github.technus.tectech.util.DoubleCount.add; import static com.github.technus.tectech.util.TT_Utility.unpackNBT; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; +import java.util.Map; +import java.util.NavigableMap; +import java.util.TreeMap; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; @@ -14,17 +22,12 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstan import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; import com.github.technus.tectech.util.TT_Utility; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import java.util.Map; -import java.util.NavigableMap; -import java.util.TreeMap; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 22.01.2017. */ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implements IEMMapWrite<EMInstanceStack> { + // Constructors public EMInstanceStackMap() {} @@ -94,21 +97,41 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem int i = 0; for (Map.Entry<IEMDefinition, EMInstanceStack> entry : entrySet()) { EMInstanceStack instance = entry.getValue(); - info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName() + " " - + EnumChatFormatting.AQUA + instance.getDefinition().getSymbol() + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.short.amount") + ": " + EnumChatFormatting.GREEN - + TT_Utility.formatNumberExp(instance.getAmount() / AVOGADRO_CONSTANT) + " " - + translateToLocal("tt.keyword.unit.mol") + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.short.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers( - instance.getDefinition().getEnergyDiffBetweenStates(0, instance.getEnergy())) - + " " + translateToLocal("tt.keyword.unit.energy") + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.short.charge") + ": " + EnumChatFormatting.GREEN - + TT_Utility.formatNumberExp(instance.getCharge()) + " " - + translateToLocal("tt.keyword.unit.charge") + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.short.time") + ": " + EnumChatFormatting.GREEN - + (instance.getLifeTime() < 0 - ? translateToLocal("tt.keyword.stable") + info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName() + + " " + + EnumChatFormatting.AQUA + + instance.getDefinition().getSymbol() + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.short.amount") + + ": " + + EnumChatFormatting.GREEN + + TT_Utility.formatNumberExp(instance.getAmount() / AVOGADRO_CONSTANT) + + " " + + translateToLocal("tt.keyword.unit.mol") + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.short.energy") + + ": " + + EnumChatFormatting.GREEN + + GT_Utility + .formatNumbers(instance.getDefinition().getEnergyDiffBetweenStates(0, instance.getEnergy())) + + " " + + translateToLocal("tt.keyword.unit.energy") + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.short.charge") + + ": " + + EnumChatFormatting.GREEN + + TT_Utility.formatNumberExp(instance.getCharge()) + + " " + + translateToLocal("tt.keyword.unit.charge") + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.short.time") + + ": " + + EnumChatFormatting.GREEN + + (instance.getLifeTime() < 0 ? translateToLocal("tt.keyword.stable") : TT_Utility.formatNumberShortExp(instance.getLifeTime()) + " " + translateToLocal("tt.keyword.unit.time")) + EnumChatFormatting.RESET; @@ -143,7 +166,8 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem // NBT public static EMInstanceStackMap fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) throws EMException { return new EMInstanceStackMap( - false, unpackNBT(EMInstanceStack.class, inner -> EMInstanceStack.fromNBT(registry, inner), nbt)); + false, + unpackNBT(EMInstanceStack.class, inner -> EMInstanceStack.fromNBT(registry, inner), nbt)); } @Override @@ -162,8 +186,8 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem } public EMInstanceStackMap takeAll() { - EMInstanceStackMap newStack = - new EMInstanceStackMap(false, new TreeMap<>(getBackingMap())); // just in case to uncouple The map + EMInstanceStackMap newStack = new EMInstanceStackMap(false, new TreeMap<>(getBackingMap())); // just in case to + // uncouple The map clear(); return newStack; } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java index f9f4b946b9..eb1fa33e11 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java @@ -1,15 +1,17 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; import java.util.Map; import java.util.NavigableMap; import java.util.TreeMap; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; +import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; + /** * Created by Tec on 12.05.2017. */ abstract class EMStackMap<T extends IEMStack> implements IEMMapRead<T> { + private final NavigableMap<IEMDefinition, T> backingMap; protected EMStackMap() { 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 47af5e716e..0db97d5229 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 @@ -6,17 +6,20 @@ import static com.github.technus.tectech.util.DoubleCount.ulpSigned; 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 net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; import com.github.technus.tectech.util.TT_Utility; -import java.lang.reflect.Array; -import java.util.*; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<? extends IEMStack>>, Cloneable { + NavigableMap<IEMDefinition, T> getBackingMap(); IEMMapRead<T> clone(); @@ -100,14 +103,27 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<? int i = 0; for (Map.Entry<IEMDefinition, T> entry : entrySet()) { T instance = entry.getValue(); - info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName() + " " - + EnumChatFormatting.AQUA + instance.getDefinition().getSymbol() + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.short.amount") + ": " + EnumChatFormatting.GREEN - + TT_Utility.formatNumberExp(instance.getAmount() / AVOGADRO_CONSTANT) + " " - + translateToLocal("tt.keyword.unit.mol") + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.short.charge") + ": " + EnumChatFormatting.GREEN - + TT_Utility.formatNumberExp(instance.getCharge()) + " " - + translateToLocal("tt.keyword.unit.charge") + EnumChatFormatting.RESET; + info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName() + + " " + + EnumChatFormatting.AQUA + + instance.getDefinition().getSymbol() + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.short.amount") + + ": " + + EnumChatFormatting.GREEN + + TT_Utility.formatNumberExp(instance.getAmount() / AVOGADRO_CONSTANT) + + " " + + translateToLocal("tt.keyword.unit.mol") + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.short.charge") + + ": " + + EnumChatFormatting.GREEN + + TT_Utility.formatNumberExp(instance.getCharge()) + + " " + + translateToLocal("tt.keyword.unit.charge") + + EnumChatFormatting.RESET; } return info; } @@ -125,8 +141,7 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<? } Iterator<Map.Entry<IEMDefinition, T>> iterator = entrySet().iterator(); - Iterator<? extends Map.Entry<IEMDefinition, ? extends IEMStack>> iteratorO = - o.entrySet().iterator(); + Iterator<? extends Map.Entry<IEMDefinition, ? extends IEMStack>> iteratorO = o.entrySet().iterator(); while (iterator.hasNext()) { int result = iterator.next().getValue().compareTo(iteratorO.next().getValue()); @@ -139,6 +154,7 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<? /** * use only for nested operations! + * * @param o * @return */ @@ -153,8 +169,7 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<? } Iterator<Map.Entry<IEMDefinition, T>> iterator = entrySet().iterator(); - Iterator<? extends Map.Entry<IEMDefinition, ? extends IEMStack>> iteratorO = - o.entrySet().iterator(); + Iterator<? extends Map.Entry<IEMDefinition, ? extends IEMStack>> iteratorO = o.entrySet().iterator(); while (iterator.hasNext()) { T first = iterator.next().getValue(); 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 e309d34670..04bf717daf 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 @@ -3,17 +3,20 @@ 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 java.util.Map; + import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; -import java.util.Map; public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> { + IEMMapWrite<T> clone(); /** * Consumes amount from map - * @param def def to consume + * + * @param def def to consume * @param amountToConsume should be comparable to {@link EMTransformationRegistry#EM_COUNT_PER_MATERIAL_AMOUNT} * @return consumed successfully */ diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java index 2e12df401f..342d8b3645 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java @@ -1,10 +1,12 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps; +import java.util.Map; + import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; -import java.util.Map; public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> { + default void cleanUp() { entrySet().removeIf(entry -> entry.getValue().isInvalidAmount()); } @@ -72,6 +74,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> { /** * Should only be used when modifying definitions to alter the integer count correctly + * * @param def * @return */ @@ -81,6 +84,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> { /** * Should only be used when modifying definitions to alter the integer count correctly + * * @param def * @param amountToConsume * @return diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java index d756c3f72f..e63b68f6f6 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java @@ -1,15 +1,17 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.recipes; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; /** * Created by Tec on 02.03.2017. */ public class EMRecipe<T> implements Comparable<EMRecipe<T>> { + private final int ID; private final EMConstantStackMap inEM; private final IEMMapRead<? extends IEMStack> outEM; @@ -17,12 +19,8 @@ public class EMRecipe<T> implements Comparable<EMRecipe<T>> { private final FluidStack[] outFluids; private T extension; - public EMRecipe( - EMConstantStackMap inEM, // not null plz - int id, - IEMMapRead<? extends IEMStack> outEM, - ItemStack[] outItems, - FluidStack[] outFluids) { + public EMRecipe(EMConstantStackMap inEM, // not null plz + int id, IEMMapRead<? extends IEMStack> outEM, ItemStack[] outItems, FluidStack[] outFluids) { this.inEM = inEM; this.outEM = outEM; this.outItems = outItems; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java index c3a4b298ff..2aad1b9e40 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java @@ -1,17 +1,19 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.recipes; +import java.util.HashMap; +import java.util.Map; + import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; -import java.util.HashMap; -import java.util.Map; /** * Created by Tec on 02.03.2017. */ public class EMRecipeMap<T> { // TODO FIX // Multimap for multiple recipes from the same thing - you know parameters might differ the output + private final Map<EMConstantStackMap, Map<Integer, EMRecipe<T>>> recipes; public EMRecipeMap() { @@ -20,9 +22,8 @@ public class EMRecipeMap<T> { // TODO FIX public EMRecipe<T> put(EMRecipe<T> in) { Map<Integer, EMRecipe<T>> r = getRecipes().computeIfAbsent(in.getInEM(), k -> new HashMap<>()); - return r.put( - in.getID(), - in); // IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - + return r.put(in.getID(), in); // IF THIS RETURN SHIT, it means that inputs are using the exact same types of + // matter as input - // (non amount wise collision) // It is either bad, or unimportant if you use different id's } @@ -35,14 +36,13 @@ public class EMRecipeMap<T> { // TODO FIX public EMRecipe<T> remove(IEMMapRead<EMDefinitionStack> map, int id) { Map<Integer, EMRecipe<T>> recipesMap = getRecipes().get(map); - return recipesMap != null - ? recipesMap.remove(id) - : null; // todo check, suspicious but ok, equals and hashcode methods are adjusted for that + return recipesMap != null ? recipesMap.remove(id) : null; // todo check, suspicious but ok, equals and hashcode + // methods are adjusted for that } public Map<Integer, EMRecipe<T>> remove(IEMMapRead<EMDefinitionStack> map) { - return getRecipes() - .remove(map); // todo check, suspicious but ok, equals and hashcode methods are adjusted for that + return getRecipes().remove(map); // todo check, suspicious but ok, equals and hashcode methods are adjusted for + // that } // Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe! @@ -56,8 +56,8 @@ public class EMRecipeMap<T> { // TODO FIX // Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores // instance data! public Map<Integer, EMRecipe<T>> findMatch(IEMMapRead<? extends IEMStack> in) { - for (Map.Entry<EMConstantStackMap, Map<Integer, EMRecipe<T>>> cElementalDefinitionStackMapHashMapEntry : - getRecipes().entrySet()) { + for (Map.Entry<EMConstantStackMap, Map<Integer, EMRecipe<T>>> cElementalDefinitionStackMapHashMapEntry : getRecipes() + .entrySet()) { if (in.containsAllAmounts(cElementalDefinitionStackMapHashMapEntry.getKey())) { return cElementalDefinitionStackMapHashMapEntry.getValue(); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java index 2757b6f23d..c121417d5e 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java @@ -2,14 +2,16 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.stacks; import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__; +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; -import net.minecraft.nbt.NBTTagCompound; /** * Created by danie_000 on 20.11.2016. */ public final class EMDefinitionStack implements IEMStack { + private final IEMDefinition definition; private final double amount; 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 09cfd180fe..a75306a3f3 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 @@ -10,6 +10,12 @@ import static java.lang.Math.max; import static java.lang.Math.min; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; + +import net.minecraft.client.Minecraft; +import net.minecraft.crash.CrashReport; +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay; import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult; @@ -18,15 +24,12 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.reg import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.util.TT_Utility; -import java.util.ArrayList; -import net.minecraft.client.Minecraft; -import net.minecraft.crash.CrashReport; -import net.minecraft.nbt.NBTTagCompound; /** * Created by danie_000 on 22.10.2016. */ public final class EMInstanceStack implements IEMStack { + public static int MIN_MULTIPLE_DECAY_CALLS = 4, MAX_MULTIPLE_DECAY_CALLS = 16; public static double DECAY_CALL_PER = EM_COUNT_PER_MATERIAL_AMOUNT; // todo @@ -192,8 +195,9 @@ public final class EMInstanceStack implements IEMStack { EMDecayResult output; if (getDefinition().usesMultipleDecayCalls(energy)) { double amountTemp = getAmount(); - int decayCnt = - (int) min(MAX_MULTIPLE_DECAY_CALLS, max(getAmount() / DECAY_CALL_PER, MIN_MULTIPLE_DECAY_CALLS)); + int decayCnt = (int) min( + MAX_MULTIPLE_DECAY_CALLS, + max(getAmount() / DECAY_CALL_PER, MIN_MULTIPLE_DECAY_CALLS)); setAmount(div(getAmount(), decayCnt)); decayCnt--; @@ -229,26 +233,21 @@ public final class EMInstanceStack implements IEMStack { return null; // return null, decay cannot be achieved } else if (getDefinition().isTimeSpanHalfLife()) { return exponentialDecayCompute( - energy > 0 - ? getDefinition().getEnergyInducedDecay(energy) - : getDefinition().getDecayArray(), + energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getDecayArray(), lifeTimeMult, -1D, newEnergyLevel); } else { if (1 > lifeTime) { return decayCompute( - energy > 0 - ? getDefinition().getEnergyInducedDecay(energy) + energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getNaturalDecayInstant(), lifeTimeMult, 0D, newEnergyLevel); } else if (apparentAge > lifeTime) { return decayCompute( - energy > 0 - ? getDefinition().getEnergyInducedDecay(energy) - : getDefinition().getDecayArray(), + energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getDecayArray(), lifeTimeMult, 0D, newEnergyLevel); @@ -258,19 +257,19 @@ public final class EMInstanceStack implements IEMStack { } // Use to get direct decay output providing correct decay array - private EMDecayResult exponentialDecayCompute( - EMDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) { + private EMDecayResult exponentialDecayCompute(EMDecay[] decays, double lifeTimeMult, double newProductsAge, + long newEnergyLevel) { double newAmount = div(getAmount(), Math.pow(2D, 1D /* 1 second */ / lifeTime)); // if(definition.getSymbol().startsWith("U ")) { - // System.out.println("newAmount = " + newAmount); - // System.out.println("amountRemaining = " + amountRemaining); - // for(cElementalDecay decay:decays){ - // System.out.println("prob = "+decay.probability); - // for(cElementalDefinitionStack stack:decay.outputStacks.values()){ - // System.out.println("stack = " + stack.getDefinition().getSymbol() + " " + stack.amount); - // } - // } + // System.out.println("newAmount = " + newAmount); + // System.out.println("amountRemaining = " + amountRemaining); + // for(cElementalDecay decay:decays){ + // System.out.println("prob = "+decay.probability); + // for(cElementalDefinitionStack stack:decay.outputStacks.values()){ + // System.out.println("stack = " + stack.getDefinition().getSymbol() + " " + stack.amount); + // } + // } // } if (newAmount == getAmount()) { newAmount -= ulpSigned(newAmount); @@ -291,8 +290,8 @@ public final class EMInstanceStack implements IEMStack { } // Use to get direct decay output providing correct decay array - private EMDecayResult decayCompute( - EMDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) { + private EMDecayResult decayCompute(EMDecay[] decays, double lifeTimeMult, double newProductsAge, + long newEnergyLevel) { if (decays == null) { return null; // Can not decay so it won't } @@ -303,8 +302,7 @@ public final class EMInstanceStack implements IEMStack { // provide non null 0 length array for annihilation } else if (decays.length == 1) { // only one type of decay :D, doesn't need dead end if (decays[0] == deadEnd) { - return makesEnergy - ? null + return makesEnergy ? null : new EMDecayResult( decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, getAmount()), mass, @@ -352,45 +350,45 @@ public final class EMInstanceStack implements IEMStack { // float remainingProbability = 1D; // // for (int i = 0; i < differentDecays; i++) { - // if (decays[i].probability >= 1D) { - // long thisDecayAmount = (long) Math.floor(remainingProbability * (double) amount); - // if (thisDecayAmount > 0) { - // if (thisDecayAmount <= amountRemaining) { - // amountRemaining -= thisDecayAmount; - // qttyOfDecay[i] += thisDecayAmount; - // }else {//in case too much was made - // qttyOfDecay[i] += amountRemaining; - // amountRemaining = 0; - // //remainingProbability=0; - // } - // } - // break; - // } - // long thisDecayAmount = (long) Math.floor(decays[i].probability * (double) amount); - // if (thisDecayAmount <= amountRemaining && thisDecayAmount > 0) {//some was made - // amountRemaining -= thisDecayAmount; - // qttyOfDecay[i] += thisDecayAmount; - // } else if (thisDecayAmount > amountRemaining) {//too much was made - // qttyOfDecay[i] += amountRemaining; - // amountRemaining = 0; - // //remainingProbability=0; - // break; - // } - // remainingProbability -= decays[i].probability; - // if(remainingProbability<=0) { - // break; - // } + // if (decays[i].probability >= 1D) { + // long thisDecayAmount = (long) Math.floor(remainingProbability * (double) amount); + // if (thisDecayAmount > 0) { + // if (thisDecayAmount <= amountRemaining) { + // amountRemaining -= thisDecayAmount; + // qttyOfDecay[i] += thisDecayAmount; + // }else {//in case too much was made + // qttyOfDecay[i] += amountRemaining; + // amountRemaining = 0; + // //remainingProbability=0; + // } + // } + // break; + // } + // long thisDecayAmount = (long) Math.floor(decays[i].probability * (double) amount); + // if (thisDecayAmount <= amountRemaining && thisDecayAmount > 0) {//some was made + // amountRemaining -= thisDecayAmount; + // qttyOfDecay[i] += thisDecayAmount; + // } else if (thisDecayAmount > amountRemaining) {//too much was made + // qttyOfDecay[i] += amountRemaining; + // amountRemaining = 0; + // //remainingProbability=0; + // break; + // } + // remainingProbability -= decays[i].probability; + // if(remainingProbability<=0) { + // break; + // } // } // for (int i = 0; i < amountRemaining; i++) { - // double rand = TecTech.RANDOM.nextDouble(); - // for (int j = 0; j < differentDecays; j++) {//looking for the thing it decayed into - // rand -= decays[j].probability; - // if (rand <= 0D) { - // qttyOfDecay[j]++; - // break; - // } - // } + // double rand = TecTech.RANDOM.nextDouble(); + // for (int j = 0; j < differentDecays; j++) {//looking for the thing it decayed into + // rand -= decays[j].probability; + // if (rand <= 0D) { + // qttyOfDecay[j]++; + // break; + // } + // } // } if (getDefinition().decayMakesEnergy(energy)) { @@ -523,30 +521,38 @@ public final class EMInstanceStack implements IEMStack { lines.add(translateToLocal("tt.keyword.scan.life_mult") + " = " + lifeTimeMult); } if (TT_Utility.areBitsSet(SCAN_GET_AGE, capabilities)) { - lines.add(translateToLocal("tt.keyword.scan.age") + " = " + getAge() + " " - + translateToLocal("tt.keyword.unit.time")); + lines.add( + translateToLocal("tt.keyword.scan.age") + " = " + + getAge() + + " " + + translateToLocal("tt.keyword.unit.time")); } if (TT_Utility.areBitsSet(SCAN_GET_COLOR_VALUE, capabilities)) { lines.add(translateToLocal("tt.keyword.scan.color") + " = " + color); } if (TT_Utility.areBitsSet(SCAN_GET_ENERGY, capabilities)) { - lines.add(translateToLocal("tt.keyword.scan.energy") + " = " - + getDefinition().getEnergyDiffBetweenStates(0, energy) + " " - + translateToLocal("tt.keyword.unit.energy")); + lines.add( + translateToLocal("tt.keyword.scan.energy") + " = " + + getDefinition().getEnergyDiffBetweenStates(0, energy) + + " " + + translateToLocal("tt.keyword.unit.energy")); } if (TT_Utility.areBitsSet(SCAN_GET_ENERGY_LEVEL, capabilities)) { lines.add(translateToLocal("tt.keyword.scan.energyLevel") + " = " + energy); } if (TT_Utility.areBitsSet(SCAN_GET_AMOUNT, capabilities)) { - lines.add(translateToLocal("tt.keyword.scan.amount") + " = " + getAmount() / AVOGADRO_CONSTANT + " " - + translateToLocal("tt.keyword.unit.mol")); + lines.add( + translateToLocal("tt.keyword.scan.amount") + " = " + + getAmount() / AVOGADRO_CONSTANT + + " " + + translateToLocal("tt.keyword.unit.mol")); } scanContents(lines, getDefinition().getSubParticles(), 1, detailsOnDepthLevels); } - private void scanContents( - ArrayList<String> lines, EMConstantStackMap definitions, int depth, int[] detailsOnDepthLevels) { + private void scanContents(ArrayList<String> lines, EMConstantStackMap definitions, int depth, + int[] detailsOnDepthLevels) { if (definitions != null && depth < detailsOnDepthLevels.length) { int deeper = depth + 1; for (EMDefinitionStack definitionStack : definitions.valuesToArray()) { @@ -605,8 +611,13 @@ public final class EMInstanceStack implements IEMStack { @Override public String toString() { - return getDefinition().toString() + ' ' + getAmount() / AVOGADRO_CONSTANT + " " - + translateToLocal("tt.keyword.unit.mol") + " " + getMass() + " " + return getDefinition().toString() + ' ' + + getAmount() / AVOGADRO_CONSTANT + + " " + + translateToLocal("tt.keyword.unit.mol") + + " " + + getMass() + + " " + translateToLocal("tt.keyword.unit.mass"); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java index b3b439408d..b1115df11f 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java @@ -2,14 +2,16 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.stacks; import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_MINIMUM; +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; -import net.minecraft.nbt.NBTTagCompound; /** * Created by danie_000 on 30.01.2017. */ public interface IEMStack extends Comparable<IEMStack>, Cloneable { + static boolean isValidAmount(double amount) { return amount >= EM_COUNT_MINIMUM; } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java index cbc9f9801d..0e4e7bf87d 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java @@ -1,10 +1,12 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformations; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; + public class EMDequantizationInfo { + private final IEMStack definition; private Object stack; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java index 3dabb8334a..c3ad01292a 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java @@ -1,13 +1,15 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformations; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; + /** * Created by Tec on 23.05.2017. */ public class EMFluidQuantizationInfo { + private final FluidStack in; private final IEMStack out; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java index 279a00af16..5acb0deb1b 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java @@ -1,17 +1,20 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformations; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; /** * Created by Tec on 23.05.2017. */ public class EMItemQuantizationInfo { + private final ItemStack in; private final boolean skipNBT; private final IEMStack out; @@ -38,9 +41,10 @@ public class EMItemQuantizationInfo { @Override public int hashCode() { - return (GameRegistry.findUniqueIdentifierFor(in.getItem()) + ":" + in.getUnlocalizedName() + ':' - + in.getItemDamage()) - .hashCode(); + return (GameRegistry.findUniqueIdentifierFor(in.getItem()) + ":" + + in.getUnlocalizedName() + + ':' + + in.getItemDamage()).hashCode(); } @Override diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java index b8af4bafc1..9c857447d7 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java @@ -1,14 +1,17 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformations; +import net.minecraftforge.oredict.OreDictionary; + import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import net.minecraftforge.oredict.OreDictionary; /** * Created by Tec on 23.05.2017. */ public class EMOredictQuantizationInfo { + private final int id; private final int amount; private final IEMStack out; diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java index 98f72ea53a..f8312cf7c2 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java @@ -2,23 +2,27 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformation import static java.lang.Math.pow; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; import java.util.HashMap; import java.util.Map; import java.util.function.Function; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; +import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack; + +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; + /** * Created by Tec on 26.05.2017. */ public class EMTransformationRegistry { + /** * Atom count per Mol */ @@ -38,8 +42,8 @@ public class EMTransformationRegistry { */ public static final double EM_COUNT_EPSILON = EM_COUNT_PER_CUBE / pow(2, 40); - public static final double EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED = - EM_COUNT_PER_MATERIAL_AMOUNT - EM_COUNT_EPSILON; + public static final double EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED = EM_COUNT_PER_MATERIAL_AMOUNT + - EM_COUNT_EPSILON; public static final double EM_COUNT_PER_CUBE_DIMINISHED = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 144 * 9; public static final double EM_COUNT_PER_ITEM_DIMINISHED = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 144; public static final double EM_COUNT_PER_1k_DIMINISHED = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 1000; @@ -59,8 +63,7 @@ public class EMTransformationRegistry { this(creator, new HashMap<>(16), new HashMap<>(16), new HashMap<>(64), new HashMap<>(256)); } - public EMTransformationRegistry( - Function<IEMStack, EMDequantizationInfo> creator, + public EMTransformationRegistry(Function<IEMStack, EMDequantizationInfo> creator, Map<Integer, EMFluidQuantizationInfo> fluidQuantization, Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization, Map<Integer, EMOredictQuantizationInfo> oredictQuantization, diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java index f5d8d42061..83117e50d2 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformations; public class OreDictionaryStack { + private final int amount; private final int id; 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 79e0d5167c..067ce567ae 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 @@ -10,6 +10,8 @@ import static gregtech.api.enums.OrePrefixes.dust; import static java.lang.Math.abs; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.*; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay; @@ -26,145 +28,36 @@ import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitiv import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition; import com.github.technus.tectech.util.TT_Utility; import com.github.technus.tectech.util.XSTR; -import java.util.*; /** * Created by danie_000 on 18.11.2016. */ public class EMAtomDefinition extends EMComplexTemplate { - private static final String[] SYMBOL = new String[] { - "Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", - "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", - "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", - "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", - "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", - "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", - "Fl", "Mc", "Lv", "Ts", "Og" - }; - private static final String[] NAME = new String[] { - "Neutronium", - "Hydrogen", - "Helium", - "Lithium", - "Beryllium", - "Boron", - "Carbon", - "Nitrogen", - "Oxygen", - "Fluorine", - "Neon", - "Sodium", - "Magnesium", - "Aluminium", - "Silicon", - "Phosphorus", - "Sulfur", - "Chlorine", - "Argon", - "Potassium", - "Calcium", - "Scandium", - "Titanium", - "Vanadium", - "Chromium", - "Manganese", - "Iron", - "Cobalt", - "Nickel", - "Copper", - "Zinc", - "Gallium", - "Germanium", - "Arsenic", - "Selenium", - "Bromine", - "Krypton", - "Rubidium", - "Strontium", - "Yttrium", - "Zirconium", - "Niobium", - "Molybdenum", - "Technetium", - "Ruthenium", - "Rhodium", - "Palladium", - "Silver", - "Cadmium", - "Indium", - "Tin", - "Antimony", - "Tellurium", - "Iodine", - "Xenon", - "Caesium", - "Barium", - "Lanthanum", - "Cerium", - "Praseodymium", - "Neodymium", - "Promethium", - "Samarium", - "Europium", - "Gadolinium", - "Terbium", - "Dysprosium", - "Holmium", - "Erbium", - "Thulium", - "Ytterbium", - "Lutetium", - "Hafnium", - "Tantalum", - "Tungsten", - "Rhenium", - "Osmium", - "Iridium", - "Platinum", - "Gold", - "Mercury", - "Thallium", - "Lead", - "Bismuth", - "Polonium", - "Astatine", - "Radon", - "Francium", - "Radium", - "Actinium", - "Thorium", - "Protactinium", - "Uranium", - "Neptunium", - "Plutonium", - "Americium", - "Curium", - "Berkelium", - "Californium", - "Einsteinium", - "Fermium", - "Mendelevium", - "Nobelium", - "Lawrencium", - "Rutherfordium", - "Dubnium", - "Seaborgium", - "Bohrium", - "Hassium", - "Meitnerium", - "Darmstadtium", - "Roentgenium", - "Copernicium", - "Nihonium", - "Flerovium", - "Moscovium", - "Livermorium", - "Tennessine", - "Oganesson" - }; - private static final String[] SYMBOL_IUPAC = new String[] { - "n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E" - }; + + private static final String[] SYMBOL = new String[] { "Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", + "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", + "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", + "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", + "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", + "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", + "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", + "Og" }; + private static final String[] NAME = new String[] { "Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", + "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", + "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", + "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", + "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", + "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", + "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", + "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", + "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", + "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", + "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", + "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", + "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", + "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson" }; + private static final String[] SYMBOL_IUPAC = new String[] { "n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", + "U", "B", "T", "Q", "P", "H", "S", "O", "E" }; public static final long ATOM_COMPLEXITY_LIMIT = 65536L; private static final byte BYTE_OFFSET = 32; @@ -178,18 +71,8 @@ public class EMAtomDefinition extends EMComplexTemplate { private static final Map<Integer, EMAtomDefinition> stableAtoms = new HashMap<>(); private static Map<Integer, TreeMap<Double, Integer>> mostStableUnstableIsotopes = new HashMap<>(); private static final Map<Integer, EMAtomDefinition> unstableAtoms = new HashMap<>(); - private static EMDefinitionStack alpha, - deuterium, - tritium, - helium_3, - beryllium_8, - carbon_14, - neon_24, - silicon_34, - uranium_238, - uranium_235, - plutonium_239, - plutonium_241; + private static EMDefinitionStack alpha, deuterium, tritium, helium_3, beryllium_8, carbon_14, neon_24, silicon_34, + uranium_238, uranium_235, plutonium_239, plutonium_241; private static final HashMap<EMAtomDefinition, Double> lifetimeOverrides = new HashMap<>(); private final EMNuclideIAEA iaea; @@ -310,8 +193,7 @@ public class EMAtomDefinition extends EMComplexTemplate { } rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME); } else { - rawLifeTime = containsAnti - ? getIaea().getHalfTime() * 1.5514433E-21d * (1d + xstr.nextDouble() * 9d) + rawLifeTime = containsAnti ? getIaea().getHalfTime() * 1.5514433E-21d * (1d + xstr.nextDouble() * 9d) : getIaea().getHalfTime(); } iaeaDefinitionExistsAndHasEnergyLevels = getIaea().getEnergeticStatesArray().length > 1; @@ -334,12 +216,11 @@ public class EMAtomDefinition extends EMComplexTemplate { if (izoDiff == 0) { decayMode = 0; } else { - decayMode = - izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) : (byte) -Math.min(2, 1 + izoDiffAbs / 4); + decayMode = izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) + : (byte) -Math.min(2, 1 + izoDiffAbs / 4); } } else { - decayMode = izoDiff > 0 - ? (byte) (Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET) + decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET); } // this.stable = this.rawLifeTime >= STABLE_RAW_LIFE_TIME; @@ -347,20 +228,18 @@ public class EMAtomDefinition extends EMComplexTemplate { } private static int stableIzoCurve(int element) { - return (int) Math.round(-1.19561E-06D * Math.pow(element, 4D) - + 1.60885E-04D * Math.pow(element, 3D) - + 3.76604E-04D * Math.pow(element, 2D) - + 1.08418E+00D * (double) element); + return (int) Math.round( + -1.19561E-06D * Math.pow(element, 4D) + 1.60885E-04D * Math.pow(element, 3D) + + 3.76604E-04D * Math.pow(element, 2D) + + 1.08418E+00D * (double) element); } - private static double calculateLifeTime( - int izoDiff, int izoDiffAbs, int element, int isotope, boolean containsAnti) { + private static double calculateLifeTime(int izoDiff, int izoDiffAbs, int element, int isotope, + boolean containsAnti) { double rawLifeTime; - if (element <= 83 - && isotope < 127 - && (izoDiffAbs == 0 - || element == 1 && isotope == 0 + if (element <= 83 && isotope < 127 + && (izoDiffAbs == 0 || element == 1 && isotope == 0 || element == 2 && isotope == 1 || izoDiffAbs == 1 && element > 2 && element % 2 == 1 || izoDiffAbs == 3 && element > 30 && element % 2 == 0 @@ -537,8 +416,7 @@ public class EMAtomDefinition extends EMComplexTemplate { } else if (ionization < 0) { ionName = ionization == -1 ? TT_Utility.toSuperscript("-") : TT_Utility.toSuperscript(-ionization + "-"); } - return TT_Utility.toSuperscript(Long.toString(getNeutralCount() + (long) getElement())) - + getShortSymbol() + return TT_Utility.toSuperscript(Long.toString(getNeutralCount() + (long) getElement())) + getShortSymbol() + ionName; } @@ -642,662 +520,687 @@ public class EMAtomDefinition extends EMComplexTemplate { private boolean getDecayFromIaea(ArrayList<EMDecay> decaysList, EMNuclideIAEA.iaeaDecay decay, long energy) { EMDefinitionStackMap withThis = elementalStacks.toMutable(), newStuff = new EMDefinitionStackMap(); switch (decay.decayName) { - case "D": - { - if (withThis.removeAllAmountsExact(deuterium.getDefinition().getSubParticles())) { - withThis.putReplace(deuterium); - decaysList.add(new EMDecay( - decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } + case "D": { + if (withThis.removeAllAmountsExact(deuterium.getDefinition().getSubParticles())) { + withThis.putReplace(deuterium); + decaysList.add( + new EMDecay( + decay.chance, + withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; } + } break; - case "3H": - { - if (withThis.removeAllAmountsExact(tritium.getDefinition().getSubParticles())) { - withThis.putReplace(tritium); - decaysList.add(new EMDecay( - decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } + case "3H": { + if (withThis.removeAllAmountsExact(tritium.getDefinition().getSubParticles())) { + withThis.putReplace(tritium); + decaysList.add( + new EMDecay( + decay.chance, + withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; } + } break; - case "3HE": - { - if (withThis.removeAllAmountsExact(helium_3.getDefinition().getSubParticles())) { - withThis.putReplace(helium_3); - decaysList.add(new EMDecay( - decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } + case "3HE": { + if (withThis.removeAllAmountsExact(helium_3.getDefinition().getSubParticles())) { + withThis.putReplace(helium_3); + decaysList.add( + new EMDecay( + decay.chance, + withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; } + } break; - case "8BE": - { - if (withThis.removeAllAmountsExact( - beryllium_8.getDefinition().getSubParticles())) { - withThis.putReplace(beryllium_8); - decaysList.add(new EMDecay( - decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } + case "8BE": { + if (withThis.removeAllAmountsExact(beryllium_8.getDefinition().getSubParticles())) { + withThis.putReplace(beryllium_8); + decaysList.add( + new EMDecay( + decay.chance, + withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; } + } break; - case "14C": - { - if (withThis.removeAllAmountsExact(carbon_14.getDefinition().getSubParticles())) { - newStuff.putReplace(carbon_14); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "14C": { + if (withThis.removeAllAmountsExact(carbon_14.getDefinition().getSubParticles())) { + newStuff.putReplace(carbon_14); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "24NE": - { - if (withThis.removeAllAmountsExact(neon_24.getDefinition().getSubParticles())) { - newStuff.putReplace(neon_24); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "24NE": { + if (withThis.removeAllAmountsExact(neon_24.getDefinition().getSubParticles())) { + newStuff.putReplace(neon_24); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "34SI": - { - if (withThis.removeAllAmountsExact( - silicon_34.getDefinition().getSubParticles())) { - newStuff.putReplace(silicon_34); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "34SI": { + if (withThis.removeAllAmountsExact(silicon_34.getDefinition().getSubParticles())) { + newStuff.putReplace(silicon_34); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; case "A": - case "A?": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2, EMHadronDefinition.hadron_p2)) { - newStuff.putReplace(alpha); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "A?": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2, EMHadronDefinition.hadron_p2)) { + newStuff.putReplace(alpha); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B+": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n1); - newStuff.putReplace(EMLeptonDefinition.lepton_e_1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B+": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n1); + newStuff.putReplace(EMLeptonDefinition.lepton_e_1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "2B+": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n2); - newStuff.putReplace(EMLeptonDefinition.lepton_e_2); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "2B+": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n2); + newStuff.putReplace(EMLeptonDefinition.lepton_e_2); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B-": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_p1); - newStuff.putReplace(EMLeptonDefinition.lepton_e1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B-": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_p1); + newStuff.putReplace(EMLeptonDefinition.lepton_e1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "2B-": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_p2); - newStuff.putReplace(EMLeptonDefinition.lepton_e2); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "2B-": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_p2); + newStuff.putReplace(EMLeptonDefinition.lepton_e2); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "EC": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "EC": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "2EC": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e2)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n2); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "2EC": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e2)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n2); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; case "B++EC": - case "EC+B+": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n2); - newStuff.putReplace(EMLeptonDefinition.lepton_e_1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "EC+B+": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n2); + newStuff.putReplace(EMLeptonDefinition.lepton_e_1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B+A": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3, EMHadronDefinition.hadron_n1)) { - newStuff.putReplace(EMLeptonDefinition.lepton_e_1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - newStuff.putReplace(alpha); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B+A": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3, EMHadronDefinition.hadron_n1)) { + newStuff.putReplace(EMLeptonDefinition.lepton_e_1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(alpha); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B+P": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n1); - newStuff.putReplace(EMLeptonDefinition.lepton_e_1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - newStuff.putReplace(EMHadronDefinition.hadron_p1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B+P": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n1); + newStuff.putReplace(EMLeptonDefinition.lepton_e_1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(EMHadronDefinition.hadron_p1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B+2P": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n1); - newStuff.putReplace(EMLeptonDefinition.lepton_e_1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - newStuff.putReplace(EMHadronDefinition.hadron_p2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B+2P": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n1); + newStuff.putReplace(EMLeptonDefinition.lepton_e_1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(EMHadronDefinition.hadron_p2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B-A": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3, EMHadronDefinition.hadron_p1)) { - newStuff.putReplace(EMLeptonDefinition.lepton_e1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); - newStuff.putReplace(alpha); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B-A": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3, EMHadronDefinition.hadron_p1)) { + newStuff.putReplace(EMLeptonDefinition.lepton_e1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(alpha); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B-N": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_p1); - newStuff.putReplace(EMLeptonDefinition.lepton_e1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); - newStuff.putReplace(EMHadronDefinition.hadron_n1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B-N": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_p1); + newStuff.putReplace(EMLeptonDefinition.lepton_e1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(EMHadronDefinition.hadron_n1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B-2N": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_p1); - newStuff.putReplace(EMLeptonDefinition.lepton_e1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); - newStuff.putReplace(EMHadronDefinition.hadron_n2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B-2N": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_p1); + newStuff.putReplace(EMLeptonDefinition.lepton_e1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(EMHadronDefinition.hadron_n2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "B-P": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) { - newStuff.putReplace(EMLeptonDefinition.lepton_e1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); - newStuff.putReplace(EMHadronDefinition.hadron_p1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B-P": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) { + newStuff.putReplace(EMLeptonDefinition.lepton_e1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(EMHadronDefinition.hadron_p1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "ECA": - { - if (withThis.removeAllAmountsExact( - EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)) { - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - newStuff.putReplace(alpha); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "ECA": { + if (withThis.removeAllAmountsExact( + EMHadronDefinition.hadron_n1, + EMLeptonDefinition.lepton_e1, + EMHadronDefinition.hadron_p3)) { + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(alpha); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "ECP": - { - if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p2)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - newStuff.putReplace(EMHadronDefinition.hadron_p1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "ECP": { + if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p2)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(EMHadronDefinition.hadron_p1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "EC2P": - { - if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - newStuff.putReplace(EMHadronDefinition.hadron_p2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "EC2P": { + if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(EMHadronDefinition.hadron_p2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "ECP+EC2P": - { // todo look at branching ratios - if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e2, EMHadronDefinition.hadron_p5)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); - newStuff.putReplace(EMHadronDefinition.hadron_p3); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "ECP+EC2P": { // todo look at branching ratios + if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e2, EMHadronDefinition.hadron_p5)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); + newStuff.putReplace(EMHadronDefinition.hadron_p3); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "N": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) { - newStuff.putReplace(EMHadronDefinition.hadron_n1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "N": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) { + newStuff.putReplace(EMHadronDefinition.hadron_n1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "2N": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) { - newStuff.putReplace(EMHadronDefinition.hadron_n2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "2N": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) { + newStuff.putReplace(EMHadronDefinition.hadron_n2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "P": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)) { - newStuff.putReplace(EMHadronDefinition.hadron_p1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "P": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)) { + newStuff.putReplace(EMHadronDefinition.hadron_p1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "2P": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) { - newStuff.putReplace(EMHadronDefinition.hadron_p2); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "2P": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) { + newStuff.putReplace(EMHadronDefinition.hadron_p2); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "SF": - { - if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { - return true; - } + case "SF": { + if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { + return true; } + } break; - case "B-F": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_p1); - newStuff.putReplace(EMLeptonDefinition.lepton_e1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); - try { - if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { - return true; - } - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "B-F": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_p1); + newStuff.putReplace(EMLeptonDefinition.lepton_e1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); + try { + if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { + return true; + } + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; case "ECF": case "ECSF": - case "EC(+SF)": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - try { - if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { - return true; - } - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "EC(+SF)": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + try { + if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { + return true; + } + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; case "SF(+EC+B+)": - case "SF+EC+B+": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n2); - newStuff.putReplace(EMLeptonDefinition.lepton_e_1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); - try { - if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { - return true; - } - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "SF+EC+B+": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n2); + newStuff.putReplace(EMLeptonDefinition.lepton_e_1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); + try { + if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { + return true; + } + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; - case "SF+EC+B-": - { - if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1)) { - newStuff.putReplace(EMLeptonDefinition.lepton_e1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); - try { - if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { - return true; - } - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "SF+EC+B-": { + if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1)) { + newStuff.putReplace(EMLeptonDefinition.lepton_e1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1); + try { + if (Fission(decaysList, withThis, newStuff, decay.chance, false)) { + return true; + } + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; case "IT": case "IT?": @@ -1312,27 +1215,28 @@ public class EMAtomDefinition extends EMComplexTemplate { } return true; } // break; - case "IT+EC+B+": - { - if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) { - withThis.putUnifyExact(EMHadronDefinition.hadron_n2); - newStuff.putReplace(EMLeptonDefinition.lepton_e_1); - newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); - newStuff.putReplace(EMGaugeBosonDefinition.boson_Y__1); - try { - newStuff.putReplace(new EMAtomDefinition( - withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) - .getStackForm(1)); - decaysList.add(new EMDecay( - decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); - return true; - } catch (Exception e) { - if (DEBUG_MODE) { - e.printStackTrace(); - } + case "IT+EC+B+": { + if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) { + withThis.putUnifyExact(EMHadronDefinition.hadron_n2); + newStuff.putReplace(EMLeptonDefinition.lepton_e_1); + newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2); + newStuff.putReplace(EMGaugeBosonDefinition.boson_Y__1); + try { + newStuff.putReplace( + new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()) + .getStackForm(1)); + decaysList.add( + new EMDecay( + decay.chance, + newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + return true; + } catch (Exception e) { + if (DEBUG_MODE) { + e.printStackTrace(); } } } + } break; case "DEAD_END": decaysList.add(deadEnd); @@ -1351,12 +1255,14 @@ public class EMAtomDefinition extends EMComplexTemplate { EMDefinitionStackMap tree = elementalStacks.toMutable(); if (tree.removeAmountExact(emit)) { try { - decaysList.add(new EMDecay( - 1, - new EMDefinitionStack( - new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), - 1), - emit)); + decaysList.add( + new EMDecay( + 1, + new EMDefinitionStack( + new EMAtomDefinition( + tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), + 1), + emit)); return true; } catch (Exception e) { if (DEBUG_MODE) { @@ -1371,12 +1277,14 @@ public class EMAtomDefinition extends EMComplexTemplate { EMDefinitionStackMap tree = elementalStacks.toMutable(); if (tree.removeAllAmountsExact(alpha.getDefinition().getSubParticles())) { try { - decaysList.add(new EMDecay( - 1, - new EMDefinitionStack( - new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), - 1), - alpha)); + decaysList.add( + new EMDecay( + 1, + new EMDefinitionStack( + new EMAtomDefinition( + tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), + 1), + alpha)); return true; } catch (Exception e) { if (DEBUG_MODE) { @@ -1392,13 +1300,15 @@ public class EMAtomDefinition extends EMComplexTemplate { if (tree.removeAmountExact(EMHadronDefinition.hadron_n1)) { try { tree.putUnifyExact(EMHadronDefinition.hadron_p1); - decaysList.add(new EMDecay( - 1, - new EMDefinitionStack( - new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), - 1), - EMLeptonDefinition.lepton_e1, - EMNeutrinoDefinition.lepton_Ve_1)); + decaysList.add( + new EMDecay( + 1, + new EMDefinitionStack( + new EMAtomDefinition( + tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), + 1), + EMLeptonDefinition.lepton_e1, + EMNeutrinoDefinition.lepton_Ve_1)); return true; } catch (Exception e) { if (DEBUG_MODE) { @@ -1414,13 +1324,15 @@ public class EMAtomDefinition extends EMComplexTemplate { if (tree.removeAmountExact(EMHadronDefinition.hadron_p1)) { try { tree.putUnifyExact(EMHadronDefinition.hadron_n1); - decaysList.add(new EMDecay( - 1, - new EMDefinitionStack( - new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), - 1), - EMLeptonDefinition.lepton_e_1, - EMNeutrinoDefinition.lepton_Ve1)); + decaysList.add( + new EMDecay( + 1, + new EMDefinitionStack( + new EMAtomDefinition( + tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), + 1), + EMLeptonDefinition.lepton_e_1, + EMNeutrinoDefinition.lepton_Ve1)); return true; } catch (Exception e) { if (DEBUG_MODE) { @@ -1436,12 +1348,14 @@ public class EMAtomDefinition extends EMComplexTemplate { if (tree.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) { try { tree.putUnifyExact(EMHadronDefinition.hadron_n1); - decaysList.add(new EMDecay( - 1, - new EMDefinitionStack( - new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), - 1), - EMNeutrinoDefinition.lepton_Ve1)); + decaysList.add( + new EMDecay( + 1, + new EMDefinitionStack( + new EMAtomDefinition( + tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), + 1), + EMNeutrinoDefinition.lepton_Ve1)); return true; } catch (Exception e) { if (DEBUG_MODE) { @@ -1452,18 +1366,13 @@ public class EMAtomDefinition extends EMComplexTemplate { return false; } - private boolean Fission( - ArrayList<EMDecay> decaysList, - EMDefinitionStackMap fissile, - EMDefinitionStackMap particles, - double probability, - boolean spontaneousCheck) { + private boolean Fission(ArrayList<EMDecay> decaysList, EMDefinitionStackMap fissile, EMDefinitionStackMap particles, + double probability, boolean spontaneousCheck) { EMDefinitionStackMap heavy = new EMDefinitionStackMap(); double[] liquidDrop = liquidDropFunction(abs(getElement()) <= 97); for (EMDefinitionStack stack : fissile.valuesToArray()) { - if (spontaneousCheck - && stack.getDefinition() instanceof EMHadronDefinition + if (spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition && (stack.getAmount() <= 80 || stack.getAmount() < 90 && XSTR_INSTANCE.nextInt(10) < stack.getAmount() - 80)) { return false; @@ -1482,8 +1391,8 @@ public class EMAtomDefinition extends EMComplexTemplate { fissile.removeAmountExact(new EMDefinitionStack(stack.getDefinition(), heavy_cnt + neutrals_cnt)); heavy.putReplace(new EMDefinitionStack(stack.getDefinition(), heavy_cnt)); // }else{ - // particles.add(stack); - // light.remove(stack.definition); + // particles.add(stack); + // light.remove(stack.definition); // } } else { int heavy_cnt = (int) Math.ceil(stack.getAmount() * liquidDrop[0]); @@ -1497,12 +1406,16 @@ public class EMAtomDefinition extends EMComplexTemplate { } try { - particles.putReplace(new EMDefinitionStack( - new EMAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1)); - particles.putReplace(new EMDefinitionStack( - new EMAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1)); - decaysList.add( - new EMDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); + particles.putReplace( + new EMDefinitionStack( + new EMAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), + 1)); + particles.putReplace( + new EMDefinitionStack( + new EMAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), + 1)); + decaysList + .add(new EMDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree())); return true; } catch (Exception e) { if (DEBUG_MODE) { @@ -1558,7 +1471,7 @@ public class EMAtomDefinition extends EMComplexTemplate { } } if (energyLevel < abs(getCharge()) / 3 + getNeutralCount()) { - return new EMDecay[] {new EMDecay(1, this, boson_Y__)}; + return new EMDecay[] { new EMDecay(1, this, boson_Y__) }; } return getNaturalDecayInstant(); } @@ -1581,10 +1494,8 @@ public class EMAtomDefinition extends EMComplexTemplate { result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * -currentEnergyLevel; } } else { - result -= getIaea() - .getEnergeticStatesArray()[ - (int) Math.min(getIaea().getEnergeticStatesArray().length - 1, currentEnergyLevel)] - .energy; + result -= getIaea().getEnergeticStatesArray()[(int) Math + .min(getIaea().getEnergeticStatesArray().length - 1, currentEnergyLevel)].energy; } if (newEnergyLevel >= getIaea().getEnergeticStatesArray().length) { if (currentEnergyLevel >= getIaea().getEnergeticStatesArray().length) { @@ -1649,22 +1560,22 @@ public class EMAtomDefinition extends EMComplexTemplate { decaysInto.add(new EMDefinitionStack(boson_Y__, 2)); } } - return new EMDecay[] {new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])), deadEnd}; + return new EMDecay[] { new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])), deadEnd }; } // @Override // public iElementalDefinition getAnti() { - // EMDefinitionStack[] stacks = this.elementalStacks.values(); - // EMDefinitionStack[] antiElements = new EMDefinitionStack[stacks.length]; - // for (int i = 0; i < antiElements.length; i++) { - // antiElements[i] = new EMDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount); - // } - // try { - // return new dAtomDefinition(false, antiElements); - // } catch (tElementalException e) { - // if (DEBUG_MODE) e.printStackTrace(); - // return null; - // } + // EMDefinitionStack[] stacks = this.elementalStacks.values(); + // EMDefinitionStack[] antiElements = new EMDefinitionStack[stacks.length]; + // for (int i = 0; i < antiElements.length; i++) { + // antiElements[i] = new EMDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount); + // } + // try { + // return new dAtomDefinition(false, antiElements); + // } catch (tElementalException e) { + // if (DEBUG_MODE) e.printStackTrace(); + // return null; + // } // } @Override @@ -1708,8 +1619,8 @@ public class EMAtomDefinition extends EMComplexTemplate { registry.registerDefinitionClass( nbtType, new EMIndirectType( - (definitionsRegistry, nbt) -> - new EMAtomDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), + (definitionsRegistry, + nbt) -> new EMAtomDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), EMAtomDefinition.class, "tt.keyword.Element")); EMNuclideIAEA.run(); @@ -1753,8 +1664,8 @@ public class EMAtomDefinition extends EMComplexTemplate { int izoDiff = isotope - Isotope; int izoDiffAbs = abs(izoDiff); double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false); - TreeMap<Double, Integer> isotopes = - mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>()); + TreeMap<Double, Integer> isotopes = mostStableUnstableIsotopes + .computeIfAbsent(element, k -> new TreeMap<>()); isotopes.put(rawLifeTime, isotope); // todo dont add stable ones } } @@ -1770,112 +1681,109 @@ public class EMAtomDefinition extends EMComplexTemplate { integerTreeSetEntry.getValue().first()), new EMDefinitionStack(EMLeptonDefinition.lepton_e, integerTreeSetEntry.getKey()))); if (DEBUG_MODE) { - TecTech.LOGGER.info("Added Stable Atom:" + integerTreeSetEntry.getKey() + ' ' - + integerTreeSetEntry.getValue().first() + ' ' - + stableAtoms.get(integerTreeSetEntry.getKey()).getMass()); + TecTech.LOGGER.info( + "Added Stable Atom:" + integerTreeSetEntry.getKey() + + ' ' + + integerTreeSetEntry.getValue().first() + + ' ' + + stableAtoms.get(integerTreeSetEntry.getKey()).getMass()); } } - for (Map.Entry<Integer, TreeMap<Double, Integer>> integerTreeMapEntry : - mostStableUnstableIsotopes.entrySet()) { + for (Map.Entry<Integer, TreeMap<Double, Integer>> integerTreeMapEntry : mostStableUnstableIsotopes + .entrySet()) { unstableAtoms.put( integerTreeMapEntry.getKey(), new EMAtomDefinition( new EMDefinitionStack(EMHadronDefinition.hadron_p, integerTreeMapEntry.getKey()), new EMDefinitionStack( EMHadronDefinition.hadron_n, - integerTreeMapEntry - .getValue() - .lastEntry() - .getValue()), + integerTreeMapEntry.getValue().lastEntry().getValue()), new EMDefinitionStack(EMLeptonDefinition.lepton_e, integerTreeMapEntry.getKey()))); if (DEBUG_MODE) { - TecTech.LOGGER.info("Added Unstable Atom:" + integerTreeMapEntry.getKey() + ' ' - + integerTreeMapEntry.getValue().lastEntry().getValue() + ' ' - + unstableAtoms.get(integerTreeMapEntry.getKey()).getMass()); + TecTech.LOGGER.info( + "Added Unstable Atom:" + integerTreeMapEntry.getKey() + + ' ' + + integerTreeMapEntry.getValue().lastEntry().getValue() + + ' ' + + unstableAtoms.get(integerTreeMapEntry.getKey()).getMass()); } } deuterium = new EMAtomDefinition( - EMHadronDefinition.hadron_p1, EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e1) - .getStackForm(1); + EMHadronDefinition.hadron_p1, + EMHadronDefinition.hadron_n1, + EMLeptonDefinition.lepton_e1).getStackForm(1); registry.registerForDisplay(deuterium.getDefinition()); tritium = new EMAtomDefinition( - EMHadronDefinition.hadron_p1, EMHadronDefinition.hadron_n2, EMLeptonDefinition.lepton_e1) - .getStackForm(1); + EMHadronDefinition.hadron_p1, + EMHadronDefinition.hadron_n2, + EMLeptonDefinition.lepton_e1).getStackForm(1); registry.registerForDisplay(tritium.getDefinition()); helium_3 = new EMAtomDefinition( - EMHadronDefinition.hadron_p2, EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e2) - .getStackForm(1); + EMHadronDefinition.hadron_p2, + EMHadronDefinition.hadron_n1, + EMLeptonDefinition.lepton_e2).getStackForm(1); registry.registerForDisplay(helium_3.getDefinition()); alpha = new EMAtomDefinition(EMHadronDefinition.hadron_p2, EMHadronDefinition.hadron_n2).getStackForm(1); registry.registerForDisplay(alpha.getDefinition()); beryllium_8 = new EMAtomDefinition( - new EMDefinitionStack(EMHadronDefinition.hadron_p, 4), - new EMDefinitionStack(EMHadronDefinition.hadron_n, 4), - new EMDefinitionStack(EMLeptonDefinition.lepton_e, 4)) - .getStackForm(1); + new EMDefinitionStack(EMHadronDefinition.hadron_p, 4), + new EMDefinitionStack(EMHadronDefinition.hadron_n, 4), + new EMDefinitionStack(EMLeptonDefinition.lepton_e, 4)).getStackForm(1); registry.registerForDisplay(beryllium_8.getDefinition()); carbon_14 = new EMAtomDefinition( - new EMDefinitionStack(EMHadronDefinition.hadron_p, 6), - new EMDefinitionStack(EMHadronDefinition.hadron_n, 8), - new EMDefinitionStack(EMLeptonDefinition.lepton_e, 6)) - .getStackForm(1); + new EMDefinitionStack(EMHadronDefinition.hadron_p, 6), + new EMDefinitionStack(EMHadronDefinition.hadron_n, 8), + new EMDefinitionStack(EMLeptonDefinition.lepton_e, 6)).getStackForm(1); registry.registerForDisplay(carbon_14.getDefinition()); neon_24 = new EMAtomDefinition( - new EMDefinitionStack(EMHadronDefinition.hadron_p, 10), - new EMDefinitionStack(EMHadronDefinition.hadron_n, 14), - new EMDefinitionStack(EMLeptonDefinition.lepton_e, 10)) - .getStackForm(1); + new EMDefinitionStack(EMHadronDefinition.hadron_p, 10), + new EMDefinitionStack(EMHadronDefinition.hadron_n, 14), + new EMDefinitionStack(EMLeptonDefinition.lepton_e, 10)).getStackForm(1); registry.registerForDisplay(neon_24.getDefinition()); silicon_34 = new EMAtomDefinition( - new EMDefinitionStack(EMHadronDefinition.hadron_p, 14), - new EMDefinitionStack(EMHadronDefinition.hadron_n, 20), - new EMDefinitionStack(EMLeptonDefinition.lepton_e, 14)) - .getStackForm(1); + new EMDefinitionStack(EMHadronDefinition.hadron_p, 14), + new EMDefinitionStack(EMHadronDefinition.hadron_n, 20), + new EMDefinitionStack(EMLeptonDefinition.lepton_e, 14)).getStackForm(1); registry.registerForDisplay(silicon_34.getDefinition()); uranium_238 = new EMAtomDefinition( - new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92), - new EMDefinitionStack(EMHadronDefinition.hadron_p, 92), - new EMDefinitionStack(EMHadronDefinition.hadron_n, 146)) - .getStackForm(1); + new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92), + new EMDefinitionStack(EMHadronDefinition.hadron_p, 92), + new EMDefinitionStack(EMHadronDefinition.hadron_n, 146)).getStackForm(1); registry.registerForDisplay(uranium_238.getDefinition()); uranium_235 = new EMAtomDefinition( - new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92), - new EMDefinitionStack(EMHadronDefinition.hadron_p, 92), - new EMDefinitionStack(EMHadronDefinition.hadron_n, 143)) - .getStackForm(1); + new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92), + new EMDefinitionStack(EMHadronDefinition.hadron_p, 92), + new EMDefinitionStack(EMHadronDefinition.hadron_n, 143)).getStackForm(1); registry.registerForDisplay(uranium_235.getDefinition()); - TecTech.LOGGER.info("Diff Mass U : " - + (uranium_238.getDefinition().getMass() - - uranium_235.getDefinition().getMass())); + TecTech.LOGGER.info( + "Diff Mass U : " + (uranium_238.getDefinition().getMass() - uranium_235.getDefinition().getMass())); plutonium_239 = new EMAtomDefinition( - new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94), - new EMDefinitionStack(EMHadronDefinition.hadron_p, 94), - new EMDefinitionStack(EMHadronDefinition.hadron_n, 145)) - .getStackForm(1); + new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94), + new EMDefinitionStack(EMHadronDefinition.hadron_p, 94), + new EMDefinitionStack(EMHadronDefinition.hadron_n, 145)).getStackForm(1); registry.registerForDisplay(plutonium_239.getDefinition()); plutonium_241 = new EMAtomDefinition( - new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94), - new EMDefinitionStack(EMHadronDefinition.hadron_p, 94), - new EMDefinitionStack(EMHadronDefinition.hadron_n, 147)) - .getStackForm(1); + new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94), + new EMDefinitionStack(EMHadronDefinition.hadron_p, 94), + new EMDefinitionStack(EMHadronDefinition.hadron_n, 147)).getStackForm(1); registry.registerForDisplay(plutonium_241.getDefinition()); - TecTech.LOGGER.info("Diff Mass Pu: " - + (plutonium_241.getDefinition().getMass() - - plutonium_239.getDefinition().getMass())); + TecTech.LOGGER.info( + "Diff Mass Pu: " + + (plutonium_241.getDefinition().getMass() - plutonium_239.getDefinition().getMass())); somethingHeavy = (EMAtomDefinition) plutonium_241.getDefinition(); @@ -2319,7 +2227,7 @@ public class EMAtomDefinition extends EMComplexTemplate { transformationInfo.addOredict( new EMDefinitionStack(uranium_238.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, - Uranium /*238*/, + Uranium /* 238 */, 1); transformationInfo.addOredict( new EMDefinitionStack(uranium_235.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), @@ -2330,7 +2238,7 @@ public class EMAtomDefinition extends EMComplexTemplate { transformationInfo.addOredict( new EMDefinitionStack(plutonium_239.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, - Plutonium /*239*/, + Plutonium /* 239 */, 1); transformationInfo.addOredict( new EMDefinitionStack(plutonium_241.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java index be51eb3681..b1f6c79d30 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java @@ -6,6 +6,12 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import net.minecraftforge.oredict.OreDictionary; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay; @@ -21,17 +27,15 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.transformations import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.OreDictionaryStack; import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import net.minecraftforge.oredict.OreDictionary; /** * Created by danie_000 on 17.11.2016. */ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map i/o + private final int hash; private static final String nbtType = "h"; @@ -210,18 +214,14 @@ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map @Override public EMDecay[] getNaturalDecayInstant() { EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray(); - if (getAmount() == 2 - && quarkStacks.length == 2 - && quarkStacks[0].getDefinition().getMass() - == quarkStacks[1].getDefinition().getMass() - && quarkStacks[0].getDefinition().getGeneration() - == -quarkStacks[1].getDefinition().getGeneration()) { + if (getAmount() == 2 && quarkStacks.length == 2 + && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() + && quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) { return EMDecay.NO_PRODUCT; } ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>(); for (EMDefinitionStack quarks : quarkStacks) { - if (quarks.getDefinition().getGeneration() == 1 - || quarks.getDefinition().getGeneration() == -1) { + if (quarks.getDefinition().getGeneration() == 1 || quarks.getDefinition().getGeneration() == -1) { // covers both quarks and antiquarks decaysInto.add(quarks); } else { @@ -229,21 +229,18 @@ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map decaysInto.add(new EMDefinitionStack(boson_Y__, 2)); } } - return new EMDecay[] {new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])), deadEnd}; + return new EMDecay[] { new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])), deadEnd }; } @Override public EMDecay[] getEnergyInducedDecay(long energyLevel) { EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray(); - if (getAmount() == 2 - && quarkStacks.length == 2 - && quarkStacks[0].getDefinition().getMass() - == quarkStacks[1].getDefinition().getMass() - && quarkStacks[0].getDefinition().getGeneration() - == -quarkStacks[1].getDefinition().getGeneration()) { + if (getAmount() == 2 && quarkStacks.length == 2 + && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() + && quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) { return EMDecay.NO_PRODUCT; } - return new EMDecay[] {new EMDecay(0.75D, quarkStacks), deadEnd}; // decay into quarks + return new EMDecay[] { new EMDecay(0.75D, quarkStacks), deadEnd }; // decay into quarks } @Override @@ -274,15 +271,12 @@ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map @Override public EMDecay[] getDecayArray() { EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray(); - if (getAmount() == 2 - && quarkStacks.length == 2 - && quarkStacks[0].getDefinition().getMass() - == quarkStacks[1].getDefinition().getMass() - && quarkStacks[0].getDefinition().getGeneration() - == -quarkStacks[1].getDefinition().getGeneration()) { + if (getAmount() == 2 && quarkStacks.length == 2 + && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() + && quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) { return EMDecay.NO_PRODUCT; } else if (getAmount() != 3) { - return new EMDecay[] {new EMDecay(0.95D, quarkStacks), deadEnd}; // decay into quarks + return new EMDecay[] { new EMDecay(0.95D, quarkStacks), deadEnd }; // decay into quarks } else { ArrayList<EMQuarkDefinition> newBaryon = new ArrayList<>(); IEMDefinition[] Particles = new IEMDefinition[2]; @@ -310,20 +304,19 @@ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map try { return new EMDecay[] { - new EMDecay( - 0.001D, - new EMHadronDefinition(false, contentOfBaryon), - Particles[0], - Particles[1], - boson_Y__), - new EMDecay(0.99D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]), - deadEnd - }; + new EMDecay( + 0.001D, + new EMHadronDefinition(false, contentOfBaryon), + Particles[0], + Particles[1], + boson_Y__), + new EMDecay(0.99D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]), + deadEnd }; } catch (EMException e) { if (DEBUG_MODE) { e.printStackTrace(); } - return new EMDecay[] {deadEnd}; + return new EMDecay[] { deadEnd }; } } } @@ -355,17 +348,17 @@ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map // @Override // public iElementalDefinition getAnti() { - // cElementalDefinitionStack[] stacks = this.quarkStacks.values(); - // cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length]; - // for (int i = 0; i < antiElements.length; i++) { - // antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount); - // } - // try { - // return new dHadronDefinition(false, antiElements); - // } catch (tElementalException e) { - // if (DEBUG_MODE) e.printStackTrace(); - // return null; - // } + // cElementalDefinitionStack[] stacks = this.quarkStacks.values(); + // cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length]; + // for (int i = 0; i < antiElements.length; i++) { + // antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount); + // } + // try { + // return new dHadronDefinition(false, antiElements); + // } catch (tElementalException e) { + // if (DEBUG_MODE) e.printStackTrace(); + // return null; + // } // } @Override @@ -393,17 +386,21 @@ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map registry.registerDefinitionClass( nbtType, new EMIndirectType( - (definitionsRegistry, nbt) -> - new EMHadronDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), + (definitionsRegistry, + nbt) -> new EMHadronDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), EMHadronDefinition.class, "tt.keyword.Hadron")); try { - hadron_p = new EMHadronDefinition(new EMConstantStackMap( - EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1))); + hadron_p = new EMHadronDefinition( + new EMConstantStackMap( + EMQuarkDefinition.quark_u.getStackForm(2), + EMQuarkDefinition.quark_d.getStackForm(1))); protonMass = hadron_p.getMass(); // redefine the proton with proper lifetime (the lifetime is based on mass comparison) - hadron_p = new EMHadronDefinition(new EMConstantStackMap( - EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1))); + hadron_p = new EMHadronDefinition( + new EMConstantStackMap( + EMQuarkDefinition.quark_u.getStackForm(2), + EMQuarkDefinition.quark_d.getStackForm(1))); SYMBOL_MAP.put(hadron_p, "p"); UNLOCALIZED_NAME_MAP.put(hadron_p, "tt.keyword.Proton"); registry.registerForDisplay(hadron_p); @@ -415,12 +412,16 @@ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map registry.registerForDisplay(hadron_p_); registry.registerDirectDefinition("~p", hadron_p_); - hadron_n = new EMHadronDefinition(new EMConstantStackMap( - EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2))); + hadron_n = new EMHadronDefinition( + new EMConstantStackMap( + EMQuarkDefinition.quark_u.getStackForm(1), + EMQuarkDefinition.quark_d.getStackForm(2))); neutronMass = hadron_n.getMass(); // redefine the neutron with proper lifetime (the lifetime is based on mass comparison) - hadron_n = new EMHadronDefinition(new EMConstantStackMap( - EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2))); + hadron_n = new EMHadronDefinition( + new EMConstantStackMap( + EMQuarkDefinition.quark_u.getStackForm(1), + EMQuarkDefinition.quark_d.getStackForm(2))); SYMBOL_MAP.put(hadron_n, "n"); UNLOCALIZED_NAME_MAP.put(hadron_n, "tt.keyword.Neutron"); registry.registerForDisplay(hadron_n); @@ -460,16 +461,16 @@ public class EMHadronDefinition extends EMComplexTemplate { // TODO Optimize map // Added to atom map, but should be in its own EMDefinitionStack neutrons = new EMDefinitionStack(hadron_n, 1000 * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED); EMDequantizationInfo emDequantizationInfo = new EMDequantizationInfo(neutrons); - emDequantizationInfo.setOre(new OreDictionaryStack( - 1, - OreDictionary.getOreID( - OrePrefixes.dust.name() + Materials.Neutronium.mName))); // todo shitty looking, but works... + emDequantizationInfo.setOre( + new OreDictionaryStack( + 1, + OreDictionary.getOreID(OrePrefixes.dust.name() + Materials.Neutronium.mName))); // todo shitty + // looking, but + // works... transformationInfo.getInfoMap().put(neutrons.getDefinition(), emDequantizationInfo); - transformationInfo - .getOredictQuantization() - .put( - OreDictionary.getOreID(OrePrefixes.ingotHot.name() + Materials.Neutronium.mName), - new EMOredictQuantizationInfo(OrePrefixes.ingotHot, Materials.Neutronium, 1, neutrons)); + transformationInfo.getOredictQuantization().put( + OreDictionary.getOreID(OrePrefixes.ingotHot.name() + Materials.Neutronium.mName), + new EMOredictQuantizationInfo(OrePrefixes.ingotHot, Materials.Neutronium, 1, neutrons)); } @Override diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java index 13cab15970..e5e0bb35ea 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java @@ -11,11 +11,12 @@ import java.util.HashSet; import java.util.TreeMap; public final class EMNuclideIAEA { + public static final double AMU_TO_EV_DIV_C_C = 9.31494061E08D, MICRO_AMU_TO_EV_DIV_C_C = 9.31494061E02D; - // Nuclide T1/2 T1/2 [s] Decay Modes ? Q Q?- Q? QEC Q?- n Sn Sp Binding/A Atomic Mass Mass - // Excess Discovery - // Abund. [mole fract.] BR [%] [?N] [barn] [keV] [keV] [keV] [keV] [keV] [keV] [keV] [? AMU] [keV] + // Nuclide T1/2 T1/2 [s] Decay Modes ? Q Q?- Q? QEC Q?- n Sn Sp Binding/A Atomic Mass Mass + // Excess Discovery + // Abund. [mole fract.] BR [%] [?N] [barn] [keV] [keV] [keV] [keV] [keV] [keV] [keV] [? AMU] [keV] // Z,N,symb,radius, unc, energy, unc, jp, half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay // %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quad , unc,Qb-,unc,Qb- @@ -28,8 +29,8 @@ public final class EMNuclideIAEA { String line = ""; try { - BufferedReader reader = - new BufferedReader(new InputStreamReader(EMNuclideIAEA.class.getResourceAsStream("nuclides.csv"))); + BufferedReader reader = new BufferedReader( + new InputStreamReader(EMNuclideIAEA.class.getResourceAsStream("nuclides.csv"))); ArrayList<String[]> blockOfData = new ArrayList<>(4); while ((line = reader.readLine()) != null) { String[] split = splitButDifferent(line, ","); @@ -59,8 +60,10 @@ public final class EMNuclideIAEA { while ((line = reader.readLine()) != null) { String[] split = splitButDifferent(line, ","); if (split.length != 47) { - throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclidesTable database " - + line); + throw new Error( + "Invalid count (" + split.length + + ") of separators in IAEA nuclidesTable database " + + line); } get(Integer.parseInt(split[0]), Integer.parseInt(split[1])).getMoreData(split); } @@ -130,9 +133,9 @@ public final class EMNuclideIAEA { private void getMoreData(String[] cells) { // if(DEBUG_MODE) { - // if (add(cells[14])) System.out.println(N + " " + Z); - // if (add(cells[17])) System.out.println(N + " " + Z); - // if (add(cells[20])) System.out.println(N + " " + Z); + // if (add(cells[14])) System.out.println(N + " " + Z); + // if (add(cells[17])) System.out.println(N + " " + Z); + // if (add(cells[20])) System.out.println(N + " " + Z); // } new energeticState( this, @@ -210,6 +213,7 @@ public final class EMNuclideIAEA { } public static final class energeticState { + public final double energy; public double Thalf; public final iaeaDecay[] decaymodes; @@ -225,11 +229,14 @@ public final class EMNuclideIAEA { } private energeticState(String[] cells) { - EMNuclideIAEA nuclide = - get((int) doubleOrNaN(cells[0], "protons"), (int) doubleOrNaN(cells[1], "neutrons")); + EMNuclideIAEA nuclide = get( + (int) doubleOrNaN(cells[0], "protons"), + (int) doubleOrNaN(cells[1], "neutrons")); if (nuclide == null) { - throw new Error("Missing nuclide " + (int) doubleOrNaN(cells[0], "protons") + ' ' - + (int) doubleOrNaN(cells[1], "neutrons")); + throw new Error( + "Missing nuclide " + (int) doubleOrNaN(cells[0], "protons") + + ' ' + + (int) doubleOrNaN(cells[1], "neutrons")); } energy = doubleOrNaN(cells[3], "energy level", nuclide) * 1000D; // to eV if (energy < 0) { @@ -243,9 +250,9 @@ public final class EMNuclideIAEA { } nuclide.energeticStates.put(energy, this); // if(DEBUG_MODE) { - // if (add(cells[12])) System.out.println(nuclide.N + " " + nuclide.Z); - // if (add(cells[15])) System.out.println(nuclide.N + " " + nuclide.Z); - // if (add(cells[18])) System.out.println(nuclide.N + " " + nuclide.Z); + // if (add(cells[12])) System.out.println(nuclide.N + " " + nuclide.Z); + // if (add(cells[15])) System.out.println(nuclide.N + " " + nuclide.Z); + // if (add(cells[18])) System.out.println(nuclide.N + " " + nuclide.Z); // } decaymodes = getDecaysFixed( cells[12], @@ -289,8 +296,8 @@ public final class EMNuclideIAEA { return false; } - private static iaeaDecay[] getDecaysFixed( - String decay1, double chance1, String decay2, double chance2, String decay3, double chance3) { + private static iaeaDecay[] getDecaysFixed(String decay1, double chance1, String decay2, double chance2, + String decay3, double chance3) { boolean do1, do2, do3; do1 = !decay1.isEmpty() && !Double.isNaN(chance1); do2 = !decay2.isEmpty() && !Double.isNaN(chance2); @@ -337,13 +344,14 @@ public final class EMNuclideIAEA { } } // if(DEBUG_MODE){ - // System.out.println("INVALID + // System.out.println("INVALID // SUM?\t"+normalization+"\t"+decay1+"\t"+chance1+"\t"+decay2+"\t"+chance2+"\t"+decay3+"\t"+chance3); // } return decays.values().toArray(new iaeaDecay[0]); } public static final class iaeaDecay { + public final double chance; public final String decayName; public static final iaeaDecay DEAD_END = new iaeaDecay(1D, "DEAD_END"); diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java index 18d8852657..e2020e06ab 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java @@ -5,8 +5,9 @@ import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate; public abstract class EMBosonDefinition extends EMPrimitiveTemplate { - protected EMBosonDefinition( - String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) { + + protected EMBosonDefinition(String name, String symbol, int generation, double mass, int charge, int color, int ID, + String bind) { super(name, symbol, generation, mass, charge, color, ID, bind); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java index 28971400d5..d5fbbfad88 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java @@ -5,8 +5,9 @@ import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate; public abstract class EMFermionDefinition extends EMPrimitiveTemplate { - protected EMFermionDefinition( - String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) { + + protected EMFermionDefinition(String name, String symbol, int generation, double mass, int charge, int color, + int ID, String bind) { super(name, symbol, generation, mass, charge, color, ID, bind); } 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 3242b374a9..0c84fccc4b 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 @@ -16,9 +16,15 @@ import com.github.technus.tectech.util.TT_Utility; * Created by danie_000 on 22.10.2016. */ public class EMGaugeBosonDefinition extends EMBosonDefinition { - public static final EMGaugeBosonDefinition - boson_g__ = new EMGaugeBosonDefinition("tt.keyword.Gluon", "g", 0, 0, 8, 27, "g"), - boson_Y__ = new EMGaugeBosonDefinition("tt.keyword.Photon", "\u03b3", 1e-18D, 0, -1, 28, "Y"), + + public static final EMGaugeBosonDefinition boson_g__ = new EMGaugeBosonDefinition( + "tt.keyword.Gluon", + "g", + 0, + 0, + 8, + 27, + "g"), boson_Y__ = new EMGaugeBosonDefinition("tt.keyword.Photon", "\u03b3", 1e-18D, 0, -1, 28, "Y"), boson_Z = new EMGaugeBosonDefinition("tt.keyword.Weak0", "Z0", 91.1876e9, 0, -1, 29, "Z0"), boson_W_ = new EMGaugeBosonDefinition("tt.keyword.WeakPlus", "W+", 80.379e9, 3, -1, 30, "W+"), boson_W = new EMGaugeBosonDefinition("tt.keyword.WeakMinus", "W-", 80.379e9, -3, -1, 31, "W-"); @@ -27,8 +33,8 @@ public class EMGaugeBosonDefinition extends EMBosonDefinition { public static final EMDefinitionStack boson_Y__1 = new EMDefinitionStack(boson_Y__, 1); public static final EMDecay deadEndHalf = new EMDecay(boson_Y__1); - protected EMGaugeBosonDefinition( - String name, String symbol, double mass, int charge, int color, int ID, String bind) { + protected EMGaugeBosonDefinition(String name, String symbol, double mass, int charge, int color, int ID, + String bind) { super(name, TT_Utility.toSuperscript(symbol), 0, mass, charge, color, ID, bind); } 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 826c7a63a1..c8e5c21735 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 @@ -16,9 +16,15 @@ import com.github.technus.tectech.util.TT_Utility; * Created by danie_000 on 22.10.2016. */ public class EMLeptonDefinition extends EMFermionDefinition { - public static final EMLeptonDefinition - lepton_e = new EMLeptonDefinition("tt.keyword.Electron", "\u03b2-", 1, 0.511e6D, -3, 15, "e-"), - lepton_m = new EMLeptonDefinition("tt.keyword.Muon", "\u03bc-", 2, 105.658e6D, -3, 17, "m-"), + + public static final EMLeptonDefinition lepton_e = new EMLeptonDefinition( + "tt.keyword.Electron", + "\u03b2-", + 1, + 0.511e6D, + -3, + 15, + "e-"), lepton_m = new EMLeptonDefinition("tt.keyword.Muon", "\u03bc-", 2, 105.658e6D, -3, 17, "m-"), lepton_t = new EMLeptonDefinition("tt.keyword.Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19, "t-"), lepton_e_ = new EMLeptonDefinition("tt.keyword.Positron", "\u03b2+", -1, 0.511e6D, 3, 16, "e+"), lepton_m_ = new EMLeptonDefinition("tt.keyword.Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18, "m+"), diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java index 7813870a36..9b42f1b5e3 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java @@ -13,15 +13,31 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefini * Created by danie_000 on 22.10.2016. */ public class EMNeutrinoDefinition extends EMLeptonDefinition { - public static final EMNeutrinoDefinition - lepton_Ve = new EMNeutrinoDefinition("tt.keyword.ElectronNeutrino", "\u03bd\u03b2", 1, 2e0D, 21, "Ve"), + + public static final EMNeutrinoDefinition lepton_Ve = new EMNeutrinoDefinition( + "tt.keyword.ElectronNeutrino", + "\u03bd\u03b2", + 1, + 2e0D, + 21, + "Ve"), lepton_Vm = new EMNeutrinoDefinition("tt.keyword.MuonNeutrino", "\u03bd\u03bc", 2, 0.15e6D, 23, "Vm"), lepton_Vt = new EMNeutrinoDefinition("tt.keyword.TauonNeutrino", "\u03bd\u03c4", 3, 15e6D, 25, "Vt"), lepton_Ve_ = new EMNeutrinoDefinition("tt.keyword.PositronNeutrino", "~\u03bd\u03b2", -1, 2e0D, 22, "~Ve"), - lepton_Vm_ = - new EMNeutrinoDefinition("tt.keyword.AntimuonNeutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24, "~Vm"), - lepton_Vt_ = - new EMNeutrinoDefinition("tt.keyword.AntitauonNeutrino", "~\u03bd\u03c4", -3, 15e6D, 26, "~Vt"); + lepton_Vm_ = new EMNeutrinoDefinition( + "tt.keyword.AntimuonNeutrino", + "~\u03bd\u03bc", + -2, + 0.15e6D, + 24, + "~Vm"), + lepton_Vt_ = new EMNeutrinoDefinition( + "tt.keyword.AntitauonNeutrino", + "~\u03bd\u03c4", + -3, + 15e6D, + 26, + "~Vt"); public static final EMDefinitionStack lepton_Ve1 = new EMDefinitionStack(lepton_Ve, 1); public static final EMDefinitionStack lepton_Ve2 = new EMDefinitionStack(lepton_Ve, 2); diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java index b78e6857a8..115e79825f 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java @@ -11,30 +11,73 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.reg * Created by danie_000 on 22.10.2016. */ public class EMPrimitiveDefinition extends EMPrimitiveTemplate { - public static final EMPrimitiveDefinition - nbtE__ = new EMPrimitiveDefinition("tt.keyword.PrimitiveNBTERROR", "!", 0, 0D, -1, Integer.MIN_VALUE, "!"), - null__ = - new EMPrimitiveDefinition( - "tt.keyword.PrimitiveNULLPOINTER", ".", 0, 0D, -3, Integer.MIN_VALUE + 1, "."), + + public static final EMPrimitiveDefinition nbtE__ = new EMPrimitiveDefinition( + "tt.keyword.PrimitiveNBTERROR", + "!", + 0, + 0D, + -1, + Integer.MIN_VALUE, + "!"), + null__ = new EMPrimitiveDefinition( + "tt.keyword.PrimitiveNULLPOINTER", + ".", + 0, + 0D, + -3, + Integer.MIN_VALUE + 1, + "."), space = new EMPrimitiveDefinition("tt.keyword.PrimitiveSpace", "_", 0, 0D, -4, Integer.MIN_VALUE + 2, "_"), - space_ = - new EMPrimitiveDefinition( - "tt.keyword.PrimitivePresence", "~_", 0, 0D, -4, Integer.MIN_VALUE + 3, "~_"), + space_ = new EMPrimitiveDefinition( + "tt.keyword.PrimitivePresence", + "~_", + 0, + 0D, + -4, + Integer.MIN_VALUE + 3, + "~_"), mass = new EMPrimitiveDefinition("tt.keyword.PrimitiveMass", "*", 0, 1, -4, Integer.MIN_VALUE + 4, "*"), - mass_ = - new EMPrimitiveDefinition( - "tt.keyword.PrimitiveDarkMass", "~*", 0, 1, -4, Integer.MIN_VALUE + 5, "~*"), - energy = - new EMPrimitiveDefinition("tt.keyword.PrimitiveEnergy", "E", 4, 0D, -4, Integer.MIN_VALUE + 6, "E"), - energy_ = - new EMPrimitiveDefinition( - "tt.keyword.PrimitiveDarkEnergy", "~E", -4, 0, -4, Integer.MIN_VALUE + 7, "~E"), - magic = - new EMPrimitiveDefinition( - "tt.keyword.PrimitiveMagic", "Ma", 5, 1e5D, 0, Integer.MIN_VALUE + 8, "Ma"), - magic_ = - new EMPrimitiveDefinition( - "tt.keyword.PrimitiveAntimagic", "~Ma", -5, 1e5D, 0, Integer.MIN_VALUE + 9, "~Ma"); + mass_ = new EMPrimitiveDefinition( + "tt.keyword.PrimitiveDarkMass", + "~*", + 0, + 1, + -4, + Integer.MIN_VALUE + 5, + "~*"), + energy = new EMPrimitiveDefinition( + "tt.keyword.PrimitiveEnergy", + "E", + 4, + 0D, + -4, + Integer.MIN_VALUE + 6, + "E"), + energy_ = new EMPrimitiveDefinition( + "tt.keyword.PrimitiveDarkEnergy", + "~E", + -4, + 0, + -4, + Integer.MIN_VALUE + 7, + "~E"), + magic = new EMPrimitiveDefinition( + "tt.keyword.PrimitiveMagic", + "Ma", + 5, + 1e5D, + 0, + Integer.MIN_VALUE + 8, + "Ma"), + magic_ = new EMPrimitiveDefinition( + "tt.keyword.PrimitiveAntimagic", + "~Ma", + -5, + 1e5D, + 0, + Integer.MIN_VALUE + 9, + "~Ma"); protected EMPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID, String bind) { super(name, symbol, type, mass, 0, color, ID, bind); 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 f1179f892f..d4e865faba 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 @@ -13,9 +13,15 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.reg * Created by danie_000 on 22.10.2016. */ public class EMQuarkDefinition extends EMFermionDefinition { - public static final EMQuarkDefinition - quark_u = new EMQuarkDefinition("tt.keyword.QuarkUp", "u", 1, 2.3e6D, 2, 3, "u"), - quark_c = new EMQuarkDefinition("tt.keyword.QuarkCharm", "c", 2, 1.29e9D, 2, 9, "c"), + + public static final EMQuarkDefinition quark_u = new EMQuarkDefinition( + "tt.keyword.QuarkUp", + "u", + 1, + 2.3e6D, + 2, + 3, + "u"), quark_c = new EMQuarkDefinition("tt.keyword.QuarkCharm", "c", 2, 1.29e9D, 2, 9, "c"), quark_t = new EMQuarkDefinition("tt.keyword.QuarkTop", "t", 3, 172.44e9D, 2, 13, "t"), quark_d = new EMQuarkDefinition("tt.keyword.QuarkDown", "d", 1, 4.8e6D, -1, 5, "d"), quark_s = new EMQuarkDefinition("tt.keyword.QuarkStrange", "s", 2, 95e6D, -1, 7, "s"), @@ -39,8 +45,8 @@ public class EMQuarkDefinition extends EMFermionDefinition { STABLE_RAW_LIFE_TIME, 3, -1, - new EMDecay(1.23201e-5D, quark_b /*,lepton_t_,lepton_Vt*/), - new EMDecay(0.050778116D, quark_s /*,lepton_m_,lepton_Vm*/), + new EMDecay(1.23201e-5D, quark_b /* ,lepton_t_,lepton_Vt */), + new EMDecay(0.050778116D, quark_s /* ,lepton_m_,lepton_Vm */), new EMDecay(0.9D, quark_d, lepton_e_, lepton_Ve), deadEnd); // makes photons and don't care quark_c.init( @@ -49,7 +55,7 @@ public class EMQuarkDefinition extends EMFermionDefinition { 0.5e-13D, 1, -1, - new EMDecay(0.00169744D, quark_b /*,lepton_t_,lepton_Vt*/), + new EMDecay(0.00169744D, quark_b /* ,lepton_t_,lepton_Vt */), new EMDecay(0.05071504D, quark_d, lepton_m_, lepton_Vm), new EMDecay(0.9D, quark_s, lepton_e_, lepton_Ve), deadEnd); // makes photons and don't care @@ -70,8 +76,8 @@ public class EMQuarkDefinition extends EMFermionDefinition { STABLE_RAW_LIFE_TIME, 3, -1, - new EMDecay(7.51689e-5D, quark_t /*,lepton_t,lepton_Vt_*/), - new EMDecay(0.05071504D, quark_c /*,lepton_m,lepton_Vm_*/), + new EMDecay(7.51689e-5D, quark_t /* ,lepton_t,lepton_Vt_ */), + new EMDecay(0.05071504D, quark_c /* ,lepton_m,lepton_Vm_ */), new EMDecay(0.9D, quark_u, lepton_e, lepton_Ve_), deadEnd); // makes photons and don't care quark_s.init( @@ -80,7 +86,7 @@ public class EMQuarkDefinition extends EMFermionDefinition { 0.6e-9D, 1, -1, - new EMDecay(0.00163216D, quark_t /*,lepton_t,lepton_Vt_*/), + new EMDecay(0.00163216D, quark_t /* ,lepton_t,lepton_Vt_ */), new EMDecay(0.050778116D, quark_u, lepton_m, lepton_Vm_), new EMDecay(0.9D, quark_c, lepton_e, lepton_Ve_), deadEnd); // makes photons and don't care @@ -101,8 +107,8 @@ public class EMQuarkDefinition extends EMFermionDefinition { STABLE_RAW_LIFE_TIME, 3, -1, - new EMDecay(1.23201e-5D, quark_b_ /*,lepton_t,lepton_Vt_*/), - new EMDecay(0.050778116D, quark_s_ /*,lepton_m,lepton_Vm_*/), + new EMDecay(1.23201e-5D, quark_b_ /* ,lepton_t,lepton_Vt_ */), + new EMDecay(0.050778116D, quark_s_ /* ,lepton_m,lepton_Vm_ */), new EMDecay(0.9D, quark_d_, lepton_e, lepton_Ve_), deadEnd); // makes photons and don't care quark_c_.init( @@ -111,7 +117,7 @@ public class EMQuarkDefinition extends EMFermionDefinition { 0.5e-13D, 1, -1, - new EMDecay(0.00169744F, quark_b_ /*,lepton_t,lepton_Vt_*/), + new EMDecay(0.00169744F, quark_b_ /* ,lepton_t,lepton_Vt_ */), new EMDecay(0.05071504F, quark_d_, lepton_m, lepton_Vm_), new EMDecay(0.9F, quark_s_, lepton_e, lepton_Ve_), deadEnd); // makes photons and don't care @@ -132,8 +138,8 @@ public class EMQuarkDefinition extends EMFermionDefinition { STABLE_RAW_LIFE_TIME, 3, -1, - new EMDecay(7.51689e-5F, quark_t_ /*,lepton_t_,lepton_Vt*/), - new EMDecay(0.05071504F, quark_c_ /*,lepton_m_,lepton_Vm*/), + new EMDecay(7.51689e-5F, quark_t_ /* ,lepton_t_,lepton_Vt */), + new EMDecay(0.05071504F, quark_c_ /* ,lepton_m_,lepton_Vm */), new EMDecay(0.9F, quark_u_, lepton_e_, lepton_Ve), deadEnd); // makes photons and don't care quark_s_.init( @@ -142,7 +148,7 @@ public class EMQuarkDefinition extends EMFermionDefinition { 0.6e-9F, 1, -1, - new EMDecay(0.00163216F, quark_t_ /*,lepton_t_,lepton_Vt*/), + new EMDecay(0.00163216F, quark_t_ /* ,lepton_t_,lepton_Vt */), new EMDecay(0.050778116F, quark_u_, lepton_m_, lepton_Vm), new EMDecay(0.9F, quark_c_, lepton_e_, lepton_Ve), deadEnd); // makes photons and don't care 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 3488ccc7ad..fbd432efb2 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 @@ -14,8 +14,14 @@ import com.github.technus.tectech.util.TT_Utility; * Created by danie_000 on 22.10.2016. */ public class EMScalarBosonDefinition extends EMBosonDefinition { - public static final EMScalarBosonDefinition boson_H__ = - new EMScalarBosonDefinition("tt.keyword.Higgs", "H0", 125.09e9D, -2, 32, "H0"); + + public static final EMScalarBosonDefinition boson_H__ = new EMScalarBosonDefinition( + "tt.keyword.Higgs", + "H0", + 125.09e9D, + -2, + 32, + "H0"); private EMScalarBosonDefinition(String name, String symbol, double mass, int color, int ID, String bind) { super(name, TT_Utility.toSuperscript(symbol), 0, mass, 0, color, ID, bind); diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java index d7afb7d5ea..49f8b5ab8e 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java @@ -1,11 +1,11 @@ package com.github.technus.tectech.mechanics.enderStorage; -import com.github.technus.tectech.TecTech; import java.io.DataInputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; + import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -15,7 +15,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.github.technus.tectech.TecTech; + public class EnderFluidContainer implements IFluidHandler, Serializable { + private static final long serialVersionUID = 2L; private static final int SERIALIZE_TYPE_WITH_NBT = 0; private static final int SERIALIZE_TYPE_WITHOUT_NBT = 1; @@ -94,7 +97,7 @@ public class EnderFluidContainer implements IFluidHandler, Serializable { @Override public FluidTankInfo[] getTankInfo(ForgeDirection forgeDirection) { - return new FluidTankInfo[] {new FluidTankInfo(getFluidStack(), CAPACITY)}; + return new FluidTankInfo[] { new FluidTankInfo(getFluidStack(), CAPACITY) }; } private void writeObject(ObjectOutputStream out) throws IOException { diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java index e58fa29cbc..e1484d566f 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java @@ -4,18 +4,21 @@ import static com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedD import static com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData.getEnderLinkTag; import static com.github.technus.tectech.thing.cover.GT_Cover_TM_EnderFluidLink.setEnderLinkTag; +import java.io.*; +import java.util.Arrays; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fluids.IFluidHandler; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import eu.usrv.yamcore.network.client.AbstractClientMessageHandler; import eu.usrv.yamcore.network.server.AbstractServerMessageHandler; import gregtech.api.metatileentity.BaseMetaTileEntity; import io.netty.buffer.ByteBuf; -import java.io.*; -import java.util.Arrays; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fluids.IFluidHandler; public class EnderLinkCoverMessage implements IMessage { + EnderLinkTankWithTag messageData; public EnderLinkCoverMessage() {} @@ -30,8 +33,7 @@ public class EnderLinkCoverMessage implements IMessage { ObjectInputStream ois = new ObjectInputStream(is); Object data = ois.readObject(); messageData = (EnderLinkTankWithTag) data; - } catch (Exception ignore) { - } + } catch (Exception ignore) {} } @Override @@ -43,11 +45,11 @@ public class EnderLinkCoverMessage implements IMessage { oos.flush(); InputStream is = new ByteArrayInputStream(baos.toByteArray()); pBuffer.writeBytes(is, baos.toByteArray().length); - } catch (Exception ignore) { - } + } catch (Exception ignore) {} } public static class EnderLinkCoverQuery extends EnderLinkCoverMessage { + public EnderLinkCoverQuery() {} public EnderLinkCoverQuery(EnderLinkTag tag, IFluidHandler fluidHandler) { @@ -56,6 +58,7 @@ public class EnderLinkCoverMessage implements IMessage { } public static class EnderLinkCoverUpdate extends EnderLinkCoverMessage { + public EnderLinkCoverUpdate() {} public EnderLinkCoverUpdate(EnderLinkTag tag, IFluidHandler fluidHandler) { @@ -64,6 +67,7 @@ public class EnderLinkCoverMessage implements IMessage { } public static class EnderLinkCoverData extends EnderLinkCoverMessage { + public EnderLinkCoverData() {} public EnderLinkCoverData(EnderLinkTag tag, IFluidHandler fluidHandler) { @@ -72,6 +76,7 @@ public class EnderLinkCoverMessage implements IMessage { } public static class ServerHandler extends AbstractServerMessageHandler<EnderLinkCoverQuery> { + @Override public IMessage handleServerMessage(EntityPlayer pPlayer, EnderLinkCoverQuery pMessage, MessageContext pCtx) { IMessage reply = null; @@ -85,6 +90,7 @@ public class EnderLinkCoverMessage implements IMessage { } public static class ServerUpdateHandler extends AbstractServerMessageHandler<EnderLinkCoverUpdate> { + @Override public IMessage handleServerMessage(EntityPlayer pPlayer, EnderLinkCoverUpdate pMessage, MessageContext pCtx) { if (pMessage.messageData != null) { @@ -104,6 +110,7 @@ public class EnderLinkCoverMessage implements IMessage { } public static class ClientHandler extends AbstractClientMessageHandler<EnderLinkCoverData> { + @Override public IMessage handleClientMessage(EntityPlayer pPlayer, EnderLinkCoverData pMessage, MessageContext pCtx) { if (pMessage.messageData != null) { @@ -114,6 +121,7 @@ public class EnderLinkCoverMessage implements IMessage { } private static class EnderLinkTankWithTag extends EnderLinkTank { + private final EnderLinkTag tag; public EnderLinkTankWithTag(EnderLinkTag tag, IFluidHandler fluidHandler) { diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java index 6b6fa0b228..1e48250040 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java @@ -1,10 +1,12 @@ package com.github.technus.tectech.mechanics.enderStorage; -import com.google.common.base.Objects; import java.io.Serializable; import java.util.UUID; +import com.google.common.base.Objects; + public class EnderLinkTag implements Serializable { + private final String frequency; private final UUID player; diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java index 93347d2016..b9e1f2a89d 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java @@ -1,12 +1,15 @@ package com.github.technus.tectech.mechanics.enderStorage; -import com.google.common.base.Objects; import java.io.Serializable; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fluids.IFluidHandler; +import com.google.common.base.Objects; + public class EnderLinkTank implements Serializable { + private final int X; private final int Y; private final int Z; 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 c3106b055c..f331692e8d 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,10 +2,10 @@ package com.github.technus.tectech.mechanics.enderStorage; import static com.github.technus.tectech.Reference.MODID; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.io.*; import java.util.HashMap; import java.util.Map; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.WorldSavedData; import net.minecraft.world.storage.MapStorage; @@ -13,7 +13,10 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fluids.IFluidHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class EnderWorldSavedData extends WorldSavedData { + private static EnderWorldSavedData INSTANCE; private static final String DATA_NAME = MODID + "_EnderWorldSavedData"; diff --git a/src/main/java/com/github/technus/tectech/mechanics/pipe/IActivePipe.java b/src/main/java/com/github/technus/tectech/mechanics/pipe/IActivePipe.java index c7f770e5e8..c1ec11ffc4 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/pipe/IActivePipe.java +++ b/src/main/java/com/github/technus/tectech/mechanics/pipe/IActivePipe.java @@ -3,6 +3,7 @@ package com.github.technus.tectech.mechanics.pipe; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; public interface IActivePipe extends IMetaTileEntity { + void setActive(boolean active); boolean getActive(); diff --git a/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToDataPipe.java b/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToDataPipe.java index a775321df2..1cd9535ee7 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToDataPipe.java +++ b/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToDataPipe.java @@ -4,6 +4,7 @@ package com.github.technus.tectech.mechanics.pipe; * Created by Tec on 26.02.2017. */ public interface IConnectsToDataPipe { + boolean canConnectData(byte side); IConnectsToDataPipe getNext(IConnectsToDataPipe source); diff --git a/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToElementalPipe.java b/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToElementalPipe.java index ea444a0678..6897c6fd3c 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToElementalPipe.java +++ b/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToElementalPipe.java @@ -4,5 +4,6 @@ package com.github.technus.tectech.mechanics.pipe; * Created by Tec on 26.02.2017. */ public interface IConnectsToElementalPipe { + boolean canConnect(byte side); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToEnergyTunnel.java b/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToEnergyTunnel.java index 3a1d24305e..98e5a9725e 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToEnergyTunnel.java +++ b/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToEnergyTunnel.java @@ -4,5 +4,6 @@ package com.github.technus.tectech.mechanics.pipe; * Created by Tec on 26.02.2017. */ public interface IConnectsToEnergyTunnel { + boolean canConnect(byte side); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/pipe/PipeActivityMessage.java b/src/main/java/com/github/technus/tectech/mechanics/pipe/PipeActivityMessage.java index a7a0f8b02e..549397afa0 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/pipe/PipeActivityMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/pipe/PipeActivityMessage.java @@ -1,5 +1,11 @@ package com.github.technus.tectech.mechanics.pipe; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -8,13 +14,9 @@ import eu.usrv.yamcore.network.server.AbstractServerMessageHandler; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; public class PipeActivityMessage implements IMessage { + int mPosX; int mPosY; int mPosZ; @@ -63,6 +65,7 @@ public class PipeActivityMessage implements IMessage { } public static class PipeActivityQuery extends PipeActivityMessage { + public PipeActivityQuery() {} public PipeActivityQuery(IActivePipe metaTile) { @@ -75,6 +78,7 @@ public class PipeActivityMessage implements IMessage { } public static class PipeActivityData extends PipeActivityMessage { + public PipeActivityData() {} private PipeActivityData(PipeActivityQuery query) { @@ -95,6 +99,7 @@ public class PipeActivityMessage implements IMessage { } public static class ClientHandler extends AbstractClientMessageHandler<PipeActivityData> { + @Override public IMessage handleClientMessage(EntityPlayer pPlayer, PipeActivityData pMessage, MessageContext pCtx) { if (pPlayer.worldObj.provider.dimensionId == pMessage.mPosD) { @@ -111,6 +116,7 @@ public class PipeActivityMessage implements IMessage { } public static class ServerHandler extends AbstractServerMessageHandler<PipeActivityQuery> { + @Override public IMessage handleServerMessage(EntityPlayer pPlayer, PipeActivityQuery pMessage, MessageContext pCtx) { World world = DimensionManager.getWorld(pMessage.mPosD); 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 a42d774bff..55504f9352 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,23 +1,26 @@ package com.github.technus.tectech.mechanics.spark; -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; -import cpw.mods.fml.relauncher.SideOnly; -import eu.usrv.yamcore.network.client.AbstractClientMessageHandler; -import io.netty.buffer.ByteBuf; import java.io.*; import java.util.Arrays; import java.util.HashSet; import java.util.Random; + import net.minecraft.client.Minecraft; 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; +import cpw.mods.fml.relauncher.SideOnly; +import eu.usrv.yamcore.network.client.AbstractClientMessageHandler; +import io.netty.buffer.ByteBuf; // TODO Re-work how sparks are distributed public class RendererMessage implements IMessage { + HashSet<ThaumSpark> sparkList; public RendererMessage() {} @@ -32,8 +35,7 @@ public class RendererMessage implements IMessage { ObjectInputStream ois = new ObjectInputStream(is); Object data = ois.readObject(); sparkList = (HashSet<ThaumSpark>) data; - } catch (IOException | ClassNotFoundException ignored) { - } + } catch (IOException | ClassNotFoundException ignored) {} } @Override @@ -45,11 +47,11 @@ public class RendererMessage implements IMessage { oos.flush(); InputStream is = new ByteArrayInputStream(baos.toByteArray()); pBuffer.writeBytes(is, baos.toByteArray().length); - } catch (IOException ignore) { - } + } catch (IOException ignore) {} } public static class RendererData extends RendererMessage { + public RendererData() {} public RendererData(HashSet<ThaumSpark> eSparkList) { @@ -58,6 +60,7 @@ public class RendererMessage implements IMessage { } public static class ClientHandler extends AbstractClientMessageHandler<RendererData> { + @Override public IMessage handleClientMessage(EntityPlayer pPlayer, RendererData pMessage, MessageContext pCtx) { // disgusting diff --git a/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java b/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java index 8bce1e56d4..14b1252caf 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java +++ b/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java @@ -1,10 +1,12 @@ package com.github.technus.tectech.mechanics.spark; -import com.gtnewhorizon.structurelib.util.Vec3Impl; import java.io.Serializable; import java.util.Objects; +import com.gtnewhorizon.structurelib.util.Vec3Impl; + public class ThaumSpark implements Serializable { + // This works regardless of if TC is loaded private static final long serialVersionUID = -7037856938316679566L; public int x, y, z, wID; @@ -40,8 +42,7 @@ public class ThaumSpark implements Serializable { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ThaumSpark that = (ThaumSpark) o; - return x == that.x - && y == that.y + return x == that.x && y == that.y && z == that.z && wID == that.wID && xR == that.xR diff --git a/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectable.java b/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectable.java index 632cf9e130..2278722308 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectable.java +++ b/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectable.java @@ -2,12 +2,14 @@ package com.github.technus.tectech.mechanics.tesla; import static java.lang.Math.sqrt; -import com.github.technus.tectech.mechanics.spark.ThaumSpark; -import com.google.common.collect.Multimap; import java.util.HashSet; import java.util.Map; +import com.github.technus.tectech.mechanics.spark.ThaumSpark; +import com.google.common.collect.Multimap; + public interface ITeslaConnectable extends ITeslaConnectableSimple { + // Map with all Teslas in the same dimension and the distance to them //TODO Range Multimap<Integer, ITeslaConnectableSimple> getTeslaNodeMap(); @@ -35,8 +37,9 @@ public interface ITeslaConnectable extends ITeslaConnectableSimple { boolean teslaDrainEnergy(long teslaVoltageDrained); class TeslaUtil { - private static final HashSet<ITeslaConnectableSimple> teslaSimpleNodeSet = - new HashSet<>(); // Targets for power transmission + + private static final HashSet<ITeslaConnectableSimple> teslaSimpleNodeSet = new HashSet<>(); // Targets for power + // transmission private static final HashSet<ITeslaConnectable> teslaNodeSet = new HashSet<>(); // Sources of power transmission public static void teslaSimpleNodeSetAdd(ITeslaConnectableSimple target) { @@ -57,12 +60,11 @@ public interface ITeslaConnectable extends ITeslaConnectableSimple { // Skip if looking at myself and skip if not in the same dimension // TODO, INTERDIM? return; - } else if (origin.getTeslaTransmissionCapability() != 0 - && origin.getTeslaReceptionCapability() != 0 + } else if (origin.getTeslaTransmissionCapability() != 0 && origin.getTeslaReceptionCapability() != 0 && origin.getTeslaTransmissionCapability() != origin.getTeslaReceptionCapability()) { - // Skip if incompatible - return; - } + // Skip if incompatible + return; + } // Range calc int distance = (int) sqrt(origin.getTeslaPosition().distanceSq(target.getTeslaPosition())); if (distance > origin.getTeslaTransmissionRange() * target.getTeslaReceptionCoefficient()) { @@ -97,13 +99,12 @@ public interface ITeslaConnectable extends ITeslaConnectableSimple { boolean canSendPower = !origin.isTeslaReadyToReceive() && remainingAmperes > 0; if (canSendPower) { - for (Map.Entry<Integer, ITeslaConnectableSimple> Rx : - origin.getTeslaNodeMap().entries()) { + for (Map.Entry<Integer, ITeslaConnectableSimple> Rx : origin.getTeslaNodeMap().entries()) { // Do we still have power left to send kind of check if (origin.getTeslaStoredEnergy() - < (origin.isOverdriveEnabled() - ? origin.getTeslaOutputVoltage() * 2 - : origin.getTeslaOutputVoltage())) break; + < (origin.isOverdriveEnabled() ? origin.getTeslaOutputVoltage() * 2 + : origin.getTeslaOutputVoltage())) + break; // Explicit words for the important fields ITeslaConnectableSimple target = Rx.getValue(); int distance = Rx.getKey(); @@ -120,8 +121,8 @@ public interface ITeslaConnectable extends ITeslaConnectableSimple { + (long) Math.round( origin.getTeslaOutputVoltage() * origin.getTeslaOverdriveLossCoefficient()); } else { - outputVoltageInjectable = - origin.getTeslaOutputVoltage() - (distance * origin.getTeslaEnergyLossPerBlock()); + outputVoltageInjectable = origin.getTeslaOutputVoltage() + - (distance * origin.getTeslaEnergyLossPerBlock()); outputVoltageConsumption = origin.getTeslaOutputVoltage(); } @@ -133,15 +134,15 @@ public interface ITeslaConnectable extends ITeslaConnectableSimple { while (canSendPower) { if (target.teslaInjectEnergy(outputVoltageInjectable)) { origin.teslaDrainEnergy(outputVoltageConsumption); - origin.getSparkList() - .add(new ThaumSpark( + origin.getSparkList().add( + new ThaumSpark( origin.getTeslaPosition(), target.getTeslaPosition(), origin.getTeslaDimension())); remainingAmperes--; // Update the can send power flag each time we send power - canSendPower = - (origin.getTeslaStoredEnergy() < outputVoltageConsumption || remainingAmperes > 0); + canSendPower = (origin.getTeslaStoredEnergy() < outputVoltageConsumption + || remainingAmperes > 0); } else { // Breaks out when I can't send anymore power break; diff --git a/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java b/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java index 1dd0a0215c..a43b313d28 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java +++ b/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java @@ -3,6 +3,7 @@ package com.github.technus.tectech.mechanics.tesla; import com.gtnewhorizon.structurelib.util.Vec3Impl; public interface ITeslaConnectableSimple { + // -128 to -1 disables capability // 0 means any source or target // 1 to 127 must match on source and target or source/target must be 0 diff --git a/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java b/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java index f8517b64ef..67316a4283 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java +++ b/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java @@ -7,6 +7,7 @@ import com.gtnewhorizon.structurelib.util.Vec3Impl; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public class TeslaCoverConnection implements ITeslaConnectableSimple { + private final IGregTechTileEntity IGT; private final Vec3Impl pos; private final byte teslaReceptionCapability; 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 9d2659075e..3c9bf8c53d 100644 --- a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java +++ b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java @@ -2,9 +2,10 @@ package com.github.technus.tectech.nei; import static com.github.technus.tectech.Reference.MODID; +import net.minecraft.nbt.NBTTagCompound; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInterModComms; -import net.minecraft.nbt.NBTTagCompound; public class IMCForNEI { diff --git a/src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java b/src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java index ffb72638c7..2c52ef30da 100644 --- a/src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java +++ b/src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java @@ -1,10 +1,12 @@ package com.github.technus.tectech.nei; import codechicken.nei.api.IConfigureNEI; + import com.github.technus.tectech.recipe.TT_recipe; import cpw.mods.fml.common.FMLCommonHandler; public class NEI_TT_Config implements IConfigureNEI { // must be NEI*Config + public static boolean sIsAdded = true; public static TT_NEI_ResearchHandler TT_RH; public static TT_NEI_ScannerHandler TT_SH; 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 50fa98dca0..918016afbc 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 @@ -3,13 +3,29 @@ package com.github.technus.tectech.nei; import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; import static gregtech.api.enums.ItemList.Display_Fluid; +import java.awt.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.*; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.recipe.TT_recipe; + import cpw.mods.fml.common.event.FMLInterModComms; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; @@ -17,17 +33,6 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import java.awt.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { @@ -84,8 +89,7 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { ArrayList<ItemStack> tResults = new ArrayList<>(); tResults.add(aResult); tResults.add(GT_OreDictUnificator.get(true, aResult)); - if (tPrefixMaterial != null - && !tPrefixMaterial.mBlackListed + if (tPrefixMaterial != null && !tPrefixMaterial.mBlackListed && !tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty()) { for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); @@ -94,8 +98,8 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); if (tFluid != null) { tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (tData.fluid.isFluidEqual(tFluid)) { tResults.add(GT_Utility.copy(tData.filledContainer)); } @@ -129,8 +133,8 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); if (tFluid != null) { tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (tData.fluid.isFluidEqual(tFluid)) { tInputs.add(GT_Utility.copy(tData.filledContainer)); } @@ -177,25 +181,24 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { } @Override - public List<String> handleItemTooltip( - GuiRecipe<?> gui, ItemStack aStack, List<String> currenttip, int aRecipeIndex) { + public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack aStack, List<String> currenttip, + int aRecipeIndex) { TemplateRecipeHandler.CachedRecipe tObject = arecipes.get(aRecipeIndex); if (tObject instanceof CachedDefaultRecipe) { CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; for (PositionedStack tStack : tRecipe.mOutputs) { if (aStack == tStack.item) { - if (!(tStack instanceof FixedPositionedStack) - || ((FixedPositionedStack) tStack).mChance <= 0 + if (!(tStack instanceof FixedPositionedStack) || ((FixedPositionedStack) tStack).mChance <= 0 || ((FixedPositionedStack) tStack).mChance == 10000) { break; } - currenttip.add(trans("150", "Chance: ") - + ((FixedPositionedStack) tStack).mChance / 100 - + '.' - + (((FixedPositionedStack) tStack).mChance % 100 < 10 - ? "0" + ((FixedPositionedStack) tStack).mChance % 100 - : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) - + '%'); + currenttip.add( + trans("150", "Chance: ") + ((FixedPositionedStack) tStack).mChance / 100 + + '.' + + (((FixedPositionedStack) tStack).mChance % 100 < 10 + ? "0" + ((FixedPositionedStack) tStack).mChance % 100 + : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + + '%'); break; } } @@ -224,12 +227,10 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { drawText( 10, 73, - trans("152.1", "Max EU: ") - + GT_Utility.formatNumbers( - (1 + (computation - minComputationPerSec) / minComputationPerSec) - * (long) tEUt - * ampere - * 20) + trans("152.1", "Max EU: ") + GT_Utility.formatNumbers( + (1 + (computation - minComputationPerSec) / minComputationPerSec) * (long) tEUt + * ampere + * 20) + " EU", -16777216); drawText( @@ -257,6 +258,7 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { } public static class FixedPositionedStack extends PositionedStack { + public final int mChance; public boolean permutated = false; @@ -281,9 +283,8 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { List<ItemStack> permutations = ItemList.itemMap.get(tStack.getItem()); if (!permutations.isEmpty()) { ItemStack stack; - for (Iterator<ItemStack> iterator = permutations.iterator(); - iterator.hasNext(); - tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, stack))) { + for (Iterator<ItemStack> iterator = permutations.iterator(); iterator + .hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, stack))) { stack = iterator.next(); } } else { @@ -298,7 +299,7 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { } items = tDisplayStacks.toArray(nullItem); if (items.length == 0) { - items = new ItemStack[] {new ItemStack(Blocks.fire)}; + items = new ItemStack[] { new ItemStack(Blocks.fire) }; } permutated = true; setPermutationToRender(0); @@ -306,6 +307,7 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { } public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe { + public final GT_Recipe mRecipe; public final List<PositionedStack> mOutputs; public final List<PositionedStack> mInputs; @@ -324,8 +326,12 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler { mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); } if (aRecipe.getOutput(tStartIndex) != null) { - mOutputs.add(new FixedPositionedStack( - aRecipe.getOutput(tStartIndex), 102, 14 + 9, aRecipe.getOutputChance(tStartIndex))); + mOutputs.add( + new FixedPositionedStack( + aRecipe.getOutput(tStartIndex), + 102, + 14 + 9, + aRecipe.getOutputChance(tStartIndex))); } } 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 15887f0e35..91219a515d 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 @@ -3,13 +3,29 @@ package com.github.technus.tectech.nei; import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; import static gregtech.api.enums.ItemList.Display_Fluid; +import java.awt.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.*; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.recipe.TT_recipe; + import cpw.mods.fml.common.event.FMLInterModComms; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; @@ -17,17 +33,6 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import java.awt.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { @@ -83,8 +88,7 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { ArrayList<ItemStack> tResults = new ArrayList<>(); tResults.add(aResult); tResults.add(GT_OreDictUnificator.get(true, aResult)); - if (tPrefixMaterial != null - && !tPrefixMaterial.mBlackListed + if (tPrefixMaterial != null && !tPrefixMaterial.mBlackListed && !tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty()) { for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); @@ -93,8 +97,8 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); if (tFluid != null) { tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (tData.fluid.isFluidEqual(tFluid)) { tResults.add(GT_Utility.copy(tData.filledContainer)); } @@ -128,8 +132,8 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); if (tFluid != null) { tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (tData.fluid.isFluidEqual(tFluid)) { tInputs.add(GT_Utility.copy(tData.filledContainer)); } @@ -172,30 +176,29 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { @Override public String getGuiTexture() { - // return "gregtech:textures/gui/" + this.mRecipeMap.mUnlocalizedName + ".png"; + // return "gregtech:textures/gui/" + this.mRecipeMap.mUnlocalizedName + ".png"; return mRecipeMap.mNEIGUIPath; } @Override - public List<String> handleItemTooltip( - GuiRecipe<?> gui, ItemStack aStack, List<String> currenttip, int aRecipeIndex) { + public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack aStack, List<String> currenttip, + int aRecipeIndex) { TemplateRecipeHandler.CachedRecipe tObject = arecipes.get(aRecipeIndex); if (tObject instanceof CachedDefaultRecipe) { CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; for (PositionedStack tStack : tRecipe.mOutputs) { if (aStack == tStack.item) { - if (!(tStack instanceof FixedPositionedStack) - || ((FixedPositionedStack) tStack).mChance <= 0 + if (!(tStack instanceof FixedPositionedStack) || ((FixedPositionedStack) tStack).mChance <= 0 || ((FixedPositionedStack) tStack).mChance == 10000) { break; } - currenttip.add(trans("150", "Chance: ") - + ((FixedPositionedStack) tStack).mChance / 100 - + '.' - + (((FixedPositionedStack) tStack).mChance % 100 < 10 - ? "0" + ((FixedPositionedStack) tStack).mChance % 100 - : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) - + '%'); + currenttip.add( + trans("150", "Chance: ") + ((FixedPositionedStack) tStack).mChance / 100 + + '.' + + (((FixedPositionedStack) tStack).mChance % 100 < 10 + ? "0" + ((FixedPositionedStack) tStack).mChance % 100 + : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + + '%'); break; } } @@ -224,12 +227,10 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { drawText( 10, 73, - trans("152.1", "Max EU: ") - + GT_Utility.formatNumbers( - (1 + (computation - minComputationPerSec) / minComputationPerSec) - * (long) tEUt - * ampere - * 20) + trans("152.1", "Max EU: ") + GT_Utility.formatNumbers( + (1 + (computation - minComputationPerSec) / minComputationPerSec) * (long) tEUt + * ampere + * 20) + " EU", -16777216); drawText( @@ -257,6 +258,7 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { } public static class FixedPositionedStack extends PositionedStack { + public final int mChance; public boolean permutated = false; @@ -281,9 +283,8 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { List<ItemStack> permutations = ItemList.itemMap.get(tStack.getItem()); if (!permutations.isEmpty()) { ItemStack stack; - for (Iterator<ItemStack> iterator = permutations.iterator(); - iterator.hasNext(); - tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, stack))) { + for (Iterator<ItemStack> iterator = permutations.iterator(); iterator + .hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, stack))) { stack = iterator.next(); } } else { @@ -298,7 +299,7 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { } items = tDisplayStacks.toArray(nullItem); if (items.length == 0) { - items = new ItemStack[] {new ItemStack(Blocks.fire)}; + items = new ItemStack[] { new ItemStack(Blocks.fire) }; } permutated = true; setPermutationToRender(0); @@ -306,6 +307,7 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { } public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe { + public final GT_Recipe mRecipe; public final List<PositionedStack> mOutputs; public final List<PositionedStack> mInputs; @@ -324,8 +326,12 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler { mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); } if (aRecipe.getOutput(tStartIndex) != null) { - mOutputs.add(new FixedPositionedStack( - aRecipe.getOutput(tStartIndex), 102, 14 + 9, aRecipe.getOutputChance(tStartIndex))); + mOutputs.add( + new FixedPositionedStack( + aRecipe.getOutput(tStartIndex), + 102, + 14 + 9, + aRecipe.getOutputChance(tStartIndex))); } } 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 e6b2d0930c..573fdc2c61 100644 --- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java @@ -2,6 +2,17 @@ package com.github.technus.tectech.proxy; import static com.github.technus.tectech.TecTech.RANDOM; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.gui.GuiNewChat; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentText; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; +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.*; @@ -9,32 +20,24 @@ 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.renderElemental.RenderElementalName; 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; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.gui.GuiNewChat; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentText; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.util.ForgeDirection; public class ClientProxy extends CommonProxy { + @Override public void registerRenderInfo() { QuantumGlassBlock.renderID = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(QuantumGlassBlock.renderID, new QuantumGlassRender()); - MinecraftForgeClient.registerItemRenderer( - ElementalDefinitionContainer_EM.INSTANCE, RenderElementalName.INSTANCE); - MinecraftForgeClient.registerItemRenderer( - DebugElementalInstanceContainer_EM.INSTANCE, RenderElementalName.INSTANCE); + MinecraftForgeClient + .registerItemRenderer(ElementalDefinitionContainer_EM.INSTANCE, RenderElementalName.INSTANCE); + MinecraftForgeClient + .registerItemRenderer(DebugElementalInstanceContainer_EM.INSTANCE, RenderElementalName.INSTANCE); if (Loader.isModLoaded("openmodularturrets")) { new TT_turret_loader().run(); @@ -81,33 +84,30 @@ public class ClientProxy extends CommonProxy { xSpd = aDir.offsetX * (0.1F + 0.2F * (float) RANDOM.nextGaussian()); zSpd = aDir.offsetZ * (0.1F + 0.2F * (float) RANDOM.nextGaussian()); } - aMuffler.getWorld() - .spawnParticle( - "largesmoke", - xPos + RANDOM.nextFloat() * 0.5F, - yPos + RANDOM.nextFloat() * 0.5F, - zPos + RANDOM.nextFloat() * 0.5F, - xSpd, - ySpd, - zSpd); - aMuffler.getWorld() - .spawnParticle( - "largesmoke", - xPos + RANDOM.nextFloat() * 0.5F, - yPos + RANDOM.nextFloat() * 0.5F, - zPos + RANDOM.nextFloat() * 0.5F, - xSpd, - ySpd, - zSpd); - aMuffler.getWorld() - .spawnParticle( - "largesmoke", - xPos + RANDOM.nextFloat() * 0.5F, - yPos + RANDOM.nextFloat() * 0.5F, - zPos + RANDOM.nextFloat() * 0.5F, - xSpd, - ySpd, - zSpd); + aMuffler.getWorld().spawnParticle( + "largesmoke", + xPos + RANDOM.nextFloat() * 0.5F, + yPos + RANDOM.nextFloat() * 0.5F, + zPos + RANDOM.nextFloat() * 0.5F, + xSpd, + ySpd, + zSpd); + aMuffler.getWorld().spawnParticle( + "largesmoke", + xPos + RANDOM.nextFloat() * 0.5F, + yPos + RANDOM.nextFloat() * 0.5F, + zPos + RANDOM.nextFloat() * 0.5F, + xSpd, + ySpd, + zSpd); + aMuffler.getWorld().spawnParticle( + "largesmoke", + xPos + RANDOM.nextFloat() * 0.5F, + yPos + RANDOM.nextFloat() * 0.5F, + zPos + RANDOM.nextFloat() * 0.5F, + xSpd, + ySpd, + zSpd); } @Override @@ -156,9 +156,13 @@ public class ClientProxy extends CommonProxy { @Override public void playSound(IGregTechTileEntity base, String name) { - base.getWorld() - .playSoundEffect( - base.getXCoord(), base.getYCoord(), base.getZCoord(), Reference.MODID + ':' + name, 1, 1); + base.getWorld().playSoundEffect( + base.getXCoord(), + base.getYCoord(), + base.getZCoord(), + Reference.MODID + ':' + name, + 1, + 1); } @Override diff --git a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java index 66d0afe48d..5fdef492e8 100644 --- a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java @@ -1,7 +1,5 @@ package com.github.technus.tectech.proxy; -import cpw.mods.fml.common.network.IGuiHandler; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; @@ -9,7 +7,11 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import cpw.mods.fml.common.network.IGuiHandler; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + public class CommonProxy implements IGuiHandler { + public void registerRenderInfo() {} public void em_particle(IGregTechTileEntity aMuffler, byte facing) {} // CUTE! @@ -47,8 +49,7 @@ public class CommonProxy implements IGuiHandler { public String getUUID(String name) { for (WorldServer worldServer : MinecraftServer.getServer().worldServers) { for (Object o : worldServer.playerEntities) { - if (o instanceof EntityPlayer - && ((EntityPlayer) o).getGameProfile().getName().equals(name)) { + if (o instanceof EntityPlayer && ((EntityPlayer) o).getGameProfile().getName().equals(name)) { return ((EntityPlayer) o).getGameProfile().getId().toString(); } } @@ -59,8 +60,7 @@ public class CommonProxy implements IGuiHandler { public boolean isOnlineName(String name) { for (WorldServer worldServer : MinecraftServer.getServer().worldServers) { for (Object o : worldServer.playerEntities) { - if (o instanceof EntityPlayer - && ((EntityPlayer) o).getGameProfile().getName().equals(name)) { + if (o instanceof EntityPlayer && ((EntityPlayer) o).getGameProfile().getName().equals(name)) { return true; } } @@ -71,12 +71,7 @@ public class CommonProxy implements IGuiHandler { public boolean isOnlineUUID(String uuid) { for (WorldServer worldServer : MinecraftServer.getServer().worldServers) { for (Object o : worldServer.playerEntities) { - if (o instanceof EntityPlayer - && ((EntityPlayer) o) - .getGameProfile() - .getId() - .toString() - .equals(uuid)) { + if (o instanceof EntityPlayer && ((EntityPlayer) o).getGameProfile().getId().toString().equals(uuid)) { return true; } } 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 1c011cb1bb..074163d9ae 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -6,27 +6,33 @@ import static gregtech.api.GregTech_API.getUnificatedOreDictStack; import static gregtech.api.util.GT_Utility.getPlasmaFuelValueInEUPerLiterFromMaterial; import static java.lang.Math.min; -import com.github.technus.tectech.util.ItemStackLong; -import gnu.trove.map.TMap; -import gnu.trove.map.hash.TCustomHashMap; -import gnu.trove.strategy.HashingStrategy; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; + import org.apache.commons.lang3.tuple.Pair; + import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper; import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; +import com.github.technus.tectech.util.ItemStackLong; + +import gnu.trove.map.TMap; +import gnu.trove.map.hash.TCustomHashMap; +import gnu.trove.strategy.HashingStrategy; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; + @SuppressWarnings("SpellCheckingInspection") public class EyeOfHarmonyRecipe { HashingStrategy<ItemStack> itemStackHashingStrategy = new HashingStrategy<ItemStack>() { + @Override public int computeHashCode(ItemStack stack) { // Not really sure how this works or if it is "unique enough". @@ -89,15 +95,9 @@ public class EyeOfHarmonyRecipe { return rocketTier; } - public EyeOfHarmonyRecipe( - ArrayList<Pair<Materials, Long>> materialList, - Block block, - final double recipeEnergyEfficiency, - final long hydrogenRequirement, - final long heliumRequirement, - final long miningTimeSeconds, - final long rocketTierOfRecipe, - final double baseSuccessChance) { + public EyeOfHarmonyRecipe(ArrayList<Pair<Materials, Long>> materialList, Block block, + final double recipeEnergyEfficiency, final long hydrogenRequirement, final long heliumRequirement, + final long miningTimeSeconds, final long rocketTierOfRecipe, final double baseSuccessChance) { this.rocketTier = rocketTierOfRecipe; this.spacetimeCasingTierRequired = min(8, rocketTierOfRecipe); @@ -106,8 +106,7 @@ public class EyeOfHarmonyRecipe { this.outputItems = validDustGenerator(materialList); - this.sumOfItems = - this.outputItems.stream().map(ItemStackLong::getStackSize).reduce(0L, Long::sum); + this.sumOfItems = this.outputItems.stream().map(ItemStackLong::getStackSize).reduce(0L, Long::sum); this.outputItems.add( new ItemStackLong(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), this.sumOfItems * 3)); @@ -133,18 +132,18 @@ public class EyeOfHarmonyRecipe { // Add a bonus fluid of compressed star matter. fluidStackArrayList.add(Materials.RawStarMatter.getFluid((this.spacetimeCasingTierRequired + 1) * 100_000)); - // Tier 0 - 576 White - // Tier 1 - 2304 White - // Tier 2 - 9216 White + // Tier 0 - 576 White + // Tier 1 - 2304 White + // Tier 2 - 9216 White // Tier 3 - 36864 White - // Tier 4 - 576 Black - // Tier 5 - 2304 Black - // Tier 6 - 9216 Black + // Tier 4 - 576 Black + // Tier 5 - 2304 Black + // Tier 6 - 9216 Black // Tier 7 - 36864 Black - // Tier 8 - 576 Universium - // Tier 9 - 2304 Universium + // Tier 8 - 576 Universium + // Tier 9 - 2304 Universium if (rocketTierOfRecipe <= 3) { fluidStackArrayList.add(Materials.WhiteDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe))); @@ -175,16 +174,10 @@ public class EyeOfHarmonyRecipe { this.euOutput = (long) (euStartCost * recipeEnergyEfficiency); } - public EyeOfHarmonyRecipe( - final GT5OreLayerHelper.NormalOreDimensionWrapper normalOreDimensionWrapper, - final GT5OreSmallHelper.SmallOreDimensionWrapper smallOreDimensionWrapper, - final Block block, - final double recipeEnergyEfficiency, - final long hydrogenRequirement, - final long heliumRequirement, - final long miningTimeSeconds, - final long spacetimeCasingTierRequired, - final double baseSuccessChance) { + public EyeOfHarmonyRecipe(final GT5OreLayerHelper.NormalOreDimensionWrapper normalOreDimensionWrapper, + final GT5OreSmallHelper.SmallOreDimensionWrapper smallOreDimensionWrapper, final Block block, + final double recipeEnergyEfficiency, final long hydrogenRequirement, final long heliumRequirement, + final long miningTimeSeconds, final long spacetimeCasingTierRequired, final double baseSuccessChance) { // Process recipes output items. // 6 * 64 = 6 stacks/second for VM tier 3 + Og gas. @@ -257,9 +250,8 @@ public class EyeOfHarmonyRecipe { private static final double TERTIARY_MULTIPLIER = (0.1); // Macerating thermal centrifuged byproduct chance. private static final double QUATERNARY_MULTIPLIER = (0.7); // Mercury/chem bath processing chance. - private static final double[] ORE_MULTIPLIER = { - PRIMARY_MULTIPLIER, SECONDARY_MULTIPLIER, TERTIARY_MULTIPLIER, QUATERNARY_MULTIPLIER - }; + private static final double[] ORE_MULTIPLIER = { PRIMARY_MULTIPLIER, SECONDARY_MULTIPLIER, TERTIARY_MULTIPLIER, + QUATERNARY_MULTIPLIER }; public static class HashMapHelper extends HashMap<Materials, Double> { @@ -276,21 +268,21 @@ public class EyeOfHarmonyRecipe { } } - public static void processHelper( - HashMapHelper outputMap, Materials material, double mainMultiplier, double probability) { + public static void processHelper(HashMapHelper outputMap, Materials material, double mainMultiplier, + double probability) { outputMap.add(material.mDirectSmelting, (material.mOreMultiplier * 2) * mainMultiplier * probability); int index = 0; for (Materials byProductMaterial : material.mOreByProducts) { outputMap.add( - byProductMaterial.mDirectSmelting, mainMultiplier * (ORE_MULTIPLIER[index++] * 2) * probability); + byProductMaterial.mDirectSmelting, + mainMultiplier * (ORE_MULTIPLIER[index++] * 2) * probability); } } private static ArrayList<Pair<Materials, Long>> processDimension( GT5OreLayerHelper.NormalOreDimensionWrapper normalOreDimWrapper, - GT5OreSmallHelper.SmallOreDimensionWrapper smallOreDimWrapper, - long timeInSeconds) { + GT5OreSmallHelper.SmallOreDimensionWrapper smallOreDimWrapper, long timeInSeconds) { HashMapHelper outputMap = new HashMapHelper(); double mainMultiplier = timeInSeconds * 384.0; @@ -304,8 +296,12 @@ public class EyeOfHarmonyRecipe { }); // Iterate over small ores in dimension and add them, kinda hacky but works and is close enough. - smallOreDimWrapper.oreVeinToProbabilityInDimension.forEach((veinInfo, probability) -> - processHelper(outputMap, veinInfo.getOreMaterial(), mainMultiplier, probability)); + smallOreDimWrapper.oreVeinToProbabilityInDimension.forEach( + (veinInfo, probability) -> processHelper( + outputMap, + veinInfo.getOreMaterial(), + mainMultiplier, + probability)); ArrayList<Pair<Materials, Long>> outputList = new ArrayList<>(); @@ -361,29 +357,31 @@ public class EyeOfHarmonyRecipe { } private static final List<Materials> VALID_PLASMAS = Stream.of( - Materials.Helium, - Materials.Iron, - Materials.Calcium, - Materials.Niobium, - Materials.Nitrogen, - Materials.Zinc, - Materials.Silver, - Materials.Titanium, - Materials.Radon, - Materials.Nickel, - Materials.Boron, - Materials.Sulfur, - Materials.Americium, - Materials.Bismuth, - Materials.Oxygen, - Materials.Tin) - .collect(Collectors.toList()); + Materials.Helium, + Materials.Iron, + Materials.Calcium, + Materials.Niobium, + Materials.Nitrogen, + Materials.Zinc, + Materials.Silver, + Materials.Titanium, + Materials.Radon, + Materials.Nickel, + Materials.Boron, + Materials.Sulfur, + Materials.Americium, + Materials.Bismuth, + Materials.Oxygen, + Materials.Tin).collect(Collectors.toList()); private static final HashMap<String, Long> plasmaEnergyMap = new HashMap<String, Long>() { + { VALID_PLASMAS.forEach( - (material -> put(material.getPlasma(1).getFluid().getUnlocalizedName(), (long) - (getPlasmaFuelValueInEUPerLiterFromMaterial(material) * getMaxPlasmaTurbineEfficiency())))); + (material -> put( + material.getPlasma(1).getFluid().getUnlocalizedName(), + (long) (getPlasmaFuelValueInEUPerLiterFromMaterial(material) + * getMaxPlasmaTurbineEfficiency())))); } }; } 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 f9c5cfeed5..f0f5534232 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java @@ -4,52 +4,58 @@ 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 com.github.technus.tectech.util.ItemStackLong; -import com.google.common.math.LongMath; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; + import org.apache.commons.lang3.tuple.Pair; + import pers.gwyog.gtneioreplugin.plugin.block.BlockDimensionDisplay; import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; import pers.gwyog.gtneioreplugin.util.DimensionHelper; import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper; import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; +import com.github.technus.tectech.util.ItemStackLong; +import com.google.common.math.LongMath; + +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; + public class EyeOfHarmonyRecipeStorage { public static final long BILLION = LongMath.pow(10, 9); // Map is unique so this is fine. HashMap<Block, String> blocksMapInverted = new HashMap<Block, String>() { + { - ModBlocks.blocks.forEach((dimString, dimBlock) -> { - put(dimBlock, dimString); - }); + ModBlocks.blocks.forEach((dimString, dimBlock) -> { put(dimBlock, dimString); }); } }; private final HashMap<String, EyeOfHarmonyRecipe> recipeHashMap = new HashMap<String, EyeOfHarmonyRecipe>() { + { for (String dimAbbreviation : DimensionHelper.DimNameDisplayed) { - BlockDimensionDisplay blockDimensionDisplay = - (BlockDimensionDisplay) ModBlocks.blocks.get(dimAbbreviation); + BlockDimensionDisplay blockDimensionDisplay = (BlockDimensionDisplay) ModBlocks.blocks + .get(dimAbbreviation); if (dimAbbreviation.equals("DD")) { specialDeepDarkRecipe(this, blockDimensionDisplay); } else { - GT5OreLayerHelper.NormalOreDimensionWrapper normalOre = - GT5OreLayerHelper.dimToOreWrapper.getOrDefault(dimAbbreviation, null); - GT5OreSmallHelper.SmallOreDimensionWrapper smallOre = - GT5OreSmallHelper.dimToSmallOreWrapper.getOrDefault(dimAbbreviation, null); + GT5OreLayerHelper.NormalOreDimensionWrapper normalOre = GT5OreLayerHelper.dimToOreWrapper + .getOrDefault(dimAbbreviation, null); + GT5OreSmallHelper.SmallOreDimensionWrapper smallOre = GT5OreSmallHelper.dimToSmallOreWrapper + .getOrDefault(dimAbbreviation, null); if ((normalOre == null) || (smallOre == null)) { - System.out.println(dimAbbreviation - + " dimension not found in dimToOreWrapper. Report error to GTNH team."); + System.out.println( + dimAbbreviation + + " dimension not found in dimToOreWrapper. Report error to GTNH team."); continue; } @@ -93,7 +99,7 @@ public class EyeOfHarmonyRecipeStorage { sEyeofHarmonyRecipes.addRecipe( false, - new ItemStack[] {planetItem}, + new ItemStack[] { planetItem }, outputItems.toArray(new ItemStack[0]), recipe, null, @@ -105,8 +111,8 @@ public class EyeOfHarmonyRecipeStorage { } } - private void specialDeepDarkRecipe( - final HashMap<String, EyeOfHarmonyRecipe> hashMap, final BlockDimensionDisplay planetItem) { + private void specialDeepDarkRecipe(final HashMap<String, EyeOfHarmonyRecipe> hashMap, + final BlockDimensionDisplay planetItem) { HashSet<Materials> validMaterialSet = new HashSet<>(); @@ -153,9 +159,7 @@ public class EyeOfHarmonyRecipeStorage { double mainMultiplier = (timeCalculator(10) * (6 * 64)); double probability = 1.0 / validMaterialList.size(); - validMaterialList.forEach((material) -> { - processHelper(outputMap, material, mainMultiplier, probability); - }); + validMaterialList.forEach((material) -> { processHelper(outputMap, material, mainMultiplier, probability); }); ArrayList<Pair<Materials, Long>> outputList = new ArrayList<>(); 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 7948d90087..cf5a12aa87 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 @@ -8,8 +8,16 @@ import static java.lang.Math.min; import static net.minecraft.util.EnumChatFormatting.*; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.*; +import java.util.function.Supplier; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidStack; + import appeng.util.ReadableNumberConverter; import codechicken.nei.PositionedStack; + import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; @@ -20,6 +28,7 @@ import com.gtnewhorizons.modularui.api.math.Alignment; import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.ProgressBar; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.util.GT_LanguageManager; @@ -27,34 +36,19 @@ import gregtech.api.util.GT_Recipe; import gregtech.common.gui.modularui.UIHelper; import gregtech.nei.GT_NEI_DefaultHandler; import gregtech.nei.NEIRecipeInfo; -import java.util.*; -import java.util.function.Supplier; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidStack; @SuppressWarnings("SpellCheckingInspection") public class TT_recipe extends GT_Recipe { + public static final String E_RECIPE_ID = "eRecipeID"; public final EMConstantStackMap[] input; public final IEMMapRead<? extends IEMStack>[] output; public final EMConstantStackMap[] eCatalyst; public final IAdditionalCheck additionalCheck; - public TT_recipe( - boolean aOptimize, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecialItems, - int[] aChances, - FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, - int aDuration, - int aEUt, - int aSpecialValue, - EMConstantStackMap[] in, - IEMMapRead<? extends IEMStack>[] out, - EMConstantStackMap[] catalyst, + public TT_recipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, + FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue, + EMConstantStackMap[] in, IEMMapRead<? extends IEMStack>[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check) { super( aOptimize, @@ -73,27 +67,18 @@ public class TT_recipe extends GT_Recipe { additionalCheck = check; } - public boolean EMisRecipeInputEqual( - boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks) { + public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, + FluidStack[] fluidStacks) { return EMisRecipeInputEqual(consume, doNotCheckStackSizes, itemStacks, fluidStacks, null, null); } - public boolean EMisRecipeInputEqual( - boolean consume, - boolean doNotCheckStackSizes, - ItemStack[] itemStacks, - FluidStack[] fluidStacks, - EMInstanceStackMap[] in) { + public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, + FluidStack[] fluidStacks, EMInstanceStackMap[] in) { return EMisRecipeInputEqual(consume, doNotCheckStackSizes, itemStacks, fluidStacks, in, null); } - public boolean EMisRecipeInputEqual( - boolean consume, - boolean doNotCheckStackSizes, - ItemStack[] itemStacks, - FluidStack[] fluidStacks, - EMInstanceStackMap[] in, - EMInstanceStackMap[] catalyst) { + public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, + FluidStack[] fluidStacks, EMInstanceStackMap[] in, EMInstanceStackMap[] catalyst) { if (additionalCheck != null && !additionalCheck.check(this, consume, doNotCheckStackSizes, itemStacks, fluidStacks, in, catalyst)) { return false; @@ -142,23 +127,14 @@ public class TT_recipe extends GT_Recipe { } @Deprecated - public boolean EMisRecipeInputEqualConsumeFromOne( - boolean consume, - boolean doNotCheckStackSizes, - ItemStack[] itemStacks, - FluidStack[] fluidStacks, - EMInstanceStackMap in) { + public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, + ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap in) { return EMisRecipeInputEqualConsumeFromOne(consume, doNotCheckStackSizes, itemStacks, fluidStacks, in, null); } @Deprecated - public boolean EMisRecipeInputEqualConsumeFromOne( - boolean consume, - boolean doNotCheckStackSizes, - ItemStack[] itemStacks, - FluidStack[] fluidStacks, - EMInstanceStackMap in, - EMInstanceStackMap[] catalyst) { + public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, + ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap in, EMInstanceStackMap[] catalyst) { if (additionalCheck != null && !additionalCheck.check(this, consume, doNotCheckStackSizes, itemStacks, fluidStacks, in, catalyst)) { return false; @@ -207,26 +183,16 @@ public class TT_recipe extends GT_Recipe { } public interface IAdditionalCheck { - boolean check( - TT_recipe thisRecipe, - boolean consume, - boolean doNotCheckStackSizes, - ItemStack[] itemStacks, - FluidStack[] fluidStacks, - EMInstanceStackMap[] in, - EMInstanceStackMap[] e); - - boolean check( - TT_recipe thisRecipe, - boolean consume, - boolean doNotCheckStackSizes, - ItemStack[] itemStacks, - FluidStack[] fluidStacks, - EMInstanceStackMap in, - EMInstanceStackMap[] e); + + boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, + FluidStack[] fluidStacks, EMInstanceStackMap[] in, EMInstanceStackMap[] e); + + boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, + FluidStack[] fluidStacks, EMInstanceStackMap in, EMInstanceStackMap[] e); } public static class TT_Recipe_Map<T extends TT_recipe> { + public static TT_Recipe_Map<TT_assLineRecipe> sCrafterRecipes = new TT_Recipe_Map<>(); public static TT_Recipe_Map<TT_assLineRecipe> sMachineRecipes = new TT_Recipe_Map<>(); @@ -260,25 +226,23 @@ public class TT_recipe extends GT_Recipe { public static class GT_Recipe_MapTT extends GT_Recipe.GT_Recipe_Map { public static final GT_Recipe_Map sEyeofHarmonyRecipes = new Eye_Of_Harmony_Recipe_Map( - new HashSet<>(250), - "gt.recipe.eyeofharmony", - "Eye of Harmony", - null, - RES_PATH_GUI + "basicmachines/Extractor", - 1, - 9 * 9, - 1, - 0, - 1, - "", - 1, - "", - true, - false) // Custom NEI handler means this must be false. - .setProgressBar(GT_UITextures.PROGRESSBAR_HAMMER, ProgressBar.Direction.DOWN) - .setProgressBarPos(78, 24 + 2) - .setUsualFluidOutputCount(18) - .setLogoPos(10, 10); + new HashSet<>(250), + "gt.recipe.eyeofharmony", + "Eye of Harmony", + null, + RES_PATH_GUI + "basicmachines/Extractor", + 1, + 9 * 9, + 1, + 0, + 1, + "", + 1, + "", + true, + false) // Custom NEI handler means this must be false. + .setProgressBar(GT_UITextures.PROGRESSBAR_HAMMER, ProgressBar.Direction.DOWN) + .setProgressBarPos(78, 24 + 2).setUsualFluidOutputCount(18).setLogoPos(10, 10); public static GT_Recipe_MapTT sResearchableFakeRecipes = new GT_Recipe_MapTT( new HashSet<>(32), @@ -314,21 +278,10 @@ public class TT_recipe extends GT_Recipe { false); public static ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes = new ArrayList<>(); - public GT_Recipe_MapTT( - Collection<GT_Recipe> aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + public GT_Recipe_MapTT(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, @@ -350,21 +303,12 @@ public class TT_recipe extends GT_Recipe { } public static class TT_assLineRecipe extends TT_recipe { + public final ItemStack mResearchItem; - public TT_assLineRecipe( - boolean aOptimize, - ItemStack researchItem, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecialItems, - FluidStack[] aFluidInputs, - int aDuration, - int aEUt, - int aSpecialValue, - EMConstantStackMap[] in, - EMConstantStackMap[] out, - EMConstantStackMap[] catalyst, + public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem, ItemStack[] aInputs, ItemStack[] aOutputs, + Object aSpecialItems, FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue, + EMConstantStackMap[] in, EMConstantStackMap[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check) { super( aOptimize, @@ -384,16 +328,8 @@ public class TT_recipe extends GT_Recipe { mResearchItem = researchItem; } - public TT_assLineRecipe( - boolean aOptimize, - ItemStack researchItem, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecialItems, - FluidStack[] aFluidInputs, - int aDuration, - int aEUt, - int aSpecialValue, + public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem, ItemStack[] aInputs, ItemStack[] aOutputs, + Object aSpecialItems, FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue, EMConstantStackMap[] in) { this( aOptimize, @@ -413,23 +349,13 @@ public class TT_recipe extends GT_Recipe { } public static class TT_EMRecipe extends TT_recipe { + public final IEMDefinition mResearchEM; public final GT_Recipe scannerRecipe; - public TT_EMRecipe( - boolean aOptimize, - GT_Recipe scannerRecipe, - IEMDefinition researchEM, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecialItems, - FluidStack[] aFluidInputs, - int aDuration, - int aEUt, - int aSpecialValue, - EMConstantStackMap[] in, - EMConstantStackMap[] out, - EMConstantStackMap[] catalyst, + public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, IEMDefinition researchEM, ItemStack[] aInputs, + ItemStack[] aOutputs, Object aSpecialItems, FluidStack[] aFluidInputs, int aDuration, int aEUt, + int aSpecialValue, EMConstantStackMap[] in, EMConstantStackMap[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check) { super( aOptimize, @@ -450,18 +376,9 @@ public class TT_recipe extends GT_Recipe { this.scannerRecipe = scannerRecipe; } - public TT_EMRecipe( - boolean aOptimize, - GT_Recipe scannerRecipe, - IEMDefinition researchEM, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecialItems, - FluidStack[] aFluidInputs, - int aDuration, - int aEUt, - int aSpecialValue, - EMConstantStackMap[] in) { + public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, IEMDefinition researchEM, ItemStack[] aInputs, + ItemStack[] aOutputs, Object aSpecialItems, FluidStack[] aFluidInputs, int aDuration, int aEUt, + int aSpecialValue, EMConstantStackMap[] in) { this( aOptimize, scannerRecipe, @@ -481,10 +398,15 @@ public class TT_recipe extends GT_Recipe { } public static class TT_Recipe_Map_EM<T extends TT_EMRecipe> { - public static TT_Recipe_Map_EM<TT_EMRecipe> sCrafterRecipesEM = - new TT_Recipe_Map_EM<>("EM Crafter Recipes", "gt.recipe.em_crafter", null); - public static TT_Recipe_Map_EM<TT_EMRecipe> sMachineRecipesEM = - new TT_Recipe_Map_EM<>("EM Machinert Recipe", "gt.recipe.em_machinery", null); + + public static TT_Recipe_Map_EM<TT_EMRecipe> sCrafterRecipesEM = new TT_Recipe_Map_EM<>( + "EM Crafter Recipes", + "gt.recipe.em_crafter", + null); + public static TT_Recipe_Map_EM<TT_EMRecipe> sMachineRecipesEM = new TT_Recipe_Map_EM<>( + "EM Machinert Recipe", + "gt.recipe.em_machinery", + null); private final HashMap<IEMDefinition, T> mRecipeMap; public final String mNEIName, mUnlocalizedName, mNEIGUIPath; @@ -515,21 +437,10 @@ public class TT_recipe extends GT_Recipe { private static final int yOrigin = 8; private static final long TRILLION = pow(10, 12); - public Eye_Of_Harmony_Recipe_Map( - Collection<GT_Recipe> aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + public Eye_Of_Harmony_Recipe_Map(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, @@ -553,40 +464,63 @@ public class TT_recipe extends GT_Recipe { EyeOfHarmonyRecipe recipe = (EyeOfHarmonyRecipe) recipeInfo.recipe.mSpecialItems; List<String> result = new ArrayList<>(); - result.add(GT_LanguageManager.addStringLocalization("EOH.Recipe.Hydrogen.In", "Hydrogen") + ": " - + formatNumbers(recipe.getHydrogenRequirement()) + " L"); - result.add(GT_LanguageManager.addStringLocalization("EOH.Recipe.Helium.In", "Helium") + ": " - + formatNumbers(recipe.getHydrogenRequirement()) + " L"); - result.add(GT_LanguageManager.addStringLocalization("EOH.Recipe.SpacetimeTier", "Spacetime Tier") + ": " - + EOH_TIER_FANCY_NAMES[(int) recipe.getSpacetimeCasingTierRequired()]); + result.add( + GT_LanguageManager.addStringLocalization("EOH.Recipe.Hydrogen.In", "Hydrogen") + ": " + + formatNumbers(recipe.getHydrogenRequirement()) + + " L"); + result.add( + GT_LanguageManager.addStringLocalization("EOH.Recipe.Helium.In", "Helium") + ": " + + formatNumbers(recipe.getHydrogenRequirement()) + + " L"); + result.add( + GT_LanguageManager.addStringLocalization("EOH.Recipe.SpacetimeTier", "Spacetime Tier") + ": " + + EOH_TIER_FANCY_NAMES[(int) recipe.getSpacetimeCasingTierRequired()]); if (recipe.getEUOutput() < TRILLION) { - result.add(GT_LanguageManager.addStringLocalization("EOH.Recipe.EU.Out", "EU Output") + ": " - + formatNumbers(recipe.getEUOutput()) + " EU"); + result.add( + GT_LanguageManager.addStringLocalization("EOH.Recipe.EU.Out", "EU Output") + ": " + + formatNumbers(recipe.getEUOutput()) + + " EU"); } else { - result.add(GT_LanguageManager.addStringLocalization("EOH.Recipe.EU.Out", "EU Output") + ": " - + ReadableNumberConverter.INSTANCE.toWideReadableForm(recipe.getEUOutput()) + " EU"); + result.add( + GT_LanguageManager.addStringLocalization("EOH.Recipe.EU.Out", "EU Output") + ": " + + ReadableNumberConverter.INSTANCE.toWideReadableForm(recipe.getEUOutput()) + + " EU"); } if (recipe.getEUOutput() < TRILLION) { - result.add(GT_LanguageManager.addStringLocalization("EOH.Recipe.EU.In", "EU Input") + ": " - + formatNumbers(recipe.getEUStartCost()) + " EU"); + result.add( + GT_LanguageManager.addStringLocalization("EOH.Recipe.EU.In", "EU Input") + ": " + + formatNumbers(recipe.getEUStartCost()) + + " EU"); } else { - result.add(GT_LanguageManager.addStringLocalization("EOH.Recipe.EU.In", "EU Input") + ": " - + ReadableNumberConverter.INSTANCE.toWideReadableForm(recipe.getEUStartCost()) + " EU"); + result.add( + GT_LanguageManager.addStringLocalization("EOH.Recipe.EU.In", "EU Input") + ": " + + ReadableNumberConverter.INSTANCE.toWideReadableForm(recipe.getEUStartCost()) + + " EU"); } - result.add(GT_LanguageManager.addStringLocalization("EOH.Recipe.BaseRecipeChance", "Base Recipe Chance") - + ": " + formatNumbers(100 * recipe.getBaseRecipeSuccessChance()) + "%"); - result.add(GT_LanguageManager.addStringLocalization( - "EOH.Recipe.RecipeEnergyEfficiency", "Recipe Energy Efficiency") - + ": " + formatNumbers(100 * recipe.getRecipeEnergyEfficiency()) + "%"); + result.add( + GT_LanguageManager.addStringLocalization("EOH.Recipe.BaseRecipeChance", "Base Recipe Chance") + + ": " + + formatNumbers(100 * recipe.getBaseRecipeSuccessChance()) + + "%"); + result.add( + GT_LanguageManager + .addStringLocalization("EOH.Recipe.RecipeEnergyEfficiency", "Recipe Energy Efficiency") + + ": " + + formatNumbers(100 * recipe.getRecipeEnergyEfficiency()) + + "%"); if (recipe.getOutputItems().size() > maxItemsToRender) { - result.add("" + DARK_RED + BOLD - + GT_LanguageManager.addStringLocalization("EOH.Recipe.Warning.0", "Warning") + RESET + ": " - + GT_LanguageManager.addStringLocalization( - "EOH.Recipe.Warning.1", "Not all items displayed.")); + result.add( + "" + DARK_RED + + BOLD + + GT_LanguageManager.addStringLocalization("EOH.Recipe.Warning.0", "Warning") + + RESET + + ": " + + GT_LanguageManager + .addStringLocalization("EOH.Recipe.Warning.1", "Not all items displayed.")); } return result; @@ -607,8 +541,8 @@ public class TT_recipe extends GT_Recipe { @Override public List<Pos2d> getItemOutputPositions(int itemOutputCount) { - return UIHelper.getGridPositions( - min(itemOutputCount, maxItemsToRender + 1), 7, yOrigin + 36, xDirMaxCount, 12); + return UIHelper + .getGridPositions(min(itemOutputCount, maxItemsToRender + 1), 7, yOrigin + 36, xDirMaxCount, 12); } @Override @@ -622,14 +556,10 @@ public class TT_recipe extends GT_Recipe { } @Override - public ModularWindow.Builder createNEITemplate( - IItemHandlerModifiable itemInputsInventory, - IItemHandlerModifiable itemOutputsInventory, - IItemHandlerModifiable specialSlotInventory, - IItemHandlerModifiable fluidInputsInventory, - IItemHandlerModifiable fluidOutputsInventory, - Supplier<Float> progressSupplier, - Pos2d windowOffset) { + public ModularWindow.Builder createNEITemplate(IItemHandlerModifiable itemInputsInventory, + IItemHandlerModifiable itemOutputsInventory, IItemHandlerModifiable specialSlotInventory, + IItemHandlerModifiable fluidInputsInventory, IItemHandlerModifiable fluidOutputsInventory, + Supplier<Float> progressSupplier, Pos2d windowOffset) { // Delay setter so that calls to #setUsualFluidInputCount and #setUsualFluidOutputCount are considered setNEIBackgroundSize(172, 117 + (Math.max(getItemRowCount() + getFluidRowCount() - 4, 0)) * 18); return super.createNEITemplate( @@ -656,8 +586,8 @@ public class TT_recipe extends GT_Recipe { } @Override - public List<String> handleNEIItemTooltip( - ItemStack stack, List<String> currentTip, GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) { + public List<String> handleNEIItemTooltip(ItemStack stack, List<String> currentTip, + GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) { super.handleNEIItemTooltip(stack, currentTip, neiCachedRecipe); if (stack == null) return currentTip; @@ -665,9 +595,9 @@ public class TT_recipe extends GT_Recipe { // Draw tooltip on planet item. if (stack.isItemEqual(currentRecipe.getRecipeTriggerItem())) { - currentTip.add(EnumChatFormatting.GRAY - + translateToLocal("Total Items: ") - + formatNumbers(currentRecipe.getSumOfItems())); + currentTip.add( + EnumChatFormatting.GRAY + translateToLocal("Total Items: ") + + formatNumbers(currentRecipe.getSumOfItems())); return currentTip; } @@ -677,10 +607,9 @@ public class TT_recipe extends GT_Recipe { if (percentage != -1.0) { currentTip.add( EnumChatFormatting.GRAY + translateToLocal("Percentage of Solid Mass: ") + percentage + "%"); - currentTip.add(EnumChatFormatting.GRAY - + translateToLocal("Item Count: ") - + formatNumbers( - currentRecipe.getItemStackToTrueStackSizeMap().get(stack))); + currentTip.add( + EnumChatFormatting.GRAY + translateToLocal("Item Count: ") + + formatNumbers(currentRecipe.getItemStackToTrueStackSizeMap().get(stack))); } return currentTip; @@ -699,8 +628,7 @@ public class TT_recipe extends GT_Recipe { for (PositionedStack stack : neiCachedRecipe.mOutputs) { if (stack instanceof GT_NEI_DefaultHandler.FixedPositionedStack) { if (EOHRecipe.getItemStackToTrueStackSizeMap().containsKey(stack.item)) { - long stackSize = - EOHRecipe.getItemStackToTrueStackSizeMap().get(stack.item); + long stackSize = EOHRecipe.getItemStackToTrueStackSizeMap().get(stack.item); String displayString; if (stackSize > 9999) { displayString = ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize); diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java index 559231f846..ee10199007 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java @@ -1,5 +1,14 @@ package com.github.technus.tectech.recipe; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap; @@ -8,6 +17,7 @@ import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM; import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.ItemList; import gregtech.api.util.GT_OreDictUnificator; @@ -15,29 +25,15 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine; import gregtech.api.util.GT_Utility; import gregtech.common.GT_RecipeAdder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class TT_recipeAdder extends GT_RecipeAdder { + public static final ItemStack[] nullItem = new ItemStack[0]; public static final FluidStack[] nullFluid = new FluidStack[0]; - public static boolean addResearchableAssemblylineRecipe( - ItemStack aResearchItem, - int totalComputationRequired, - int computationRequiredPerSec, - int researchEUt, - int researchAmperage, - ItemStack[] aInputs, - FluidStack[] aFluidInputs, - ItemStack aOutput, - int assDuration, - int assEUt) { + public static boolean addResearchableAssemblylineRecipe(ItemStack aResearchItem, int totalComputationRequired, + int computationRequiredPerSec, int researchEUt, int researchAmperage, ItemStack[] aInputs, + FluidStack[] aFluidInputs, ItemStack aOutput, int assDuration, int assEUt) { if (aInputs == null) { aInputs = nullItem; } @@ -49,17 +45,20 @@ public class TT_recipeAdder extends GT_RecipeAdder { } for (ItemStack tItem : aInputs) { if (tItem == null) { - TecTech.LOGGER.error("addResearchableAssemblingLineRecipe " + aResearchItem.getDisplayName() + " --> " - + aOutput.getUnlocalizedName() + " there is some null item in that recipe"); + TecTech.LOGGER.error( + "addResearchableAssemblingLineRecipe " + aResearchItem.getDisplayName() + + " --> " + + aOutput.getUnlocalizedName() + + " there is some null item in that recipe"); } } researchAmperage = GT_Utility.clamp(researchAmperage, 1, Short.MAX_VALUE); computationRequiredPerSec = GT_Utility.clamp(computationRequiredPerSec, 1, Short.MAX_VALUE); TT_recipe.GT_Recipe_MapTT.sResearchableFakeRecipes.addFakeRecipe( false, - new ItemStack[] {aResearchItem}, - new ItemStack[] {aOutput}, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Writes Research result")}, + new ItemStack[] { aResearchItem }, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result") }, null, null, totalComputationRequired, @@ -68,52 +67,45 @@ public class TT_recipeAdder extends GT_RecipeAdder { GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe( false, aInputs, - new ItemStack[] {aOutput}, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Reads Research result")}, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result") }, aFluidInputs, null, assDuration, assEUt, 0, false); - GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine( - CustomItemList.UnusedStuff.get(1), - totalComputationRequired / computationRequiredPerSec, - aInputs, - aFluidInputs, - aOutput, - assDuration, - assEUt)); - TT_recipe.GT_Recipe_MapTT.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine( - aResearchItem, - totalComputationRequired / computationRequiredPerSec, - aInputs, - aFluidInputs, - aOutput, - assDuration, - assEUt)); + GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add( + new GT_Recipe.GT_Recipe_AssemblyLine( + CustomItemList.UnusedStuff.get(1), + totalComputationRequired / computationRequiredPerSec, + aInputs, + aFluidInputs, + aOutput, + assDuration, + assEUt)); + TT_recipe.GT_Recipe_MapTT.sAssemblylineRecipes.add( + new GT_Recipe.GT_Recipe_AssemblyLine( + aResearchItem, + totalComputationRequired / computationRequiredPerSec, + aInputs, + aFluidInputs, + aOutput, + assDuration, + assEUt)); return true; } - public static boolean addResearchableAssemblylineRecipe( - ItemStack aResearchItem, - int totalComputationRequired, - int computationRequiredPerSec, - int researchEUt, - int researchAmperage, - Object[] aInputs, - FluidStack[] aFluidInputs, - ItemStack aOutput, - int assDuration, - int assEUt) { + public static boolean addResearchableAssemblylineRecipe(ItemStack aResearchItem, int totalComputationRequired, + int computationRequiredPerSec, int researchEUt, int researchAmperage, Object[] aInputs, + FluidStack[] aFluidInputs, ItemStack aOutput, int assDuration, int assEUt) { if (aInputs == null) { aInputs = nullItem; } if (aFluidInputs == null) { aFluidInputs = nullFluid; } - if (aResearchItem == null - || totalComputationRequired <= 0 + if (aResearchItem == null || totalComputationRequired <= 0 || aOutput == null || aInputs.length > 16 || aFluidInputs.length > 4 @@ -149,11 +141,12 @@ public class TT_recipeAdder extends GT_RecipeAdder { if (objs.length >= 2 && !(tList = GT_OreDictUnificator.getOres(objs[0])).isEmpty()) { try { // sort the output, so the hash code is stable across launches - tList.sort(Comparator.<ItemStack, String>comparing( - s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId) - .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId) - .thenComparingInt(Items.feather::getDamage) - .thenComparingInt(s -> s.stackSize)); + tList.sort( + Comparator + .<ItemStack, String>comparing( + s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId) + .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId) + .thenComparingInt(Items.feather::getDamage).thenComparingInt(s -> s.stackSize)); int tAmount = ((Number) objs[1]).intValue(); List<ItemStack> uList = new ArrayList<>(); for (ItemStack tStack : tList) { @@ -168,13 +161,17 @@ public class TT_recipeAdder extends GT_RecipeAdder { tPersistentHash = tPersistentHash * 31 + tAmount; continue; } catch (Exception t) { - TecTech.LOGGER.error("addAssemblingLineRecipe " + aResearchItem.getDisplayName() - + " --> there is some ... in that recipe"); + TecTech.LOGGER.error( + "addAssemblingLineRecipe " + aResearchItem.getDisplayName() + + " --> there is some ... in that recipe"); } } } - TecTech.LOGGER.error("addAssemblingLineRecipe " + aResearchItem.getDisplayName() + " --> " - + aOutput.getUnlocalizedName() + " there is some null item in that recipe"); + TecTech.LOGGER.error( + "addAssemblingLineRecipe " + aResearchItem.getDisplayName() + + " --> " + + aOutput.getUnlocalizedName() + + " there is some null item in that recipe"); } tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(aResearchItem, true, false); tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(aOutput, true, false); @@ -192,9 +189,9 @@ public class TT_recipeAdder extends GT_RecipeAdder { tPersistentHash = tPersistentHash * 31 + assEUt; TT_recipe.GT_Recipe_MapTT.sResearchableFakeRecipes.addFakeRecipe( false, - new ItemStack[] {aResearchItem}, - new ItemStack[] {aOutput}, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Writes Research result")}, + new ItemStack[] { aResearchItem }, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result") }, null, null, totalComputationRequired, @@ -203,8 +200,8 @@ public class TT_recipeAdder extends GT_RecipeAdder { GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe( false, tInputs, - new ItemStack[] {aOutput}, - new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Reads Research result")}, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result") }, aFluidInputs, null, assDuration, @@ -237,19 +234,10 @@ public class TT_recipeAdder extends GT_RecipeAdder { return true; } - public static boolean addResearchableEMmachineRecipe( - ItemStack aResearchItem, - int totalComputationRequired, - int computationRequiredPerSec, - int researchEUt, - int researchAmperage, - ItemStack[] aInputs, - FluidStack[] aFluidInputs, - EMConstantStackMap[] eInputs, - ItemStack aOutput, - int machineDuration, - int machineEUt, - int machineAmperage) { + public static boolean addResearchableEMmachineRecipe(ItemStack aResearchItem, int totalComputationRequired, + int computationRequiredPerSec, int researchEUt, int researchAmperage, ItemStack[] aInputs, + FluidStack[] aFluidInputs, EMConstantStackMap[] eInputs, ItemStack aOutput, int machineDuration, + int machineEUt, int machineAmperage) { if (aInputs == null) { aInputs = nullItem; } @@ -261,8 +249,11 @@ public class TT_recipeAdder extends GT_RecipeAdder { } for (ItemStack tItem : aInputs) { if (tItem == null) { - TecTech.LOGGER.error("addResearchableEMmachineRecipe " + aResearchItem.getDisplayName() + " --> " - + aOutput.getUnlocalizedName() + " there is some null item in that recipe"); + TecTech.LOGGER.error( + "addResearchableEMmachineRecipe " + aResearchItem.getDisplayName() + + " --> " + + aOutput.getUnlocalizedName() + + " there is some null item in that recipe"); } } if (researchAmperage <= 0) { @@ -277,44 +268,34 @@ public class TT_recipeAdder extends GT_RecipeAdder { } TT_recipe.GT_Recipe_MapTT.sResearchableFakeRecipes.addFakeRecipe( false, - new ItemStack[] {aResearchItem}, - new ItemStack[] {aOutput}, - new ItemStack[] { - ItemList.Tool_DataOrb.getWithName( - 1L, "Writes Research result for " + GT_MetaTileEntity_EM_machine.machine) - }, + new ItemStack[] { aResearchItem }, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataOrb + .getWithName(1L, "Writes Research result for " + GT_MetaTileEntity_EM_machine.machine) }, null, null, totalComputationRequired, researchEUt, researchAmperage | computationRequiredPerSec << 16); - TT_recipe.TT_Recipe_Map.sMachineRecipes.add(new TT_recipe.TT_assLineRecipe( - false, - aResearchItem, - aInputs, - new ItemStack[] {aOutput}, - new ItemStack[] {ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")}, - aFluidInputs, - machineDuration, - machineEUt, - machineAmperage, - eInputs)); + TT_recipe.TT_Recipe_Map.sMachineRecipes.add( + new TT_recipe.TT_assLineRecipe( + false, + aResearchItem, + aInputs, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result") }, + aFluidInputs, + machineDuration, + machineEUt, + machineAmperage, + eInputs)); return true; } - public static boolean addResearchableEMcrafterRecipe( - ItemStack aResearchItem, - int totalComputationRequired, - int computationRequiredPerSec, - int researchEUt, - int researchAmperage, - EMConstantStackMap[] eInputs, - EMConstantStackMap[] catalyst, - TT_recipe.IAdditionalCheck check, - ItemStack aOutput, - int crafterDuration, - int crafterEUt, - int crafterAmperage) { + public static boolean addResearchableEMcrafterRecipe(ItemStack aResearchItem, int totalComputationRequired, + int computationRequiredPerSec, int researchEUt, int researchAmperage, EMConstantStackMap[] eInputs, + EMConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check, ItemStack aOutput, int crafterDuration, + int crafterEUt, int crafterAmperage) { if (aResearchItem == null || totalComputationRequired <= 0 || aOutput == null) { return false; } @@ -330,47 +311,37 @@ public class TT_recipeAdder extends GT_RecipeAdder { } TT_recipe.GT_Recipe_MapTT.sResearchableFakeRecipes.addFakeRecipe( false, - new ItemStack[] {aResearchItem}, - new ItemStack[] {aOutput}, - new ItemStack[] { - ItemList.Tool_DataOrb.getWithName( - 1L, "Writes Research result for " + GT_MetaTileEntity_EM_crafting.crafter) - }, + new ItemStack[] { aResearchItem }, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataOrb + .getWithName(1L, "Writes Research result for " + GT_MetaTileEntity_EM_crafting.crafter) }, null, null, totalComputationRequired, researchEUt, researchAmperage | computationRequiredPerSec << 16); - TT_recipe.TT_Recipe_Map.sCrafterRecipes.add(new TT_recipe.TT_assLineRecipe( - false, - aResearchItem, - null, - new ItemStack[] {aOutput}, - new ItemStack[] {ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")}, - null, - crafterDuration, - crafterEUt, - crafterAmperage, - eInputs, - null, - catalyst, - check)); + TT_recipe.TT_Recipe_Map.sCrafterRecipes.add( + new TT_recipe.TT_assLineRecipe( + false, + aResearchItem, + null, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result") }, + null, + crafterDuration, + crafterEUt, + crafterAmperage, + eInputs, + null, + catalyst, + check)); return true; } - public static boolean addScannableEMmachineRecipe( - IEMDefinition aResearchEM, - int totalComputationRequired, - int computationRequiredPerSec, - int researchEUt, - int researchAmperage, - ItemStack[] aInputs, - FluidStack[] aFluidInputs, - EMConstantStackMap[] eInputs, - ItemStack aOutput, - int machineDuration, - int machineEUt, - int machineAmperage) { + public static boolean addScannableEMmachineRecipe(IEMDefinition aResearchEM, int totalComputationRequired, + int computationRequiredPerSec, int researchEUt, int researchAmperage, ItemStack[] aInputs, + FluidStack[] aFluidInputs, EMConstantStackMap[] eInputs, ItemStack aOutput, int machineDuration, + int machineEUt, int machineAmperage) { if (aInputs == null) { aInputs = nullItem; } @@ -382,8 +353,11 @@ public class TT_recipeAdder extends GT_RecipeAdder { } for (ItemStack tItem : aInputs) { if (tItem == null) { - TecTech.LOGGER.error("addScannableEMmachineRecipe " + aResearchEM + " --> " - + aOutput.getUnlocalizedName() + " there is some null item in that recipe"); + TecTech.LOGGER.error( + "addScannableEMmachineRecipe " + aResearchEM + + " --> " + + aOutput.getUnlocalizedName() + + " there is some null item in that recipe"); } } if (researchAmperage <= 0) { @@ -397,49 +371,39 @@ public class TT_recipeAdder extends GT_RecipeAdder { computationRequiredPerSec = Short.MAX_VALUE; } ItemStack placeholder = new ItemStack(ElementalDefinitionContainer_EM.INSTANCE); - ElementalDefinitionContainer_EM.setContent( - placeholder, new EMConstantStackMap(new EMDefinitionStack(aResearchEM, 1))); + ElementalDefinitionContainer_EM + .setContent(placeholder, new EMConstantStackMap(new EMDefinitionStack(aResearchEM, 1))); GT_Recipe thisRecipe = TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe( false, - new ItemStack[] {placeholder}, - new ItemStack[] {aOutput}, - new ItemStack[] { - ItemList.Tool_DataOrb.getWithName( - 1L, "Writes Research result for " + GT_MetaTileEntity_EM_machine.machine) - }, + new ItemStack[] { placeholder }, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataOrb + .getWithName(1L, "Writes Research result for " + GT_MetaTileEntity_EM_machine.machine) }, null, null, totalComputationRequired, researchEUt, researchAmperage | computationRequiredPerSec << 16); - TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.add(new TT_recipe.TT_EMRecipe( - false, - thisRecipe, - aResearchEM, - aInputs, - new ItemStack[] {aOutput}, - new ItemStack[] {ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")}, - aFluidInputs, - machineDuration, - machineEUt, - machineAmperage, - eInputs)); + TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.add( + new TT_recipe.TT_EMRecipe( + false, + thisRecipe, + aResearchEM, + aInputs, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result") }, + aFluidInputs, + machineDuration, + machineEUt, + machineAmperage, + eInputs)); return true; } - public static boolean addScannableEMcrafterRecipe( - IEMDefinition aResearchEM, - int totalComputationRequired, - int computationRequiredPerSec, - int researchEUt, - int researchAmperage, - EMConstantStackMap[] eInputs, - EMConstantStackMap[] catalyst, - TT_recipe.IAdditionalCheck check, - ItemStack aOutput, - int crafterDuration, - int crafterEUt, - int crafterAmperage) { + public static boolean addScannableEMcrafterRecipe(IEMDefinition aResearchEM, int totalComputationRequired, + int computationRequiredPerSec, int researchEUt, int researchAmperage, EMConstantStackMap[] eInputs, + EMConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check, ItemStack aOutput, int crafterDuration, + int crafterEUt, int crafterAmperage) { if (aResearchEM == null || totalComputationRequired <= 0 || aOutput == null) { return false; } @@ -454,36 +418,35 @@ public class TT_recipeAdder extends GT_RecipeAdder { computationRequiredPerSec = Short.MAX_VALUE; } ItemStack placeholder = new ItemStack(ElementalDefinitionContainer_EM.INSTANCE); - ElementalDefinitionContainer_EM.setContent( - placeholder, new EMConstantStackMap(new EMDefinitionStack(aResearchEM, 1))); + ElementalDefinitionContainer_EM + .setContent(placeholder, new EMConstantStackMap(new EMDefinitionStack(aResearchEM, 1))); GT_Recipe thisRecipe = TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe( false, - new ItemStack[] {placeholder}, - new ItemStack[] {aOutput}, - new ItemStack[] { - ItemList.Tool_DataOrb.getWithName( - 1L, "Writes Research result for " + GT_MetaTileEntity_EM_crafting.crafter) - }, + new ItemStack[] { placeholder }, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataOrb + .getWithName(1L, "Writes Research result for " + GT_MetaTileEntity_EM_crafting.crafter) }, null, null, totalComputationRequired, researchEUt, researchAmperage | computationRequiredPerSec << 16); - TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.add(new TT_recipe.TT_EMRecipe( - false, - thisRecipe, - aResearchEM, - null, - new ItemStack[] {aOutput}, - new ItemStack[] {ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")}, - null, - crafterDuration, - crafterEUt, - crafterAmperage, - eInputs, - null, - catalyst, - check)); + TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.add( + new TT_recipe.TT_EMRecipe( + false, + thisRecipe, + aResearchEM, + null, + new ItemStack[] { aOutput }, + new ItemStack[] { ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result") }, + null, + crafterDuration, + crafterEUt, + crafterAmperage, + eInputs, + null, + catalyst, + check)); return true; } } diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index 32e62ce335..d918a550c0 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -2,15 +2,17 @@ package com.github.technus.tectech.thing; import static gregtech.api.enums.GT_Values.W; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import gregtech.api.interfaces.IItemContainer; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public enum CustomItemList implements IItemContainer { + Casing_UEV, Casing_UIV, Casing_UMV, diff --git a/src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java b/src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java index 64261ca12c..4fd0867078 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java @@ -1,9 +1,5 @@ package com.github.technus.tectech.thing.block; -import com.github.technus.tectech.TecTech; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,6 +8,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; +import com.github.technus.tectech.TecTech; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class EyeOfHarmonyBlock extends Block { public EyeOfHarmonyBlock() { @@ -56,22 +58,13 @@ public class EyeOfHarmonyBlock extends Block { } public static void registerOther(Block block) { - String name = - block.getUnlocalizedName().substring(block.getUnlocalizedName().indexOf(".") + 1); + String name = block.getUnlocalizedName().substring(block.getUnlocalizedName().indexOf(".") + 1); GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); } @Override - public boolean onBlockActivated( - World world, - int x, - int y, - int z, - EntityPlayer player, - int p_149727_6_, - float p_149727_7_, - float p_149727_8_, - float p_149727_9_) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, + float p_149727_7_, float p_149727_8_, float p_149727_9_) { TileEyeOfHarmony tile = (TileEyeOfHarmony) world.getTileEntity(x, y, z); if (player.isSneaking()) { diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java index b84f04c783..2512fc7aaf 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java @@ -3,11 +3,6 @@ package com.github.technus.tectech.thing.block; import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.TecTech.creativeTabTecTech; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import eu.usrv.yamcore.blocks.BlockBase; -import gregtech.api.GregTech_API; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,10 +10,17 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import eu.usrv.yamcore.blocks.BlockBase; +import gregtech.api.GregTech_API; + /** * Created by danie_000 on 17.12.2016. */ public final class QuantumGlassBlock extends BlockBase { + public static IIcon stuff; public static int renderID; public static QuantumGlassBlock INSTANCE; @@ -53,7 +55,7 @@ public final class QuantumGlassBlock extends BlockBase { // @Override // public boolean canRenderInPass(int pass) { - // return true; + // return true; // } @Override @@ -74,8 +76,8 @@ public final class QuantumGlassBlock extends BlockBase { @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered( - IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, + int p_149646_5_) { Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); return block != this; // && super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, // p_149646_5_); diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java index aabcdc2fee..86273974ff 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java @@ -4,6 +4,7 @@ import static com.github.technus.tectech.util.CommonValues.TEC_MARK_EM; import static net.minecraft.util.StatCollector.translateToLocal; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -14,6 +15,7 @@ import net.minecraft.util.EnumChatFormatting; * Created by Tec on 11.04.2017. */ public class QuantumGlassItem extends ItemBlock { + public static QuantumGlassItem INSTANCE; public QuantumGlassItem(Block block) { @@ -24,8 +26,8 @@ public class QuantumGlassItem extends ItemBlock { public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { aList.add(TEC_MARK_EM); aList.add(translateToLocal("tile.quantumGlass.desc.0")); // Dense yet transparent - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("tile.quantumGlass.desc.1")); // Glassy & Classy + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("tile.quantumGlass.desc.1")); // Glassy & Classy } } diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java index aac2c9d5a1..30050f7027 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java @@ -1,13 +1,15 @@ package com.github.technus.tectech.thing.block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + /** * Created by danie_000 on 19.12.2016. */ @@ -49,8 +51,8 @@ public final class QuantumGlassRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { renderer.renderStandardBlock(block, x, y, z); Tessellator tes = Tessellator.instance; @@ -63,12 +65,8 @@ public final class QuantumGlassRender implements ISimpleBlockRenderingHandler { // South if (world.getBlock(x, y, z + 1).getClass() != QuantumGlassBlock.class) { - tes.addVertexWithUV( - x, - y, - z + 0.999, - side.getMinU(), - side.getMaxV()); // 0.999 instead of 1 for fighting (textures overlapping) + tes.addVertexWithUV(x, y, z + 0.999, side.getMinU(), side.getMaxV()); // 0.999 instead of 1 for fighting + // (textures overlapping) tes.addVertexWithUV(x, y + 1, z + 0.999, side.getMinU(), side.getMinV()); tes.addVertexWithUV(x + 1, y + 1, z + 0.999, side.getMaxU(), side.getMinV()); tes.addVertexWithUV(x + 1, y, z + 0.999, side.getMaxU(), side.getMaxV()); diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java index 2717a95425..24838bdaf9 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java @@ -2,12 +2,9 @@ package com.github.technus.tectech.thing.block; import static com.github.technus.tectech.Reference.MODID; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import eu.usrv.yamcore.blocks.BlockBase; import java.util.ArrayList; import java.util.Random; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; @@ -16,10 +13,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import eu.usrv.yamcore.blocks.BlockBase; + /** * Created by danie_000 on 17.12.2016. */ public final class QuantumStuffBlock extends BlockBase { + public static IIcon stuff; public static int renderID; public static QuantumStuffBlock INSTANCE; @@ -59,7 +62,7 @@ public final class QuantumStuffBlock extends BlockBase { // @Override // public boolean canRenderInPass(int pass) { - // return true; + // return true; // } @Override @@ -80,8 +83,8 @@ public final class QuantumStuffBlock extends BlockBase { @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered( - IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, + int p_149646_5_) { return false; } diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java index 1c974a1510..9495d24770 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java @@ -1,19 +1,22 @@ package com.github.technus.tectech.thing.block; -import com.github.technus.tectech.TecTech; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import com.github.technus.tectech.TecTech; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + /** * Created by danie_000 on 19.12.2016. */ public final class QuantumStuffRender implements ISimpleBlockRenderingHandler { + private static Tessellator tes = Tessellator.instance; @Override @@ -51,16 +54,15 @@ public final class QuantumStuffRender implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { // renderer.renderStandardBlock(block, x, y, z); GL11.glPushMatrix(); tes.setNormal(0F, 1F, 0F); tes.setBrightness(15728880); IIcon side = QuantumStuffBlock.stuff; for (int i = 0; i < 6; i++) { - float f = 1 - TecTech.RANDOM.nextFloat() / 4f, - g = f - TecTech.RANDOM.nextFloat() / 4f, + float f = 1 - TecTech.RANDOM.nextFloat() / 4f, g = f - TecTech.RANDOM.nextFloat() / 4f, r = g - TecTech.RANDOM.nextFloat() / 4f - 0.25f; tes.setColorOpaque_F(r, g, f); float rotX = TecTech.RANDOM.nextFloat() * 2 * (float) Math.PI, @@ -80,18 +82,8 @@ public final class QuantumStuffRender implements ISimpleBlockRenderingHandler { return true; } - private void tesAbuse( - int x, - int y, - int z, - float sx, - float sy, - float sz, - float rotX, - float rotY, - float rotZ, - float sideU, - float sideV) { + private void tesAbuse(int x, int y, int z, float sx, float sy, float sz, float rotX, float rotY, float rotZ, + float sideU, float sideV) { Vec3 pos = Vec3.createVectorHelper(sx, sy, sz); pos.rotateAroundX(rotX); pos.rotateAroundY(rotY); diff --git a/src/main/java/com/github/technus/tectech/thing/block/ReactorSimBlock.java b/src/main/java/com/github/technus/tectech/thing/block/ReactorSimBlock.java index 0cb032e623..199e962c0b 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/ReactorSimBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/ReactorSimBlock.java @@ -2,13 +2,6 @@ package com.github.technus.tectech.thing.block; import static com.github.technus.tectech.Reference.MODID; -import com.github.technus.tectech.thing.tileEntity.ReactorSimTileEntity; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.core.IC2; -import ic2.core.IHasGui; -import ic2.core.block.TileEntityBlock; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -19,10 +12,20 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.github.technus.tectech.thing.tileEntity.ReactorSimTileEntity; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.core.IC2; +import ic2.core.IHasGui; +import ic2.core.block.TileEntityBlock; + /** * Created by danie_000 on 30.09.2017. */ public class ReactorSimBlock extends Block implements ITileEntityProvider { + public static ReactorSimBlock INSTANCE; public static IIcon stuff; @@ -72,8 +75,8 @@ public class ReactorSimBlock extends Block implements ITileEntityProvider { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float a, float b, float c) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float a, + float b, float c) { if (entityPlayer.isSneaking()) { return false; } else { diff --git a/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java b/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java index c4f27a4f66..b97d294e91 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java +++ b/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java @@ -4,6 +4,7 @@ import static com.github.technus.tectech.util.CommonValues.TEC_MARK_GENERAL; import static net.minecraft.util.StatCollector.translateToLocal; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -14,6 +15,7 @@ import net.minecraft.util.EnumChatFormatting; * Created by danie_000 on 30.09.2017. */ public class ReactorSimItem extends ItemBlock { + public static QuantumGlassItem INSTANCE; public ReactorSimItem(Block block) { @@ -24,8 +26,8 @@ public class ReactorSimItem extends ItemBlock { public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { aList.add(TEC_MARK_GENERAL); aList.add(translateToLocal("tile.reactorSim.desc.0")); // Fission Reaction Uncertainty Resolver 9001 - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("tile.reactorSim.desc.1")); // Explodes, but not as much... + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("tile.reactorSim.desc.1")); // Explodes, but not as much... } } 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 81cafff41d..371ba30a6f 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 @@ -3,7 +3,6 @@ package com.github.technus.tectech.thing.block; import static com.github.technus.tectech.Reference.MODID; import static java.lang.Math.*; -import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -13,8 +12,11 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.FMLClientHandler; + public class RenderEyeOfHarmony extends TileEntitySpecialRenderer { private static final ResourceLocation STAR_LAYER_0 = new ResourceLocation(MODID, "models/StarLayer0.png"); @@ -91,9 +93,7 @@ public class RenderEyeOfHarmony extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_BLEND); // Bind animation to layer of star. - FMLClientHandler.instance() - .getClient() - .getTextureManager() + FMLClientHandler.instance().getClient().getTextureManager() .bindTexture(new ResourceLocation(MODID, "models/spaceLayer.png")); final float scale = 0.01f * 17.5f; @@ -191,9 +191,9 @@ public class RenderEyeOfHarmony extends TileEntitySpecialRenderer { double y = 0; double z = 0; - double[] X = {x - 0.5, x - 0.5, x + 0.5, x + 0.5, x + 0.5, x + 0.5, x - 0.5, x - 0.5}; - double[] Y = {y + 0.5, y - 0.5, y - 0.5, y + 0.5, y + 0.5, y - 0.5, y - 0.5, y + 0.5}; - double[] Z = {z + 0.5, z + 0.5, z + 0.5, z + 0.5, z - 0.5, z - 0.5, z - 0.5, z - 0.5}; + double[] X = { x - 0.5, x - 0.5, x + 0.5, x + 0.5, x + 0.5, x + 0.5, x - 0.5, x - 0.5 }; + double[] Y = { y + 0.5, y - 0.5, y - 0.5, y + 0.5, y + 0.5, y - 0.5, y - 0.5, y + 0.5 }; + double[] Z = { z + 0.5, z + 0.5, z + 0.5, z + 0.5, z - 0.5, z - 0.5, z - 0.5, z - 0.5 }; tes.startDrawingQuads(); 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 192c70a1c5..1907906750 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 @@ -2,6 +2,7 @@ package com.github.technus.tectech.thing.block; import java.util.*; import java.util.stream.IntStream; + import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -9,6 +10,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; + import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; public class TileEyeOfHarmony extends TileEntity { @@ -80,14 +82,9 @@ public class TileEyeOfHarmony extends TileEntity { } public static class OrbitingObject { - public OrbitingObject( - Block block, - float distance, - float rotationSpeed, - float orbitSpeed, - float xAngle, - float zAngle, - float scale) { + + public OrbitingObject(Block block, float distance, float rotationSpeed, float orbitSpeed, float xAngle, + float zAngle, float scale) { this.block = block; this.distance = distance; this.rotationSpeed = rotationSpeed; @@ -111,8 +108,8 @@ public class TileEyeOfHarmony extends TileEntity { } private final ArrayList<OrbitingObject> orbitingObjects = new ArrayList<>(); - private static final Set<String> BLACKLISTED_BLOCKS = - Collections.unmodifiableSet(new HashSet<>(Arrays.asList("Tf", "Ow", "ED", "EA", "VA"))); + private static final Set<String> BLACKLISTED_BLOCKS = Collections + .unmodifiableSet(new HashSet<>(Arrays.asList("Tf", "Ow", "ED", "EA", "VA"))); // Map of strings to blocks private static final Map<String, Block> BLOCKS; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java index 8591ca22b4..19ccac3d6b 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java @@ -2,7 +2,17 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.github.technus.tectech.thing.CustomItemList; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -10,19 +20,13 @@ import gregtech.api.objects.GT_CopiedBlockTexture; import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_Block_Casings_Abstract; import gregtech.common.blocks.GT_Material_Casings; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; /** * Created by danie_000 on 03.10.2016. */ // Mostly tesla coils, also 2 eye of harmony casings. public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { + private static IIcon[] tM0 = new IIcon[2]; private static IIcon[] tM1 = new IIcon[2]; private static IIcon[] tM2 = new IIcon[2]; @@ -43,36 +47,36 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { public GT_Block_CasingsBA0() { super(GT_Item_CasingsBA0.class, "gt.blockcasingsBA0", GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { - Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = - new GT_CopiedBlockTexture(this, 6, b); - /*IMPORTANT for block recoloring**/ + Textures.BlockIcons.casingTexturePages[texturePage][b + + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); + /* IMPORTANT for block recoloring **/ } - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".0.name", "Redstone Alloy Primary Tesla Windings"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".1.name", "MV Superconductor Primary Tesla Windings"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".2.name", "HV Superconductor Primary Tesla Windings"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".3.name", "EV Superconductor Primary Tesla Windings"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".4.name", "IV Superconductor Primary Tesla Windings"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".5.name", "LuV Superconductor Primary Tesla Windings"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".9.name", "ZPM Superconductor Primary Tesla Windings"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".0.name", "Redstone Alloy Primary Tesla Windings"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".1.name", "MV Superconductor Primary Tesla Windings"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".2.name", "HV Superconductor Primary Tesla Windings"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".3.name", "EV Superconductor Primary Tesla Windings"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".4.name", "IV Superconductor Primary Tesla Windings"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".5.name", "LuV Superconductor Primary Tesla Windings"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".9.name", "ZPM Superconductor Primary Tesla Windings"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Tesla Base Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Tesla Toroid Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Tesla Secondary Windings"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".10.name", "Ultimate Temporal Boundary Casing"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".11.name", "Reinforced Spacetime Structure Casing"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".12.name", "Infinite Spacetime Energy Boundary Casing"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".10.name", "Ultimate Temporal Boundary Casing"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".11.name", "Reinforced Spacetime Structure Casing"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".12.name", "Infinite Spacetime Energy Boundary Casing"); CustomItemList.tM_TeslaPrimary_0.set(new ItemStack(this, 1, 0)); CustomItemList.tM_TeslaPrimary_1.set(new ItemStack(this, 1, 1)); 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 f4888b5125..e101689a82 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 @@ -3,20 +3,23 @@ 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 net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import com.github.technus.tectech.thing.CustomItemList; + import gregtech.api.enums.Textures; import gregtech.api.objects.GT_CopiedBlockTexture; import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_Block_Casings_Abstract; import gregtech.common.blocks.GT_Material_Casings; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; /** * Created by danie_000 on 03.10.2016. */ public class GT_Block_CasingsNH extends GT_Block_Casings_Abstract { + public static boolean mConnectedMachineTextures = true; public GT_Block_CasingsNH() { @@ -25,7 +28,7 @@ public class GT_Block_CasingsNH extends GT_Block_Casings_Abstract { for (byte b = 0; b < 16; b = (byte) (b + 1)) { Textures.BlockIcons.casingTexturePages[8][b + 64] = new GT_CopiedBlockTexture(this, 6, b); - /*IMPORTANT for block recoloring*/ + /* IMPORTANT for block recoloring */ } GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "UEV Machine Casing"); // adding diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java index fcaa068bce..8378ea2e4c 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java @@ -3,7 +3,17 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.TecTech.creativeTabTecTech; import static com.github.technus.tectech.TecTech.tectechTexturePage1; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.github.technus.tectech.thing.CustomItemList; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -11,39 +21,16 @@ import gregtech.api.objects.GT_CopiedBlockTexture; import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_Block_Casings_Abstract; import gregtech.common.blocks.GT_Material_Casings; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; /** * Created by danie_000 on 03.10.2016. */ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { + public static final byte texturePage = tectechTexturePage1; - public static final short textureOffset = texturePage << 7; // Start of PAGE 8 (which is the 9th page) (8*128) - private static IIcon eM0, - eM1, - eM1s, - eM2, - eM2s, - eM3, - eM3s, - eM4, - eM5, - eM6, - eM7, - eM7s, - eM8, - eM9, - eM10, - eM11, - eM12, - eM13, - eM14; + public static final short textureOffset = texturePage << 7; // Start of PAGE 8 (which is the 9th page) (8*128) + private static IIcon eM0, eM1, eM1s, eM2, eM2s, eM3, eM3s, eM4, eM5, eM6, eM7, eM7s, eM8, eM9, eM10, eM11, eM12, + eM13, eM14; private static IIcon[] debug = new IIcon[6]; public GT_Block_CasingsTT() { @@ -52,7 +39,7 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { for (byte b = 0; b < 16; b = (byte) (b + 1)) { Textures.BlockIcons.casingTexturePages[texturePage][b] = new GT_CopiedBlockTexture(this, 6, b); - /*IMPORTANT for block recoloring**/ + /* IMPORTANT for block recoloring **/ } GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "High Power Casing"); @@ -72,13 +59,14 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Dimensional Bridge Generator"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Ultimate Molecular Casing"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".13.name", "Ultimate Advanced Molecular Casing"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".14.name", "Ultimate Containment Field Generator"); - - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".15.name", "Debug Sides"); // NOT REGISTER AS TEXTURE FOR HATCHES! + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".13.name", "Ultimate Advanced Molecular Casing"); + GT_LanguageManager + .addStringLocalization(getUnlocalizedName() + ".14.name", "Ultimate Containment Field Generator"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Debug Sides"); // NOT REGISTER AS + // TEXTURE FOR + // HATCHES! CustomItemList.eM_Power.set(new ItemStack(this, 1, 0)); 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 a2b61b08bd..35bfe12071 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 @@ -4,14 +4,17 @@ import static com.github.technus.tectech.util.CommonValues.*; import static gregtech.api.util.GT_Utility.formatNumbers; import static net.minecraft.util.StatCollector.translateToLocal; -import gregtech.common.blocks.GT_Item_Casings_Abstract; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import gregtech.common.blocks.GT_Item_Casings_Abstract; + public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract { + public GT_Item_CasingsBA0(Block par1) { super(par1); } @@ -30,37 +33,43 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract { case 3: // "EV Superconductor Primary Tesla Windings" case 4: // "IV Superconductor Primary Tesla Windings" case 5: // "LuV Superconductor Primary Tesla Windings" - aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " - + formatNumbers(V[aStack.getItemDamage() + 1]) + " EU/t"); // Handles up to - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsBA0.0.desc.1")); // What one man calls God, another calls the + aList.add( + translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + + formatNumbers(V[aStack.getItemDamage() + 1]) + + " EU/t"); // Handles up to + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsBA0.0.desc.1")); // What one man calls God, another + // calls the // laws of physics. break; case 6: // "Tesla Base Casing" aList.add(translateToLocal("gt.blockcasingsBA0.6.desc.0")); // The base of a wondrous contraption - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsBA0.6.desc.1")); // it's alive, IT'S ALIVE! + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsBA0.6.desc.1")); // it's alive, IT'S ALIVE! break; case 7: // "Tesla Toroid Casing" aList.add(translateToLocal("gt.blockcasingsBA0.7.desc.0")); // Made out of the finest tin foil! - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsBA0.7.desc.1")); // Faraday suits might come later + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsBA0.7.desc.1")); // Faraday suits might come later break; case 8: // "Tesla Secondary Windings" aList.add(translateToLocal("gt.blockcasingsBA0.8.desc.0")); // Picks up power from a primary coil - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsBA0.8.desc.1")); // Who wouldn't want a 32k epoxy multi? + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsBA0.8.desc.1")); // Who wouldn't want a 32k epoxy + // multi? break; case 9: // "ZPM Superconductor Primary Tesla Windings" - aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + formatNumbers(V[7]) - + " EU/t"); // Handles up to - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsBA0.0.desc.1")); // What one man calls God, another calls the + aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + formatNumbers(V[7]) + " EU/t"); // Handles + // up + // to + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsBA0.0.desc.1")); // What one man calls God, another + // calls the // laws of physics. break; default: // WTF? diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java index cfe2e0a702..b69abca128 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java @@ -1,12 +1,14 @@ package com.github.technus.tectech.thing.casing; -import gregtech.common.blocks.GT_Item_Casings_Abstract; import net.minecraft.block.Block; +import gregtech.common.blocks.GT_Item_Casings_Abstract; + /** * Created by danie_000 on 03.10.2016. */ public class GT_Item_CasingsNH extends GT_Item_Casings_Abstract { + public GT_Item_CasingsNH(Block par1) { super(par1); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java index 19822a679d..8417c848bf 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java @@ -4,17 +4,20 @@ import static com.github.technus.tectech.util.CommonValues.COSMIC_MARK; import static com.github.technus.tectech.util.CommonValues.TEC_MARK_EM; import static net.minecraft.util.StatCollector.translateToLocal; -import gregtech.common.blocks.GT_Item_Casings_Abstract; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import gregtech.common.blocks.GT_Item_Casings_Abstract; + /** * Created by danie_000 on 03.10.2016. */ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract { + public GT_Item_CasingsTT(Block par1) { super(par1); } @@ -29,98 +32,104 @@ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract { switch (aStack.getItemDamage()) { case 0: // "High Power Casing" aList.add(translateToLocal("gt.blockcasingsTT.0.desc.0")); // Well suited for high power applications. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.0.desc.1")); // The power levels are rising! + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.0.desc.1")); // The power levels are rising! break; case 1: // "Computer Casing" aList.add(translateToLocal("gt.blockcasingsTT.1.desc.0")); // Nice and clean casing. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.1.desc.1")); // Dust can break it!? + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.1.desc.1")); // Dust can break it!? break; case 2: // "Computer Heat Vent" aList.add(translateToLocal("gt.blockcasingsTT.2.desc.0")); // Air vent with a filter. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.2.desc.1")); // Perfectly muffled sound! + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.2.desc.1")); // Perfectly muffled sound! break; case 3: // "Advanced Computer Casing" aList.add(translateToLocal("gt.blockcasingsTT.3.desc.0")); // Contains high bandwidth bus - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.3.desc.1")); // couple thousand qubits wide. + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.3.desc.1")); // couple thousand qubits wide. break; case 4: // "Molecular Casing" aList.add(translateToLocal("gt.blockcasingsTT.4.desc.0")); // Stops elemental things. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.4.desc.1")); // Radiation and emotions too... + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.4.desc.1")); // Radiation and emotions too... break; case 5: // "Advanced Molecular Casing" aList.add(translateToLocal("gt.blockcasingsTT.5.desc.0")); // Cooling and stabilization. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.5.desc.1")); // A comfortable machine bed. + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.5.desc.1")); // A comfortable machine bed. break; case 6: // "Containment Field Generator" aList.add(translateToLocal("gt.blockcasingsTT.6.desc.0")); // Creates a field that... - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.6.desc.1")); // can stop even force carriers. + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.6.desc.1")); // can stop even force carriers. break; case 7: // "Molecular Coil" aList.add(translateToLocal("gt.blockcasingsTT.7.desc.0")); // Well it does things too... - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.7.desc.1")); // [Use this coil!] + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.7.desc.1")); // [Use this coil!] break; case 8: // "Collider Hollow Casing" aList.add(translateToLocal("gt.blockcasingsTT.8.desc.0")); // Reinforced accelerator tunnel. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.8.desc.1")); // Most advanced pipe ever. + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.8.desc.1")); // Most advanced pipe ever. break; case 9: // "Spacetime Altering Casing" aList.add(translateToLocal("gt.blockcasingsTT.9.desc.0")); // c is no longer the limit. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.9.desc.1")); // Wibbly wobbly timey wimey stuff. + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.9.desc.1")); // Wibbly wobbly timey wimey stuff. break; case 10: // "Teleportation Casing" aList.add(translateToLocal("gt.blockcasingsTT.10.desc.0")); // Remote connection. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.10.desc.1")); // Better touch with a stick. + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.10.desc.1")); // Better touch with a stick. break; case 11: // "Dimensional Bridge Generator" aList.add(translateToLocal("gt.blockcasingsTT.11.desc.0")); // Interdimensional Operations. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.11.desc.1")); // Around the universe and other places too. + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.11.desc.1")); // Around the universe and other + // places too. break; case 12: // "Ultimate Molecular Casing" aList.add(translateToLocal("gt.blockcasingsTT.12.desc.0")); // Ultimate in every way. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.12.desc.1")); // I don't know what it can't do. + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.12.desc.1")); // I don't know what it can't do. break; case 13: // "Ultimate Advanced Molecular Casing" aList.add(translateToLocal("gt.blockcasingsTT.13.desc.0")); // More Ultimate in every way. - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.13.desc.1")); // I don't know what I am doing! + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.13.desc.1")); // I don't know what I am doing! break; case 14: // "Ultimate Containment Field Generator" aList.add(translateToLocal("gt.blockcasingsTT.14.desc.0")); // Black Hole... - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockcasingsTT.14.desc.1")); // Meh... + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockcasingsTT.14.desc.1")); // Meh... break; case 15: // "Debug Sides" aList.add(translateToLocal("gt.blockcasingsTT.15.desc.0")); // Lazy man way of determining sides. - aList.add(EnumChatFormatting.BLUE.toString() - + translateToLocal("gt.blockcasingsTT.15.desc.1")); // 0, 1, 2, 3, 4, 5, 6?! + aList.add(EnumChatFormatting.BLUE.toString() + translateToLocal("gt.blockcasingsTT.15.desc.1")); // 0, + // 1, + // 2, + // 3, + // 4, + // 5, + // 6?! break; default: // WTF? aList.add("Damn son where did you get that!?"); diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java index b320a4e191..1b670ee9d9 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java @@ -4,15 +4,18 @@ import static com.google.common.math.LongMath.pow; import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.util.GT_Utility.formatNumbers; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Item_Casings_Abstract; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import gregtech.api.util.GT_LanguageManager; +import gregtech.common.blocks.GT_Item_Casings_Abstract; + public class GT_Item_Casings_Spacetime extends GT_Item_Casings_Abstract { + public GT_Item_Casings_Spacetime(Block par1) { super(par1); } @@ -29,20 +32,25 @@ public class GT_Item_Casings_Spacetime extends GT_Item_Casings_Abstract { case 6: case 7: case 8: - aList.add(GT_LanguageManager.addStringLocalization( - "EOH.Spacetime.Standard.Tooltip.0", "Supports an internal spacetime volume of up to ") - + formatNumbers(pow(10, 5 + aStack.getItemDamage())) + "km³."); - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + GT_LanguageManager.addStringLocalization( - "EOH.Spacetime.Standard.Tooltip.1", "Capable of running recipes up to tier ") - + aStack.getItemDamage()); + aList.add( + GT_LanguageManager.addStringLocalization( + "EOH.Spacetime.Standard.Tooltip.0", + "Supports an internal spacetime volume of up to ") + + formatNumbers(pow(10, 5 + aStack.getItemDamage())) + + "km³."); + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + GT_LanguageManager.addStringLocalization( + "EOH.Spacetime.Standard.Tooltip.1", + "Capable of running recipes up to tier ") + + aStack.getItemDamage()); break; default: - aList.add(EnumChatFormatting.RED.toString() - + EnumChatFormatting.BOLD - + GT_LanguageManager.addStringLocalization( - "EOH.TimeDilation.Error.Tooltip", "Error, report to GTNH team")); + aList.add( + EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + + GT_LanguageManager.addStringLocalization( + "EOH.TimeDilation.Error.Tooltip", + "Error, report to GTNH team")); } aList.add(AuthorColen); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java index d43803d802..728335e754 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java @@ -2,15 +2,18 @@ package com.github.technus.tectech.thing.casing; import static gregtech.api.enums.GT_Values.AuthorColen; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Item_Casings_Abstract; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import gregtech.api.util.GT_LanguageManager; +import gregtech.common.blocks.GT_Item_Casings_Abstract; + public class GT_Item_Casings_Stabilisation extends GT_Item_Casings_Abstract { + public GT_Item_Casings_Stabilisation(Block par1) { super(par1); } @@ -27,16 +30,18 @@ public class GT_Item_Casings_Stabilisation extends GT_Item_Casings_Abstract { case 6: case 7: case 8: - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + GT_LanguageManager.addStringLocalization( - "EOH.Stability.Tooltip.0", "Increases stability of spacetime field.")); + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + GT_LanguageManager.addStringLocalization( + "EOH.Stability.Tooltip.0", + "Increases stability of spacetime field.")); break; default: - aList.add(EnumChatFormatting.RED.toString() - + EnumChatFormatting.BOLD - + GT_LanguageManager.addStringLocalization( - "EOH.TimeDilation.Error.Tooltip", "Error, report to GTNH team")); + aList.add( + EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + + GT_LanguageManager.addStringLocalization( + "EOH.TimeDilation.Error.Tooltip", + "Error, report to GTNH team")); } aList.add(AuthorColen); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java index e7b10db184..0fc4d31f72 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java @@ -2,15 +2,18 @@ package com.github.technus.tectech.thing.casing; import static gregtech.api.enums.GT_Values.AuthorColen; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Item_Casings_Abstract; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import gregtech.api.util.GT_LanguageManager; +import gregtech.common.blocks.GT_Item_Casings_Abstract; + public class GT_Item_Casings_TimeAcceleration extends GT_Item_Casings_Abstract { + public GT_Item_Casings_TimeAcceleration(Block par1) { super(par1); } @@ -27,16 +30,18 @@ public class GT_Item_Casings_TimeAcceleration extends GT_Item_Casings_Abstract { case 6: case 7: case 8: - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + GT_LanguageManager.addStringLocalization( - "EOH.TimeDilation.Standard.Tooltip", "Time dilation in a box.")); + aList.add( + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + GT_LanguageManager.addStringLocalization( + "EOH.TimeDilation.Standard.Tooltip", + "Time dilation in a box.")); break; default: - aList.add(EnumChatFormatting.RED.toString() - + EnumChatFormatting.BOLD - + GT_LanguageManager.addStringLocalization( - "EOH.TimeDilation.Error.Tooltip", "Error, report to GTNH team")); + aList.add( + EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + + GT_LanguageManager.addStringLocalization( + "EOH.TimeDilation.Error.Tooltip", + "Error, report to GTNH team")); } aList.add(AuthorColen); } 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 3dbc4b7477..f7329ee3d7 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 @@ -3,7 +3,17 @@ 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 java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.github.technus.tectech.thing.CustomItemList; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -11,16 +21,10 @@ import gregtech.api.objects.GT_CopiedBlockTexture; import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_Block_Casings_Abstract; import gregtech.common.blocks.GT_Material_Casings; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; @SuppressWarnings("SpellCheckingInspection") public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { + private static IIcon textureTier0; private static IIcon textureTier1; private static IIcon textureTier2; 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 4b5af29857..6dbd2b3ff8 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 @@ -3,7 +3,17 @@ 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 java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.github.technus.tectech.thing.CustomItemList; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -11,16 +21,10 @@ import gregtech.api.objects.GT_CopiedBlockTexture; import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_Block_Casings_Abstract; import gregtech.common.blocks.GT_Material_Casings; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; @SuppressWarnings("SpellCheckingInspection") public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { + private static IIcon textureTier0; private static IIcon textureTier1; private static IIcon textureTier2; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java index 35ff77a2cc..90b6ee4ed9 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java @@ -1,12 +1,14 @@ package com.github.technus.tectech.thing.casing; -import com.github.technus.tectech.thing.block.EyeOfHarmonyBlock; import net.minecraft.block.Block; +import com.github.technus.tectech.thing.block.EyeOfHarmonyBlock; + /** * Created by danie_000 on 03.10.2016. */ public final class TT_Container_Casings { + public static Block sBlockCasingsTT; public static Block sBlockCasingsBA0; 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 204c9f9ae0..50241dd0df 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 @@ -3,7 +3,17 @@ 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 java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.github.technus.tectech.thing.CustomItemList; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -11,16 +21,10 @@ import gregtech.api.objects.GT_CopiedBlockTexture; import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_Block_Casings_Abstract; import gregtech.common.blocks.GT_Material_Casings; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; @SuppressWarnings("SpellCheckingInspection") public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { + private static IIcon textureTier0; private static IIcon textureTier1; private static IIcon textureTier2; diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java index e977126595..53500c683e 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java @@ -3,6 +3,14 @@ package com.github.technus.tectech.thing.cover; import static com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData.getEnderFluidContainer; import static com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData.getEnderLinkTag; +import java.util.UUID; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidHandler; + import com.github.technus.tectech.loader.NetworkDispatcher; import com.github.technus.tectech.mechanics.enderStorage.EnderLinkCoverMessage; import com.github.technus.tectech.mechanics.enderStorage.EnderLinkTag; @@ -11,6 +19,7 @@ import com.gtnewhorizons.modularui.api.math.Color; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; + import eu.usrv.yamcore.auxiliary.PlayerChatHelper; import gregtech.api.gui.modularui.GT_CoverUIBuildContext; import gregtech.api.gui.modularui.GT_UITextures; @@ -20,14 +29,9 @@ import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget; -import java.util.UUID; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { + private static final int L_PER_TICK = 8000; private static final int IMPORT_EXPORT_MASK = 0b0001; private static final int PUBLIC_PRIVATE_MASK = 0b0010; @@ -61,8 +65,8 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { } @Override - public int doCoverThings( - byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { + public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, + long aTimer) { if ((aTileEntity instanceof IFluidHandler)) { IFluidHandler fluidHandlerSelf = (IFluidHandler) aTileEntity; IFluidHandler fluidHandlerEnder = getEnderFluidContainer(getEnderLinkTag((IFluidHandler) aTileEntity)); @@ -92,15 +96,8 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { } @Override - public int onCoverScrewdriverclick( - byte aSide, - int aCoverID, - int aCoverVariable, - ICoverable aTileEntity, - EntityPlayer aPlayer, - float aX, - float aY, - float aZ) { + public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, + EntityPlayer aPlayer, float aX, float aY, float aZ) { int newCoverVariable = toggleBit(aCoverVariable, IMPORT_EXPORT_MASK); if (testBit(aCoverVariable, IMPORT_EXPORT_MASK)) { @@ -160,71 +157,86 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { @SuppressWarnings("PointlessArithmeticExpression") @Override protected void addUIWidgets(ModularWindow.Builder builder) { - NetworkDispatcher.INSTANCE.sendToServer(new EnderLinkCoverMessage.EnderLinkCoverQuery( - tag, (IFluidHandler) getUIBuildContext().getTile())); + NetworkDispatcher.INSTANCE.sendToServer( + new EnderLinkCoverMessage.EnderLinkCoverQuery(tag, (IFluidHandler) getUIBuildContext().getTile())); GUI_INSTANCE = this; frequencyField = new TextFieldWidget() { + @Override public void onRemoveFocus() { super.onRemoveFocus(); try { String string = getText(); tag = new EnderLinkTag(string, tag.getUUID()); - NetworkDispatcher.INSTANCE.sendToServer(new EnderLinkCoverMessage.EnderLinkCoverUpdate( - tag, (IFluidHandler) getUIBuildContext().getTile())); - } catch (NumberFormatException ignored) { - } + NetworkDispatcher.INSTANCE.sendToServer( + new EnderLinkCoverMessage.EnderLinkCoverUpdate( + tag, + (IFluidHandler) getUIBuildContext().getTile())); + } catch (NumberFormatException ignored) {} resetTextField(); } }; - builder.widget(frequencyField - .setTextColor(Color.WHITE.dark(1)) - .setTextAlignment(Alignment.CenterLeft) + builder.widget( + frequencyField.setTextColor(Color.WHITE.dark(1)).setTextAlignment(Alignment.CenterLeft) .setFocusOnGuiOpen(true) .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) - .setPos(START_X + SPACE_X * 0, START_Y + SPACE_Y * 0) - .setSize(SPACE_X * 5 - 8, 12)) - .widget(new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( + .setPos(START_X + SPACE_X * 0, START_Y + SPACE_Y * 0).setSize(SPACE_X * 5 - 8, 12)) + .widget( + new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( this::getCoverData, this::setCoverData, GT_Cover_TM_EnderFluidLink.this, (id, coverData) -> !getClickable(id, convert(coverData)), (id, coverData) -> new ISerializableObject.LegacyCoverData( - getNewCoverVariable(id, convert(coverData)))) - .addToggleButton( - PUBLIC_BUTTON_ID, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_WHITELIST) - .addTooltip(GT_Utility.trans("326", "Public")) - .setPos(START_X + SPACE_X * 0, START_Y + SPACE_Y * 2)) - .addToggleButton( - PRIVATE_BUTTON_ID, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLACKLIST) - .addTooltip(GT_Utility.trans("327", "Private")) - .setPos(START_X + SPACE_X * 1, START_Y + SPACE_Y * 2)) - .addToggleButton( - IMPORT_BUTTON_ID, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(START_X + SPACE_X * 0, START_Y + SPACE_Y * 3)) - .addToggleButton( - EXPORT_BUTTON_ID, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("006", "Export")) - .setPos(START_X + SPACE_X * 1, START_Y + SPACE_Y * 3))) - .widget(new TextWidget(GT_Utility.trans("328", "Channel")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(START_X + SPACE_X * 5, 4 + START_Y + SPACE_Y * 0)) - .widget(new TextWidget(GT_Utility.trans("329", "Public/Private")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(START_X + SPACE_X * 2, 4 + START_Y + SPACE_Y * 2)) - .widget(new TextWidget(GT_Utility.trans("229", "Import/Export")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(START_X + SPACE_X * 2, 4 + START_Y + SPACE_Y * 3)); + getNewCoverVariable(id, convert(coverData)))).addToggleButton( + PUBLIC_BUTTON_ID, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_WHITELIST) + .addTooltip(GT_Utility.trans("326", "Public")) + .setPos(START_X + SPACE_X * 0, START_Y + SPACE_Y * 2)) + .addToggleButton( + PRIVATE_BUTTON_ID, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget + .setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_BLACKLIST) + .addTooltip(GT_Utility.trans("327", "Private")) + .setPos( + START_X + SPACE_X * 1, + START_Y + SPACE_Y * 2)) + .addToggleButton( + IMPORT_BUTTON_ID, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget + .setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip(GT_Utility.trans("007", "Import")) + .setPos( + START_X + SPACE_X * 0, + START_Y + SPACE_Y * 3)) + .addToggleButton( + EXPORT_BUTTON_ID, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget + .setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_EXPORT) + .addTooltip(GT_Utility.trans("006", "Export")) + .setPos( + START_X + SPACE_X * 1, + START_Y + SPACE_Y * 3))) + .widget( + new TextWidget(GT_Utility.trans("328", "Channel")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(START_X + SPACE_X * 5, 4 + START_Y + SPACE_Y * 0)) + .widget( + new TextWidget(GT_Utility.trans("329", "Public/Private")) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(START_X + SPACE_X * 2, 4 + START_Y + SPACE_Y * 2)) + .widget( + new TextWidget(GT_Utility.trans("229", "Import/Export")) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(START_X + SPACE_X * 2, 4 + START_Y + SPACE_Y * 3)); resetTextField(); } @@ -274,8 +286,10 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { ownerUUID = null; } EnderLinkTag newTag = new EnderLinkTag(tag.getFrequency(), ownerUUID); - NetworkDispatcher.INSTANCE.sendToServer(new EnderLinkCoverMessage.EnderLinkCoverUpdate( - newTag, (IFluidHandler) getUIBuildContext().getTile())); + NetworkDispatcher.INSTANCE.sendToServer( + new EnderLinkCoverMessage.EnderLinkCoverUpdate( + newTag, + (IFluidHandler) getUIBuildContext().getTile())); } } } diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java index 699a6dc0bc..75ef0386bc 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java @@ -1,18 +1,21 @@ package com.github.technus.tectech.thing.cover; +import net.minecraft.item.ItemStack; + import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; + import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.util.GT_CoverBehavior; -import net.minecraft.item.ItemStack; public class GT_Cover_TM_PowerPassUpgrade extends GT_CoverBehavior { + public GT_Cover_TM_PowerPassUpgrade() {} @Override public boolean isCoverPlaceable(byte aSide, ItemStack aStack, ICoverable aTileEntity) { - IMetaTileEntity iGregTechTileEntityOffset = - aTileEntity.getIGregTechTileEntityOffset(0, 0, 0).getMetaTileEntity(); + IMetaTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0) + .getMetaTileEntity(); if (iGregTechTileEntityOffset instanceof GT_MetaTileEntity_MultiblockBase_EM) { GT_MetaTileEntity_MultiblockBase_EM multi = (GT_MetaTileEntity_MultiblockBase_EM) iGregTechTileEntityOffset; return !multi.ePowerPassCover; @@ -22,8 +25,8 @@ public class GT_Cover_TM_PowerPassUpgrade extends GT_CoverBehavior { @Override public void placeCover(byte aSide, ItemStack aCover, ICoverable aTileEntity) { - IMetaTileEntity iGregTechTileEntityOffset = - aTileEntity.getIGregTechTileEntityOffset(0, 0, 0).getMetaTileEntity(); + IMetaTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0) + .getMetaTileEntity(); if (iGregTechTileEntityOffset instanceof GT_MetaTileEntity_MultiblockBase_EM) { GT_MetaTileEntity_MultiblockBase_EM multi = (GT_MetaTileEntity_MultiblockBase_EM) iGregTechTileEntityOffset; multi.ePowerPassCover = true; @@ -33,10 +36,10 @@ public class GT_Cover_TM_PowerPassUpgrade extends GT_CoverBehavior { } @Override - public boolean onCoverRemoval( - byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, boolean aForced) { - IMetaTileEntity iGregTechTileEntityOffset = - aTileEntity.getIGregTechTileEntityOffset(0, 0, 0).getMetaTileEntity(); + public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, + boolean aForced) { + IMetaTileEntity iGregTechTileEntityOffset = aTileEntity.getIGregTechTileEntityOffset(0, 0, 0) + .getMetaTileEntity(); if (iGregTechTileEntityOffset instanceof GT_MetaTileEntity_MultiblockBase_EM) { GT_MetaTileEntity_MultiblockBase_EM multi = (GT_MetaTileEntity_MultiblockBase_EM) iGregTechTileEntityOffset; multi.ePowerPassCover = false; diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java index 03caa0948c..152d69a5bf 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java @@ -3,23 +3,28 @@ package com.github.technus.tectech.thing.cover; import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.teslaSimpleNodeSetAdd; import static ic2.api.info.Info.DMG_ELECTRIC; +import net.minecraft.entity.player.EntityPlayer; + import com.github.technus.tectech.mechanics.tesla.TeslaCoverConnection; + import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.util.GT_CoverBehavior; import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.EntityPlayer; public class GT_Cover_TM_TeslaCoil extends GT_CoverBehavior { + public GT_Cover_TM_TeslaCoil() {} @Override - public int doCoverThings( - byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { + public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, + long aTimer) { // Only do stuff if we're on top and have power if (aSide == 1 || aTileEntity.getEUCapacity() > 0) { // Makes sure we're on the list - teslaSimpleNodeSetAdd(new TeslaCoverConnection( - aTileEntity.getIGregTechTileEntityOffset(0, 0, 0), getTeslaReceptionCapability())); + teslaSimpleNodeSetAdd( + new TeslaCoverConnection( + aTileEntity.getIGregTechTileEntityOffset(0, 0, 0), + getTeslaReceptionCapability())); } return super.doCoverThings(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity, aTimer); } @@ -35,15 +40,8 @@ public class GT_Cover_TM_TeslaCoil extends GT_CoverBehavior { } @Override - public int onCoverScrewdriverclick( - byte aSide, - int aCoverID, - int aCoverVariable, - ICoverable aTileEntity, - EntityPlayer aPlayer, - float aX, - float aY, - float aZ) { + public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, + EntityPlayer aPlayer, float aX, float aY, float aZ) { // Shock a non-hazmat player if they dare stuff a screwdriver into one of these if (aTileEntity.getStoredEU() > 0 && !GT_Utility.isWearingFullElectroHazmat(aPlayer)) { aPlayer.attackEntityFrom(DMG_ELECTRIC, 20); diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java index 10e8efc9ef..dba5a8ab12 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java @@ -1,9 +1,11 @@ package com.github.technus.tectech.thing.cover; -import gregtech.api.interfaces.tileentity.ICoverable; import net.minecraftforge.fluids.Fluid; +import gregtech.api.interfaces.tileentity.ICoverable; + public class GT_Cover_TM_TeslaCoil_Ultimate extends GT_Cover_TM_TeslaCoil { + public GT_Cover_TM_TeslaCoil_Ultimate() {} @Override diff --git a/src/main/java/com/github/technus/tectech/thing/gui/TecTechUITextures.java b/src/main/java/com/github/technus/tectech/thing/gui/TecTechUITextures.java index 781bee68c4..5f61ad59ac 100644 --- a/src/main/java/com/github/technus/tectech/thing/gui/TecTechUITextures.java +++ b/src/main/java/com/github/technus/tectech/thing/gui/TecTechUITextures.java @@ -2,110 +2,103 @@ package com.github.technus.tectech.thing.gui; import static com.github.technus.tectech.Reference.MODID; -import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture; -import com.gtnewhorizons.modularui.api.drawable.UITexture; import java.util.stream.Collectors; import java.util.stream.IntStream; +import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture; +import com.gtnewhorizons.modularui.api.drawable.UITexture; + public class TecTechUITextures { - public static final AdaptableUITexture BACKGROUND_SCREEN_BLUE = - AdaptableUITexture.of(MODID, "gui/background/screen_blue", 90, 72, 2); - public static final UITexture BACKGROUND_SCREEN_BLUE_PARAMETRIZER_TXT = - UITexture.fullImage(MODID, "gui/background/screen_blue_parametrizer_txt"); - public static final UITexture BACKGROUND_SCREEN_BLUE_NO_INVENTORY = - UITexture.fullImage(MODID, "gui/background/screen_blue_no_inventory"); + public static final AdaptableUITexture BACKGROUND_SCREEN_BLUE = AdaptableUITexture + .of(MODID, "gui/background/screen_blue", 90, 72, 2); + public static final UITexture BACKGROUND_SCREEN_BLUE_PARAMETRIZER_TXT = UITexture + .fullImage(MODID, "gui/background/screen_blue_parametrizer_txt"); + public static final UITexture BACKGROUND_SCREEN_BLUE_NO_INVENTORY = UITexture + .fullImage(MODID, "gui/background/screen_blue_no_inventory"); public static final UITexture BUTTON_STANDARD_16x16 = UITexture.fullImage(MODID, "gui/button/standard_16x16"); - public static final UITexture BUTTON_STANDARD_LIGHT_16x16 = - UITexture.fullImage(MODID, "gui/button/standard_light_16x16"); + public static final UITexture BUTTON_STANDARD_LIGHT_16x16 = UITexture + .fullImage(MODID, "gui/button/standard_light_16x16"); - public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_DISABLED = - UITexture.fullImage(MODID, "gui/overlay_button/power_switch_disabled"); - public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_OFF = - UITexture.fullImage(MODID, "gui/overlay_button/power_switch_off"); - public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_ON = - UITexture.fullImage(MODID, "gui/overlay_button/power_switch_on"); + public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_DISABLED = UITexture + .fullImage(MODID, "gui/overlay_button/power_switch_disabled"); + public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_OFF = UITexture + .fullImage(MODID, "gui/overlay_button/power_switch_off"); + public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_ON = UITexture + .fullImage(MODID, "gui/overlay_button/power_switch_on"); public static final UITexture OVERLAY_BUTTON_HEAT_OFF = UITexture.fullImage(MODID, "gui/overlay_button/heat_off"); public static final UITexture OVERLAY_BUTTON_HEAT_ON = UITexture.fullImage(MODID, "gui/overlay_button/heat_on"); public static final UITexture[] OVERLAY_BUTTON_UNCERTAINTY = IntStream.range(0, 16) .mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_button/uncertainty/" + i)) - .collect(Collectors.toList()) - .toArray(new UITexture[0]); - public static final UITexture OVERLAY_BUTTON_SAFE_VOID_DISABLED = - UITexture.fullImage(MODID, "gui/overlay_button/safe_void_disabled"); - public static final UITexture OVERLAY_BUTTON_SAFE_VOID_OFF = - UITexture.fullImage(MODID, "gui/overlay_button/safe_void_off"); - public static final UITexture OVERLAY_BUTTON_SAFE_VOID_ON = - UITexture.fullImage(MODID, "gui/overlay_button/safe_void_on"); - public static final UITexture OVERLAY_BUTTON_POWER_PASS_DISABLED = - UITexture.fullImage(MODID, "gui/overlay_button/power_pass_disabled"); - public static final UITexture OVERLAY_BUTTON_POWER_PASS_OFF = - UITexture.fullImage(MODID, "gui/overlay_button/power_pass_off"); - public static final UITexture OVERLAY_BUTTON_POWER_PASS_ON = - UITexture.fullImage(MODID, "gui/overlay_button/power_pass_on"); - public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_ID = - UITexture.fullImage(MODID, "gui/overlay_button/parametrizer_id"); - public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_0 = - UITexture.fullImage(MODID, "gui/overlay_button/parametrizer_0"); - public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_1 = - UITexture.fullImage(MODID, "gui/overlay_button/parametrizer_1"); - public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_X = - UITexture.fullImage(MODID, "gui/overlay_button/parametrizer_x"); - public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_S = - UITexture.fullImage(MODID, "gui/overlay_button/parametrizer_s"); - public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_T = - UITexture.fullImage(MODID, "gui/overlay_button/parametrizer_t"); - public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_C = - UITexture.fullImage(MODID, "gui/overlay_button/parametrizer_c"); - public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_IF = - UITexture.fullImage(MODID, "gui/overlay_button/parametrizer_if"); + .collect(Collectors.toList()).toArray(new UITexture[0]); + public static final UITexture OVERLAY_BUTTON_SAFE_VOID_DISABLED = UITexture + .fullImage(MODID, "gui/overlay_button/safe_void_disabled"); + public static final UITexture OVERLAY_BUTTON_SAFE_VOID_OFF = UITexture + .fullImage(MODID, "gui/overlay_button/safe_void_off"); + public static final UITexture OVERLAY_BUTTON_SAFE_VOID_ON = UITexture + .fullImage(MODID, "gui/overlay_button/safe_void_on"); + public static final UITexture OVERLAY_BUTTON_POWER_PASS_DISABLED = UITexture + .fullImage(MODID, "gui/overlay_button/power_pass_disabled"); + public static final UITexture OVERLAY_BUTTON_POWER_PASS_OFF = UITexture + .fullImage(MODID, "gui/overlay_button/power_pass_off"); + public static final UITexture OVERLAY_BUTTON_POWER_PASS_ON = UITexture + .fullImage(MODID, "gui/overlay_button/power_pass_on"); + public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_ID = UITexture + .fullImage(MODID, "gui/overlay_button/parametrizer_id"); + public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_0 = UITexture + .fullImage(MODID, "gui/overlay_button/parametrizer_0"); + public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_1 = UITexture + .fullImage(MODID, "gui/overlay_button/parametrizer_1"); + public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_X = UITexture + .fullImage(MODID, "gui/overlay_button/parametrizer_x"); + public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_S = UITexture + .fullImage(MODID, "gui/overlay_button/parametrizer_s"); + public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_T = UITexture + .fullImage(MODID, "gui/overlay_button/parametrizer_t"); + public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_C = UITexture + .fullImage(MODID, "gui/overlay_button/parametrizer_c"); + public static final UITexture OVERLAY_BUTTON_PARAMETRIZER_IF = UITexture + .fullImage(MODID, "gui/overlay_button/parametrizer_if"); public static final UITexture OVERLAY_SLOT_RACK = UITexture.fullImage(MODID, "gui/overlay_slot/rack"); public static final UITexture OVERLAY_SLOT_MESH = UITexture.fullImage(MODID, "gui/overlay_slot/mesh"); public static final UITexture PICTURE_TECTECH_LOGO = UITexture.fullImage(MODID, "gui/picture/tectech_logo"); - public static final UITexture PICTURE_TECTECH_LOGO_DARK = - UITexture.fullImage(MODID, "gui/picture/tectech_logo_dark"); + public static final UITexture PICTURE_TECTECH_LOGO_DARK = UITexture + .fullImage(MODID, "gui/picture/tectech_logo_dark"); public static final UITexture PICTURE_RACK_LARGE = UITexture.fullImage(MODID, "gui/picture/rack_large"); public static final UITexture PICTURE_HEAT_SINK = UITexture.fullImage(MODID, "gui/picture/heat_sink"); - public static final UITexture PICTURE_UNCERTAINTY_MONITOR = - UITexture.fullImage(MODID, "gui/picture/uncertainty/monitor"); - public static final UITexture PICTURE_UNCERTAINTY_INDICATOR = - UITexture.fullImage(MODID, "gui/picture/uncertainty/indicator"); - public static final UITexture PICTURE_UNCERTAINTY_SELECTED = - UITexture.fullImage(MODID, "gui/picture/uncertainty/selected"); + public static final UITexture PICTURE_UNCERTAINTY_MONITOR = UITexture + .fullImage(MODID, "gui/picture/uncertainty/monitor"); + public static final UITexture PICTURE_UNCERTAINTY_INDICATOR = UITexture + .fullImage(MODID, "gui/picture/uncertainty/indicator"); + public static final UITexture PICTURE_UNCERTAINTY_SELECTED = UITexture + .fullImage(MODID, "gui/picture/uncertainty/selected"); public static final UITexture[] PICTURE_UNCERTAINTY_VALID = IntStream.range(0, 9) .mapToObj(i -> UITexture.fullImage(MODID, "gui/picture/uncertainty/valid_" + i)) - .collect(Collectors.toList()) - .toArray(new UITexture[0]); + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture[] PICTURE_UNCERTAINTY_INVALID = IntStream.range(0, 9) .mapToObj(i -> UITexture.fullImage(MODID, "gui/picture/uncertainty/invalid_" + i)) - .collect(Collectors.toList()) - .toArray(new UITexture[0]); + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture PICTURE_HEAT_SINK_SMALL = UITexture.fullImage(MODID, "gui/picture/heat_sink_small"); public static final UITexture PICTURE_PARAMETER_BLANK = UITexture.fullImage(MODID, "gui/picture/parameter_blank"); public static final UITexture[] PICTURE_PARAMETER_BLUE = IntStream.range(0, 20) .mapToObj(i -> UITexture.partly(MODID, "gui/picture/parameter_blue", 158, 4, i * 8, 0, i * 8 + 6, 4)) - .collect(Collectors.toList()) - .toArray(new UITexture[0]); + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture[] PICTURE_PARAMETER_CYAN = IntStream.range(0, 20) .mapToObj(i -> UITexture.partly(MODID, "gui/picture/parameter_cyan", 158, 4, i * 8, 0, i * 8 + 6, 4)) - .collect(Collectors.toList()) - .toArray(new UITexture[0]); + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture[] PICTURE_PARAMETER_GREEN = IntStream.range(0, 20) .mapToObj(i -> UITexture.partly(MODID, "gui/picture/parameter_green", 158, 4, i * 8, 0, i * 8 + 6, 4)) - .collect(Collectors.toList()) - .toArray(new UITexture[0]); + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture[] PICTURE_PARAMETER_ORANGE = IntStream.range(0, 20) .mapToObj(i -> UITexture.partly(MODID, "gui/picture/parameter_orange", 158, 4, i * 8, 0, i * 8 + 6, 4)) - .collect(Collectors.toList()) - .toArray(new UITexture[0]); + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture[] PICTURE_PARAMETER_RED = IntStream.range(0, 20) .mapToObj(i -> UITexture.partly(MODID, "gui/picture/parameter_red", 158, 4, i * 8, 0, i * 8 + 6, 4)) - .collect(Collectors.toList()) - .toArray(new UITexture[0]); + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture PICTURE_PARAMETER_GRAY = UITexture.fullImage(MODID, "gui/picture/parameter_gray"); - public static final UITexture PICTURE_UNCERTAINTY_MONITOR_MULTIMACHINE = - UITexture.fullImage(MODID, "gui/picture/uncertainty/monitor_multimachine"); + public static final UITexture PICTURE_UNCERTAINTY_MONITOR_MULTIMACHINE = UITexture + .fullImage(MODID, "gui/picture/uncertainty/monitor_multimachine"); } 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 561c149a2d..6b359dcf8f 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 @@ -4,22 +4,11 @@ import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.TecTech.creativeTabTecTech; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.avrClone.AvrCore; -import com.github.technus.avrClone.instructions.InstructionRegistry; -import com.github.technus.avrClone.memory.program.ProgramMemory; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.loader.gui.ModGuiHandler; -import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_MicroController; -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.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -30,11 +19,24 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -@Optional.InterfaceList({ - @Optional.Interface(iface = "dan200.computercraft.api.media.IMedia", modid = "ComputerCraft"), - @Optional.Interface(iface = "li.cil.oc.api.fs.FileSystem", modid = "OpenComputers") -}) +import com.github.technus.avrClone.AvrCore; +import com.github.technus.avrClone.instructions.InstructionRegistry; +import com.github.technus.avrClone.memory.program.ProgramMemory; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.loader.gui.ModGuiHandler; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_MicroController; + +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.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +@Optional.InterfaceList({ @Optional.Interface(iface = "dan200.computercraft.api.media.IMedia", modid = "ComputerCraft"), + @Optional.Interface(iface = "li.cil.oc.api.fs.FileSystem", modid = "OpenComputers") }) public class AvrProgrammer extends Item implements IMedia { + public static AvrProgrammer INSTANCE = new AvrProgrammer(); private AvrProgrammer() { @@ -46,17 +48,8 @@ public class AvrProgrammer extends Item implements IMedia { } @Override - public boolean onItemUseFirst( - ItemStack stack, - EntityPlayer aPlayer, - World aWorld, - int aX, - int aY, - int aZ, - int side, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUseFirst(ItemStack stack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int side, + float hitX, float hitY, float hitZ) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity == null || aPlayer instanceof FakePlayer) { return aPlayer instanceof EntityPlayerMP; @@ -70,15 +63,16 @@ public class AvrProgrammer extends Item implements IMedia { NBTTagCompound pgm = stack.stackTagCompound.getCompoundTag("pgm"); if (pgm.hasKey("instructions")) { AvrCore core = ((GT_MetaTileEntity_MicroController) metaTE).core; - InstructionRegistry registry = - InstructionRegistry.REGISTRIES.get(pgm.getString("instructionRegistry")); + InstructionRegistry registry = InstructionRegistry.REGISTRIES + .get(pgm.getString("instructionRegistry")); if (registry != null) { - core.setProgramMemory(new ProgramMemory( - registry, - pgm.getBoolean("immersive"), - pgm.getIntArray("instructions"), - pgm.getIntArray("param0"), - pgm.getIntArray("param1"))); + core.setProgramMemory( + new ProgramMemory( + registry, + pgm.getBoolean("immersive"), + pgm.getIntArray("instructions"), + pgm.getIntArray("param0"), + pgm.getIntArray("param1"))); } } } @@ -94,8 +88,8 @@ public class AvrProgrammer extends Item implements IMedia { return false; } - public void writeToProgrammer( - ItemStack stack, InstructionRegistry registry, boolean immersive, List<String> strings) throws Exception { + public void writeToProgrammer(ItemStack stack, InstructionRegistry registry, boolean immersive, + List<String> strings) throws Exception { writeToProgrammer(stack, new ProgramMemory(registry, immersive, strings)); } @@ -126,8 +120,8 @@ public class AvrProgrammer extends Item implements IMedia { public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { if (aStack.stackTagCompound.hasKey("avr")) { NBTTagCompound avr = aStack.stackTagCompound.getCompoundTag("avr"); - aList.add(translateToLocal("item.em.programmer.desc.0") + ": " - + avr.getInteger("programCounter")); // Current PC + aList.add(translateToLocal("item.em.programmer.desc.0") + ": " + avr.getInteger("programCounter")); // Current + // PC aList.add(translateToLocal("item.em.programmer.desc.1") + ": " + avr.getBoolean("awoken")); // Awoken aList.add(translateToLocal("item.em.programmer.desc.2") + ": " + avr.getBoolean("active")); // Active aList.add(translateToLocal("item.em.programmer.desc.3") + ": " + avr.getBoolean("debugRun")); // Debug @@ -164,6 +158,7 @@ public class AvrProgrammer extends Item implements IMedia { @Optional.Method(modid = "ComputerCraft") public IMount createDataMount(ItemStack itemStack, World world) { return new IWritableMount() { + @Override public void makeDirectory(String s) throws IOException { throw new IOException("Cannot make dir!"); 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 b4ddca5cf1..ef8a0c9c92 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 @@ -7,6 +7,20 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor import static cpw.mods.fml.relauncher.Side.CLIENT; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.Collections; +import java.util.List; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.font.TecTechFontRender; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; @@ -17,22 +31,11 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstan import com.github.technus.tectech.thing.item.renderElemental.IElementalItem; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import java.util.Collections; -import java.util.List; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; /** * Created by Tec on 15.03.2017. @@ -49,17 +52,8 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE } @Override - public boolean onItemUseFirst( - ItemStack aStack, - EntityPlayer aPlayer, - World aWorld, - int aX, - int aY, - int aZ, - int aSide, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, + int aSide, float hitX, float hitY, float hitZ) { NBTTagCompound tNBT = aStack.getTagCompound(); TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (aPlayer instanceof EntityPlayerMP) { @@ -70,8 +64,9 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE EMInstanceStackMap content = ((IEMContainer) metaTE).getContentHandler(); if (tNBT.hasKey("content")) { try { - content.putUnifyAll(EMInstanceStackMap.fromNBT( - TecTech.definitionsRegistry, tNBT.getCompoundTag("content"))); + content.putUnifyAll( + EMInstanceStackMap + .fromNBT(TecTech.definitionsRegistry, tNBT.getCompoundTag("content"))); } catch (EMException e) { if (DEBUG_MODE) { e.printStackTrace(); @@ -112,14 +107,14 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE NBTTagCompound tNBT = aStack.getTagCompound(); if (tNBT != null && tNBT.hasKey("content")) { aList.add(translateToLocal("item.em.debugContainer.desc.0") + ": "); // Contains - EMInstanceStackMap content = - EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry, tNBT.getCompoundTag("content")); + EMInstanceStackMap content = EMInstanceStackMap + .fromNBT(TecTech.definitionsRegistry, tNBT.getCompoundTag("content")); Collections.addAll(aList, content.getElementalInfo()); } else { aList.add(translateToLocal("item.em.debugContainer.desc.1")); // Container for elemental matter } - aList.add(EnumChatFormatting.BLUE - + translateToLocal("item.em.debugContainer.desc.2")); // Right click on elemental hatches + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.debugContainer.desc.2")); // Right click on + // elemental hatches } catch (Exception e) { if (DEBUG_MODE) { e.printStackTrace(); @@ -139,21 +134,30 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE that.setTagCompound(new NBTTagCompound()); list.add(that); for (IEMDefinition definition : TecTech.definitionsRegistry.getStacksRegisteredForDisplay()) { - list.add(setContent( - new ItemStack(this) - .setStackDisplayName(definition.getLocalizedName() + " " + 1 + " " - + translateToLocal("tt.keyword.unit.mbMols")), - new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT)))); - list.add(setContent( - new ItemStack(this) - .setStackDisplayName(definition.getLocalizedName() + " " + 1 + " " - + translateToLocal("tt.keyword.unit.itemMols")), - new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_ITEM)))); - list.add(setContent( - new ItemStack(this) - .setStackDisplayName(definition.getLocalizedName() + " " + 1000 + " " - + translateToLocal("tt.keyword.unit.mbMols")), - new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_1k)))); + list.add( + setContent( + new ItemStack(this).setStackDisplayName( + definition.getLocalizedName() + " " + + 1 + + " " + + translateToLocal("tt.keyword.unit.mbMols")), + new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT)))); + list.add( + setContent( + new ItemStack(this).setStackDisplayName( + definition.getLocalizedName() + " " + + 1 + + " " + + translateToLocal("tt.keyword.unit.itemMols")), + new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_ITEM)))); + list.add( + setContent( + new ItemStack(this).setStackDisplayName( + definition.getLocalizedName() + " " + + 1000 + + " " + + translateToLocal("tt.keyword.unit.mbMols")), + new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_1k)))); } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java index 730e7aea3c..a32fd2adc3 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java @@ -6,6 +6,16 @@ import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static cpw.mods.fml.relauncher.Side.CLIENT; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.Collections; +import java.util.List; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.font.TecTechFontRender; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; @@ -14,21 +24,15 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefiniti import com.github.technus.tectech.thing.item.renderElemental.IElementalItem; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Collections; -import java.util.List; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; /** * Created by Tec on 15.03.2017. */ public final class ElementalDefinitionContainer_EM extends Item implements IElementalItem { + public static ElementalDefinitionContainer_EM INSTANCE; private ElementalDefinitionContainer_EM() { @@ -97,8 +101,8 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem NBTTagCompound tNBT = aStack.getTagCompound(); if (tNBT != null && tNBT.hasKey("content")) { aList.add(translateToLocal("item.em.definitionContainer.desc.0") + ": "); // Should Contain - EMDefinitionStackMap content = - EMDefinitionStackMap.fromNBT(TecTech.definitionsRegistry, tNBT.getCompoundTag("content")); + EMDefinitionStackMap content = EMDefinitionStackMap + .fromNBT(TecTech.definitionsRegistry, tNBT.getCompoundTag("content")); Collections.addAll(aList, content.getElementalInfo()); } else { aList.add(translateToLocal("item.em.definitionContainer.desc.1")); // Recipe Hint diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java index c22a4cfdb2..97fda7b051 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java @@ -5,17 +5,9 @@ import static com.github.technus.tectech.TecTech.creativeTabTecTech; import static cpw.mods.fml.relauncher.Side.CLIENT; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.font.TecTechFontRender; -import com.github.technus.tectech.loader.gui.ModGuiHandler; -import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; -import com.github.technus.tectech.thing.CustomItemList; -import com.github.technus.tectech.util.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -27,10 +19,22 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.font.TecTechFontRender; +import com.github.technus.tectech.loader.gui.ModGuiHandler; +import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; +import com.github.technus.tectech.thing.CustomItemList; +import com.github.technus.tectech.util.CommonValues; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + /** * Created by Tec on 15.03.2017. */ public final class ElementalDefinitionScanStorage_EM extends Item { + public static ElementalDefinitionScanStorage_EM INSTANCE; public static IIcon offline, online; @@ -63,8 +67,8 @@ public final class ElementalDefinitionScanStorage_EM extends Item { public static ArrayList<String> getLines(ItemStack containerItem) { if (containerItem.stackTagCompound != null && containerItem.stackTagCompound.hasKey("content")) { - EMInstanceStackMap content = EMInstanceStackMap.fromNBT( - TecTech.definitionsRegistry, containerItem.stackTagCompound.getCompoundTag("content")); + EMInstanceStackMap content = EMInstanceStackMap + .fromNBT(TecTech.definitionsRegistry, containerItem.stackTagCompound.getCompoundTag("content")); return content.getScanInfo(containerItem.stackTagCompound.getIntArray("scanConfiguration")); } return null; @@ -74,8 +78,9 @@ public final class ElementalDefinitionScanStorage_EM extends Item { public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.TEC_MARK_EM); if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("content")) { - aList.add(EnumChatFormatting.BLUE - + translateToLocal("item.em.definitionScanStorage.desc.0")); // Contains scan result + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.definitionScanStorage.desc.0")); // Contains + // scan + // result aList.add(translateToLocal("item.em.definitionScanStorage.desc.1")); // Use to read } else { aList.add(translateToLocal("item.em.definitionScanStorage.desc.2")); // Storage for matter scan data diff --git a/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java b/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java index 666888d85e..34b0f26685 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java @@ -4,18 +4,22 @@ import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.thing.CustomItemList.enderLinkFluidCover; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.util.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import com.github.technus.tectech.util.CommonValues; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public final class EnderFluidLinkCover extends Item { + public static EnderFluidLinkCover INSTANCE; private EnderFluidLinkCover() { @@ -28,13 +32,14 @@ public final class EnderFluidLinkCover extends Item { public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.tm.enderfluidlinkcover.desc.0")); // Ender-Fluid-Enables Machines! - aList.add(EnumChatFormatting.BLUE - + translateToLocal( - "item.tm.enderfluidlinkcover.desc.1")); // Use on any side of a fluid tank to link it to + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.enderfluidlinkcover.desc.1")); // Use on any side + // of a fluid tank + // to link it to // the Ender - aList.add(EnumChatFormatting.BLUE - + translateToLocal( - "item.tm.enderfluidlinkcover.desc.2")); // Ender Tanks so are laggy -Bot from the Chads of NH + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.enderfluidlinkcover.desc.2")); // Ender Tanks so + // are laggy -Bot + // from the Chads + // of NH } public static void run() { diff --git a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java index 1a176b53b6..b572dcdc83 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java +++ b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java @@ -5,16 +5,9 @@ import static com.github.technus.tectech.TecTech.creativeTabTecTech; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; -import com.github.technus.tectech.Reference; -import com.github.technus.tectech.util.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; -import gregtech.api.util.GT_Utility; import java.util.ArrayList; import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -23,9 +16,21 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; + import org.apache.commons.lang3.reflect.FieldUtils; +import com.github.technus.tectech.Reference; +import com.github.technus.tectech.util.CommonValues; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.BaseMetaPipeEntity; +import gregtech.api.metatileentity.BaseMetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; +import gregtech.api.util.GT_Utility; + public class EuMeterGT extends Item { + public static EuMeterGT INSTANCE; private EuMeterGT() { @@ -36,17 +41,8 @@ public class EuMeterGT extends Item { } @Override - public boolean onItemUseFirst( - ItemStack aStack, - EntityPlayer aPlayer, - World aWorld, - int aX, - int aY, - int aZ, - int aSide, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, + int aSide, float hitX, float hitY, float hitZ) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity == null || aPlayer instanceof FakePlayer) { return aPlayer instanceof EntityPlayerMP; @@ -63,45 +59,70 @@ public class EuMeterGT extends Item { if (tTileEntity instanceof BaseMetaTileEntity) { GT_Utility.sendChatToPlayer( aPlayer, - EnumChatFormatting.AQUA + "----- X:" + aX + " Y:" + aY + " Z:" + aZ + " D:" - + aWorld.provider.dimensionId + " S:" + aSide + " -----"); + EnumChatFormatting.AQUA + "----- X:" + + aX + + " Y:" + + aY + + " Z:" + + aZ + + " D:" + + aWorld.provider.dimensionId + + " S:" + + aSide + + " -----"); GT_Utility.sendChatToPlayer( aPlayer, translateToLocalFormatted("tt.keyphrase.Stored_energy", clientLocale) + ": " + EnumChatFormatting.YELLOW + (((BaseMetaTileEntity) tTileEntity).getUniversalEnergyStored()) - + EnumChatFormatting.RESET + '/' + EnumChatFormatting.GREEN + + EnumChatFormatting.RESET + + '/' + + EnumChatFormatting.GREEN + (((BaseMetaTileEntity) tTileEntity).getUniversalEnergyCapacity())); GT_Utility.sendChatToPlayer( aPlayer, translateToLocalFormatted("tt.keyphrase.Stored_EU", clientLocale) + ": " - + EnumChatFormatting.YELLOW + (((BaseMetaTileEntity) tTileEntity).getStoredEU()) - + EnumChatFormatting.RESET + '/' + EnumChatFormatting.GREEN + + EnumChatFormatting.YELLOW + + (((BaseMetaTileEntity) tTileEntity).getStoredEU()) + + EnumChatFormatting.RESET + + '/' + + EnumChatFormatting.GREEN + (((BaseMetaTileEntity) tTileEntity).getEUCapacity())); GT_Utility.sendChatToPlayer( aPlayer, translateToLocalFormatted("tt.keyphrase.Average_IO", clientLocale) + ": " + EnumChatFormatting.YELLOW + (((BaseMetaTileEntity) tTileEntity).getAverageElectricInput()) - + EnumChatFormatting.RESET + '/' + EnumChatFormatting.YELLOW + + EnumChatFormatting.RESET + + '/' + + EnumChatFormatting.YELLOW + (((BaseMetaTileEntity) tTileEntity).getAverageElectricOutput())); GT_Utility.sendChatToPlayer( aPlayer, translateToLocalFormatted("tt.keyphrase.Average_IO_(max)", clientLocale) + ": " - + EnumChatFormatting.GOLD + (((BaseMetaTileEntity) tTileEntity).getInputVoltage()) - + EnumChatFormatting.RESET + '/' + EnumChatFormatting.GOLD + + EnumChatFormatting.GOLD + + (((BaseMetaTileEntity) tTileEntity).getInputVoltage()) + + EnumChatFormatting.RESET + + '/' + + EnumChatFormatting.GOLD + (((BaseMetaTileEntity) tTileEntity).getOutputVoltage())); GT_Utility.sendChatToPlayer( aPlayer, translateToLocalFormatted("tt.keyphrase.Average_IO_max", clientLocale) + ": " - + EnumChatFormatting.RED + (((BaseMetaTileEntity) tTileEntity).getMaxSafeInput()) - + EnumChatFormatting.RESET + '/' + EnumChatFormatting.RED + + EnumChatFormatting.RED + + (((BaseMetaTileEntity) tTileEntity).getMaxSafeInput()) + + EnumChatFormatting.RESET + + '/' + + EnumChatFormatting.RED + (((BaseMetaTileEntity) tTileEntity).getMaxEnergyOutput())); GT_Utility.sendChatToPlayer( aPlayer, translateToLocalFormatted("tt.keyphrase.Amperage_IO_(max)", clientLocale) + ": " - + EnumChatFormatting.GOLD + (((BaseMetaTileEntity) tTileEntity).getInputAmperage()) - + EnumChatFormatting.RESET + '/' + EnumChatFormatting.GOLD + + EnumChatFormatting.GOLD + + (((BaseMetaTileEntity) tTileEntity).getInputAmperage()) + + EnumChatFormatting.RESET + + '/' + + EnumChatFormatting.GOLD + (((BaseMetaTileEntity) tTileEntity).getOutputAmperage())); GT_Utility.sendChatToPlayer( aPlayer, @@ -134,8 +155,8 @@ public class EuMeterGT extends Item { public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.TEC_MARK_GENERAL); aList.add(translateToLocal("item.em.EuMeterGT.desc.0")); // Measures basic EU related stuff - aList.add( - EnumChatFormatting.BLUE + translateToLocal("item.em.EuMeterGT.desc.1")); // Just right click on blocks. + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.EuMeterGT.desc.1")); // Just right click on + // blocks. } public static void run() { diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java index df43c23a2a..28d5fd22d8 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java @@ -5,17 +5,8 @@ import static com.github.technus.tectech.TecTech.creativeTabTecTech; import static com.github.technus.tectech.thing.CustomItemList.parametrizerMemory; import static net.minecraft.util.StatCollector.translateToLocal; -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.multi.base.GT_MetaTileEntity_MultiblockBase_EM; -import com.github.technus.tectech.util.CommonValues; -import com.github.technus.tectech.util.TT_Utility; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -28,10 +19,23 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.World; +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.multi.base.GT_MetaTileEntity_MultiblockBase_EM; +import com.github.technus.tectech.util.CommonValues; +import com.github.technus.tectech.util.TT_Utility; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + /** * Created by Tec on 15.03.2017. */ public final class ParametrizerMemoryCard extends Item { + public static ParametrizerMemoryCard INSTANCE; private static IIcon locked, unlocked; @@ -44,17 +48,8 @@ public final class ParametrizerMemoryCard extends Item { } @Override - public boolean onItemUseFirst( - ItemStack aStack, - EntityPlayer aPlayer, - World aWorld, - int aX, - int aY, - int aZ, - int aSide, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, + int aSide, float hitX, float hitY, float hitZ) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (aPlayer instanceof EntityPlayerMP) { aStack.stackSize = 1; @@ -89,7 +84,9 @@ public final class ParametrizerMemoryCard extends Item { NBTTagCompound tNBT = aStack.getTagCompound(); if (aStack.getItemDamage() == 1) { base.parametrization.trySetParameters( - tNBT.getInteger("param"), tNBT.getDouble("value0D"), tNBT.getDouble("value1D")); + tNBT.getInteger("param"), + tNBT.getDouble("value0D"), + tNBT.getDouble("value1D")); return true; } } else if (metaTE instanceof GT_MetaTileEntity_Hatch_ParamText) { @@ -142,29 +139,35 @@ public final class ParametrizerMemoryCard extends Item { aList.add(translateToLocal("item.em.parametrizerMemoryCard.desc.0")); // Stores Parameters if (aStack.getItemDamage() == 1) { - aList.add(EnumChatFormatting.BLUE - + translateToLocal( - "item.em.parametrizerMemoryCard.desc.1")); // Use on Parametrizer/Controller to configure it + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.parametrizerMemoryCard.desc.1")); // Use on + // Parametrizer/Controller + // to + // configure + // it } else { - aList.add(EnumChatFormatting.BLUE - + translateToLocal( - "item.em.parametrizerMemoryCard.desc.2")); // Use on Parametrizer to store parameters + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.parametrizerMemoryCard.desc.2")); // Use on + // Parametrizer + // to store + // parameters } - aList.add(EnumChatFormatting.BLUE - + translateToLocal("item.em.parametrizerMemoryCard.desc.3")); // Sneak right click to lock/unlock + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.parametrizerMemoryCard.desc.3")); // Sneak right + // click to + // lock/unlock double temp; if (tNBT != null && tNBT.hasKey("param")) { aList.add("Hatch ID: " + EnumChatFormatting.AQUA + tNBT.getInteger("param")); temp = tNBT.getInteger("value0D"); aList.add("Value 0D: " + EnumChatFormatting.AQUA + temp); - aList.add("Value 0B: " + EnumChatFormatting.AQUA - + TT_Utility.longBitsToShortString(Double.doubleToLongBits(temp))); + aList.add( + "Value 0B: " + EnumChatFormatting.AQUA + + TT_Utility.longBitsToShortString(Double.doubleToLongBits(temp))); aList.add("Value 0s: " + EnumChatFormatting.AQUA + tNBT.getString("value0s")); temp = tNBT.getInteger("value1D"); aList.add("Value 1D: " + EnumChatFormatting.AQUA + temp); - aList.add("Value 1B: " + EnumChatFormatting.AQUA - + TT_Utility.longBitsToShortString(Double.doubleToLongBits(temp))); + aList.add( + "Value 1B: " + EnumChatFormatting.AQUA + + TT_Utility.longBitsToShortString(Double.doubleToLongBits(temp))); aList.add("Value 1s: " + EnumChatFormatting.AQUA + tNBT.getString("value1s")); } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java index cd1f651661..a03eae6674 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java @@ -4,18 +4,22 @@ import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.thing.CustomItemList.powerPassUpgradeCover; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.util.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import com.github.technus.tectech.util.CommonValues; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public final class PowerPassUpgradeCover extends Item { + public static PowerPassUpgradeCover INSTANCE; private PowerPassUpgradeCover() { @@ -27,12 +31,14 @@ public final class PowerPassUpgradeCover extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); - aList.add(translateToLocal( - "item.tm.powerpassupgradecover.desc.0")); // Add power pass functionality to TecTech Multiblocks - aList.add(EnumChatFormatting.BLUE - + translateToLocal("item.tm.powerpassupgradecover.desc.1")); // Active transformer in a can?? - aList.add(EnumChatFormatting.BLUE - + translateToLocal("item.tm.powerpassupgradecover.desc.2")); // Chain them up like Christmas lights! + aList.add(translateToLocal("item.tm.powerpassupgradecover.desc.0")); // Add power pass functionality to TecTech + // Multiblocks + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.powerpassupgradecover.desc.1")); // Active + // transformer in + // a can?? + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.powerpassupgradecover.desc.2")); // Chain them up + // like Christmas + // lights! } public static void run() { diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index 0070a965a4..434c106cfa 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -5,11 +5,8 @@ import static com.github.technus.tectech.thing.CustomItemList.teslaCapacitor; import static com.github.technus.tectech.util.CommonValues.V; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.util.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +15,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; +import com.github.technus.tectech.util.CommonValues; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public final class TeslaCoilCapacitor extends Item { + public static TeslaCoilCapacitor INSTANCE; private static IIcon LVicon, MVicon, HVicon, EVicon, IVicon, LuVicon, ZPMicon; @@ -32,19 +36,24 @@ public final class TeslaCoilCapacitor extends Item { public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() <= 6) { - aList.add(translateToLocal("item.tm.teslaCoilCapacitor.desc.0") + " " + V[aStack.getItemDamage() + 1] * 512 - + " " + translateToLocal("item.tm.teslaCoilCapacitor.desc.1") + " " + V[aStack.getItemDamage() + 1] - + " EU/t"); // Stores 16384 EU in a tesla tower at 32 EU/t + aList.add( + translateToLocal("item.tm.teslaCoilCapacitor.desc.0") + " " + + V[aStack.getItemDamage() + 1] * 512 + + " " + + translateToLocal("item.tm.teslaCoilCapacitor.desc.1") + + " " + + V[aStack.getItemDamage() + 1] + + " EU/t"); // Stores 16384 EU in a tesla tower at 32 EU/t } else { - aList.add(translateToLocal( - "item.tm.teslaCoilCapacitor.desc.2")); // Yeet this broken item into some spicy water! + aList.add(translateToLocal("item.tm.teslaCoilCapacitor.desc.2")); // Yeet this broken item into some spicy + // water! } - aList.add(EnumChatFormatting.BLUE - + translateToLocal( - "item.tm.teslaCoilCapacitor.desc.3")); // Insert into a Capacitor hatch of a Tesla Tower - aList.add(EnumChatFormatting.BLUE - + translateToLocal( - "item.tm.teslaCoilCapacitor.desc.4")); // Capacitors are the same thing as batteries, right? + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.teslaCoilCapacitor.desc.3")); // Insert into a + // Capacitor hatch + // of a Tesla Tower + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.teslaCoilCapacitor.desc.4")); // Capacitors are + // the same thing as + // batteries, right? } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java index 8f636b5c5e..366b000273 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java @@ -4,11 +4,8 @@ import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.thing.CustomItemList.teslaComponent; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.util.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,7 +14,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; +import com.github.technus.tectech.util.CommonValues; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public final class TeslaCoilComponent extends Item { + public static TeslaCoilComponent INSTANCE; private static IIcon ultItemIcon; @@ -30,8 +34,8 @@ public final class TeslaCoilComponent extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); - aList.add(EnumChatFormatting.BLUE - + translateToLocal("item.tm.itemTeslaComponent.desc")); // Tesla bois need these! + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.itemTeslaComponent.desc")); // Tesla bois need + // these! } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java index 8bb9b19816..073d29153b 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java @@ -4,11 +4,8 @@ import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.thing.CustomItemList.teslaCover; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.util.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,7 +14,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; +import com.github.technus.tectech.util.CommonValues; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public final class TeslaCoilCover extends Item { + public static TeslaCoilCover INSTANCE; private static IIcon ultItemIcon; @@ -38,15 +42,15 @@ public final class TeslaCoilCover extends Item { aList.add(translateToLocal("item.tm.teslaCover.desc.1")); // Tesla-Enables Machines! (BUT LOUDER!!) break; default: - aList.add( - translateToLocal("item.tm.teslaCover.desc.2")); // Yeet this broken item into some spicy water! + aList.add(translateToLocal("item.tm.teslaCover.desc.2")); // Yeet this broken item into some spicy + // water! break; } - aList.add(EnumChatFormatting.BLUE - + translateToLocal( - "item.tm.teslaCover.desc.3")); // Use on top of a machine to enable Tesla capabilities - aList.add(EnumChatFormatting.BLUE - + translateToLocal("item.tm.teslaCover.desc.4")); // Who the hell uses cables anyway? + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.teslaCover.desc.3")); // Use on top of a machine + // to enable Tesla + // capabilities + aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.teslaCover.desc.4")); // Who the hell uses cables + // anyway? } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java index e2a6fade93..28520a2678 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java @@ -4,18 +4,22 @@ import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.thing.CustomItemList.teslaStaff; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.Reference; -import com.github.technus.tectech.util.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_Utility; import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.github.technus.tectech.Reference; +import com.github.technus.tectech.util.CommonValues; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.util.GT_Utility; + public final class TeslaStaff extends Item { + public static TeslaStaff INSTANCE; private TeslaStaff() { diff --git a/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java b/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java index ffd6f787e7..3b9267ca85 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java +++ b/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; public class ProgrammerScreen extends GuiScreen { + private NBTTagCompound tag; public ProgrammerScreen(EntityPlayer player) { 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 4e9d90bc50..7e7304f8ca 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 @@ -3,10 +3,8 @@ package com.github.technus.tectech.thing.item.gui; import static com.github.technus.tectech.Reference.MODID; import static org.lwjgl.opengl.GL11.*; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.font.TecTechFontRender; -import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM; import java.util.Objects; + import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundHandler; @@ -15,10 +13,15 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.font.TecTechFontRender; +import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM; + /** * Created by danie_000 on 17.12.2017. */ public class ScanDisplayScreen extends GuiScreen { + private static final int sizeX = 240, sizeY = 220, renderedLines = 10; private int baseX, baseY; private Button up, down, pgUp, pgDown; @@ -26,15 +29,14 @@ public class ScanDisplayScreen extends GuiScreen { private int firstLine; private static final ResourceLocation[] BACKGROUNDS = new ResourceLocation[] { - new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen1.png"), - new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen2.png"), - new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen3.png"), - new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen4.png"), - new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen5.png"), - new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen6.png"), - new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen7.png"), - new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen8.png") - }; + new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen1.png"), + new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen2.png"), + new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen3.png"), + new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen4.png"), + new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen5.png"), + new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen6.png"), + new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen7.png"), + new ResourceLocation(MODID + ":textures/gui/scanDisplayScreen8.png") }; private static final ResourceLocation ITEM = new ResourceLocation(MODID + ":textures/gui/scanDisplayItem.png"); public ScanDisplayScreen(EntityPlayer player) { @@ -62,10 +64,10 @@ public class ScanDisplayScreen extends GuiScreen { for (int i = firstLine - 1, j = 8; i >= 0 && j != 0; i--, j /= 2) { int equalPos = lines[i].indexOf('='); if (equalPos >= 0) { - TecTechFontRender.INSTANCE.drawSplitString( - lines[i].substring(0, equalPos), textBaseX, textBaseY - 8 + j, 200, itick); - TecTechFontRender.INSTANCE.drawSplitString( - lines[i].substring(equalPos), textBaseXX, textBaseY - 8 + j, 200, itick); + TecTechFontRender.INSTANCE + .drawSplitString(lines[i].substring(0, equalPos), textBaseX, textBaseY - 8 + j, 200, itick); + TecTechFontRender.INSTANCE + .drawSplitString(lines[i].substring(equalPos), textBaseXX, textBaseY - 8 + j, 200, itick); } else { TecTechFontRender.INSTANCE.drawSplitString(lines[i], textBaseX, textBaseY - 8 + j, 200, itick); } @@ -74,10 +76,10 @@ public class ScanDisplayScreen extends GuiScreen { textBaseY += 9; int equalPos = lines[i].indexOf('='); if (equalPos >= 0) { - TecTechFontRender.INSTANCE.drawSplitString( - lines[i].substring(0, equalPos), textBaseX, textBaseY, 200, itick); - TecTechFontRender.INSTANCE.drawSplitString( - lines[i].substring(equalPos), textBaseXX, textBaseY, 200, itick); + TecTechFontRender.INSTANCE + .drawSplitString(lines[i].substring(0, equalPos), textBaseX, textBaseY, 200, itick); + TecTechFontRender.INSTANCE + .drawSplitString(lines[i].substring(equalPos), textBaseXX, textBaseY, 200, itick); } else { TecTechFontRender.INSTANCE.drawSplitString(lines[i], textBaseX, textBaseY, 200, itick); } @@ -85,10 +87,10 @@ public class ScanDisplayScreen extends GuiScreen { for (int i = firstLine + renderedLines, j = 8; i < lines.length && j != 0; i++, j /= 2) { int equalPos = lines[i].indexOf('='); if (equalPos >= 0) { - TecTechFontRender.INSTANCE.drawSplitString( - lines[i].substring(0, equalPos), textBaseX, textBaseY + 17 - j, 200, itick); - TecTechFontRender.INSTANCE.drawSplitString( - lines[i].substring(equalPos), textBaseXX, textBaseY + 17 - j, 200, itick); + TecTechFontRender.INSTANCE + .drawSplitString(lines[i].substring(0, equalPos), textBaseX, textBaseY + 17 - j, 200, itick); + TecTechFontRender.INSTANCE + .drawSplitString(lines[i].substring(equalPos), textBaseXX, textBaseY + 17 - j, 200, itick); } else { TecTechFontRender.INSTANCE.drawSplitString(lines[i], textBaseX, textBaseY + 17 - j, 200, itick); } @@ -136,6 +138,7 @@ public class ScanDisplayScreen extends GuiScreen { } private static class Button extends GuiButton { + int u, v; Button(int id, int x, int y, int u, int v) { @@ -147,8 +150,9 @@ public class ScanDisplayScreen extends GuiScreen { @Override public void drawButton(Minecraft mc, int xPos, int yPos) { if (visible) { - field_146123_n = - xPos >= xPosition && yPos >= yPosition && xPos < xPosition + width && yPos < yPosition + height; + field_146123_n = xPos >= xPosition && yPos >= yPosition + && xPos < xPosition + width + && yPos < yPosition + height; glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); mc.getTextureManager().bindTexture(BACKGROUNDS[0]); @@ -161,8 +165,8 @@ public class ScanDisplayScreen extends GuiScreen { // play cool sound fx @Override public void func_146113_a(SoundHandler soundHandler) { - soundHandler.playSound( - PositionedSoundRecord.func_147674_a(new ResourceLocation(MODID + ":fx_click"), 1.0F)); + soundHandler + .playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation(MODID + ":fx_click"), 1.0F)); } } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/renderElemental/IElementalItem.java b/src/main/java/com/github/technus/tectech/thing/item/renderElemental/IElementalItem.java index 797ca90088..a284f46a5e 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/renderElemental/IElementalItem.java +++ b/src/main/java/com/github/technus/tectech/thing/item/renderElemental/IElementalItem.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public interface IElementalItem { + default String getSymbol(ItemStack stack, int index) { try { NBTTagCompound tNBT = stack.getTagCompound(); diff --git a/src/main/java/com/github/technus/tectech/thing/item/renderElemental/RenderElementalName.java b/src/main/java/com/github/technus/tectech/thing/item/renderElemental/RenderElementalName.java index 1d7a3f55aa..a57cc32cab 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/renderElemental/RenderElementalName.java +++ b/src/main/java/com/github/technus/tectech/thing/item/renderElemental/RenderElementalName.java @@ -1,26 +1,28 @@ package com.github.technus.tectech.thing.item.renderElemental; -import com.github.technus.tectech.font.TecTechFontRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; +import com.github.technus.tectech.font.TecTechFontRender; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderElementalName implements IItemRenderer { + public static final RenderElementalName INSTANCE = new RenderElementalName(); public boolean handleRenderType(final ItemStack itemStack, final IItemRenderer.ItemRenderType type) { return type == ItemRenderType.INVENTORY; } - public boolean shouldUseRenderHelper( - final IItemRenderer.ItemRenderType type, - final ItemStack itemStack, + public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack itemStack, final IItemRenderer.ItemRendererHelper helper) { return false; } 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 37cfe64acd..604160cdd5 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 @@ -10,6 +10,7 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.objects.GT_SidedTexture; public class Textures { + private static final IIconContainer OVERLAY_ENERGY_IN_POWER = new CustomIcon("iconsets/OVERLAY_ENERGY_IN_POWER"); private static final IIconContainer OVERLAY_ENERGY_OUT_POWER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_POWER"); private static final IIconContainer OVERLAY_ENERGY_IN_LASER = new CustomIcon("iconsets/OVERLAY_ENERGY_IN_LASER"); @@ -32,173 +33,146 @@ public class Textures { private static final IIconContainer TESLA_TRANSCEIVER_TOP = new CustomIcon("iconsets/TESLA_TRANSCEIVER_TOP"); - public static IIconContainer[] - MACHINECASINGS_SIDE_TT = - new IIconContainer[] { - MACHINE_8V_SIDE, MACHINE_LV_SIDE, MACHINE_MV_SIDE, MACHINE_HV_SIDE, - MACHINE_EV_SIDE, MACHINE_IV_SIDE, MACHINE_LuV_SIDE, MACHINE_ZPM_SIDE, - MACHINE_UV_SIDE, MACHINE_MAX_SIDE, MACHINE_UEV_SIDE, MACHINE_UIV_SIDE, - MACHINE_UMV_SIDE, MACHINE_UXV_SIDE, MACHINE_MAXV_SIDE, - }, - MACHINECASINGS_TOP_TT = - new IIconContainer[] { - MACHINE_8V_TOP, MACHINE_LV_TOP, MACHINE_MV_TOP, MACHINE_HV_TOP, - MACHINE_EV_TOP, MACHINE_IV_TOP, MACHINE_LuV_TOP, MACHINE_ZPM_TOP, - MACHINE_UV_TOP, MACHINE_MAX_TOP, MACHINE_UEV_TOP, MACHINE_UIV_TOP, - MACHINE_UMV_TOP, MACHINE_UXV_TOP, MACHINE_MAXV_TOP, - }, - MACHINECASINGS_BOTTOM_TT = - new IIconContainer[] { - MACHINE_8V_BOTTOM, MACHINE_LV_BOTTOM, MACHINE_MV_BOTTOM, MACHINE_HV_BOTTOM, - MACHINE_EV_BOTTOM, MACHINE_IV_BOTTOM, MACHINE_LuV_BOTTOM, MACHINE_ZPM_BOTTOM, - MACHINE_UV_BOTTOM, MACHINE_MAX_BOTTOM, MACHINE_UEV_BOTTOM, MACHINE_UIV_BOTTOM, - MACHINE_UMV_BOTTOM, MACHINE_UXV_BOTTOM, MACHINE_MAXV_BOTTOM, - }; - public static ITexture[] - OVERLAYS_ENERGY_IN_TT = - new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {180, 180, 180, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {220, 220, 220, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {255, 100, 0, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {255, 255, 30, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {128, 128, 128, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {240, 240, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {220, 220, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {200, 200, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {180, 180, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {160, 160, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {140, 140, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {120, 120, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {100, 100, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {80, 80, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {60, 60, 245, 0}), - }, - OVERLAYS_ENERGY_OUT_TT = - new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {180, 180, 180, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {220, 220, 220, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {255, 100, 0, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {255, 255, 30, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {128, 128, 128, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {240, 240, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {220, 220, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {200, 200, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {180, 180, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {160, 160, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {140, 140, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {120, 120, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {100, 100, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {80, 80, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {60, 60, 245, 0}), - }, - OVERLAYS_ENERGY_IN_MULTI_TT = - new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {180, 180, 180, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {220, 220, 220, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {255, 100, 0, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {255, 255, 30, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {128, 128, 128, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {240, 240, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {220, 220, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {200, 200, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {180, 180, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {160, 160, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {140, 140, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {120, 120, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {100, 100, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {80, 80, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {60, 60, 245, 0}), - }, - OVERLAYS_ENERGY_OUT_MULTI_TT = - new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {180, 180, 180, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {220, 220, 220, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {255, 100, 0, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {255, 255, 30, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {128, 128, 128, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {240, 240, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {220, 220, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {200, 200, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {180, 180, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {160, 160, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {140, 140, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {120, 120, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {100, 100, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {80, 80, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {60, 60, 245, 0}), - }, - OVERLAYS_ENERGY_IN_POWER_TT = - new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {180, 180, 180, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {220, 220, 220, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {255, 100, 0, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {255, 255, 30, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {128, 128, 128, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {240, 240, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {220, 220, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {200, 200, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {180, 180, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {160, 160, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {140, 140, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {120, 120, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {100, 100, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {80, 80, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {60, 60, 245, 0}), - }, - OVERLAYS_ENERGY_OUT_POWER_TT = - new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {180, 180, 180, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {220, 220, 220, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {255, 100, 0, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {255, 255, 30, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {128, 128, 128, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {240, 240, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {220, 220, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {200, 200, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {180, 180, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {160, 160, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {140, 140, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {120, 120, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {100, 100, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {80, 80, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {60, 60, 245, 0}), - }, - OVERLAYS_ENERGY_IN_LASER_TT = - new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {180, 180, 180, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {220, 220, 220, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {255, 100, 0, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {255, 255, 30, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {128, 128, 128, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {240, 240, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {220, 220, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {200, 200, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {180, 180, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {160, 160, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {140, 140, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {120, 120, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {100, 100, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {80, 80, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {60, 60, 245, 0}), - }, - OVERLAYS_ENERGY_OUT_LASER_TT = - new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {180, 180, 180, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {220, 220, 220, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {255, 100, 0, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {255, 255, 30, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {128, 128, 128, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {240, 240, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {220, 220, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {200, 200, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {180, 180, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {160, 160, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {140, 140, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {120, 120, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {100, 100, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {80, 80, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {60, 60, 245, 0}), - }; + public static IIconContainer[] MACHINECASINGS_SIDE_TT = new IIconContainer[] { MACHINE_8V_SIDE, MACHINE_LV_SIDE, + MACHINE_MV_SIDE, MACHINE_HV_SIDE, MACHINE_EV_SIDE, MACHINE_IV_SIDE, MACHINE_LuV_SIDE, MACHINE_ZPM_SIDE, + MACHINE_UV_SIDE, MACHINE_MAX_SIDE, MACHINE_UEV_SIDE, MACHINE_UIV_SIDE, MACHINE_UMV_SIDE, MACHINE_UXV_SIDE, + MACHINE_MAXV_SIDE, }, + MACHINECASINGS_TOP_TT = new IIconContainer[] { MACHINE_8V_TOP, MACHINE_LV_TOP, MACHINE_MV_TOP, + MACHINE_HV_TOP, MACHINE_EV_TOP, MACHINE_IV_TOP, MACHINE_LuV_TOP, MACHINE_ZPM_TOP, MACHINE_UV_TOP, + MACHINE_MAX_TOP, MACHINE_UEV_TOP, MACHINE_UIV_TOP, MACHINE_UMV_TOP, MACHINE_UXV_TOP, + MACHINE_MAXV_TOP, }, + MACHINECASINGS_BOTTOM_TT = new IIconContainer[] { MACHINE_8V_BOTTOM, MACHINE_LV_BOTTOM, MACHINE_MV_BOTTOM, + MACHINE_HV_BOTTOM, MACHINE_EV_BOTTOM, MACHINE_IV_BOTTOM, MACHINE_LuV_BOTTOM, MACHINE_ZPM_BOTTOM, + MACHINE_UV_BOTTOM, MACHINE_MAX_BOTTOM, MACHINE_UEV_BOTTOM, MACHINE_UIV_BOTTOM, MACHINE_UMV_BOTTOM, + MACHINE_UXV_BOTTOM, MACHINE_MAXV_BOTTOM, }; + public static ITexture[] OVERLAYS_ENERGY_IN_TT = new ITexture[] { + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 180, 180, 180, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 220, 220, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 200, 200, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 180, 180, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 160, 160, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 140, 140, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 120, 120, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 100, 100, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 80, 80, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] { 60, 60, 245, 0 }), }, + OVERLAYS_ENERGY_OUT_TT = new ITexture[] { + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 180, 180, 180, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 220, 220, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 200, 200, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 180, 180, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 160, 160, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 140, 140, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 120, 120, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 100, 100, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 80, 80, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] { 60, 60, 245, 0 }), }, + OVERLAYS_ENERGY_IN_MULTI_TT = new ITexture[] { + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 180, 180, 180, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 220, 220, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 200, 200, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 180, 180, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 160, 160, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 140, 140, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 120, 120, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 100, 100, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 80, 80, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] { 60, 60, 245, 0 }), }, + OVERLAYS_ENERGY_OUT_MULTI_TT = new ITexture[] { + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 180, 180, 180, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 220, 220, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 200, 200, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 180, 180, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 160, 160, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 140, 140, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 120, 120, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 100, 100, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 80, 80, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] { 60, 60, 245, 0 }), }, + OVERLAYS_ENERGY_IN_POWER_TT = new ITexture[] { + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 180, 180, 180, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 220, 220, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 200, 200, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 180, 180, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 160, 160, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 140, 140, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 120, 120, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 100, 100, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 80, 80, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] { 60, 60, 245, 0 }), }, + OVERLAYS_ENERGY_OUT_POWER_TT = new ITexture[] { + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 180, 180, 180, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 220, 220, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 200, 200, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 180, 180, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 160, 160, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 140, 140, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 120, 120, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 100, 100, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 80, 80, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] { 60, 60, 245, 0 }), }, + OVERLAYS_ENERGY_IN_LASER_TT = new ITexture[] { + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 180, 180, 180, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 220, 220, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 200, 200, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 180, 180, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 160, 160, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 140, 140, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 120, 120, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 100, 100, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 80, 80, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] { 60, 60, 245, 0 }), }, + OVERLAYS_ENERGY_OUT_LASER_TT = new ITexture[] { + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 180, 180, 180, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 220, 220, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 200, 200, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 180, 180, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 160, 160, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 140, 140, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 120, 120, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 100, 100, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 80, 80, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] { 60, 60, 245, 0 }), }; public static ITexture[][] MACHINE_CASINGS_TT = new ITexture[15][17]; @@ -220,8 +194,16 @@ public class Textures { System.arraycopy(OVERLAYS_ENERGY_IN_TT, 0, OVERLAYS_ENERGY_IN, 0, OVERLAYS_ENERGY_IN_TT.length); System.arraycopy(OVERLAYS_ENERGY_OUT_TT, 0, OVERLAYS_ENERGY_OUT, 0, OVERLAYS_ENERGY_OUT_TT.length); System.arraycopy( - OVERLAYS_ENERGY_IN_MULTI_TT, 0, OVERLAYS_ENERGY_IN_MULTI, 0, OVERLAYS_ENERGY_IN_MULTI_TT.length); + OVERLAYS_ENERGY_IN_MULTI_TT, + 0, + OVERLAYS_ENERGY_IN_MULTI, + 0, + OVERLAYS_ENERGY_IN_MULTI_TT.length); System.arraycopy( - OVERLAYS_ENERGY_OUT_MULTI_TT, 0, OVERLAYS_ENERGY_OUT_MULTI, 0, OVERLAYS_ENERGY_OUT_MULTI_TT.length); + OVERLAYS_ENERGY_OUT_MULTI_TT, + 0, + OVERLAYS_ENERGY_OUT_MULTI, + 0, + OVERLAYS_ENERGY_OUT_MULTI_TT.length); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java index 37d08728e1..ca0ef296f8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java @@ -5,6 +5,14 @@ import static com.github.technus.tectech.util.CommonValues.V; import static com.github.technus.tectech.util.TT_Utility.getUniqueIdentifier; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.util.CommonValues; @@ -13,6 +21,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; import com.gtnewhorizons.modularui.common.widget.SlotGroup; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -23,17 +32,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by Tec on 03.04.2017. */ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch implements IAddUIWidgets { + private static Textures.BlockIcons.CustomIcon TM_H; private static Textures.BlockIcons.CustomIcon TM_H_ACTIVE; private static Map<String, GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent> componentBinds = new HashMap<>(); @@ -62,12 +66,12 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TM_H_ACTIVE)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TM_H_ACTIVE) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TM_H)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TM_H) }; } @Override @@ -118,11 +122,11 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i @Override public String[] getDescription() { - return new String[] { - CommonValues.THETA_MOVEMENT, - translateToLocal("gt.blockmachines.hatch.capacitor.desc.0"), // For Tesla Tower - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.hatch.capacitor.desc.1") // Stores 'nergy! (for a while) + return new String[] { CommonValues.THETA_MOVEMENT, translateToLocal("gt.blockmachines.hatch.capacitor.desc.0"), // For + // Tesla + // Tower + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.capacitor.desc.1") // Stores 'nergy! + // (for a while) }; } @@ -159,7 +163,7 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i } } } - return new long[] {tier, tCurrent, tEnergyMax}; + return new long[] { tier, tCurrent, tEnergyMax }; } @Override @@ -169,43 +173,62 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 4) - .startFromSlot(0) - .endAtSlot(15) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - @Override - public int getSlotStackLimit() { - return 1; - } + builder.widget( + SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - @Override - public boolean isEnabled() { - return !getBaseMetaTileEntity().isActive(); - } - }) - .background(getGUITextureSet().getItemSlot()) - .build() - .setPos(52, 7)); + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isEnabled() { + return !getBaseMetaTileEntity().isActive(); + } + }).background(getGUITextureSet().getItemSlot()).build().setPos(52, 7)); } public static void run() { new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent( - Reference.MODID + ":item.tm.teslaCoilCapacitor.0", 0, 1, V[1] * 512); // LV Capacitor + Reference.MODID + ":item.tm.teslaCoilCapacitor.0", + 0, + 1, + V[1] * 512); // LV Capacitor new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent( - Reference.MODID + ":item.tm.teslaCoilCapacitor.1", 1, 1, V[2] * 512); // MV Capacitor + Reference.MODID + ":item.tm.teslaCoilCapacitor.1", + 1, + 1, + V[2] * 512); // MV Capacitor new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent( - Reference.MODID + ":item.tm.teslaCoilCapacitor.2", 2, 1, V[3] * 512); // HV Capacitor + Reference.MODID + ":item.tm.teslaCoilCapacitor.2", + 2, + 1, + V[3] * 512); // HV Capacitor new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent( - Reference.MODID + ":item.tm.teslaCoilCapacitor.3", 3, 1, V[4] * 512); // EV Capacitor + Reference.MODID + ":item.tm.teslaCoilCapacitor.3", + 3, + 1, + V[4] * 512); // EV Capacitor new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent( - Reference.MODID + ":item.tm.teslaCoilCapacitor.4", 4, 1, V[5] * 512); // IV Capacitor + Reference.MODID + ":item.tm.teslaCoilCapacitor.4", + 4, + 1, + V[5] * 512); // IV Capacitor new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent( - Reference.MODID + ":item.tm.teslaCoilCapacitor.5", 5, 1, V[6] * 512); // LuV Capacitor + Reference.MODID + ":item.tm.teslaCoilCapacitor.5", + 5, + 1, + V[6] * 512); // LuV Capacitor new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent( - Reference.MODID + ":item.tm.teslaCoilCapacitor.6", 6, 1, V[7] * 512); // ZPM Capacitor + Reference.MODID + ":item.tm.teslaCoilCapacitor.6", + 6, + 1, + V[7] * 512); // ZPM Capacitor } public static class CapacitorComponent implements Comparable<GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent> { + private final String unlocalizedName; private final long tier, current, energyMax; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java index b2d93e91dc..f40c4d0ae1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java @@ -3,30 +3,33 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static com.github.technus.tectech.util.CommonValues.MOVE_AT; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 27.10.2016. */ public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatch_DataConnector<QuantumDataPacket> { + public GT_MetaTileEntity_Hatch_CreativeData(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, ""); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_CreativeData( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_CreativeData(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -81,7 +84,7 @@ public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatc } @Override - public IConnectsToDataPipe getNext(IConnectsToDataPipe source /*==this*/) { + public IConnectsToDataPipe getNext(IConnectsToDataPipe source /* ==this */) { IGregTechTileEntity base = getBaseMetaTileEntity(); byte color = base.getColorization(); if (color < 0) { @@ -99,8 +102,8 @@ public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatc && ((GT_MetaTileEntity_Hatch_InputData) meta).getColorization() == color && ((GT_MetaTileEntity_Hatch_InputData) meta) .canConnectData(GT_Utility.getOppositeSide(base.getFrontFacing()))) { - return (IConnectsToDataPipe) meta; - } + return (IConnectsToDataPipe) meta; + } return null; } @@ -122,12 +125,12 @@ public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatc @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.debug.tt.data.desc.0"), // Quantum Data Output - translateToLocal("gt.blockmachines.debug.tt.data.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.debug.tt.data.desc.2") // Must be painted to work + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.debug.tt.data.desc.0"), // Quantum + // Data + // Output + translateToLocal("gt.blockmachines.debug.tt.data.desc.1"), // High speed fibre optics connector. + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.data.desc.2") // Must be painted + // to work }; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java index b838aa470f..0a89384cea 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java @@ -2,8 +2,14 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -12,12 +18,9 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class GT_MetaTileEntity_Hatch_CreativeMaintenance extends GT_MetaTileEntity_Hatch_Maintenance { + private static Textures.BlockIcons.CustomIcon face; public GT_MetaTileEntity_Hatch_CreativeMaintenance(int aID, String aName, String aNameRegional, int aTier) { @@ -25,20 +28,19 @@ public class GT_MetaTileEntity_Hatch_CreativeMaintenance extends GT_MetaTileEnti TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_CreativeMaintenance( - String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_CreativeMaintenance(String aName, int aTier, String[] aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures, false); } @Override public String[] getDescription() { - return new String[] { - CommonValues.THETA_MOVEMENT, - translateToLocal( - "gt.blockmachines.debug.tt.maintenance.desc.0"), // For automatically maintaining Multiblocks - translateToLocal("gt.blockmachines.debug.tt.maintenance.desc.1"), // Does fix everything but itself. - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.debug.tt.maintenance.desc.2") // Fixing is for plebs! + return new String[] { CommonValues.THETA_MOVEMENT, + translateToLocal("gt.blockmachines.debug.tt.maintenance.desc.0"), // For automatically maintaining + // Multiblocks + translateToLocal("gt.blockmachines.debug.tt.maintenance.desc.1"), // Does fix everything but itself. + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.maintenance.desc.2") // Fixing is + // for plebs! }; } @@ -51,29 +53,31 @@ public class GT_MetaTileEntity_Hatch_CreativeMaintenance extends GT_MetaTileEnti @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(face)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(face) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(face)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(face) }; } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_Hatch_CreativeMaintenance( - this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - this.mWrench = - this.mScrewdriver = this.mSoftHammer = this.mHardHammer = this.mCrowbar = this.mSolderingTool = true; + this.mWrench = this.mScrewdriver = this.mSoftHammer = this.mHardHammer = this.mCrowbar = this.mSolderingTool = true; } @Override - public boolean onRightclick( - IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) { + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, + float aY, float aZ) { return false; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java index 3f4606d837..bec0fde90e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java @@ -4,10 +4,21 @@ import static com.github.technus.tectech.util.CommonValues.MOVE_AT; import static gregtech.api.enums.Dyes.MACHINE_METAL; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.mechanics.dataTransport.DataPacket; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Dyes; @@ -16,20 +27,13 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by danie_000 on 11.12.2016. */ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket> extends GT_MetaTileEntity_Hatch implements IConnectsToDataPipe { + public static Textures.BlockIcons.CustomIcon EM_D_SIDES; public static Textures.BlockIcons.CustomIcon EM_D_ACTIVE; public static Textures.BlockIcons.CustomIcon EM_D_CONN; @@ -40,14 +44,14 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket public short id = -1; - protected GT_MetaTileEntity_Hatch_DataConnector( - int aID, String aName, String aNameRegional, int aTier, String descr) { + protected GT_MetaTileEntity_Hatch_DataConnector(int aID, String aName, String aNameRegional, int aTier, + String descr) { super(aID, aName, aNameRegional, aTier, 0, descr); TT_Utility.setTier(aTier, this); } - protected GT_MetaTileEntity_Hatch_DataConnector( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + protected GT_MetaTileEntity_Hatch_DataConnector(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -62,23 +66,20 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - new GT_RenderedTexture( - EM_D_ACTIVE, - Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), - new GT_RenderedTexture(EM_D_CONN) - }; + return new ITexture[] { aBaseTexture, + new GT_RenderedTexture( + EM_D_ACTIVE, + Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), + new GT_RenderedTexture(EM_D_CONN) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - new GT_RenderedTexture( - EM_D_SIDES, Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), - new GT_RenderedTexture(EM_D_CONN) - }; + return new ITexture[] { aBaseTexture, + new GT_RenderedTexture( + EM_D_SIDES, + Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), + new GT_RenderedTexture(EM_D_CONN) }; } @Override @@ -175,29 +176,27 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket public String[] getInfoData() { if (id > 0) { return new String[] { - translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id, - translateToLocalFormatted("tt.keyword.Content", clientLocale) + ": " + EnumChatFormatting.AQUA - + (q != null ? q.getContentString() : 0), - translateToLocalFormatted("tt.keyword.PacketHistory", clientLocale) + ": " + EnumChatFormatting.RED - + (q != null ? q.getTraceSize() : 0), - }; + translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id, + translateToLocalFormatted("tt.keyword.Content", clientLocale) + ": " + + EnumChatFormatting.AQUA + + (q != null ? q.getContentString() : 0), + translateToLocalFormatted("tt.keyword.PacketHistory", clientLocale) + ": " + + EnumChatFormatting.RED + + (q != null ? q.getTraceSize() : 0), }; } return new String[] { - translateToLocalFormatted("tt.keyword.Content", clientLocale) + ": " + EnumChatFormatting.AQUA - + (q != null ? q.getContentString() : 0), - translateToLocalFormatted("tt.keyword.PacketHistory", clientLocale) + ": " + EnumChatFormatting.RED - + (q != null ? q.getTraceSize() : 0), - }; + translateToLocalFormatted("tt.keyword.Content", clientLocale) + ": " + + EnumChatFormatting.AQUA + + (q != null ? q.getContentString() : 0), + translateToLocalFormatted("tt.keyword.PacketHistory", clientLocale) + ": " + + EnumChatFormatting.RED + + (q != null ? q.getTraceSize() : 0), }; } @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - "Text description shouldn't be seen, report to Tec", - "High speed fibre optics connector.", - EnumChatFormatting.AQUA + "Must be painted to work" - }; + return new String[] { CommonValues.TEC_MARK_EM, "Text description shouldn't be seen, report to Tec", + "High speed fibre optics connector.", EnumChatFormatting.AQUA + "Must be painted to work" }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java index bf7671a062..b1980e2852 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java @@ -4,54 +4,55 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ import static com.github.technus.tectech.util.CommonValues.V; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; /** * Created by danie_000 on 16.12.2016. */ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch { + public final int Amperes; public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super( - aID, - aName, - aNameRegional, - aTier, - 0, - translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0")); // Multiple Ampere Energy Extractor for + super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0")); // Multiple + // Ampere + // Energy + // Extractor + // for // Multiblocks Amperes = aAmp; TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_DynamoMulti( - String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_DynamoMulti(String aName, int aTier, int aAmp, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); Amperes = aAmp; } - public GT_MetaTileEntity_Hatch_DynamoMulti( - int aID, String aName, String aNameRegional, int aTier, int i, String description, int aAmp) { + public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int i, + String description, int aAmp) { super(aID, aName, aNameRegional, aTier, 0, description); Amperes = aAmp; } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; + return new ITexture[] { aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier] }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; + return new ITexture[] { aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier] }; } @Override @@ -121,8 +122,8 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { - return new String[] {CommonValues.TEC_MARK_GENERAL, mDescription - // "Amperes Out: "+ EnumChatFormatting.AQUA+Amperes+" A" + return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription + // "Amperes Out: "+ EnumChatFormatting.AQUA+Amperes+" A" }; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java index e25877817d..bd0882a28a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java @@ -5,24 +5,27 @@ import static com.github.technus.tectech.util.CommonValues.TRANSFER_AT; import static com.github.technus.tectech.util.CommonValues.V; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.mechanics.pipe.IConnectsToEnergyTunnel; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Energy; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 16.12.2016. */ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatch_DynamoMulti implements IConnectsToEnergyTunnel { + public GT_MetaTileEntity_Hatch_DynamoTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) { super( aID, @@ -35,19 +38,19 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_DynamoTunnel( - String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, OVERLAYS_ENERGY_OUT_LASER_TT[mTier]}; + return new ITexture[] { aBaseTexture, OVERLAYS_ENERGY_OUT_LASER_TT[mTier] }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, OVERLAYS_ENERGY_OUT_LASER_TT[mTier]}; + return new ITexture[] { aBaseTexture, OVERLAYS_ENERGY_OUT_LASER_TT[mTier] }; } @Override @@ -122,12 +125,12 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - mDescription, // TODO NOT PASS DESCRIPTION - translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(Amperes * maxEUOutput()) + EnumChatFormatting.RESET - + " EU/t" // Throughput + return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, // TODO NOT PASS DESCRIPTION + translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(Amperes * maxEUOutput()) + + EnumChatFormatting.RESET + + " EU/t" // Throughput }; } @@ -157,8 +160,8 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc byte front = aBaseMetaTileEntity.getFrontFacing(); byte opposite = GT_Utility.getOppositeSide(front); for (short dist = 1; dist < 1000; dist++) { - IGregTechTileEntity tGTTileEntity = - aBaseMetaTileEntity.getIGregTechTileEntityAtSideAndDistance(front, dist); + IGregTechTileEntity tGTTileEntity = aBaseMetaTileEntity + .getIGregTechTileEntityAtSideAndDistance(front, dist); if (tGTTileEntity != null && tGTTileEntity.getColorization() == color) { IMetaTileEntity aMetaTileEntity = tGTTileEntity.getMetaTileEntity(); if (aMetaTileEntity != null) { @@ -170,23 +173,19 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc return; } else if (maxEUOutput() == ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()) { - long diff = Math.min( - Amperes * 20L * maxEUOutput(), - Math.min( - ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUStore() - - aMetaTileEntity - .getBaseMetaTileEntity() - .getStoredEU(), - aBaseMetaTileEntity.getStoredEU())); - - setEUVar(aBaseMetaTileEntity.getStoredEU() - diff); - - ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity) - .setEUVar(aMetaTileEntity - .getBaseMetaTileEntity() - .getStoredEU() - + diff); - } + long diff = Math.min( + Amperes * 20L * maxEUOutput(), + Math.min( + ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity) + .maxEUStore() + - aMetaTileEntity.getBaseMetaTileEntity().getStoredEU(), + aBaseMetaTileEntity.getStoredEU())); + + setEUVar(aBaseMetaTileEntity.getStoredEU() - diff); + + ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity) + .setEUVar(aMetaTileEntity.getBaseMetaTileEntity().getStoredEU() + diff); + } return; } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Energy) { if (((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).connectionCount < 2) { 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 f137c274f8..1925aa5b72 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 @@ -8,12 +8,23 @@ import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Mult import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.mechanics.pipe.IConnectsToElementalPipe; import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Dyes; @@ -23,20 +34,13 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by danie_000 on 11.12.2016. */ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements IEMContainer, IConnectsToElementalPipe { + private static Textures.BlockIcons.CustomIcon EM_T_SIDES; private static Textures.BlockIcons.CustomIcon EM_T_ACTIVE; private static Textures.BlockIcons.CustomIcon EM_T_CONN; @@ -50,14 +54,14 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta public short id = -1; private byte deathDelay = 2; - protected GT_MetaTileEntity_Hatch_ElementalContainer( - int aID, String aName, String aNameRegional, int aTier, String descr) { + protected GT_MetaTileEntity_Hatch_ElementalContainer(int aID, String aName, String aNameRegional, int aTier, + String descr) { super(aID, aName, aNameRegional, aTier, 0, descr); TT_Utility.setTier(aTier, this); } - protected GT_MetaTileEntity_Hatch_ElementalContainer( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + protected GT_MetaTileEntity_Hatch_ElementalContainer(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -72,23 +76,20 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - new GT_RenderedTexture( - EM_T_ACTIVE, - Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), - new GT_RenderedTexture(EM_T_CONN) - }; + return new ITexture[] { aBaseTexture, + new GT_RenderedTexture( + EM_T_ACTIVE, + Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), + new GT_RenderedTexture(EM_T_CONN) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - new GT_RenderedTexture( - EM_T_SIDES, Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), - new GT_RenderedTexture(EM_T_CONN) - }; + return new ITexture[] { aBaseTexture, + new GT_RenderedTexture( + EM_T_SIDES, + Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), + new GT_RenderedTexture(EM_T_CONN) }; } @Override @@ -134,35 +135,37 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta deathDelay = 3; } else { if (deathDelay == 1) { - IGregTechTileEntity tGTTileEntity = - aBaseMetaTileEntity.getIGregTechTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()); - if (tGTTileEntity == null - || !(tGTTileEntity.getMetaTileEntity() - instanceof GT_MetaTileEntity_Hatch_OverflowElemental)) { + IGregTechTileEntity tGTTileEntity = aBaseMetaTileEntity + .getIGregTechTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()); + if (tGTTileEntity == null || !(tGTTileEntity + .getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_OverflowElemental)) { tGTTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide((byte) 0); } - if (tGTTileEntity == null - || !(tGTTileEntity.getMetaTileEntity() - instanceof GT_MetaTileEntity_Hatch_OverflowElemental)) { + if (tGTTileEntity == null || !(tGTTileEntity + .getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_OverflowElemental)) { tGTTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide((byte) 1); } - if (tGTTileEntity != null - && tGTTileEntity.getMetaTileEntity() - instanceof GT_MetaTileEntity_Hatch_OverflowElemental) { - GT_MetaTileEntity_Hatch_OverflowElemental aMetaTileEntity = - (GT_MetaTileEntity_Hatch_OverflowElemental) tGTTileEntity.getMetaTileEntity(); + if (tGTTileEntity != null && tGTTileEntity + .getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_OverflowElemental) { + GT_MetaTileEntity_Hatch_OverflowElemental aMetaTileEntity = (GT_MetaTileEntity_Hatch_OverflowElemental) tGTTileEntity + .getMetaTileEntity(); if (aMetaTileEntity.addOverflowMatter(overflowMatter)) { if (TecTech.configTecTech.BOOM_ENABLE) { tGTTileEntity.doExplosion(V[14]); } else { TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter * 32D); - TecTech.proxy.broadcast("Container1 " + translateToLocal("tt.keyword.BOOM") + " " - + aBaseMetaTileEntity.getXCoord() + ' ' + aBaseMetaTileEntity.getYCoord() - + ' ' + aBaseMetaTileEntity.getZCoord()); + TecTech.proxy.broadcast( + "Container1 " + translateToLocal("tt.keyword.BOOM") + + " " + + aBaseMetaTileEntity.getXCoord() + + ' ' + + aBaseMetaTileEntity.getYCoord() + + ' ' + + aBaseMetaTileEntity.getZCoord()); } } - deathDelay = - 3; // needed in some cases like repetitive failures. Should be 4 since there is -- + deathDelay = 3; // needed in some cases like repetitive failures. Should be 4 since there is + // -- // at end but meh... overflowMatter = 0F; } @@ -173,9 +176,14 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter * 32D); deathDelay = 3; overflowMatter = 0; - TecTech.proxy.broadcast("Container0 " + translateToLocal("tt.keyword.BOOM") + " " - + aBaseMetaTileEntity.getXCoord() + ' ' + aBaseMetaTileEntity.getYCoord() + ' ' - + aBaseMetaTileEntity.getZCoord()); + TecTech.proxy.broadcast( + "Container0 " + translateToLocal("tt.keyword.BOOM") + + " " + + aBaseMetaTileEntity.getXCoord() + + ' ' + + aBaseMetaTileEntity.getYCoord() + + ' ' + + aBaseMetaTileEntity.getZCoord()); } } deathDelay--; @@ -272,40 +280,38 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta if (TecTech.configTecTech.EASY_SCAN || DEBUG_MODE) { if (id > 0) { if (content == null || content.size() == 0) { - return new String[] { - translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id, - translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale) - }; + return new String[] { translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + + EnumChatFormatting.AQUA + + id, translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale) }; } else { String[] lines = content.getElementalInfo(); String[] output = new String[lines.length + 1]; output[0] = translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " - + EnumChatFormatting.AQUA + id; + + EnumChatFormatting.AQUA + + id; System.arraycopy(lines, 0, output, 1, lines.length); return output; } } if (content == null || content.size() == 0) { - return new String[] {translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale)}; + return new String[] { translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale) }; } return content.getElementalInfo(); } else { if (id > 0) { if (content == null || content.size() == 0) { - return new String[] { - translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id, - translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale) - }; + return new String[] { translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + + EnumChatFormatting.AQUA + + id, translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale) }; } return new String[] { - translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id, - translateToLocalFormatted("tt.keyphrase.Contains_EM", clientLocale) - }; + translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id, + translateToLocalFormatted("tt.keyphrase.Contains_EM", clientLocale) }; } if (content == null || content.size() == 0) { - return new String[] {translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale)}; + return new String[] { translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale) }; } - return new String[] {translateToLocalFormatted("tt.keyphrase.Contains_EM", clientLocale)}; + return new String[] { translateToLocalFormatted("tt.keyphrase.Contains_EM", clientLocale) }; } } @@ -315,19 +321,19 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta @Override public String[] getDescription() { - return new String[] { - TEC_MARK_EM, - mDescription, - translateToLocal("tt.base.emhatch.desc.0") + " " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(getMaxStacksCount()), // Max stacks amount: - translateToLocal("tt.base.emhatch.desc.1") + " " + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(getMaxStackSize()), // Stack capacity: - translateToLocal("tt.base.emhatch.desc.2"), // Place Overflow Hatch behind,on top or below - translateToLocal("tt.base.emhatch.desc.3"), // to provide overflow protection while this block - translateToLocal("tt.base.emhatch.desc.4"), // is not attached to multi block. - translateToLocal("tt.base.emhatch.desc.5"), // Transport range can be extended in straight - translateToLocal("tt.base.emhatch.desc.6"), // line up to 15 blocks with quantum tunnels. - EnumChatFormatting.AQUA + translateToLocal("tt.base.emhatch.desc.7") // Must be painted to work + return new String[] { TEC_MARK_EM, mDescription, + translateToLocal("tt.base.emhatch.desc.0") + " " + + EnumChatFormatting.AQUA + + GT_Utility.formatNumbers(getMaxStacksCount()), // Max stacks amount: + translateToLocal("tt.base.emhatch.desc.1") + " " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(getMaxStackSize()), // Stack capacity: + translateToLocal("tt.base.emhatch.desc.2"), // Place Overflow Hatch behind,on top or below + translateToLocal("tt.base.emhatch.desc.3"), // to provide overflow protection while this block + translateToLocal("tt.base.emhatch.desc.4"), // is not attached to multi block. + translateToLocal("tt.base.emhatch.desc.5"), // Transport range can be extended in straight + translateToLocal("tt.base.emhatch.desc.6"), // line up to 15 blocks with quantum tunnels. + EnumChatFormatting.AQUA + translateToLocal("tt.base.emhatch.desc.7") // Must be painted to work }; } @@ -339,8 +345,13 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta if (TecTech.configTecTech.BOOM_ENABLE) { base.doExplosion(V[15]); } else { - TecTech.proxy.broadcast(translateToLocal("tt.keyword.BOOM") + " " + base.getXCoord() + ' ' - + base.getYCoord() + ' ' + base.getZCoord()); + TecTech.proxy.broadcast( + translateToLocal("tt.keyword.BOOM") + " " + + base.getXCoord() + + ' ' + + base.getYCoord() + + ' ' + + base.getZCoord()); } } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java index 2039c9bec6..659c3843eb 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java @@ -4,56 +4,57 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ import static com.github.technus.tectech.util.CommonValues.V; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 16.12.2016. */ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch { + public final int Amperes; public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super( - aID, - aName, - aNameRegional, - aTier, - 0, - translateToLocal("gt.blockmachines.hatch.energymulti.desc.0")); // Multiple Ampere Energy Injector for + super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.energymulti.desc.0")); // Multiple + // Ampere + // Energy + // Injector + // for // Multiblocks Amperes = aAmp; TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_EnergyMulti( - String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_EnergyMulti(String aName, int aTier, int aAmp, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); Amperes = aAmp; } - public GT_MetaTileEntity_Hatch_EnergyMulti( - int aID, String aName, String aNameRegional, int aTier, int i, String description, int aAmp) { + public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int i, + String description, int aAmp) { super(aID, aName, aNameRegional, aTier, 0, description); Amperes = aAmp; } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; + return new ITexture[] { aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier] }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; + return new ITexture[] { aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier] }; } @Override @@ -128,11 +129,11 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - mDescription, - translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(maxAmperesIn()) + " A" // Amperes In + return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, + translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " + + EnumChatFormatting.AQUA + + GT_Utility.formatNumbers(maxAmperesIn()) + + " A" // Amperes In }; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java index ff46211db5..0107a28fa3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java @@ -5,22 +5,25 @@ import static com.github.technus.tectech.util.CommonValues.TRANSFER_AT; import static com.github.technus.tectech.util.CommonValues.V; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.mechanics.pipe.IConnectsToEnergyTunnel; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 16.12.2016. */ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatch_EnergyMulti implements IConnectsToEnergyTunnel { + public GT_MetaTileEntity_Hatch_EnergyTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) { super( aID, @@ -33,19 +36,19 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_EnergyTunnel( - String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, OVERLAYS_ENERGY_IN_LASER_TT[mTier]}; + return new ITexture[] { aBaseTexture, OVERLAYS_ENERGY_IN_LASER_TT[mTier] }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, OVERLAYS_ENERGY_IN_LASER_TT[mTier]}; + return new ITexture[] { aBaseTexture, OVERLAYS_ENERGY_IN_LASER_TT[mTier] }; } @Override @@ -120,12 +123,12 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - mDescription, - translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(Amperes * maxEUInput()) + EnumChatFormatting.RESET - + " EU/t" // Throughput + return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, + translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(Amperes * maxEUInput()) + + EnumChatFormatting.RESET + + " EU/t" // Throughput }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java index af6197be39..d830f69b17 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java @@ -2,6 +2,11 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.thing.gui.TecTechUITextures; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; @@ -11,6 +16,7 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; 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.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -21,15 +27,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by Tec on 03.04.2017. */ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch implements IAddGregtechLogo { + private static Textures.BlockIcons.CustomIcon EM_H; private static Textures.BlockIcons.CustomIcon EM_H_ACTIVE; @@ -52,12 +55,12 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(EM_H_ACTIVE)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(EM_H_ACTIVE) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(EM_H)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(EM_H) }; } @Override @@ -101,9 +104,9 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl return true; } // if(aBaseMetaTileEntity.isActive()) - // aPlayer.addChatComponentMessage(new ChatComponentText("It is still active...")); + // aPlayer.addChatComponentMessage(new ChatComponentText("It is still active...")); // else if(heat>0) - // aPlayer.addChatComponentMessage(new ChatComponentText("It is still warm...")); + // aPlayer.addChatComponentMessage(new ChatComponentText("It is still warm...")); // else GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; @@ -116,11 +119,11 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.hatch.holder.desc.0"), // For Research Station - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.hatch.holder.desc.1") // Advanced Holding Mechanism! + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.holder.desc.0"), // For + // Research + // Station + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.holder.desc.1") // Advanced Holding + // Mechanism! }; } @@ -131,46 +134,43 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO) - .setSize(18, 18) - .setPos(151, 63)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO).setSize(18, 18) + .setPos(151, 63)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_HEAT_SINK) - .setPos(46, 17) - .setSize(84, 60)) - .widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_RACK_LARGE) - .setPos(68, 27) - .setSize(40, 40)) + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_HEAT_SINK).setPos(46, 17).setSize(84, 60)) + .widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_RACK_LARGE).setPos(68, 27) + .setSize(40, 40)) .widget(new SlotWidget(new BaseSlot(inventoryHandler, 0) { - @Override - public int getSlotStackLimit() { - return 1; - } - - @Override - public boolean isEnabled() { - return !getBaseMetaTileEntity().isActive(); - } - }) - .setPos(79, 38)) - .widget(new DrawableWidget() - .setDrawable(TecTechUITextures.BUTTON_STANDARD_LIGHT_16x16) - .setPos(152, 24) - .setSize(16, 16)) - .widget(new DrawableWidget() - .setDrawable(() -> getBaseMetaTileEntity().isActive() - ? TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON - : TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_DISABLED) - .setPos(152, 24) - .setSize(16, 16)) - .widget(new FakeSyncWidget.BooleanSyncer( - () -> getBaseMetaTileEntity().isActive(), - val -> getBaseMetaTileEntity().setActive(val))); + + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isEnabled() { + return !getBaseMetaTileEntity().isActive(); + } + }).setPos(79, 38)) + .widget( + new DrawableWidget().setDrawable(TecTechUITextures.BUTTON_STANDARD_LIGHT_16x16).setPos(152, 24) + .setSize(16, 16)) + .widget( + new DrawableWidget() + .setDrawable( + () -> getBaseMetaTileEntity().isActive() + ? TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON + : TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_DISABLED) + .setPos(152, 24).setSize(16, 16)) + .widget( + new FakeSyncWidget.BooleanSyncer( + () -> getBaseMetaTileEntity().isActive(), + val -> getBaseMetaTileEntity().setActive(val))); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java index 8626458b70..804a6d0f9a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java @@ -2,20 +2,23 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 27.10.2016. */ public class GT_MetaTileEntity_Hatch_InputData extends GT_MetaTileEntity_Hatch_DataConnector<QuantumDataPacket> { + private boolean delDelay = true; public GT_MetaTileEntity_Hatch_InputData(int aID, String aName, String aNameRegional, int aTier) { @@ -82,12 +85,14 @@ public class GT_MetaTileEntity_Hatch_InputData extends GT_MetaTileEntity_Hatch_D @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.hatch.datain.desc.0"), // Quantum Data Input for Multiblocks - translateToLocal("gt.blockmachines.hatch.datain.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.hatch.datain.desc.2") // Must be painted to work + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datain.desc.0"), // Quantum + // Data + // Input + // for + // Multiblocks + translateToLocal("gt.blockmachines.hatch.datain.desc.1"), // High speed fibre optics connector. + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datain.desc.2") // Must be painted to + // work }; } 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 ce0215f2c9..0504cbb081 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 @@ -7,26 +7,31 @@ import static gregtech.api.enums.Dyes.MACHINE_METAL; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.mechanics.dataTransport.InventoryDataPacket; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.enums.Dyes; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess; import gregtech.api.objects.GT_RenderedTexture; -import java.util.ArrayList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import org.apache.commons.lang3.reflect.FieldUtils; public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Hatch_DataAccess implements IConnectsToDataPipe { + public boolean delDelay = true; private ItemStack[] stacks; @@ -37,30 +42,27 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_InputDataItems( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_InputDataItems(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - new GT_RenderedTexture( - EM_D_ACTIVE, - Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), - new GT_RenderedTexture(EM_D_CONN) - }; + return new ITexture[] { aBaseTexture, + new GT_RenderedTexture( + EM_D_ACTIVE, + Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), + new GT_RenderedTexture(EM_D_CONN) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - new GT_RenderedTexture( - EM_D_SIDES, Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), - new GT_RenderedTexture(EM_D_CONN) - }; + return new ITexture[] { aBaseTexture, + new GT_RenderedTexture( + EM_D_SIDES, + Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), + new GT_RenderedTexture(EM_D_CONN) }; } @Override @@ -216,12 +218,14 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.hatch.datainass.desc.0"), // ItemStack Data Input for Multiblocks - translateToLocal("gt.blockmachines.hatch.datainass.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.hatch.datainass.desc.2") // Must be painted to work + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datainass.desc.0"), // ItemStack + // Data + // Input + // for + // Multiblocks + translateToLocal("gt.blockmachines.hatch.datainass.desc.1"), // High speed fibre optics connector. + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datainass.desc.2") // Must be painted + // to work }; } @@ -232,10 +236,8 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha @Override public String[] getInfoData() { - return new String[] { - translateToLocalFormatted("tt.keyphrase.Content_Stack_Count", clientLocale) + ": " - + (stacks == null ? 0 : stacks.length) - }; + return new String[] { translateToLocalFormatted("tt.keyphrase.Content_Stack_Count", clientLocale) + ": " + + (stacks == null ? 0 : stacks.length) }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java index fdbfc23ff7..3ef9180649 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java @@ -3,6 +3,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -11,23 +12,20 @@ import gregtech.api.metatileentity.MetaTileEntity; * Created by danie_000 on 27.10.2016. */ public class GT_MetaTileEntity_Hatch_InputElemental extends GT_MetaTileEntity_Hatch_ElementalContainer { + public GT_MetaTileEntity_Hatch_InputElemental(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - translateToLocal("gt.blockmachines.emin.desc")); // Elemental Input for Multiblocks + super(aID, aName, aNameRegional, aTier, translateToLocal("gt.blockmachines.emin.desc")); // Elemental Input for + // Multiblocks TT_Utility.setTier(aTier, this); } // public GT_MetaTileEntity_Hatch_InputElemental(String aName, int aTier, String aDescription, ITexture[][][] // aTextures) { - // super(aName, aTier, aDescription, aTextures); + // super(aName, aTier, aDescription, aTextures); // } - public GT_MetaTileEntity_Hatch_InputElemental( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_InputElemental(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java index 4ebbfe069b..0ea3844522 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java @@ -2,23 +2,26 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 27.10.2016. */ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_DataConnector<QuantumDataPacket> { + public GT_MetaTileEntity_Hatch_OutputData(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, ""); TT_Utility.setTier(aTier, this); @@ -80,17 +83,19 @@ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_ @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.hatch.dataout.desc.0"), // Quantum Data Output for Multiblocks - translateToLocal("gt.blockmachines.hatch.dataout.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.hatch.dataout.desc.2") // Must be painted to work + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataout.desc.0"), // Quantum + // Data + // Output + // for + // Multiblocks + translateToLocal("gt.blockmachines.hatch.dataout.desc.1"), // High speed fibre optics connector. + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataout.desc.2") // Must be painted + // to work }; } @Override - public IConnectsToDataPipe getNext(IConnectsToDataPipe source /*==this*/) { + public IConnectsToDataPipe getNext(IConnectsToDataPipe source /* ==this */) { IGregTechTileEntity base = getBaseMetaTileEntity(); byte color = base.getColorization(); if (color < 0) { @@ -108,8 +113,8 @@ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_ && ((GT_MetaTileEntity_Hatch_InputData) meta).getColorization() == color && ((GT_MetaTileEntity_Hatch_InputData) meta) .canConnectData(GT_Utility.getOppositeSide(base.getFrontFacing()))) { - return (IConnectsToDataPipe) meta; - } + return (IConnectsToDataPipe) meta; + } return null; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java index 323973acbb..ed68426152 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java @@ -2,29 +2,32 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.mechanics.dataTransport.InventoryDataPacket; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; public class GT_MetaTileEntity_Hatch_OutputDataItems extends GT_MetaTileEntity_Hatch_DataConnector<InventoryDataPacket> { + public GT_MetaTileEntity_Hatch_OutputDataItems(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, ""); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OutputDataItems( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_OutputDataItems(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -99,7 +102,7 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems } @Override - public IConnectsToDataPipe getNext(IConnectsToDataPipe source /*==this*/) { + public IConnectsToDataPipe getNext(IConnectsToDataPipe source /* ==this */) { IGregTechTileEntity base = getBaseMetaTileEntity(); byte color = base.getColorization(); if (color < 0) { @@ -117,19 +120,22 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems && ((GT_MetaTileEntity_Hatch_InputDataItems) meta).getColorization() == color && ((GT_MetaTileEntity_Hatch_InputDataItems) meta) .canConnectData(GT_Utility.getOppositeSide(base.getFrontFacing()))) { - return (IConnectsToDataPipe) meta; - } + return (IConnectsToDataPipe) meta; + } return null; } @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.hatch.dataoutass.desc.0"), // ItemStack Data Output for Multiblocks - translateToLocal("gt.blockmachines.hatch.dataoutass.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.2") // Must be painted to work + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataoutass.desc.0"), // ItemStack + // Data + // Output + // for + // Multiblocks + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.1"), // High speed fibre optics connector. + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.2") // Must be + // painted to + // work }; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java index da125d3e5f..4274ce14aa 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java @@ -4,6 +4,7 @@ import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -14,23 +15,20 @@ import gregtech.api.util.GT_Utility; * Created by danie_000 on 27.10.2016. */ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_Hatch_ElementalContainer { + public GT_MetaTileEntity_Hatch_OutputElemental(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - translateToLocal("gt.blockmachines.emout.desc")); // Elemental Output for Multiblocks + super(aID, aName, aNameRegional, aTier, translateToLocal("gt.blockmachines.emout.desc")); // Elemental Output + // for Multiblocks TT_Utility.setTier(aTier, this); } // public GT_MetaTileEntity_Hatch_OutputElemental(String aName, int aTier, String aDescription, ITexture[][][] // aTextures) { - // super(aName, aTier, aDescription, aTextures); + // super(aName, aTier, aDescription, aTextures); // } - public GT_MetaTileEntity_Hatch_OutputElemental( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_OutputElemental(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -63,15 +61,14 @@ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_H byte front = aBaseMetaTileEntity.getFrontFacing(); byte opposite = GT_Utility.getOppositeSide(front); for (byte dist = 1; dist < 16; dist++) { - IGregTechTileEntity tGTTileEntity = - aBaseMetaTileEntity.getIGregTechTileEntityAtSideAndDistance(front, dist); + IGregTechTileEntity tGTTileEntity = aBaseMetaTileEntity + .getIGregTechTileEntityAtSideAndDistance(front, dist); if (tGTTileEntity != null && tGTTileEntity.getColorization() == color) { IMetaTileEntity aMetaTileEntity = tGTTileEntity.getMetaTileEntity(); if (aMetaTileEntity != null) { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputElemental && opposite == tGTTileEntity.getFrontFacing()) { - ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity) - .getContentHandler() + ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity).getContentHandler() .putUnifyAll(content); ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity).updateSlots(); content.clear(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java index b41963964d..1ef4097992 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java @@ -8,18 +8,6 @@ import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Mult import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.util.CommonValues; -import com.github.technus.tectech.util.TT_Utility; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -32,12 +20,28 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; + import org.apache.commons.lang3.reflect.FieldUtils; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.util.CommonValues; +import com.github.technus.tectech.util.TT_Utility; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.objects.GT_RenderedTexture; + /** * Created by danie_000 on 12.12.2016. */ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity_Hatch { + private static Textures.BlockIcons.CustomIcon EM_T_SIDES; private static Textures.BlockIcons.CustomIcon EM_T_ACTIVE; public static Textures.BlockIcons.CustomIcon MufflerEM; @@ -48,23 +52,20 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity private String clientLocale = "en_US"; - public GT_MetaTileEntity_Hatch_OverflowElemental( - int aID, String aName, String aNameRegional, int aTier, double max) { - super( - aID, - aName, - aNameRegional, - aTier, - 0, - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.0")); // Disposes excess elemental Matter + public GT_MetaTileEntity_Hatch_OverflowElemental(int aID, String aName, String aNameRegional, int aTier, + double max) { + super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.emmuffler.desc.0")); // Disposes + // excess + // elemental + // Matter overflowMatter = max / 2; overflowMax = max; overflowDisperse = overflowMax / (float) (30 - aTier); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OverflowElemental( - String aName, int aTier, double max, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_OverflowElemental(String aName, int aTier, double max, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); overflowMatter = max / 2; overflowMax = max; @@ -83,37 +84,36 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - new GT_RenderedTexture( - EM_T_ACTIVE, - Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), - new GT_RenderedTexture(MufflerEM) - }; + return new ITexture[] { aBaseTexture, + new GT_RenderedTexture( + EM_T_ACTIVE, + Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), + new GT_RenderedTexture(MufflerEM) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - new GT_RenderedTexture( - EM_T_SIDES, Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), - new GT_RenderedTexture(MufflerEMidle) - }; + return new ITexture[] { aBaseTexture, + new GT_RenderedTexture( + EM_T_SIDES, + Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())), + new GT_RenderedTexture(MufflerEMidle) }; } @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - mDescription, - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(overflowMax) + " " + translateToLocal("tt.keyword.unit.mass"), - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(overflowDisperse) + " " - + translateToLocal("tt.keyword.unit.massFlux"), - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3") - }; + return new String[] { CommonValues.TEC_MARK_EM, mDescription, + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(overflowMax) + + " " + + translateToLocal("tt.keyword.unit.mass"), + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(overflowDisperse) + + " " + + translateToLocal("tt.keyword.unit.massFlux"), + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3") }; } @Override @@ -175,26 +175,22 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity overflowMatter = 0; aBaseMetaTileEntity.setActive(false); aBaseMetaTileEntity.setLightValue((byte) 0); - aBaseMetaTileEntity - .getWorld() - .updateLightByType( - EnumSkyBlock.Block, - aBaseMetaTileEntity.getXCoord(), - aBaseMetaTileEntity.getYCoord(), - aBaseMetaTileEntity.getZCoord()); + aBaseMetaTileEntity.getWorld().updateLightByType( + EnumSkyBlock.Block, + aBaseMetaTileEntity.getXCoord(), + aBaseMetaTileEntity.getYCoord(), + aBaseMetaTileEntity.getZCoord()); } vapePollution(aBaseMetaTileEntity); } else { if (overflowMatter > 0) { aBaseMetaTileEntity.setActive(true); aBaseMetaTileEntity.setLightValue((byte) 15); - aBaseMetaTileEntity - .getWorld() - .updateLightByType( - EnumSkyBlock.Block, - aBaseMetaTileEntity.getXCoord(), - aBaseMetaTileEntity.getYCoord(), - aBaseMetaTileEntity.getZCoord()); + aBaseMetaTileEntity.getWorld().updateLightByType( + EnumSkyBlock.Block, + aBaseMetaTileEntity.getXCoord(), + aBaseMetaTileEntity.getYCoord(), + aBaseMetaTileEntity.getZCoord()); } } } else if (aBaseMetaTileEntity.isClientSide() && aBaseMetaTileEntity.isActive()) { @@ -257,16 +253,22 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity @Override public String[] getInfoData() { - return new String[] { - translateToLocalFormatted("tt.keyphrase.Contained_mass", clientLocale) + ":", - EnumChatFormatting.RED + TT_Utility.formatNumberExp(overflowMatter) + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.unit.mass") + " / ", - EnumChatFormatting.GREEN + TT_Utility.formatNumberShortExp(overflowMax) + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.unit.mass"), - translateToLocalFormatted("tt.keyphrase.Mass_Disposal_speed", clientLocale) + ": " + EnumChatFormatting.BLUE - + TT_Utility.formatNumberShortExp(overflowDisperse) + EnumChatFormatting.RESET + " " - + translateToLocal("tt.keyword.unit.massFlux") - }; + return new String[] { translateToLocalFormatted("tt.keyphrase.Contained_mass", clientLocale) + ":", + EnumChatFormatting.RED + TT_Utility.formatNumberExp(overflowMatter) + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.unit.mass") + + " / ", + EnumChatFormatting.GREEN + TT_Utility.formatNumberShortExp(overflowMax) + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.unit.mass"), + translateToLocalFormatted("tt.keyphrase.Mass_Disposal_speed", clientLocale) + ": " + + EnumChatFormatting.BLUE + + TT_Utility.formatNumberShortExp(overflowDisperse) + + EnumChatFormatting.RESET + + " " + + translateToLocal("tt.keyword.unit.massFlux") }; } @Override @@ -276,10 +278,13 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity if (TecTech.configTecTech.BOOM_ENABLE) { getBaseMetaTileEntity().doExplosion(V[15]); } else { - TecTech.proxy.broadcast(translateToLocalFormatted("tt.keyphrase.Muffler_BOOM", clientLocale) + " " - + getBaseMetaTileEntity().getXCoord() + ' ' - + getBaseMetaTileEntity().getYCoord() + ' ' - + getBaseMetaTileEntity().getZCoord()); + TecTech.proxy.broadcast( + translateToLocalFormatted("tt.keyphrase.Muffler_BOOM", clientLocale) + " " + + getBaseMetaTileEntity().getXCoord() + + ' ' + + getBaseMetaTileEntity().getYCoord() + + ' ' + + getBaseMetaTileEntity().getZCoord()); } } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java index bf315e1dfe..5ca8cc4787 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java @@ -2,6 +2,19 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.gui.TecTechUITextures; import com.github.technus.tectech.util.CommonValues; @@ -14,6 +27,7 @@ import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -26,21 +40,12 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by danie_000 on 15.12.2016. */ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch implements IAddGregtechLogo, IAddUIWidgets { + public int pointer = 0; public int param = -1; public double value0D = 0; @@ -71,26 +76,26 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(ScreenON)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(ScreenON) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(ScreenOFF)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(ScreenOFF) }; } // @Override // public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - // if (aBaseMetaTileEntity.isClientSide() && (aTick % 20L == 0L)) { - // //refresh casing on state change - // int Xpos = aBaseMetaTileEntity.getXCoord(); - // int Ypos = aBaseMetaTileEntity.getYCoord(); - // int Zpos = aBaseMetaTileEntity.getZCoord(); - // try { - // aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(Xpos , Ypos, Zpos , Xpos , Ypos, Zpos ); - // } catch (Exception e) {} - // } - // super.onPostTick(aBaseMetaTileEntity, aTick); + // if (aBaseMetaTileEntity.isClientSide() && (aTick % 20L == 0L)) { + // //refresh casing on state change + // int Xpos = aBaseMetaTileEntity.getXCoord(); + // int Ypos = aBaseMetaTileEntity.getYCoord(); + // int Zpos = aBaseMetaTileEntity.getZCoord(); + // try { + // aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(Xpos , Ypos, Zpos , Xpos , Ypos, Zpos ); + // } catch (Exception e) {} + // } + // super.onPostTick(aBaseMetaTileEntity, aTick); // } @Override @@ -106,14 +111,23 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple @Override public String[] getInfoData() { return new String[] { - translateToLocalFormatted("tt.keyword.Parametrizer", clientLocale) + " " - + translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.GREEN - + param, - translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 0D: " + EnumChatFormatting.AQUA + value0D, - translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 1D: " + EnumChatFormatting.BLUE + value1D, - translateToLocalFormatted("tt.keyword.Input", clientLocale) + " 0D: " + EnumChatFormatting.GOLD + input0D, - translateToLocalFormatted("tt.keyword.Input", clientLocale) + " 1D: " + EnumChatFormatting.YELLOW + input1D, - }; + translateToLocalFormatted("tt.keyword.Parametrizer", clientLocale) + " " + + translateToLocalFormatted("tt.keyword.ID", clientLocale) + + ": " + + EnumChatFormatting.GREEN + + param, + translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 0D: " + + EnumChatFormatting.AQUA + + value0D, + translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 1D: " + + EnumChatFormatting.BLUE + + value1D, + translateToLocalFormatted("tt.keyword.Input", clientLocale) + " 0D: " + + EnumChatFormatting.GOLD + + input0D, + translateToLocalFormatted("tt.keyword.Input", clientLocale) + " 1D: " + + EnumChatFormatting.YELLOW + + input1D, }; } @Override @@ -146,8 +160,7 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); pointer = aNBT.getInteger("ePointer"); - if (aNBT.hasKey("eFloats") - || aNBT.hasKey("eValue0i") + if (aNBT.hasKey("eFloats") || aNBT.hasKey("eValue0i") || aNBT.hasKey("eValue1i") || aNBT.hasKey("eInput0i") || aNBT.hasKey("eInput1i")) { @@ -214,11 +227,11 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - EnumChatFormatting.DARK_RED + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.", - EnumChatFormatting.DARK_RED + "If it doesn't work, try removing Parametrizer from multiblock structure.", - }; + return new String[] { CommonValues.TEC_MARK_GENERAL, + EnumChatFormatting.DARK_RED + + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.", + EnumChatFormatting.DARK_RED + + "If it doesn't work, try removing Parametrizer from multiblock structure.", }; } @Override @@ -228,19 +241,17 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO_DARK) - .setSize(18, 18) - .setPos(112, 55)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO_DARK).setSize(18, 18) + .setPos(112, 55)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { final boolean isAdvanced = mTier > 5; - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE) - .setPos(43, 4) - .setSize(90, 72)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE).setPos(43, 4) + .setSize(90, 72)); addChangeParamButton( builder, @@ -249,66 +260,52 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple 4, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_ID); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (secondRow.get()) { - secondRow.set(false); - } else { - columnPointer.addAndGet(shift ? -16 : -4); - } + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (secondRow.get()) { + secondRow.set(false); + } else { + columnPointer.addAndGet(shift ? -16 : -4); + } + } else { + value0D -= shift ? 4096 : 256; + } + }, 7, 22, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_0); + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (secondRow.get()) { + columnPointer.addAndGet(shift ? -16 : -4); + } else { + secondRow.set(true); + } + } else { + value1D -= shift ? 4096 : 256; + } + }, 7, 40, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_1); + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (shift) { + if (secondRow.get()) { + value1D = Double.longBitsToDouble(0xFFFF_FFFF_FFFF_FFFFL); } else { - value0D -= shift ? 4096 : 256; + value0D = Double.longBitsToDouble(0xFFFF_FFFF_FFFF_FFFFL); } - }, - 7, - 22, - GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, - TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_0); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (secondRow.get()) { - columnPointer.addAndGet(shift ? -16 : -4); - } else { - secondRow.set(true); - } + } else { + if (secondRow.get()) { + long temp = Double.doubleToLongBits(value1D); + temp |= 1L << (long) columnPointer.get(); + value1D = Double.longBitsToDouble(temp); } else { - value1D -= shift ? 4096 : 256; + long temp = Double.doubleToLongBits(value0D); + temp |= 1L << (long) columnPointer.get(); + value0D = Double.longBitsToDouble(temp); } - }, - 7, - 40, - GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, - TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_1); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (shift) { - if (secondRow.get()) { - value1D = Double.longBitsToDouble(0xFFFF_FFFF_FFFF_FFFFL); - } else { - value0D = Double.longBitsToDouble(0xFFFF_FFFF_FFFF_FFFFL); - } - } else { - if (secondRow.get()) { - long temp = Double.doubleToLongBits(value1D); - temp |= 1L << (long) columnPointer.get(); - value1D = Double.longBitsToDouble(temp); - } else { - long temp = Double.doubleToLongBits(value0D); - temp |= 1L << (long) columnPointer.get(); - value0D = Double.longBitsToDouble(temp); - } - } - } else { - value0D /= shift ? 4096 : 256; - value1D /= shift ? 4096 : 256; - } - }, + } + } else { + value0D /= shift ? 4096 : 256; + value1D /= shift ? 4096 : 256; + } + }, 7, 58, isAdvanced ? TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_S : GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, @@ -321,66 +318,52 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple 4, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_ID); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (secondRow.get()) { - secondRow.set(false); - } else { - columnPointer.addAndGet(shift ? -2 : -1); - } - } else { - value0D -= shift ? 16 : 1; - } - }, - 25, - 22, - GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, - TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_0); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (secondRow.get()) { - columnPointer.addAndGet(shift ? -2 : -1); - } else { - secondRow.set(true); - } + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (secondRow.get()) { + secondRow.set(false); + } else { + columnPointer.addAndGet(shift ? -2 : -1); + } + } else { + value0D -= shift ? 16 : 1; + } + }, 25, 22, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_0); + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (secondRow.get()) { + columnPointer.addAndGet(shift ? -2 : -1); + } else { + secondRow.set(true); + } + } else { + value1D -= shift ? 16 : 1; + } + }, 25, 40, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_1); + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (shift) { + if (secondRow.get()) { + value1D = Double.longBitsToDouble(0); } else { - value1D -= shift ? 16 : 1; + value0D = Double.longBitsToDouble(0); } - }, - 25, - 40, - GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, - TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_1); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (shift) { - if (secondRow.get()) { - value1D = Double.longBitsToDouble(0); - } else { - value0D = Double.longBitsToDouble(0); - } - } else { - if (secondRow.get()) { - long temp = Double.doubleToLongBits(value1D); - temp &= ~(1L << (long) columnPointer.get()); - value1D = Double.longBitsToDouble(temp); - } else { - long temp = Double.doubleToLongBits(value0D); - temp &= ~(1L << (long) columnPointer.get()); - value0D = Double.longBitsToDouble(temp); - } - } + } else { + if (secondRow.get()) { + long temp = Double.doubleToLongBits(value1D); + temp &= ~(1L << (long) columnPointer.get()); + value1D = Double.longBitsToDouble(temp); } else { - value0D /= shift ? 16 : 2; - value1D /= shift ? 16 : 2; + long temp = Double.doubleToLongBits(value0D); + temp &= ~(1L << (long) columnPointer.get()); + value0D = Double.longBitsToDouble(temp); } - }, + } + } else { + value0D /= shift ? 16 : 2; + value1D /= shift ? 16 : 2; + } + }, 25, 58, isAdvanced ? TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_C : GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, @@ -393,66 +376,52 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple 4, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_ID); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (secondRow.get()) { - secondRow.set(false); - } else { - columnPointer.addAndGet(shift ? 2 : 1); - } - } else { - value0D += shift ? 16 : 1; - } - }, - 133, - 22, - GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, - TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_0); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (secondRow.get()) { - columnPointer.addAndGet(shift ? 2 : 1); - } else { - secondRow.set(true); - } + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (secondRow.get()) { + secondRow.set(false); + } else { + columnPointer.addAndGet(shift ? 2 : 1); + } + } else { + value0D += shift ? 16 : 1; + } + }, 133, 22, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_0); + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (secondRow.get()) { + columnPointer.addAndGet(shift ? 2 : 1); + } else { + secondRow.set(true); + } + } else { + value1D += shift ? 16 : 1; + } + }, 133, 40, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_1); + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (shift) { + if (secondRow.get()) { + value1D = Double.longBitsToDouble(~Double.doubleToLongBits(value1D)); } else { - value1D += shift ? 16 : 1; + value0D = Double.longBitsToDouble(~Double.doubleToLongBits(value1D)); } - }, - 133, - 40, - GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, - TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_1); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (shift) { - if (secondRow.get()) { - value1D = Double.longBitsToDouble(~Double.doubleToLongBits(value1D)); - } else { - value0D = Double.longBitsToDouble(~Double.doubleToLongBits(value1D)); - } - } else { - if (secondRow.get()) { - long temp = Double.doubleToLongBits(value1D); - temp ^= 1L << (long) columnPointer.get(); - value1D = Double.longBitsToDouble(temp); - } else { - long temp = Double.doubleToLongBits(value0D); - temp ^= 1L << (long) columnPointer.get(); - value0D = Double.longBitsToDouble(temp); - } - } + } else { + if (secondRow.get()) { + long temp = Double.doubleToLongBits(value1D); + temp ^= 1L << (long) columnPointer.get(); + value1D = Double.longBitsToDouble(temp); } else { - value0D *= shift ? 16 : 2; - value1D *= shift ? 16 : 2; + long temp = Double.doubleToLongBits(value0D); + temp ^= 1L << (long) columnPointer.get(); + value0D = Double.longBitsToDouble(temp); } - }, + } + } else { + value0D *= shift ? 16 : 2; + value1D *= shift ? 16 : 2; + } + }, 133, 58, isAdvanced ? TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_T : GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, @@ -465,51 +434,37 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple 4, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_ID); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (secondRow.get()) { - secondRow.set(false); - } else { - columnPointer.addAndGet(shift ? 16 : 4); - } - } else { - value0D += shift ? 4096 : 256; - } - }, - 151, - 22, - GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, - TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_0); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - if (secondRow.get()) { - columnPointer.addAndGet(shift ? 16 : 4); - } else { - secondRow.set(true); - } - } else { - value1D += shift ? 4096 : 256; - } - }, - 151, - 40, - GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, - TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_1); - addChangeParamButton( - builder, - (shift, columnPointer, secondRow) -> { - if (isAdvanced) { - value0D = input0D; - value1D = input1D; - } else { - value0D *= shift ? 4096 : 256; - value1D *= shift ? 4096 : 256; - } - }, + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (secondRow.get()) { + secondRow.set(false); + } else { + columnPointer.addAndGet(shift ? 16 : 4); + } + } else { + value0D += shift ? 4096 : 256; + } + }, 151, 22, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_0); + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + if (secondRow.get()) { + columnPointer.addAndGet(shift ? 16 : 4); + } else { + secondRow.set(true); + } + } else { + value1D += shift ? 4096 : 256; + } + }, 151, 40, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_1); + addChangeParamButton(builder, (shift, columnPointer, secondRow) -> { + if (isAdvanced) { + value0D = input0D; + value1D = input1D; + } else { + value0D *= shift ? 4096 : 256; + value1D *= shift ? 4096 : 256; + } + }, 151, 58, isAdvanced ? TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_IF : GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, @@ -526,90 +481,79 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple final String CIRCLED_1 = "\u2460"; final String ARROW_DOWN = "\u2b07"; final String ARROW_UP = "\u2b06"; - builder.widget(TextWidget.dynamicString(() -> (isAdvanced ? "Parameters X: " : "Parameters: ") + param) - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 7)) - .widget(TextWidget.dynamicString(() -> CIRCLED_0 + ARROW_DOWN + TT_Utility.formatNumberExp(input0D)) - .setSynced(false) - .setDefaultColor(0x22ddff) - .setPos(46, 16)) - .widget(TextWidget.dynamicString(() -> CIRCLED_1 + ARROW_DOWN + TT_Utility.formatNumberExp(input1D)) - .setSynced(false) - .setDefaultColor(0x00ffff) - .setPos(46, 24)) - .widget(TextWidget.dynamicString(() -> CIRCLED_0 + ARROW_UP + TT_Utility.formatNumberExp(value0D)) - .setSynced(false) - .setDefaultColor(0x00bbff) - .setPos(46, 33)) - .widget(TextWidget.dynamicString(() -> CIRCLED_1 + ARROW_UP + TT_Utility.formatNumberExp(value1D)) - .setSynced(false) - .setDefaultColor(0x0077ff) - .setPos(46, 41)) - .widget(TextWidget.dynamicString(() -> CIRCLED_0 - + ARROW_UP - + TT_Utility.longBitsToShortString(Double.doubleToLongBits(value0D))) - .setSynced(false) - .setDefaultColor(0x00bbff) - .setScale(.5f) - .setTextAlignment(Alignment.CenterLeft) - .setPos(46, 50)) - .widget(TextWidget.dynamicString(() -> CIRCLED_1 - + ARROW_UP - + TT_Utility.longBitsToShortString(Double.doubleToLongBits(value1D))) - .setSynced(false) - .setDefaultColor(0x0077ff) - .setScale(.5f) - .setTextAlignment(Alignment.CenterLeft) - .setPos(46, 58)); + builder.widget( + TextWidget + .dynamicString( + () -> (isAdvanced ? "Parameters X: " : "Parameters: ") + param) + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 7)) + .widget( + TextWidget + .dynamicString( + () -> CIRCLED_0 + ARROW_DOWN + TT_Utility.formatNumberExp(input0D)) + .setSynced(false).setDefaultColor(0x22ddff).setPos(46, 16)) + .widget( + TextWidget + .dynamicString( + () -> CIRCLED_1 + ARROW_DOWN + TT_Utility.formatNumberExp(input1D)) + .setSynced(false).setDefaultColor(0x00ffff).setPos(46, 24)) + .widget( + TextWidget.dynamicString(() -> CIRCLED_0 + ARROW_UP + TT_Utility.formatNumberExp(value0D)) + .setSynced(false).setDefaultColor(0x00bbff).setPos(46, 33)) + .widget( + TextWidget.dynamicString(() -> CIRCLED_1 + ARROW_UP + TT_Utility.formatNumberExp(value1D)) + .setSynced(false).setDefaultColor(0x0077ff).setPos(46, 41)) + .widget( + TextWidget + .dynamicString( + () -> CIRCLED_0 + ARROW_UP + + TT_Utility.longBitsToShortString(Double.doubleToLongBits(value0D))) + .setSynced(false).setDefaultColor(0x00bbff).setScale(.5f) + .setTextAlignment(Alignment.CenterLeft).setPos(46, 50)) + .widget( + TextWidget + .dynamicString( + () -> CIRCLED_1 + ARROW_UP + + TT_Utility.longBitsToShortString(Double.doubleToLongBits(value1D))) + .setSynced(false).setDefaultColor(0x0077ff).setScale(.5f) + .setTextAlignment(Alignment.CenterLeft).setPos(46, 58)); if (isAdvanced) { - builder.widget(TextWidget.dynamicString(() -> - "Pointer " + Integer.toHexString(pointer | 0x10000).substring(1)) - .setSynced(false) - .setDefaultColor(0x0033ff) - .setPos(46, 66)); + builder.widget( + TextWidget.dynamicString(() -> "Pointer " + Integer.toHexString(pointer | 0x10000).substring(1)) + .setSynced(false).setDefaultColor(0x0033ff).setPos(46, 66)); } } - private void addChangeParamButton( - ModularWindow.Builder builder, - OnClick onClick, - int xPos, - int yPos, - IDrawable overlay1, - IDrawable overlay2) { + private void addChangeParamButton(ModularWindow.Builder builder, OnClick onClick, int xPos, int yPos, + IDrawable overlay1, IDrawable overlay2) { final boolean isAdvanced = mTier > 5; - builder.widget(new ButtonWidget() - .setOnClick((clickData, widget) -> { - AtomicInteger columnPointer = new AtomicInteger(pointer & 0xff); - AtomicBoolean secondRow = new AtomicBoolean((pointer & 0x0100) != 0); - onClick.accept(clickData.shift, columnPointer, secondRow); - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - if (isAdvanced) { - if (columnPointer.get() >= 64) { - columnPointer.set(63); - } else if (columnPointer.get() < 0) { - columnPointer.set(0); - } - pointer = secondRow.get() ? columnPointer.get() + 0x100 : columnPointer.get(); - } - if (param > 9) { - param = 9; - } else if (param < -1) { - param = -1; - } - }) - .setPlayClickSound(false) + builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { + AtomicInteger columnPointer = new AtomicInteger(pointer & 0xff); + AtomicBoolean secondRow = new AtomicBoolean((pointer & 0x0100) != 0); + onClick.accept(clickData.shift, columnPointer, secondRow); + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + if (isAdvanced) { + if (columnPointer.get() >= 64) { + columnPointer.set(63); + } else if (columnPointer.get() < 0) { + columnPointer.set(0); + } + pointer = secondRow.get() ? columnPointer.get() + 0x100 : columnPointer.get(); + } + if (param > 9) { + param = 9; + } else if (param < -1) { + param = -1; + } + }).setPlayClickSound(false) .setBackground( - overlay2 != null - ? new IDrawable[] {GT_UITextures.BUTTON_STANDARD, overlay1, overlay2} - : new IDrawable[] {GT_UITextures.BUTTON_STANDARD, overlay1}) - .setSize(18, 18) - .setPos(xPos, yPos)); + overlay2 != null ? new IDrawable[] { GT_UITextures.BUTTON_STANDARD, overlay1, overlay2 } + : new IDrawable[] { GT_UITextures.BUTTON_STANDARD, overlay1 }) + .setSize(18, 18).setPos(xPos, yPos)); } @FunctionalInterface private interface OnClick { + void accept(boolean shift, AtomicInteger columnPointer, AtomicBoolean secondRow); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java index 9b795a0a08..bf41683c03 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java @@ -2,6 +2,15 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.gui.TecTechUITextures; import com.github.technus.tectech.util.CommonValues; @@ -16,23 +25,18 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; + import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by danie_000 on 15.12.2016. */ public class GT_MetaTileEntity_Hatch_ParamText extends GT_MetaTileEntity_Hatch_Param { + public String value0s = ""; public String value1s = ""; @@ -48,16 +52,16 @@ public class GT_MetaTileEntity_Hatch_ParamText extends GT_MetaTileEntity_Hatch_P // @Override // public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - // if (aBaseMetaTileEntity.isClientSide() && (aTick % 20L == 0L)) { - // //refresh casing on state change - // int Xpos = aBaseMetaTileEntity.getXCoord(); - // int Ypos = aBaseMetaTileEntity.getYCoord(); - // int Zpos = aBaseMetaTileEntity.getZCoord(); - // try { - // aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(Xpos , Ypos, Zpos , Xpos , Ypos, Zpos ); - // } catch (Exception e) {} - // } - // super.onPostTick(aBaseMetaTileEntity, aTick); + // if (aBaseMetaTileEntity.isClientSide() && (aTick % 20L == 0L)) { + // //refresh casing on state change + // int Xpos = aBaseMetaTileEntity.getXCoord(); + // int Ypos = aBaseMetaTileEntity.getYCoord(); + // int Zpos = aBaseMetaTileEntity.getZCoord(); + // try { + // aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(Xpos , Ypos, Zpos , Xpos , Ypos, Zpos ); + // } catch (Exception e) {} + // } + // super.onPostTick(aBaseMetaTileEntity, aTick); // } @Override @@ -73,18 +77,29 @@ public class GT_MetaTileEntity_Hatch_ParamText extends GT_MetaTileEntity_Hatch_P @Override public String[] getInfoData() { return new String[] { - translateToLocalFormatted("tt.keyword.Parametrizer", clientLocale) + " " - + translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.GREEN - + param, - translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 0S: " + EnumChatFormatting.DARK_AQUA - + value0s, - translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 1S: " + EnumChatFormatting.DARK_BLUE - + value1s, - translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 0D: " + EnumChatFormatting.AQUA + value0D, - translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 1D: " + EnumChatFormatting.BLUE + value1D, - translateToLocalFormatted("tt.keyword.Input", clientLocale) + " 0D: " + EnumChatFormatting.GOLD + input0D, - translateToLocalFormatted("tt.keyword.Input", clientLocale) + " 1D: " + EnumChatFormatting.YELLOW + input1D, - }; + translateToLocalFormatted("tt.keyword.Parametrizer", clientLocale) + " " + + translateToLocalFormatted("tt.keyword.ID", clientLocale) + + ": " + + EnumChatFormatting.GREEN + + param, + translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 0S: " + + EnumChatFormatting.DARK_AQUA + + value0s, + translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 1S: " + + EnumChatFormatting.DARK_BLUE + + value1s, + translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 0D: " + + EnumChatFormatting.AQUA + + value0D, + translateToLocalFormatted("tt.keyword.Value", clientLocale) + " 1D: " + + EnumChatFormatting.BLUE + + value1D, + translateToLocalFormatted("tt.keyword.Input", clientLocale) + " 0D: " + + EnumChatFormatting.GOLD + + input0D, + translateToLocalFormatted("tt.keyword.Input", clientLocale) + " 1D: " + + EnumChatFormatting.YELLOW + + input1D, }; } @Override @@ -159,27 +174,25 @@ public class GT_MetaTileEntity_Hatch_ParamText extends GT_MetaTileEntity_Hatch_P @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - EnumChatFormatting.DARK_RED + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.", - EnumChatFormatting.DARK_RED + "If it doesn't work, try removing Parametrizer from multiblock structure.", - }; + return new String[] { CommonValues.TEC_MARK_GENERAL, + EnumChatFormatting.DARK_RED + + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.", + EnumChatFormatting.DARK_RED + + "If it doesn't work, try removing Parametrizer from multiblock structure.", }; } @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO_DARK) - .setSize(18, 18) - .setPos(148, 55)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO_DARK).setSize(18, 18) + .setPos(148, 55)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE_PARAMETRIZER_TXT) - .setPos(7, 4) - .setSize(162, 72)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE_PARAMETRIZER_TXT).setPos(7, 4) + .setSize(162, 72)); addChangeNumberButton(builder, -16, -4, 7, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE); addChangeNumberButton(builder, -2, -1, 25, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL); @@ -191,89 +204,74 @@ public class GT_MetaTileEntity_Hatch_ParamText extends GT_MetaTileEntity_Hatch_P .widget(new FakeSyncWidget.DoubleSyncer(() -> value1D, val -> value1D = val)) .widget(new FakeSyncWidget.DoubleSyncer(() -> input0D, val -> input0D = val)) .widget(new FakeSyncWidget.DoubleSyncer(() -> input1D, val -> input1D = val)); - // .widget(new FakeSyncWidget.StringSyncer(() -> value0s, val -> value0s = val)) - // .widget(new FakeSyncWidget.StringSyncer(() -> value1s, val -> value1s = val)); + // .widget(new FakeSyncWidget.StringSyncer(() -> value0s, val -> value0s = val)) + // .widget(new FakeSyncWidget.StringSyncer(() -> value1s, val -> value1s = val)); final String CIRCLED_0 = "\u24EA"; final String CIRCLED_1 = "\u2460"; final String ARROW_DOWN = "\u2b07"; final String ARROW_UP = "\u2b06"; - builder.widget(TextWidget.dynamicString(() -> "Parameters: " + param) - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 7)) - .widget(new TextWidget(CIRCLED_0 + ARROW_UP) - .setDefaultColor(0x00bbff) - .setPos(10, 29)) - .widget(new TextWidget(CIRCLED_1 + ARROW_UP) - .setDefaultColor(0x0077ff) - .setPos(10, 44)) - .widget(TextWidget.dynamicString(() -> CIRCLED_0 + ARROW_DOWN + TT_Utility.formatNumberExp(input0D)) - .setSynced(false) - .setDefaultColor(0x22ddff) - .setPos(10, 56)) - .widget(TextWidget.dynamicString(() -> CIRCLED_1 + ARROW_DOWN + TT_Utility.formatNumberExp(input1D)) - .setSynced(false) - .setDefaultColor(0x00ffff) - .setPos(10, 65)); + builder.widget( + TextWidget.dynamicString(() -> "Parameters: " + param).setSynced(false) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 7)) + .widget(new TextWidget(CIRCLED_0 + ARROW_UP).setDefaultColor(0x00bbff).setPos(10, 29)) + .widget(new TextWidget(CIRCLED_1 + ARROW_UP).setDefaultColor(0x0077ff).setPos(10, 44)) + .widget( + TextWidget + .dynamicString( + () -> CIRCLED_0 + ARROW_DOWN + TT_Utility.formatNumberExp(input0D)) + .setSynced(false).setDefaultColor(0x22ddff).setPos(10, 56)) + .widget( + TextWidget.dynamicString(() -> CIRCLED_1 + ARROW_DOWN + TT_Utility.formatNumberExp(input1D)) + .setSynced(false).setDefaultColor(0x00ffff).setPos(10, 65)); addTextField(builder, true); addTextField(builder, false); } - private void addChangeNumberButton( - ModularWindow.Builder builder, int changeNumberShift, int changeNumber, int xPos, IDrawable overlay) { - builder.widget(new ButtonWidget() - .setOnClick((clickData, widget) -> { - param += clickData.shift ? changeNumberShift : changeNumber; - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - if (param > 9) { - param = 9; - } else if (param < -1) { - param = -1; - } - }) - .setPlayClickSound(false) + private void addChangeNumberButton(ModularWindow.Builder builder, int changeNumberShift, int changeNumber, int xPos, + IDrawable overlay) { + builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { + param += clickData.shift ? changeNumberShift : changeNumber; + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + if (param > 9) { + param = 9; + } else if (param < -1) { + param = -1; + } + }).setPlayClickSound(false) .setBackground(GT_UITextures.BUTTON_STANDARD, overlay, TecTechUITextures.OVERLAY_BUTTON_PARAMETRIZER_ID) - .setSize(18, 18) - .setPos(xPos, 4)); + .setSize(18, 18).setPos(xPos, 4)); } private void addTextField(ModularWindow.Builder builder, boolean isIndex0) { TextFieldWidget widget = new TextFieldWidget(); - builder.widget(widget.setGetter(() -> isIndex0 ? value0s : value1s) - .setSetter(str -> { - double val; - try { - val = parse(str); - } catch (Exception e) { - // This shouldn't happen as long as validator works - str = ""; - val = 0; - } - if (isIndex0) { - value0s = str; - value0D = val; - } else { - value1s = str; - value1D = val; - } - }) - .setValidator(str -> { - try { - parse(str); - return str; - } catch (Exception e) { - return widget.getLastText().size() > 0 - ? widget.getLastText().get(0) - : ""; - } - }) - .setTextColor(Color.WHITE.dark(1)) - .setTextAlignment(Alignment.CenterLeft) + builder.widget(widget.setGetter(() -> isIndex0 ? value0s : value1s).setSetter(str -> { + double val; + try { + val = parse(str); + } catch (Exception e) { + // This shouldn't happen as long as validator works + str = ""; + val = 0; + } + if (isIndex0) { + value0s = str; + value0D = val; + } else { + value1s = str; + value1D = val; + } + }).setValidator(str -> { + try { + parse(str); + return str; + } catch (Exception e) { + return widget.getLastText().size() > 0 ? widget.getLastText().get(0) : ""; + } + }).setTextColor(Color.WHITE.dark(1)).setTextAlignment(Alignment.CenterLeft) .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) - .setPos(26, isIndex0 ? 26 : 41) - .setSize(138, 12)); + .setPos(26, isIndex0 ? 26 : 41).setSize(138, 12)); } private double parse(String str) { 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 b99e030559..e45893eff6 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 @@ -6,6 +6,18 @@ import static com.github.technus.tectech.util.TT_Utility.getUniqueIdentifier; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +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; @@ -18,6 +30,7 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; 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; @@ -31,20 +44,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by Tec on 03.04.2017. */ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implements IAddGregtechLogo, IAddUIWidgets { + private static Textures.BlockIcons.CustomIcon EM_R; private static Textures.BlockIcons.CustomIcon EM_R_ACTIVE; public int heat = 0; @@ -88,12 +93,12 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(EM_R_ACTIVE)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(EM_R_ACTIVE) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(EM_R)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(EM_R) }; } @Override @@ -149,9 +154,9 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem clientLocale = "en_US"; } // if(aBaseMetaTileEntity.isActive()) - // aPlayer.addChatComponentMessage(new ChatComponentText("It is still active...")); + // aPlayer.addChatComponentMessage(new ChatComponentText("It is still active...")); // else if(heat>0) - // aPlayer.addChatComponentMessage(new ChatComponentText("It is still warm...")); + // aPlayer.addChatComponentMessage(new ChatComponentText("It is still warm...")); // else GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; @@ -176,12 +181,11 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem * (comp.heat > 0 ? comp.heat * overclock * overclock * overvolt : comp.heat); // =MAX(0;MIN(MIN($B4;1*C$3+C$3-0,25);1+RAND()+(C$3-1)-($B4-1)/2)) if (overvolt * 10f > 7f + TecTech.RANDOM.nextFloat()) { - computation += comp.computation - * Math.max( - 0, - Math.min( - Math.min(overclock, overvolt + overvolt - 0.25), - 1 + TecTech.RANDOM.nextFloat() + (overvolt - 1) - (overclock - 1) / 2)); + computation += comp.computation * Math.max( + 0, + Math.min( + Math.min(overclock, overvolt + overvolt - 0.25), + 1 + TecTech.RANDOM.nextFloat() + (overvolt - 1) - (overclock - 1) / 2)); } } } else { @@ -250,9 +254,9 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem // @Override // public void onRemoval() { - // if(mInventory!=null && (heat>0 || (getBaseMetaTileEntity()!=null && getBaseMetaTileEntity().isActive()))) - // for(int i=0;i<mInventory.length;i++) - // mInventory[i]=null; + // if(mInventory!=null && (heat>0 || (getBaseMetaTileEntity()!=null && getBaseMetaTileEntity().isActive()))) + // for(int i=0;i<mInventory.length;i++) + // mInventory[i]=null; // } @Override @@ -262,11 +266,11 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.hatch.rack.desc.0"), // 4 Slot Rack - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.hatch.rack.desc.1") // Holds Computer Components + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.rack.desc.0"), // 4 + // Slot + // Rack + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.rack.desc.1") // Holds Computer + // Components }; } @@ -278,15 +282,19 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem @Override public String[] getInfoData() { return new String[] { - translateToLocalFormatted("tt.keyphrase.Base_computation", clientLocale) + ": " + EnumChatFormatting.AQUA - + getComputationPower(1, 0, false), - translateToLocalFormatted("tt.keyphrase.After_overclocking", clientLocale) + ": " + EnumChatFormatting.AQUA - + getComputationPower(overClock, 0, false), - translateToLocalFormatted("tt.keyphrase.Heat_Accumulated", clientLocale) + ": " + EnumChatFormatting.RED - + (heat + 99) / 100 + EnumChatFormatting.RESET + " %" - }; + translateToLocalFormatted("tt.keyphrase.Base_computation", clientLocale) + ": " + + EnumChatFormatting.AQUA + + getComputationPower(1, 0, false), + translateToLocalFormatted("tt.keyphrase.After_overclocking", clientLocale) + ": " + + EnumChatFormatting.AQUA + + getComputationPower(overClock, 0, false), + translateToLocalFormatted("tt.keyphrase.Heat_Accumulated", clientLocale) + ": " + + EnumChatFormatting.RED + + (heat + 99) / 100 + + EnumChatFormatting.RESET + + " %" }; // heat==0? --> ((heat+9)/10) = 0 - // Heat==1-10? --> 1 + // Heat==1-10? --> 1 } @Override @@ -296,60 +304,55 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO) - .setSize(18, 18) - .setPos(151, 63)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO).setSize(18, 18) + .setPos(151, 63)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_HEAT_SINK) - .setPos(46, 17) - .setSize(84, 60)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_HEAT_SINK).setPos(46, 17).setSize(84, 60)); - Pos2d[] positions = new Pos2d[] { - new Pos2d(68, 27), new Pos2d(90, 27), new Pos2d(68, 49), new Pos2d(90, 49), - }; + Pos2d[] positions = new Pos2d[] { new Pos2d(68, 27), new Pos2d(90, 27), new Pos2d(68, 49), new Pos2d(90, 49), }; for (int i = 0; i < positions.length; i++) { builder.widget(new SlotWidget(new BaseSlot(inventoryHandler, i) { - @Override - public int getSlotStackLimit() { - return 1; - } - @Override - public boolean isEnabled() { - return !getBaseMetaTileEntity().isActive() && heat <= 0; - } - }) - .setBackground(getGUITextureSet().getItemSlot(), TecTechUITextures.OVERLAY_SLOT_RACK) + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isEnabled() { + return !getBaseMetaTileEntity().isActive() && heat <= 0; + } + }).setBackground(getGUITextureSet().getItemSlot(), TecTechUITextures.OVERLAY_SLOT_RACK) .setPos(positions[i])); - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.BUTTON_STANDARD_LIGHT_16x16) - .setPos(152, 24) - .setSize(16, 16)) - .widget(new DrawableWidget() - .setDrawable(() -> getBaseMetaTileEntity().isActive() - ? TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON - : TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_DISABLED) - .setPos(152, 24) + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.BUTTON_STANDARD_LIGHT_16x16).setPos(152, 24) .setSize(16, 16)) - .widget(new FakeSyncWidget.BooleanSyncer( - () -> getBaseMetaTileEntity().isActive(), - val -> getBaseMetaTileEntity().setActive(val))); - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.BUTTON_STANDARD_LIGHT_16x16) - .setPos(152, 41) - .setSize(16, 16)) - .widget(new DrawableWidget() - .setDrawable(() -> heat > 0 - ? TecTechUITextures.OVERLAY_BUTTON_HEAT_ON - : TecTechUITextures.OVERLAY_BUTTON_HEAT_OFF) - .setPos(152, 41) + .widget( + new DrawableWidget() + .setDrawable( + () -> getBaseMetaTileEntity().isActive() + ? TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON + : TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_DISABLED) + .setPos(152, 24).setSize(16, 16)) + .widget( + new FakeSyncWidget.BooleanSyncer( + () -> getBaseMetaTileEntity().isActive(), + val -> getBaseMetaTileEntity().setActive(val))); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.BUTTON_STANDARD_LIGHT_16x16).setPos(152, 41) .setSize(16, 16)) + .widget( + new DrawableWidget() + .setDrawable( + () -> heat > 0 ? TecTechUITextures.OVERLAY_BUTTON_HEAT_ON + : TecTechUITextures.OVERLAY_BUTTON_HEAT_OFF) + .setPos(152, 41).setSize(16, 16)) .widget(new FakeSyncWidget.IntegerSyncer(() -> heat, val -> heat = val)); } } @@ -440,6 +443,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem } public static class RackComponent implements Comparable<RackComponent> { + private final String unlocalizedName; private final float heat, coEff, computation, maxHeat; private final boolean subZero; 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 8dd056155c..7a01feac3d 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 @@ -4,6 +4,16 @@ import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; import static org.lwjgl.opengl.GL11.*; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.gui.TecTechUITextures; import com.github.technus.tectech.util.CommonValues; @@ -17,6 +27,7 @@ import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -29,24 +40,17 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by danie_000 on 15.12.2016. */ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch implements IAddGregtechLogo, IAddUIWidgets { + private static Textures.BlockIcons.CustomIcon ScreenON; private static Textures.BlockIcons.CustomIcon ScreenOFF; - public short[] matrix = - new short[] {500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500}; + public short[] matrix = new short[] { 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, + 500 }; public byte selection = -1, mode = 0, status = -128; // all 8 bits set private String clientLocale = "en_US"; @@ -72,12 +76,12 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(ScreenON)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(ScreenON) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, new GT_RenderedTexture(ScreenOFF)}; + return new ITexture[] { aBaseTexture, new GT_RenderedTexture(ScreenOFF) }; } @Override @@ -106,9 +110,9 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch @Override public String[] getInfoData() { - return new String[] { - translateToLocalFormatted("tt.keyword.Status", clientLocale) + ": " + EnumChatFormatting.GOLD + status - }; + return new String[] { translateToLocalFormatted("tt.keyword.Status", clientLocale) + ": " + + EnumChatFormatting.GOLD + + status }; } @Override @@ -193,12 +197,12 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.hatch.certain.desc.0"), // Feeling certain, or not? - EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockmachines.hatch.certain.desc.1") // Schrödinger equation in a box + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.certain.desc.0"), // Feeling + // certain, + // or + // not? + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockmachines.hatch.certain.desc.1") // Schrödinger equation in a box }; } @@ -224,65 +228,67 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch break; case 2: // ooo xox ooo result += balanceCheck( - 4, matrix[0], matrix[4], matrix[1], matrix[5], matrix[2], matrix[6], matrix[3], - matrix[7]) - ? 0 - : 1; + 4, + matrix[0], + matrix[4], + matrix[1], + matrix[5], + matrix[2], + matrix[6], + matrix[3], + matrix[7]) ? 0 : 1; result += balanceCheck( - 4, - matrix[8], - matrix[12], - matrix[9], - matrix[13], - matrix[10], - matrix[14], - matrix[11], - matrix[15]) - ? 0 - : 2; + 4, + matrix[8], + matrix[12], + matrix[9], + matrix[13], + matrix[10], + matrix[14], + matrix[11], + matrix[15]) ? 0 : 2; break; case 3: // oxo xox oxo result += balanceCheck( - 2, - matrix[0], - matrix[4], - matrix[8], - matrix[12], - matrix[1], - matrix[5], - matrix[9], - matrix[13]) - ? 0 - : 1; + 2, + matrix[0], + matrix[4], + matrix[8], + matrix[12], + matrix[1], + matrix[5], + matrix[9], + matrix[13]) ? 0 : 1; result += balanceCheck( - 4, matrix[0], matrix[4], matrix[1], matrix[5], matrix[2], matrix[6], matrix[3], - matrix[7]) - ? 0 - : 2; + 4, + matrix[0], + matrix[4], + matrix[1], + matrix[5], + matrix[2], + matrix[6], + matrix[3], + matrix[7]) ? 0 : 2; result += balanceCheck( - 4, - matrix[8], - matrix[12], - matrix[9], - matrix[13], - matrix[10], - matrix[14], - matrix[11], - matrix[15]) - ? 0 - : 4; + 4, + matrix[8], + matrix[12], + matrix[9], + matrix[13], + matrix[10], + matrix[14], + matrix[11], + matrix[15]) ? 0 : 4; result += balanceCheck( - 2, - matrix[2], - matrix[6], - matrix[10], - matrix[14], - matrix[3], - matrix[7], - matrix[11], - matrix[15]) - ? 0 - : 8; + 2, + matrix[2], + matrix[6], + matrix[10], + matrix[14], + matrix[3], + matrix[7], + matrix[11], + matrix[15]) ? 0 : 8; break; case 4: // xox ooo xox result += balanceCheck(2, matrix[0], matrix[4], matrix[1], matrix[5]) ? 0 : 1; @@ -327,10 +333,10 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch // @Override // public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - // if(aSide == this.getBaseMetaTileEntity().getFrontFacing()) { - // changeMode(++mode); - // GT_Utility.sendChatToPlayer(aPlayer, "Equation mode: "+mode); - // } + // if(aSide == this.getBaseMetaTileEntity().getFrontFacing()) { + // changeMode(++mode); + // GT_Utility.sendChatToPlayer(aPlayer, "Equation mode: "+mode); + // } // } @Override @@ -340,48 +346,42 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO_DARK) - .setSize(18, 18) - .setPos(112, 55)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO_DARK).setSize(18, 18) + .setPos(112, 55)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { final boolean isAdvanced = mTier > 7; - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE) - .setPos(43, 4) + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE).setPos(43, 4) .setSize(90, 72)) - .widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_UNCERTAINTY_MONITOR) - .setPos(46, 27) - .setSize(46, 46)); + .widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_UNCERTAINTY_MONITOR).setPos(46, 27) + .setSize(46, 46)); - int[] xPositions = new int[] {7, 25, 133, 151}; + int[] xPositions = new int[] { 7, 25, 133, 151 }; for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { final int index = i * 4 + j; - builder.widget(new ButtonWidget() - .setOnClick((clickData, widget) -> { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - if (selection == -1) { - selection = (byte) index; - } else { - short temp = matrix[selection]; - matrix[selection] = matrix[index]; - matrix[index] = temp; - selection = -1; - } - compute(); - }) - .setPlayClickSound(false) - .setBackground( - GT_UITextures.BUTTON_STANDARD, - TecTechUITextures.OVERLAY_BUTTON_UNCERTAINTY[index]) - .setPos(xPositions[i], 4 + j * 18) - .setSize(18, 18)) + builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + if (selection == -1) { + selection = (byte) index; + } else { + short temp = matrix[selection]; + matrix[selection] = matrix[index]; + matrix[index] = temp; + selection = -1; + } + compute(); + }).setPlayClickSound(false) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + TecTechUITextures.OVERLAY_BUTTON_UNCERTAINTY[index]) + .setPos(xPositions[i], 4 + j * 18).setSize(18, 18)) .widget(new FakeSyncWidget.ShortSyncer(() -> matrix[index], val -> matrix[index] = val)); } } @@ -389,83 +389,76 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch .widget(new FakeSyncWidget.ByteSyncer(() -> mode, val -> mode = val)) .widget(new FakeSyncWidget.ByteSyncer(() -> status, val -> status = val)); - builder.widget(TextWidget.dynamicString(() -> "Status: " + (status == 0 ? "OK" : "NG")) - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 7)); + builder.widget( + TextWidget.dynamicString(() -> "Status: " + (status == 0 ? "OK" : "NG")).setSynced(false) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 7)); for (int i = 0; i < 9; i++) { final int index = i; - builder.widget(new DrawableWidget() - .setDrawable(() -> { - UITexture valid = TecTechUITextures.PICTURE_UNCERTAINTY_VALID[index]; - UITexture invalid = TecTechUITextures.PICTURE_UNCERTAINTY_INVALID[index]; - switch (mode) { - case 1: // ooo oxo ooo - if (index == 4) return status == 0 ? valid : invalid; - break; - case 2: // ooo xox ooo - if (index == 3) return (status & 1) == 0 ? valid : invalid; - if (index == 5) return (status & 2) == 0 ? valid : invalid; - break; - case 3: // oxo xox oxo - if (index == 1) return (status & 1) == 0 ? valid : invalid; - if (index == 3) return (status & 2) == 0 ? valid : invalid; - if (index == 5) return (status & 4) == 0 ? valid : invalid; - if (index == 7) return (status & 8) == 0 ? valid : invalid; - break; - case 4: // xox ooo xox - if (index == 0) return (status & 1) == 0 ? valid : invalid; - if (index == 2) return (status & 2) == 0 ? valid : invalid; - if (index == 6) return (status & 4) == 0 ? valid : invalid; - if (index == 8) return (status & 8) == 0 ? valid : invalid; - break; - case 5: // xox oxo xox - if (index == 0) return (status & 1) == 0 ? valid : invalid; - if (index == 2) return (status & 2) == 0 ? valid : invalid; - if (index == 4) return (status & 4) == 0 ? valid : invalid; - if (index == 6) return (status & 8) == 0 ? valid : invalid; - if (index == 8) return (status & 16) == 0 ? valid : invalid; - break; - } - return null; - }) - .setPos(55 + (index % 3) * 12, 36 + (index / 3) * 12) - .setSize(4, 4)); + builder.widget(new DrawableWidget().setDrawable(() -> { + UITexture valid = TecTechUITextures.PICTURE_UNCERTAINTY_VALID[index]; + UITexture invalid = TecTechUITextures.PICTURE_UNCERTAINTY_INVALID[index]; + switch (mode) { + case 1: // ooo oxo ooo + if (index == 4) return status == 0 ? valid : invalid; + break; + case 2: // ooo xox ooo + if (index == 3) return (status & 1) == 0 ? valid : invalid; + if (index == 5) return (status & 2) == 0 ? valid : invalid; + break; + case 3: // oxo xox oxo + if (index == 1) return (status & 1) == 0 ? valid : invalid; + if (index == 3) return (status & 2) == 0 ? valid : invalid; + if (index == 5) return (status & 4) == 0 ? valid : invalid; + if (index == 7) return (status & 8) == 0 ? valid : invalid; + break; + case 4: // xox ooo xox + if (index == 0) return (status & 1) == 0 ? valid : invalid; + if (index == 2) return (status & 2) == 0 ? valid : invalid; + if (index == 6) return (status & 4) == 0 ? valid : invalid; + if (index == 8) return (status & 8) == 0 ? valid : invalid; + break; + case 5: // xox oxo xox + if (index == 0) return (status & 1) == 0 ? valid : invalid; + if (index == 2) return (status & 2) == 0 ? valid : invalid; + if (index == 4) return (status & 4) == 0 ? valid : invalid; + if (index == 6) return (status & 8) == 0 ? valid : invalid; + if (index == 8) return (status & 16) == 0 ? valid : invalid; + break; + } + return null; + }).setPos(55 + (index % 3) * 12, 36 + (index / 3) * 12).setSize(4, 4)); } for (int i = 0; i < 16; i++) { final int index = i; - builder.widget( - new DrawableWidget() { - @Override - public void draw(float partialTicks) { - if (isAdvanced) { - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glColor4f(1f, 1f, 1f, (float) matrix[index] / 1000f); - - // super.draw but without disabling blend - GlStateManager.pushMatrix(); - getDrawable().draw(Pos2d.ZERO, getSize(), partialTicks); - GlStateManager.popMatrix(); - - glDisable(GL_BLEND); - glColor4f(1f, 1f, 1f, 1f); - } else { - if (TecTech.RANDOM.nextInt(1000) < matrix[index]) { - super.draw(partialTicks); - } - } - } - }.setDrawable(TecTechUITextures.PICTURE_UNCERTAINTY_INDICATOR) - .setPos(47 + (i / 4) * 12, 28 + (i % 4) * 12) - .setSize(8, 8)) - .widget(new DrawableWidget() - .setDrawable( + builder.widget(new DrawableWidget() { + + @Override + public void draw(float partialTicks) { + if (isAdvanced) { + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glColor4f(1f, 1f, 1f, (float) matrix[index] / 1000f); + + // super.draw but without disabling blend + GlStateManager.pushMatrix(); + getDrawable().draw(Pos2d.ZERO, getSize(), partialTicks); + GlStateManager.popMatrix(); + + glDisable(GL_BLEND); + glColor4f(1f, 1f, 1f, 1f); + } else { + if (TecTech.RANDOM.nextInt(1000) < matrix[index]) { + super.draw(partialTicks); + } + } + } + }.setDrawable(TecTechUITextures.PICTURE_UNCERTAINTY_INDICATOR).setPos(47 + (i / 4) * 12, 28 + (i % 4) * 12) + .setSize(8, 8)).widget( + new DrawableWidget().setDrawable( () -> selection == index ? TecTechUITextures.PICTURE_UNCERTAINTY_SELECTED : null) - .setPos(46 + (i / 4) * 12, 27 + (i % 4) * 12) - .setSize(10, 10)); + .setPos(46 + (i / 4) * 12, 27 + (i % 4) * 12).setSize(10, 10)); } } } 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 781c1cc5d1..3b15b362c1 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 @@ -12,7 +12,22 @@ import static gregtech.api.util.GT_Utility.formatNumbers; import static java.lang.Math.*; import static net.minecraft.util.EnumChatFormatting.*; +import java.util.*; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.tuple.Pair; +import org.spongepowered.libraries.com.google.common.math.LongMath; + import appeng.util.ReadableNumberConverter; + import com.github.technus.tectech.recipe.EyeOfHarmonyRecipe; import com.github.technus.tectech.thing.block.TileEyeOfHarmony; import com.github.technus.tectech.thing.casing.TT_Container_Casings; @@ -25,6 +40,7 @@ import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Materials; @@ -39,17 +55,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME; import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; -import java.util.*; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.tuple.Pair; -import org.spongepowered.libraries.com.google.common.math.LongMath; @SuppressWarnings("SpellCheckingInspection") public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_MultiblockBase_EM @@ -75,1239 +80,640 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl @Override public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source, EntityPlayerMP actor) { if (mMachine) return -1; - int realBudget = elementBudget >= 200 - ? elementBudget - : Math.min(200, elementBudget * 5); // 200 blocks max per placement. + int realBudget = elementBudget >= 200 ? elementBudget : Math.min(200, elementBudget * 5); // 200 blocks max per + // placement. return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 16, 16, 0, realBudget, source, actor, false, true); } protected static final String STRUCTURE_PIECE_MAIN = "main"; // Multiblock structure. - private static final IStructureDefinition<GT_MetaTileEntity_EM_EyeOfHarmony> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_EyeOfHarmony>builder() - .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][] { - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " CCCCCCCCC ", - " C C ", - " CCCCCCCCC ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " C C ", - " DDDDD ", - " DDCDCDD ", - " CCCCDCCDCCDCCCC ", - " DDDDDDD ", - " CCCCDCCDCCDCCCC ", - " DDCDCDD ", - " DDDDD ", - " C C ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " D ", - " D ", - " DDDDDDD ", - " DD DD ", - " D EEE D ", - " CCC D EAAAE D CCC ", - " DDD EAAAE DDD ", - " CCC D EAAAE D CCC ", - " D EEE D ", - " DD DD ", - " DDDDDDD ", - " D ", - " D ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " D ", - " D ", - " ", - " ", - " ", - " ", - " ", - " CC CC ", - " DD DD ", - " CC CC ", - " ", - " ", - " ", - " ", - " ", - " D ", - " D ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " C C ", - " CCCCC ", - " D ", - " A ", - " A ", - " ", - " ", - " ", - " ", - " C C ", - " CC CC ", - " CDAA AADC ", - " CC CC ", - " C C ", - " ", - " ", - " ", - " ", - " A ", - " A ", - " D ", - " CCCCC ", - " C C ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " D ", - " SEEAEES ", - " ", - " ", - " ", - " ", - " ", - " S S ", - " E E ", - " CC E E CC ", - " DA AD ", - " CC E E CC ", - " E E ", - " S S ", - " ", - " ", - " ", - " ", - " ", - " SEEAEES ", - " D ", - " C C ", - " C C ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " C C ", - " CCCCC ", - " D ", - " A ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " CC CC ", - " CDA ADC ", - " CC CC ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " A ", - " D ", - " CCCCC ", - " C C ", - " ", - " ", - " " - }, - { - " ", - " ", - " C C ", - " C C ", - " D ", - " SEEAEES ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " S S ", - " E E ", - " CC E E CC ", - " DA AD ", - " CC E E CC ", - " E E ", - " S S ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " SEEAEES ", - " D ", - " C C ", - " C C ", - " ", - " " - }, - { - " ", - " ", - " C C ", - " D ", - " A ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " DA AD ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " A ", - " D ", - " C C ", - " ", - " " - }, - { - " ", - " C C ", - " C C ", - " D ", - " A ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " CC CC ", - " DA AD ", - " CC CC ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " A ", - " D ", - " C C ", - " C C ", - " " - }, - { - " ", - " C C ", - " D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " D D ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D ", - " C C ", - " " - }, - { - " ", - " C C ", - " D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " D D ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D ", - " C C ", - " " - }, - { - " CCCCCCC ", - " C C ", - " DDDDDDD ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - "CCD DCC", - " D D ", - "CCD DCC", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " DDDDDDD ", - " C C ", - " C C " - }, - { - " CCHHHHHCC ", - " DDDDD ", - " DD DD ", - " ", - " ", - " S S ", - " ", - " S S ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - " D D ", - "CD DC", - " D D ", - "CD DC", - " D D ", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " S S ", - " ", - " S S ", - " ", - " ", - " DD DD ", - " DDDDD ", - " C C " - }, - { - " CHHHHHHHC ", - " DDCDCDD ", - " D EEE D ", - " ", - " C C ", - " E E ", - " C C ", - " E E ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - " D D ", - "CCE ECC", - " DE ED ", - "CCE ECC", - " D D ", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " E E ", - " C C ", - " E E ", - " C C ", - " ", - " D EEE D ", - " DDCDCDD ", - " C C " - }, - { - " CHHCCCHHC ", - " CCCCDCCDCCDCCCC ", - " CCC D EAAAE D CCC ", - " CC CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " C C ", - " CC CC ", - " C C ", - " C C ", - "CCD DCC", - "CD DC", - "CCE ECC", - "CCA ACC", - "CDA ADC", - "CCA ACC", - "CCE ECC", - "CD DC", - "CCD DCC", - " C C ", - " C C ", - " CC CC ", - " C C ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC CC ", - " CCC D EAAAE D CCC ", - " CCCCDCCDCCDCCCC ", - " CCCCCCCCC " - }, - { - " CHHC~CHHC ", - " DDDDDDD ", - " DDD EAAAE DDD ", - " DD DD ", - " CDAA AADC ", - " DA AD ", - " CDA ADC ", - " DA AD ", - " DA AD ", - " DA AD ", - " D D ", - " D D ", - " D D ", - " D D ", - " DE ED ", - "CDA ADC", - " DA AD ", - "CDA ADC", - " DE ED ", - " D D ", - " D D ", - " D D ", - " D D ", - " DA AD ", - " DA AD ", - " DA AD ", - " CDA ADC ", - " DA AD ", - " CDAA AADC ", - " DD DD ", - " DDD EAAAE DDD ", - " DDDDDDD ", - " C C " - }, - { - " CHHCCCHHC ", - " CCCCDCCDCCDCCCC ", - " CCC D EAAAE D CCC ", - " CC CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " C C ", - " CC CC ", - " C C ", - " C C ", - "CCD DCC", - "CD DC", - "CCE ECC", - "CCA ACC", - "CDA ADC", - "CCA ACC", - "CCE ECC", - "CD DC", - "CCD DCC", - " C C ", - " C C ", - " CC CC ", - " C C ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC CC ", - " CCC D EAAAE D CCC ", - " CCCCDCCDCCDCCCC ", - " CCCCCCCCC " - }, - { - " CHHHHHHHC ", - " DDCDCDD ", - " D EEE D ", - " ", - " C C ", - " E E ", - " C C ", - " E E ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - " D D ", - "CCE ECC", - " DE ED ", - "CCE ECC", - " D D ", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " E E ", - " C C ", - " E E ", - " C C ", - " ", - " D EEE D ", - " DDCDCDD ", - " C C " - }, - { - " CCHHHHHCC ", - " DDDDD ", - " DD DD ", - " ", - " ", - " S S ", - " ", - " S S ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - " D D ", - "CD DC", - " D D ", - "CD DC", - " D D ", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " S S ", - " ", - " S S ", - " ", - " ", - " DD DD ", - " DDDDD ", - " C C " - }, - { - " CCCCCCC ", - " C C ", - " DDDDDDD ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - "CCD DCC", - " D D ", - "CCD DCC", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " DDDDDDD ", - " C C ", - " C C " - }, - { - " ", - " C C ", - " D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " D D ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D ", - " C C ", - " " - }, - { - " ", - " C C ", - " D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " D D ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D ", - " C C ", - " " - }, - { - " ", - " C C ", - " C C ", - " D ", - " A ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " CC CC ", - " DA AD ", - " CC CC ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " A ", - " D ", - " C C ", - " C C ", - " " - }, - { - " ", - " ", - " C C ", - " D ", - " A ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " DA AD ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " A ", - " D ", - " C C ", - " ", - " " - }, - { - " ", - " ", - " C C ", - " C C ", - " D ", - " SEEAEES ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " S S ", - " E E ", - " CC E E CC ", - " DA AD ", - " CC E E CC ", - " E E ", - " S S ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " SEEAEES ", - " D ", - " C C ", - " C C ", - " ", - " " - }, - { - " ", - " ", - " ", - " C C ", - " CCCCC ", - " D ", - " A ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " CC CC ", - " CDA ADC ", - " CC CC ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " A ", - " D ", - " CCCCC ", - " C C ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " D ", - " SEEAEES ", - " ", - " ", - " ", - " ", - " ", - " S S ", - " E E ", - " CC E E CC ", - " DA AD ", - " CC E E CC ", - " E E ", - " S S ", - " ", - " ", - " ", - " ", - " ", - " SEEAEES ", - " D ", - " C C ", - " C C ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " C C ", - " CCCCC ", - " D ", - " A ", - " A ", - " ", - " ", - " ", - " ", - " C C ", - " CC CC ", - " CDAA AADC ", - " CC CC ", - " C C ", - " ", - " ", - " ", - " ", - " A ", - " A ", - " D ", - " CCCCC ", - " C C ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " D ", - " D ", - " ", - " ", - " ", - " ", - " ", - " CC CC ", - " DD DD ", - " CC CC ", - " ", - " ", - " ", - " ", - " ", - " D ", - " D ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " D ", - " D ", - " DDDDDDD ", - " DD DD ", - " D EEE D ", - " CCC D EAAAE D CCC ", - " DDD EAAAE DDD ", - " CCC D EAAAE D CCC ", - " D EEE D ", - " DD DD ", - " DDDDDDD ", - " D ", - " D ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " C C ", - " DDDDD ", - " DDCDCDD ", - " CCCCDCCDCCDCCCC ", - " DDDDDDD ", - " CCCCDCCDCCDCCCC ", - " DDCDCDD ", - " DDDDD ", - " C C ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " CCCCCCCCC ", - " C C ", - " CCCCCCCCC ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - } - })) - .addElement( - 'A', - ofBlocksTiered( - (block, meta) -> block == TT_Container_Casings.SpacetimeCompressionFieldGenerators - ? meta - : -1, - ImmutableList.of( - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 0), - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 1), - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 2), - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 3), - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 4), - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 5), - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 6), - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 7), - Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 8)), - -1, - (t, meta) -> t.spacetimeCompressionFieldMetadata = meta, - t -> t.spacetimeCompressionFieldMetadata)) - .addElement( - 'S', - ofBlocksTiered( - (block, meta) -> - block == TT_Container_Casings.StabilisationFieldGenerators ? meta : -1, - ImmutableList.of( - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 0), - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 1), - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 2), - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 3), - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 4), - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 5), - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 6), - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 7), - Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 8)), - -1, - (t, meta) -> t.stabilisationFieldMetadata = meta, - t -> t.stabilisationFieldMetadata)) - .addElement('C', ofBlock(sBlockCasingsBA0, 11)) - .addElement('D', ofBlock(sBlockCasingsBA0, 10)) - .addElement( - 'H', - buildHatchAdder(GT_MetaTileEntity_EM_EyeOfHarmony.class) - .atLeast(InputHatch, OutputHatch, OutputBus, Maintenance) - .casingIndex(texturePage << 7) - .dot(1) - .buildAndChain(sBlockCasingsBA0, 12)) - .addElement( - 'E', - ofBlocksTiered( - (block, meta) -> - block == TT_Container_Casings.TimeAccelerationFieldGenerator ? meta : -1, - ImmutableList.of( - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 0), - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 1), - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 2), - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 3), - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 4), - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 5), - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 6), - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 7), - Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 8)), - -1, - (t, meta) -> t.timeAccelerationFieldMetadata = meta, - t -> t.timeAccelerationFieldMetadata)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_EyeOfHarmony> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_EyeOfHarmony>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " C C ", " CCCCCCCCC ", + " C C ", " CCCCCCCCC ", + " C C ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " C C ", " C C ", + " C C ", " DDDDD ", + " DDCDCDD ", " CCCCDCCDCCDCCCC ", + " DDDDDDD ", " CCCCDCCDCCDCCCC ", + " DDCDCDD ", " DDDDD ", + " C C ", " C C ", + " C C ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " C C ", " C C ", + " D ", " D ", + " DDDDDDD ", " DD DD ", + " D EEE D ", " CCC D EAAAE D CCC ", + " DDD EAAAE DDD ", " CCC D EAAAE D CCC ", + " D EEE D ", " DD DD ", + " DDDDDDD ", " D ", + " D ", " C C ", + " C C ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " D ", " D ", + " ", " ", + " ", " ", + " ", " CC CC ", + " DD DD ", " CC CC ", + " ", " ", + " ", " ", + " ", " D ", + " D ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " C C ", + " CCCCC ", " D ", + " A ", " A ", + " ", " ", + " ", " ", + " C C ", " CC CC ", + " CDAA AADC ", " CC CC ", + " C C ", " ", + " ", " ", + " ", " A ", + " A ", " D ", + " CCCCC ", " C C ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " C C ", " C C ", + " D ", " SEEAEES ", + " ", " ", + " ", " ", + " ", " S S ", + " E E ", " CC E E CC ", + " DA AD ", " CC E E CC ", + " E E ", " S S ", + " ", " ", + " ", " ", + " ", " SEEAEES ", + " D ", " C C ", + " C C ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " C C ", + " CCCCC ", " D ", + " A ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " CC CC ", + " CDA ADC ", " CC CC ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " A ", " D ", + " CCCCC ", " C C ", + " ", " ", + " " }, + { " ", " ", + " C C ", " C C ", + " D ", " SEEAEES ", + " ", " ", + " ", " ", + " ", " ", + " ", " S S ", + " E E ", " CC E E CC ", + " DA AD ", " CC E E CC ", + " E E ", " S S ", + " ", " ", + " ", " ", + " ", " ", + " ", " SEEAEES ", + " D ", " C C ", + " C C ", " ", + " " }, + { " ", " ", + " C C ", " D ", + " A ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " DA AD ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " A ", " D ", + " C C ", " ", + " " }, + { " ", " C C ", + " C C ", " D ", + " A ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " CC CC ", + " DA AD ", " CC CC ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " A ", " D ", + " C C ", " C C ", + " " }, + { " ", " C C ", + " D ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " D D ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " D ", " C C ", + " " }, + { " ", " C C ", + " D ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " D D ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " D ", " C C ", + " " }, + { " CCCCCCC ", " C C ", + " DDDDDDD ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " D D ", + " D D ", "CCD DCC", + " D D ", "CCD DCC", + " D D ", " D D ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " DDDDDDD ", " C C ", + " C C " }, + { " CCHHHHHCC ", " DDDDD ", + " DD DD ", " ", + " ", " S S ", + " ", " S S ", + " ", " ", + " ", " ", + " D D ", " D D ", + " D D ", "CD DC", + " D D ", "CD DC", + " D D ", " D D ", + " D D ", " ", + " ", " ", + " ", " S S ", + " ", " S S ", + " ", " ", + " DD DD ", " DDDDD ", + " C C " }, + { " CHHHHHHHC ", " DDCDCDD ", + " D EEE D ", " ", + " C C ", " E E ", + " C C ", " E E ", + " ", " ", + " ", " ", + " D D ", " D D ", + " D D ", "CCE ECC", + " DE ED ", "CCE ECC", + " D D ", " D D ", + " D D ", " ", + " ", " ", + " ", " E E ", + " C C ", " E E ", + " C C ", " ", + " D EEE D ", " DDCDCDD ", + " C C " }, + { " CHHCCCHHC ", " CCCCDCCDCCDCCCC ", + " CCC D EAAAE D CCC ", " CC CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " C C ", " CC CC ", + " C C ", " C C ", + "CCD DCC", "CD DC", + "CCE ECC", "CCA ACC", + "CDA ADC", "CCA ACC", + "CCE ECC", "CD DC", + "CCD DCC", " C C ", + " C C ", " CC CC ", + " C C ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC CC ", + " CCC D EAAAE D CCC ", " CCCCDCCDCCDCCCC ", + " CCCCCCCCC " }, + { " CHHC~CHHC ", " DDDDDDD ", + " DDD EAAAE DDD ", " DD DD ", + " CDAA AADC ", " DA AD ", + " CDA ADC ", " DA AD ", + " DA AD ", " DA AD ", + " D D ", " D D ", + " D D ", " D D ", + " DE ED ", "CDA ADC", + " DA AD ", "CDA ADC", + " DE ED ", " D D ", + " D D ", " D D ", + " D D ", " DA AD ", + " DA AD ", " DA AD ", + " CDA ADC ", " DA AD ", + " CDAA AADC ", " DD DD ", + " DDD EAAAE DDD ", " DDDDDDD ", + " C C " }, + { " CHHCCCHHC ", " CCCCDCCDCCDCCCC ", + " CCC D EAAAE D CCC ", " CC CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " C C ", " CC CC ", + " C C ", " C C ", + "CCD DCC", "CD DC", + "CCE ECC", "CCA ACC", + "CDA ADC", "CCA ACC", + "CCE ECC", "CD DC", + "CCD DCC", " C C ", + " C C ", " CC CC ", + " C C ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC CC ", + " CCC D EAAAE D CCC ", " CCCCDCCDCCDCCCC ", + " CCCCCCCCC " }, + { " CHHHHHHHC ", " DDCDCDD ", + " D EEE D ", " ", + " C C ", " E E ", + " C C ", " E E ", + " ", " ", + " ", " ", + " D D ", " D D ", + " D D ", "CCE ECC", + " DE ED ", "CCE ECC", + " D D ", " D D ", + " D D ", " ", + " ", " ", + " ", " E E ", + " C C ", " E E ", + " C C ", " ", + " D EEE D ", " DDCDCDD ", + " C C " }, + { " CCHHHHHCC ", " DDDDD ", + " DD DD ", " ", + " ", " S S ", + " ", " S S ", + " ", " ", + " ", " ", + " D D ", " D D ", + " D D ", "CD DC", + " D D ", "CD DC", + " D D ", " D D ", + " D D ", " ", + " ", " ", + " ", " S S ", + " ", " S S ", + " ", " ", + " DD DD ", " DDDDD ", + " C C " }, + { " CCCCCCC ", " C C ", + " DDDDDDD ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " D D ", + " D D ", "CCD DCC", + " D D ", "CCD DCC", + " D D ", " D D ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " DDDDDDD ", " C C ", + " C C " }, + { " ", " C C ", + " D ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " D D ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " D ", " C C ", + " " }, + { " ", " C C ", + " D ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " D D ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " D ", " C C ", + " " }, + { " ", " C C ", + " C C ", " D ", + " A ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " CC CC ", + " DA AD ", " CC CC ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " A ", " D ", + " C C ", " C C ", + " " }, + { " ", " ", + " C C ", " D ", + " A ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " DA AD ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " A ", " D ", + " C C ", " ", + " " }, + { " ", " ", + " C C ", " C C ", + " D ", " SEEAEES ", + " ", " ", + " ", " ", + " ", " ", + " ", " S S ", + " E E ", " CC E E CC ", + " DA AD ", " CC E E CC ", + " E E ", " S S ", + " ", " ", + " ", " ", + " ", " ", + " ", " SEEAEES ", + " D ", " C C ", + " C C ", " ", + " " }, + { " ", " ", + " ", " C C ", + " CCCCC ", " D ", + " A ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " CC CC ", + " CDA ADC ", " CC CC ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " A ", " D ", + " CCCCC ", " C C ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " C C ", " C C ", + " D ", " SEEAEES ", + " ", " ", + " ", " ", + " ", " S S ", + " E E ", " CC E E CC ", + " DA AD ", " CC E E CC ", + " E E ", " S S ", + " ", " ", + " ", " ", + " ", " SEEAEES ", + " D ", " C C ", + " C C ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " C C ", + " CCCCC ", " D ", + " A ", " A ", + " ", " ", + " ", " ", + " C C ", " CC CC ", + " CDAA AADC ", " CC CC ", + " C C ", " ", + " ", " ", + " ", " A ", + " A ", " D ", + " CCCCC ", " C C ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " D ", " D ", + " ", " ", + " ", " ", + " ", " CC CC ", + " DD DD ", " CC CC ", + " ", " ", + " ", " ", + " ", " D ", + " D ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " C C ", " C C ", + " D ", " D ", + " DDDDDDD ", " DD DD ", + " D EEE D ", " CCC D EAAAE D CCC ", + " DDD EAAAE DDD ", " CCC D EAAAE D CCC ", + " D EEE D ", " DD DD ", + " DDDDDDD ", " D ", + " D ", " C C ", + " C C ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " C C ", " C C ", + " C C ", " DDDDD ", + " DDCDCDD ", " CCCCDCCDCCDCCCC ", + " DDDDDDD ", " CCCCDCCDCCDCCCC ", + " DDCDCDD ", " DDDDD ", + " C C ", " C C ", + " C C ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " C C ", " CCCCCCCCC ", + " C C ", " CCCCCCCCC ", + " C C ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " } })) + .addElement( + 'A', + ofBlocksTiered( + (block, meta) -> block == TT_Container_Casings.SpacetimeCompressionFieldGenerators ? meta + : -1, + ImmutableList.of( + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 0), + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 1), + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 2), + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 3), + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 4), + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 5), + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 6), + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 7), + Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 8)), + -1, + (t, meta) -> t.spacetimeCompressionFieldMetadata = meta, + t -> t.spacetimeCompressionFieldMetadata)) + .addElement( + 'S', + ofBlocksTiered( + (block, meta) -> block == TT_Container_Casings.StabilisationFieldGenerators ? meta : -1, + ImmutableList.of( + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 0), + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 1), + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 2), + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 3), + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 4), + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 5), + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 6), + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 7), + Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 8)), + -1, + (t, meta) -> t.stabilisationFieldMetadata = meta, + t -> t.stabilisationFieldMetadata)) + .addElement('C', ofBlock(sBlockCasingsBA0, 11)).addElement('D', ofBlock(sBlockCasingsBA0, 10)) + .addElement( + 'H', + buildHatchAdder(GT_MetaTileEntity_EM_EyeOfHarmony.class) + .atLeast(InputHatch, OutputHatch, OutputBus, Maintenance).casingIndex(texturePage << 7) + .dot(1).buildAndChain(sBlockCasingsBA0, 12)) + .addElement( + 'E', + ofBlocksTiered( + (block, meta) -> block == TT_Container_Casings.TimeAccelerationFieldGenerator ? meta : -1, + ImmutableList.of( + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 0), + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 1), + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 2), + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 3), + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 4), + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 5), + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 6), + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 7), + Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 8)), + -1, + (t, meta) -> t.timeAccelerationFieldMetadata = meta, + t -> t.timeAccelerationFieldMetadata)) + .build(); private double hydrogenOverflowProbabilityAdjustment; private double heliumOverflowProbabilityAdjustment; @@ -1315,8 +721,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl private List<ItemStackLong> outputItems = new ArrayList<>(); - private void calculateHydrogenHeliumInputExcessValues( - final long hydrogenRecipeRequirement, final long heliumRecipeRequirement) { + private void calculateHydrogenHeliumInputExcessValues(final long hydrogenRecipeRequirement, + final long heliumRecipeRequirement) { long hydrogenStored = validFluidMap.get(Materials.Hydrogen.getGas(1L)); long heliumStored = validFluidMap.get(Materials.Helium.getGas(1L)); @@ -1329,8 +735,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl } private double recipeChanceCalculator() { - double chance = currentRecipe.getBaseRecipeSuccessChance() - - timeAccelerationFieldMetadata * 0.1 + double chance = currentRecipe.getBaseRecipeSuccessChance() - timeAccelerationFieldMetadata * 0.1 + stabilisationFieldMetadata * 0.05 - hydrogenOverflowProbabilityAdjustment - heliumOverflowProbabilityAdjustment; @@ -1343,8 +748,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl } private double recipeYieldCalculator() { - double yield = 1.0 - - hydrogenOverflowProbabilityAdjustment + double yield = 1.0 - hydrogenOverflowProbabilityAdjustment - heliumOverflowProbabilityAdjustment - stabilisationFieldMetadata * 0.05; @@ -1362,8 +766,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl // = 3%*3% = 5.91% discount. long spacetimeCasingDifference = (recipeSpacetimeCasingRequired - spacetimeCompressionFieldMetadata); - double recipeTimeDiscounted = recipeTime - * pow(2.0, -timeAccelerationFieldMetadata) + double recipeTimeDiscounted = recipeTime * pow(2.0, -timeAccelerationFieldMetadata) * pow(1 - SPACETIME_CASING_DIFFERENCE_DISCOUNT_PERCENTAGE, spacetimeCasingDifference); return (int) Math.max(recipeTimeDiscounted, 1.0); } @@ -1461,17 +864,28 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl .addInfo(BLUE + "Spacetime Compression Field Generator:") .addInfo("- The tier of this block determines what recipes can be run. If the multiblocks") .addInfo(" spacetime compression field block exceeds the requirements of the recipe it") - .addInfo(" will decrease the processing time by " + RED + "3%" + GRAY - + " per tier over the requirement. This") - .addInfo(" is multiplicative.") - .addInfo(BLUE + "Time Dilation Field Generator:") - .addInfo("- Decreases the time required by a recipe by a factor of " + RED + "2" + GRAY - + " per tier of block.") - .addInfo(" Decreases the probability of a recipe succeeding by " + RED + "10%" + GRAY - + " per tier (additive)") + .addInfo( + " will decrease the processing time by " + RED + + "3%" + + GRAY + + " per tier over the requirement. This") + .addInfo(" is multiplicative.").addInfo(BLUE + "Time Dilation Field Generator:") + .addInfo( + "- Decreases the time required by a recipe by a factor of " + RED + + "2" + + GRAY + + " per tier of block.") + .addInfo( + " Decreases the probability of a recipe succeeding by " + RED + + "10%" + + GRAY + + " per tier (additive)") .addInfo(BLUE + "Stabilisation Field Generator:") - .addInfo("- Increases the probability of a recipe succeeding by " + RED + "5%" + GRAY - + " per tier (additive).") + .addInfo( + "- Increases the probability of a recipe succeeding by " + RED + + "5%" + + GRAY + + " per tier (additive).") .addInfo(" Decreases the yield of a recipe by " + RED + "5%" + GRAY + " per tier (additive). ") .addInfo(GOLD + "--------------------------------------------------------------------------------") .addInfo("Going over a recipe requirement on hydrogen or helium has a penalty on yield and recipe") @@ -1490,19 +904,24 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl "is avaliable the items/fluids will be " + UNDERLINE + DARK_RED + "voided" + RESET + GRAY + ".") .addInfo(GOLD + "--------------------------------------------------------------------------------") .addInfo("Recipes that fail will return a random amount of the fluid back from the recipe and some") - .addInfo("exotic material that rejects conventional physics.") - .addSeparator() + .addInfo("exotic material that rejects conventional physics.").addSeparator() .addStructureInfo("Eye of Harmony structure is too complex! See schematic for details.") - .addStructureInfo(EnumChatFormatting.GOLD + "896" + EnumChatFormatting.GRAY - + " Reinforced Spacetime Structure Casing.") - .addStructureInfo(EnumChatFormatting.GOLD + "534" + EnumChatFormatting.GRAY - + " Ultimate Temporal Boundary Casing.") + .addStructureInfo( + EnumChatFormatting.GOLD + "896" + + EnumChatFormatting.GRAY + + " Reinforced Spacetime Structure Casing.") + .addStructureInfo( + EnumChatFormatting.GOLD + "534" + + EnumChatFormatting.GRAY + + " Ultimate Temporal Boundary Casing.") .addStructureInfo( EnumChatFormatting.GOLD + "680" + EnumChatFormatting.GRAY + " Time Dilation Field Generator.") .addStructureInfo( EnumChatFormatting.GOLD + "48" + EnumChatFormatting.GRAY + " Stabilisation Field Generator.") - .addStructureInfo(EnumChatFormatting.GOLD + "138" + EnumChatFormatting.GRAY - + " Spacetime Compression Field Generator.") + .addStructureInfo( + EnumChatFormatting.GOLD + "138" + + EnumChatFormatting.GRAY + + " Spacetime Compression Field Generator.") .addStructureInfo("--------------------------------------------") .addStructureInfo( "Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " maintenance hatch.") @@ -1514,8 +933,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl "Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " input busses.") .addStructureInfo( "Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " ME output bus.") - .addStructureInfo("--------------------------------------------") - .beginStructureBlock(33, 33, 33, false) + .addStructureInfo("--------------------------------------------").beginStructureBlock(33, 33, 33, false) .toolTipFinisher(AuthorColen.substring(8) + EnumChatFormatting.GRAY + "&" + CommonValues.TEC_MARK_EM); return tt; } @@ -1529,20 +947,13 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][12], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][12]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12] }; } @Override @@ -1551,6 +962,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl } private final Map<FluidStack, Long> validFluidMap = new HashMap<FluidStack, Long>() { + { put(Materials.Hydrogen.getGas(1), 0L); put(Materials.Helium.getGas(1), 0L); @@ -1637,10 +1049,12 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl } mMaxProgresstime = recipeProcessTimeCalculator( - recipeObject.getRecipeTimeInTicks(), recipeObject.getSpacetimeCasingTierRequired()); + recipeObject.getRecipeTimeInTicks(), + recipeObject.getSpacetimeCasingTierRequired()); calculateHydrogenHeliumInputExcessValues( - recipeObject.getHydrogenRequirement(), recipeObject.getHeliumRequirement()); + recipeObject.getHydrogenRequirement(), + recipeObject.getHeliumRequirement()); if (EOH_DEBUG_MODE) { hydrogenOverflowProbabilityAdjustment = 0; @@ -1697,15 +1111,12 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl double zOffset = 16 * getExtendedFacing().getRelativeBackInWorld().offsetZ; double yOffset = 16 * getExtendedFacing().getRelativeBackInWorld().offsetY; - this.getBaseMetaTileEntity() - .getWorld() + this.getBaseMetaTileEntity().getWorld() .setBlock((int) (x + xOffset), (int) (y + yOffset), (int) (z + zOffset), Blocks.air); - this.getBaseMetaTileEntity() - .getWorld() + this.getBaseMetaTileEntity().getWorld() .setBlock((int) (x + xOffset), (int) (y + yOffset), (int) (z + zOffset), eyeOfHarmonyRenderBlock); - TileEyeOfHarmony rendererTileEntity = (TileEyeOfHarmony) - this.getBaseMetaTileEntity().getWorld().getTileEntity((int) (x + xOffset), (int) (y + yOffset), (int) - (z + zOffset)); + TileEyeOfHarmony rendererTileEntity = (TileEyeOfHarmony) this.getBaseMetaTileEntity().getWorld() + .getTileEntity((int) (x + xOffset), (int) (y + yOffset), (int) (z + zOffset)); rendererTileEntity.setTier(currentRecipe.getRocketTier()); @@ -1723,9 +1134,10 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl private void outputFailedChance() { // todo Replace with proper fluid once added to GT. - int exoticMaterialOutputAmount = - (int) ((successChance) * 1440 * (getHydrogenStored() + getHeliumStored()) / 1_000_000_000.0); - mOutputFluids = new FluidStack[] {Materials.SpaceTime.getFluid(exoticMaterialOutputAmount)}; + int exoticMaterialOutputAmount = (int) ((successChance) * 1440 + * (getHydrogenStored() + getHeliumStored()) + / 1_000_000_000.0); + mOutputFluids = new FluidStack[] { Materials.SpaceTime.getFluid(exoticMaterialOutputAmount) }; super.outputAfterRecipe_EM(); } @@ -1746,8 +1158,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl double zOffset = 16 * getExtendedFacing().getRelativeBackInWorld().offsetZ; double yOffset = 16 * getExtendedFacing().getRelativeBackInWorld().offsetZ; - this.getBaseMetaTileEntity() - .getWorld() + this.getBaseMetaTileEntity().getWorld() .setBlock((int) (x + xOffset), (int) (y + yOffset), (int) (z + zOffset), Blocks.air); } @@ -1838,16 +1249,21 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl str.add("EU Output: " + RED + formatNumbers(euOutput) + RESET + " EU"); if (mOutputFluids.length > 0) { // Star matter is always the last element in the array. - str.add("Estimated Star Matter Output: " + RED - + formatNumbers(mOutputFluids[mOutputFluids.length - 1].amount) + RESET + " L"); + str.add( + "Estimated Star Matter Output: " + RED + + formatNumbers(mOutputFluids[mOutputFluids.length - 1].amount) + + RESET + + " L"); } long euPerTick = euOutput / maxProgresstime(); if (euPerTick < LongMath.pow(10, 12)) { str.add("Estimated EU/t: " + RED + formatNumbers(euOutput / maxProgresstime()) + RESET + " EU/t"); } else { - str.add("Estimated EU/t: " + RED - + ReadableNumberConverter.INSTANCE.toWideReadableForm(euOutput / maxProgresstime()) + RESET - + " EU/t"); + str.add( + "Estimated EU/t: " + RED + + ReadableNumberConverter.INSTANCE.toWideReadableForm(euOutput / maxProgresstime()) + + RESET + + " EU/t"); } str.add(GOLD + "-----------------------------------------------------"); } @@ -1856,7 +1272,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl @Override public String[] getStructureDescription(ItemStack stackSize) { - return new String[] {"Eye of Harmony multiblock"}; + return new String[] { "Eye of Harmony multiblock" }; } // NBT save/load strings. @@ -1904,8 +1320,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl public void loadNBTData(final NBTTagCompound aNBT) { // Load the quantity of fluid stored inside the controller. - validFluidMap.forEach( - (key, value) -> validFluidMap.put(key, aNBT.getLong("stored." + key.getUnlocalizedName()))); + validFluidMap + .forEach((key, value) -> validFluidMap.put(key, aNBT.getLong("stored." + key.getUnlocalizedName()))); // Load other stuff from NBT. recipeRunning = aNBT.getBoolean(RECIPE_RUNNING_NBT_TAG); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java index 45486183fd..1ce1166697 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java @@ -8,12 +8,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; 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; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -21,197 +26,84 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region variables private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.annihilation.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal( - "gt.blockmachines.multimachine.em.annihilation.hint.1"), // 2 - Elemental Hatches or Molecular Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.annihilation.hint.0"), // 1 - Classic Hatches or High + // Power Casing + translateToLocal("gt.blockmachines.multimachine.em.annihilation.hint.1"), // 2 - Elemental Hatches or + // Molecular Casing }; // endregion // region structure - private static final IStructureDefinition<GT_MetaTileEntity_EM_annihilation> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_annihilation>builder() - .addShape("main", transpose(new String[][] { - { - " ", - " AB BA ", - " AB BA ", - " BBB ", - " A A A ", - "AA F AA", - " A A A ", - " BBB ", - " AB BA ", - " AB BA ", - " " - }, - { - " ", - " AB BA ", - " EECEEECEE ", - " EGGEEEGGE ", - "ACGGGEGGGCA", - "AEGGGDGGGEA", - "ACGGGEGGGCA", - " EGGEEEGGE ", - " EECEEECEE ", - " AB BA ", - " " - }, - { - " ", - " B B ", - " EGGEGEGGE ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " EGGEGEGGE ", - " B B ", - " " - }, - { - " AAA ", - "AA BAB AA", - "ACGGEGEGGCA", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - "ACGGEGEGGCA", - "AA BAB AA", - " AAA " - }, - { - " AHHHA ", - "BBBBBBBBBBB", - "BEEEDEDEEEB", - "BE EB", - " G G ", - " G G ", - " G G ", - "BE EB", - "BEEEDEDEEEB", - "BBBBBBBBBBB", - " AHHHA " - }, - { - " AH~HA ", - " ABBBA ", - " EGGEEEGGE ", - "BE EB", - "AE EA", - "FD DF", - "AE EA", - "BE EB", - " EGGEEEGGE ", - " ABBBA ", - " AHHHA " - }, - { - " AHHHA ", - "BBBBBBBBBBB", - "BEEEDEDEEEB", - "BE EB", - " G G ", - " G G ", - " G G ", - "BE EB", - "BEEEDEDEEEB", - "BBBBBBBBBBB", - " AHHHA " - }, - { - " AAA ", - "AA BAB AA", - "ACGGEGEGGCA", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - "ACGGEGEGGCA", - "AA BAB AA", - " AAA " - }, - { - " ", - " B B ", - " EGGEGEGGE ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " EGGEGEGGE ", - " B B ", - " " - }, - { - " ", - " AB BA ", - " EECEEECEE ", - " EGGEEEGGE ", - "ACGGGEGGGCA", - "AEGGGDGGGEA", - "ACGGGEGGGCA", - " EGGEEEGGE ", - " EECEEECEE ", - " AB BA ", - " " - }, - { - " ", - " AB BA ", - " AB BA ", - " BBB ", - " A A A ", - "AA F AA", - " A A A ", - " BBB ", - " AB BA ", - " AB BA ", - " " - } - })) - .addElement('A', ofBlock(sBlockCasingsTT, 4)) - .addElement('B', ofBlock(sBlockCasingsTT, 5)) - .addElement('C', ofBlock(sBlockCasingsTT, 6)) - .addElement('D', ofBlock(sBlockCasingsTT, 10)) - .addElement('E', ofBlock(sBlockCasingsTT, 12)) - .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'H', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_annihilation::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'F', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_annihilation::addElementalToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_annihilation> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_annihilation>builder() + .addShape( + "main", + transpose( + new String[][] { + { " ", " AB BA ", " AB BA ", " BBB ", " A A A ", + "AA F AA", " A A A ", " BBB ", " AB BA ", " AB BA ", + " " }, + { " ", " AB BA ", " EECEEECEE ", " EGGEEEGGE ", "ACGGGEGGGCA", + "AEGGGDGGGEA", "ACGGGEGGGCA", " EGGEEEGGE ", " EECEEECEE ", " AB BA ", + " " }, + { " ", " B B ", " EGGEGEGGE ", " G G ", " G G ", + " G G ", " G G ", " G G ", " EGGEGEGGE ", " B B ", + " " }, + { " AAA ", "AA BAB AA", "ACGGEGEGGCA", " G G ", " G G ", + " G G ", " G G ", " G G ", "ACGGEGEGGCA", "AA BAB AA", + " AAA " }, + { " AHHHA ", "BBBBBBBBBBB", "BEEEDEDEEEB", "BE EB", " G G ", + " G G ", " G G ", "BE EB", "BEEEDEDEEEB", "BBBBBBBBBBB", + " AHHHA " }, + { " AH~HA ", " ABBBA ", " EGGEEEGGE ", "BE EB", "AE EA", + "FD DF", "AE EA", "BE EB", " EGGEEEGGE ", " ABBBA ", + " AHHHA " }, + { " AHHHA ", "BBBBBBBBBBB", "BEEEDEDEEEB", "BE EB", " G G ", + " G G ", " G G ", "BE EB", "BEEEDEDEEEB", "BBBBBBBBBBB", + " AHHHA " }, + { " AAA ", "AA BAB AA", "ACGGEGEGGCA", " G G ", " G G ", + " G G ", " G G ", " G G ", "ACGGEGEGGCA", "AA BAB AA", + " AAA " }, + { " ", " B B ", " EGGEGEGGE ", " G G ", " G G ", + " G G ", " G G ", " G G ", " EGGEGEGGE ", " B B ", + " " }, + { " ", " AB BA ", " EECEEECEE ", " EGGEEEGGE ", "ACGGGEGGGCA", + "AEGGGDGGGEA", "ACGGGEGGGCA", " EGGEEEGGE ", " EECEEECEE ", " AB BA ", + " " }, + { " ", " AB BA ", " AB BA ", " BBB ", " A A A ", + "AA F AA", " A A A ", " BBB ", " AB BA ", " AB BA ", + " " } })) + .addElement('A', ofBlock(sBlockCasingsTT, 4)).addElement('B', ofBlock(sBlockCasingsTT, 5)) + .addElement('C', ofBlock(sBlockCasingsTT, 6)).addElement('D', ofBlock(sBlockCasingsTT, 10)) + .addElement('E', ofBlock(sBlockCasingsTT, 12)).addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'H', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_annihilation::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'F', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_annihilation::addElementalToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .build(); // endregion public GT_MetaTileEntity_EM_annihilation(int aID, String aName, String aNameRegional) { @@ -235,24 +127,23 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.annihilation.name")) // Machine Type: Annihilation Generator - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.annihilation.desc.0")) // Controller block of the + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.annihilation.name")) // Machine Type: + // Annihilation + // Generator + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.annihilation.desc.0")) // Controller block + // of the // Annihilation Generator .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(11, 11, 11, false) + .addSeparator().beginStructureBlock(11, 11, 11, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.Elemental"), translateToLocal("tt.keyword.Structure.AnyMolecularCasing"), 1) // Elemental Hatch: Any Molecular Casing - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -266,20 +157,13 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][12], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][12]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12] }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java index 9d595339d0..ec1a9a441d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java @@ -10,12 +10,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; 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; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -23,14 +28,12 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region variables private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; @@ -38,11 +41,10 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E // todo CHECK VALUES private static final double NEUTRONIUM_BLOCK_MASS = 4.1E17; private static final double NEUTRONIUM_BLOCK_ATOM_COUNT = 2.4478671E44; - private static final double NEUTRONIUM_BLOCK_TO_EU_INSTANT = URANIUM_MASS_TO_EU_INSTANT - * NEUTRONIUM_BLOCK_MASS + private static final double NEUTRONIUM_BLOCK_TO_EU_INSTANT = URANIUM_MASS_TO_EU_INSTANT * NEUTRONIUM_BLOCK_MASS / (URANIUM_INGOT_MASS_DIFF * 1.78266191e-36); // ~ 5.314e40 - private static final double NEUTRON_TO_EU_INSTANT = - NEUTRONIUM_BLOCK_TO_EU_INSTANT / NEUTRONIUM_BLOCK_ATOM_COUNT; // ~ 0.00021708694 + private static final double NEUTRON_TO_EU_INSTANT = NEUTRONIUM_BLOCK_TO_EU_INSTANT / NEUTRONIUM_BLOCK_ATOM_COUNT; // ~ + // 0.00021708694 public boolean glassDome = false; // endregion @@ -52,2345 +54,1158 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E // per dim disable thingies // region structure actual - private static final IStructureDefinition<GT_MetaTileEntity_EM_bhg> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_bhg>builder() - .addShape("main_t1", transpose(new String[][] { - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " CCCCCCCCC ", - " C C ", - " CCCCCCCCC ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " C C ", - " DDDDD ", - " DDCDCDD ", - " CCCCDCCDCCDCCCC ", - " DDDDDDD ", - " CCCCDCCDCCDCCCC ", - " DDCDCDD ", - " DDDDD ", - " C C ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " D ", - " D ", - " DDDDDDD ", - " DD DD ", - " D EEE D ", - " CCC D EAAAE D CCC ", - " DDD EAAAE DDD ", - " CCC D EAAAE D CCC ", - " D EEE D ", - " DD DD ", - " DDDDDDD ", - " D ", - " D ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " D ", - " D ", - " ", - " ", - " ", - " ", - " ", - " CC CC ", - " DD DD ", - " CC CC ", - " ", - " ", - " ", - " ", - " ", - " D ", - " D ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " C C ", - " CCCCC ", - " D ", - " B ", - " B ", - " ", - " ", - " ", - " ", - " C C ", - " CC CC ", - " CDBB BBDC ", - " CC CC ", - " C C ", - " ", - " ", - " ", - " ", - " B ", - " B ", - " D ", - " CCCCC ", - " C C ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " D ", - " EEEBEEE ", - " ", - " ", - " ", - " ", - " ", - " E E ", - " E E ", - " CC E E CC ", - " DB BD ", - " CC E E CC ", - " E E ", - " E E ", - " ", - " ", - " ", - " ", - " ", - " EEEBEEE ", - " D ", - " C C ", - " C C ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " C C ", - " CCCCC ", - " D ", - " B ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " CC CC ", - " CDB BDC ", - " CC CC ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " B ", - " D ", - " CCCCC ", - " C C ", - " ", - " ", - " " - }, - { - " ", - " ", - " C C ", - " C C ", - " D ", - " EEEBEEE ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " E E ", - " E E ", - " CC E E CC ", - " DB BD ", - " CC E E CC ", - " E E ", - " E E ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " EEEBEEE ", - " D ", - " C C ", - " C C ", - " ", - " " - }, - { - " ", - " ", - " C C ", - " D ", - " B ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " DB BD ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " B ", - " D ", - " C C ", - " ", - " " - }, - { - " ", - " C C ", - " C C ", - " D ", - " B ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " CC CC ", - " DB BD ", - " CC CC ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " B ", - " D ", - " C C ", - " C C ", - " " - }, - { - " ", - " C C ", - " D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " D D ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D ", - " C C ", - " " - }, - { - " ", - " C C ", - " D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " D D ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D ", - " C C ", - " " - }, - { - " CCCCCCC ", - " C C ", - " DDDDDDD ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - "CCD DCC", - " D D ", - "CCD DCC", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " DDDDDDD ", - " C C ", - " C C " - }, - { - " CCHHHHHCC ", - " DDDDD ", - " DD DD ", - " ", - " ", - " E E ", - " ", - " E E ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - " D D ", - "CD DC", - " D D ", - "CD DC", - " D D ", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " E E ", - " ", - " E E ", - " ", - " ", - " DD DD ", - " DDDDD ", - " C C " - }, - { - " CHHHHHHHC ", - " DDCDCDD ", - " D EEE D ", - " ", - " C C ", - " E E ", - " C C ", - " E E ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - " D D ", - "CCE ECC", - " DE ED ", - "CCE ECC", - " D D ", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " E E ", - " C C ", - " E E ", - " C C ", - " ", - " D EEE D ", - " DDCDCDD ", - " C C " - }, - { - " CHHFFFHHC ", - " CCCCDCCDCCDCCCC ", - " CCC D EAAAE D CCC ", - " CC CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " C C ", - " CC CC ", - " C C ", - " C C ", - "CCD DCC", - "CD DC", - "CCE ECC", - "CCA ACC", - "CDA ADC", - "CCA ACC", - "CCE ECC", - "CD DC", - "CCD DCC", - " C C ", - " C C ", - " CC CC ", - " C C ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC CC ", - " CCC D EAAAE D CCC ", - " CCCCDCCDCCDCCCC ", - " CCCCCCCCC " - }, - { - " CHHF~FHHC ", - " DDDDDDD ", - " DDD EAAAE DDD ", - " DD DD ", - " CDBB BBDC ", - " DB BD ", - " CDB BDC ", - " DB BD ", - " DB BD ", - " DB BD ", - " D D ", - " D D ", - " D D ", - " D D ", - " DE ED ", - "CDA ADC", - " DA AD ", - "CDA ADC", - " DE ED ", - " D D ", - " D D ", - " D D ", - " D D ", - " DB BD ", - " DB BD ", - " DB BD ", - " CDB BDC ", - " DB BD ", - " CDBB BBDC ", - " DD DD ", - " DDD EAAAE DDD ", - " DDDDDDD ", - " C C " - }, - { - " CHHFFFHHC ", - " CCCCDCCDCCDCCCC ", - " CCC D EAAAE D CCC ", - " CC CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " C C ", - " CC CC ", - " C C ", - " C C ", - "CCD DCC", - "CD DC", - "CCE ECC", - "CCA ACC", - "CDA ADC", - "CCA ACC", - "CCE ECC", - "CD DC", - "CCD DCC", - " C C ", - " C C ", - " CC CC ", - " C C ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC CC ", - " CCC D EAAAE D CCC ", - " CCCCDCCDCCDCCCC ", - " CCCCCCCCC " - }, - { - " CHHHHHHHC ", - " DDCDCDD ", - " D EEE D ", - " ", - " C C ", - " E E ", - " C C ", - " E E ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - " D D ", - "CCE ECC", - " DE ED ", - "CCE ECC", - " D D ", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " E E ", - " C C ", - " E E ", - " C C ", - " ", - " D EEE D ", - " DDCDCDD ", - " C C " - }, - { - " CCHHHHHCC ", - " DDDDD ", - " DD DD ", - " ", - " ", - " E E ", - " ", - " E E ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - " D D ", - "CD DC", - " D D ", - "CD DC", - " D D ", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " E E ", - " ", - " E E ", - " ", - " ", - " DD DD ", - " DDDDD ", - " C C " - }, - { - " CCCCCCC ", - " C C ", - " DDDDDDD ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D D ", - " D D ", - "CCD DCC", - " D D ", - "CCD DCC", - " D D ", - " D D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " DDDDDDD ", - " C C ", - " C C " - }, - { - " ", - " C C ", - " D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " D D ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D ", - " C C ", - " " - }, - { - " ", - " C C ", - " D ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " D D ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " D ", - " C C ", - " " - }, - { - " ", - " C C ", - " C C ", - " D ", - " B ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " CC CC ", - " DB BD ", - " CC CC ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " B ", - " D ", - " C C ", - " C C ", - " " - }, - { - " ", - " ", - " C C ", - " D ", - " B ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " DB BD ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " B ", - " D ", - " C C ", - " ", - " " - }, - { - " ", - " ", - " C C ", - " C C ", - " D ", - " EEEBEEE ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " E E ", - " E E ", - " CC E E CC ", - " DB BD ", - " CC E E CC ", - " E E ", - " E E ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " EEEBEEE ", - " D ", - " C C ", - " C C ", - " ", - " " - }, - { - " ", - " ", - " ", - " C C ", - " CCCCC ", - " D ", - " B ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " CC CC ", - " CDB BDC ", - " CC CC ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " B ", - " D ", - " CCCCC ", - " C C ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " D ", - " EEEBEEE ", - " ", - " ", - " ", - " ", - " ", - " E E ", - " E E ", - " CC E E CC ", - " DB BD ", - " CC E E CC ", - " E E ", - " E E ", - " ", - " ", - " ", - " ", - " ", - " EEEBEEE ", - " D ", - " C C ", - " C C ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " C C ", - " CCCCC ", - " D ", - " B ", - " B ", - " ", - " ", - " ", - " ", - " C C ", - " CC CC ", - " CDBB BBDC ", - " CC CC ", - " C C ", - " ", - " ", - " ", - " ", - " B ", - " B ", - " D ", - " CCCCC ", - " C C ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " D ", - " D ", - " ", - " ", - " ", - " ", - " ", - " CC CC ", - " DD DD ", - " CC CC ", - " ", - " ", - " ", - " D ", - " D ", - " D ", - " D ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " D ", - " D ", - " DDDDDDD ", - " DD DD ", - " D EEE D ", - " CCC D EAAAE D CCC ", - " DDD EAAAE DDD ", - " CCC D EAAAE D CCC ", - " D EEE D ", - " DD DD ", - " DDDDDDD ", - " D ", - " D ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " C C ", - " DDDDD ", - " DDCDCDD ", - " CCCCDCCDCCDCCCC ", - " DDDDDDD ", - " CCCCDCCDCCDCCCC ", - " DDCDCDD ", - " DDDDD ", - " C C ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " CCCCCCCCC ", - " C C ", - " CCCCCCCCC ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - } - })) - .addShape("main_t2", transpose(new String[][] { - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " CCCCCCCCC ", - " C C ", - " CCCCCCCCC ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " GGC CGG ", - " GGGC CGGG ", - " GGGGC CGGGG ", - " GGGGDDDDDGGGG ", - " GGGDDCDCDDGGG ", - " CCCCDCCDCCDCCCC ", - " DDDDDDD ", - " CCCCDCCDCCDCCCC ", - " GGGDDCDCDDGGG ", - " GGGGDDDDDGGGG ", - " GGGGC CGGGG ", - " GGGC CGGG ", - " GGC CGG ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " GGC CGG ", - " GGGGC CGGGG ", - " GGG D GGG ", - " GGG D GGG ", - " GG DDDDDDD GG ", - " GG DD DD GG ", - " GG D EEE D GG ", - " CCC D EAAAE D CCC ", - " DDD EAAAE DDD ", - " CCC D EAAAE D CCC ", - " GG D EEE D GG ", - " GG DD DD GG ", - " GG DDDDDDD GG ", - " GGG D GGG ", - " GGG D GGG ", - " GGGGC CGGGG ", - " GGC CGG ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " GGGC CGGG ", - " GGG D GGG ", - " GG D GG ", - " GG GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " CC CC ", - " DD DD ", - " CC CC ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG GG ", - " GG D GG ", - " GGG D GGG ", - " GGGC CGGG ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " C C ", - " GGGCCCCCGGG ", - " GGG D GGG ", - " GG B GG ", - " GG B GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " C C ", - " CC CC ", - " CDBB BBDC ", - " CC CC ", - " C C ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG B GG ", - " GG B GG ", - " GGG D GGG ", - " GGGCCCCCGGG ", - " C C ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " C C ", - " GGGGGC CGGGGG ", - " GGG D GGG ", - " GG EEEBEEE GG ", - " GG GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " G E E G ", - " G E E G ", - " CC E E CC ", - " DB BD ", - " CC E E CC ", - " G E E G ", - " G E E G ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG GG ", - " GG EEEBEEE GG ", - " GGG D GGG ", - " GGGGGC CGGGGG ", - " C C ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " C C ", - " GGGCCCCCGGG ", - " GGG D GGG ", - " GG B GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " C C ", - " CC CC ", - " CDB BDC ", - " CC CC ", - " C C ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG B GG ", - " GGG D GGG ", - " GGGCCCCCGGG ", - " C C ", - " ", - " ", - " " - }, - { - " ", - " ", - " C C ", - " GGGC CGGG ", - " GGG D GGG ", - " GG EEEBEEE GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G E E G ", - " G E E G ", - " CC E E CC ", - " DB BD ", - " CC E E CC ", - " G E E G ", - " G E E G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG EEEBEEE GG ", - " GGG D GGG ", - " GGGC CGGG ", - " C C ", - " ", - " " - }, - { - " ", - " ", - " GGC CGG ", - " GGG D GGG ", - " GG B GG ", - " GG GG ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " C C ", - " DB BD ", - " C C ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " GG GG ", - " GG B GG ", - " GGG D GGG ", - " GGC CGG ", - " ", - " " - }, - { - " ", - " C C ", - " GGGGC CGGGG ", - " GG D GG ", - " GG B GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " CC CC ", - " DB BD ", - " CC CC ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG B GG ", - " GG D GG ", - " GGGGC CGGGG ", - " C C ", - " " - }, - { - " ", - " GGC CGG ", - " GGG D GGG ", - " GG GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " C C ", - " D D ", - " C C ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG GG ", - " GGG D GGG ", - " GGC CGG ", - " " - }, - { - " ", - " GGGC CGGG ", - " GGG D GGG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " C C ", - " D D ", - " C C ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GGG D GGG ", - " GGGC CGGG ", - " " - }, - { - " CCCCCCC ", - " GGGGC CGGGG ", - " GG DDDDDDD GG ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GD DG ", - " GD DG ", - "CCD DCC", - " D D ", - "CCD DCC", - " GD DG ", - " GD DG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " GG DDDDDDD GG ", - " GGGGC CGGGG ", - " C C " - }, - { - " CCHHHHHCC ", - " GGGGDDDDDGGGG ", - " GG DD DD GG ", - " G G ", - " G G ", - " G E E G ", - " G G ", - " G E E G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GD DG ", - " GD DG ", - " D D ", - "CD DC", - " D D ", - "CD DC", - " D D ", - " GD DG ", - " GD DG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G E E G ", - " G G ", - " G E E G ", - " G G ", - " G G ", - " GG DD DD GG ", - " GGGGDDDDDGGGG ", - " C C " - }, - { - " CHHHHHHHC ", - " GGGDDCDCDDGGG ", - " GG D EEE D GG ", - " G G ", - " C C ", - " G E E G ", - " C C ", - " G E E G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GD DG ", - " D D ", - " D D ", - "CCE ECC", - " DE ED ", - "CCE ECC", - " D D ", - " D D ", - " GD DG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G E E G ", - " C C ", - " G E E G ", - " C C ", - " G G ", - " GG D EEE D GG ", - " GGGDDCDCDDGGG ", - " C C " - }, - { - " CHHFFFHHC ", - " CCCCDCCDCCDCCCC ", - " CCC D EAAAE D CCC ", - " CC CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " C C ", - " CC CC ", - " C C ", - " C C ", - "CCD DCC", - "CD DC", - "CCE ECC", - "CCA ACC", - "CDA ADC", - "CCA ACC", - "CCE ECC", - "CD DC", - "CCD DCC", - " C C ", - " C C ", - " CC CC ", - " C C ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC CC ", - " CCC D EAAAE D CCC ", - " CCCCDCCDCCDCCCC ", - " CCCCCCCCC " - }, - { - " CHHF~FHHC ", - " DDDDDDD ", - " DDD EAAAE DDD ", - " DD DD ", - " CDBB BBDC ", - " DB BD ", - " CDB BDC ", - " DB BD ", - " DB BD ", - " DB BD ", - " D D ", - " D D ", - " D D ", - " D D ", - " DE ED ", - "CDA ADC", - " DA AD ", - "CDA ADC", - " DE ED ", - " D D ", - " D D ", - " D D ", - " D D ", - " DB BD ", - " DB BD ", - " DB BD ", - " CDB BDC ", - " DB BD ", - " CDBB BBDC ", - " DD DD ", - " DDD EAAAE DDD ", - " DDDDDDD ", - " C C " - }, - { - " CHHFFFHHC ", - " CCCCDCCDCCDCCCC ", - " CCC D EAAAE D CCC ", - " CC CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " C C ", - " CC CC ", - " C C ", - " C C ", - "CCD DCC", - "CD DC", - "CCE ECC", - "CCA ACC", - "CDA ADC", - "CCA ACC", - "CCE ECC", - "CD DC", - "CCD DCC", - " C C ", - " C C ", - " CC CC ", - " C C ", - " CC E E CC ", - " CC CC ", - " CC E E CC ", - " CC CC ", - " CC CC ", - " CCC D EAAAE D CCC ", - " CCCCDCCDCCDCCCC ", - " CCCCCCCCC " - }, - { - " CHHHHHHHC ", - " GGGDDCDCDDGGG ", - " GG D EEE D GG ", - " G G ", - " C C ", - " G E E G ", - " C C ", - " G E E G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GD DG ", - " D D ", - " D D ", - "CCE ECC", - " DE ED ", - "CCE ECC", - " D D ", - " D D ", - " GD DG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G E E G ", - " C C ", - " G E E G ", - " C C ", - " G G ", - " GG D EEE D GG ", - " GGGDDCDCDDGGG ", - " C C " - }, - { - " CCHHHHHCC ", - " GGGGDDDDDGGGG ", - " GG DD DD GG ", - " G G ", - " G G ", - " G E E G ", - " G G ", - " G E E G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GD DG ", - " GD DG ", - " D D ", - "CD DC", - " D D ", - "CD DC", - " D D ", - " GD DG ", - " GD DG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G E E G ", - " G G ", - " G E E G ", - " G G ", - " G G ", - " GG DD DD GG ", - " GGGGDDDDDGGGG ", - " C C " - }, - { - " CCCCCCC ", - " GGGGC CGGGG ", - " GG DDDDDDD GG ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GD DG ", - " GD DG ", - "CCD DCC", - " D D ", - "CCD DCC", - " GD DG ", - " GD DG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " GG DDDDDDD GG ", - " GGGGC CGGGG ", - " C C " - }, - { - " ", - " GGGC CGGG ", - " GGG D GGG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " C C ", - " D D ", - " C C ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GGG D GGG ", - " GGGC CGGG ", - " " - }, - { - " ", - " GGC CGG ", - " GGG D GGG ", - " GG GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " C C ", - " D D ", - " C C ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG GG ", - " GGG D GGG ", - " GGC CGG ", - " " - }, - { - " ", - " C C ", - " GGGGC CGGGG ", - " GG D GG ", - " GG B GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " CC CC ", - " DB BD ", - " CC CC ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG B GG ", - " GG D GG ", - " GGGGC CGGGG ", - " C C ", - " " - }, - { - " ", - " ", - " GGC CGG ", - " GGG D GGG ", - " GG B GG ", - " GG GG ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " C C ", - " DB BD ", - " C C ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " GG GG ", - " GG B GG ", - " GGG D GGG ", - " GGC CGG ", - " ", - " " - }, - { - " ", - " ", - " C C ", - " GGGC CGGG ", - " GGG D GGG ", - " GG EEEBEEE GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G E E G ", - " G E E G ", - " CC E E CC ", - " DB BD ", - " CC E E CC ", - " G E E G ", - " G E E G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG EEEBEEE GG ", - " GGG D GGG ", - " GGGC CGGG ", - " C C ", - " ", - " " - }, - { - " ", - " ", - " ", - " C C ", - " GGGCCCCCGGG ", - " GGG D GGG ", - " GG B GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " C C ", - " CC CC ", - " CDB BDC ", - " CC CC ", - " C C ", - " G G ", - " G G ", - " G G ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG B GG ", - " GGG D GGG ", - " GGGCCCCCGGG ", - " C C ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " C C ", - " GGGGGC CGGGGG ", - " GGG D GGG ", - " GG EEEBEEE GG ", - " GG GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " G E E G ", - " G E E G ", - " CC E E CC ", - " DB BD ", - " CC E E CC ", - " G E E G ", - " G E E G ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG GG ", - " GG EEEBEEE GG ", - " GGG D GGG ", - " GGGGGC CGGGGG ", - " C C ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " C C ", - " GGGCCCCCGGG ", - " GGG D GGG ", - " GG B GG ", - " GG B GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " C C ", - " CC CC ", - " CDBB BBDC ", - " CC CC ", - " C C ", - " G G ", - " G G ", - " GG GG ", - " G G ", - " GG B GG ", - " GG B GG ", - " GGG D GGG ", - " GGGCCCCCGGG ", - " C C ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " GGGC CGGG ", - " GGG D GGG ", - " GG D GG ", - " GG GG ", - " G G ", - " GG GG ", - " G G ", - " G G ", - " CC CC ", - " DD DD ", - " CC CC ", - " G G ", - " G G ", - " GG GG ", - " G D G ", - " GG D GG ", - " GG D GG ", - " GGG D GGG ", - " GGGC CGGG ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " GGC CGG ", - " GGGGC CGGGG ", - " GGG D GGG ", - " GGG D GGG ", - " GG DDDDDDD GG ", - " GG DD DD GG ", - " GG D EEE D GG ", - " CCC D EAAAE D CCC ", - " DDD EAAAE DDD ", - " CCC D EAAAE D CCC ", - " GG D EEE D GG ", - " GG DD DD GG ", - " GG DDDDDDD GG ", - " GGG D GGG ", - " GGG D GGG ", - " GGGGC CGGGG ", - " GGC CGG ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " GGC CGG ", - " GGGC CGGG ", - " GGGGC CGGGG ", - " GGGGDDDDDGGGG ", - " GGGDDCDCDDGGG ", - " CCCCDCCDCCDCCCC ", - " DDDDDDD ", - " CCCCDCCDCCDCCCC ", - " GGGDDCDCDDGGG ", - " GGGGDDDDDGGGG ", - " GGGGC CGGGG ", - " GGGC CGGG ", - " GGC CGG ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - }, - { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " C C ", - " C C ", - " C C ", - " CCCCCCCCC ", - " C C ", - " CCCCCCCCC ", - " C C ", - " C C ", - " C C ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - } - })) - .addElement('A', ofBlock(sBlockCasingsTT, 10)) - .addElement('B', ofBlock(sBlockCasingsTT, 11)) - .addElement('C', ofBlock(sBlockCasingsTT, 12)) - .addElement('D', ofBlock(sBlockCasingsTT, 13)) - .addElement('E', ofBlock(sBlockCasingsTT, 14)) - .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'H', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_bhg::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'F', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_bhg::addElementalToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_bhg> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_bhg>builder() + .addShape( + "main_t1", + transpose( + new String[][] { + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " C C ", " CCCCCCCCC ", + " C C ", " CCCCCCCCC ", + " C C ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " C C ", " C C ", + " C C ", " DDDDD ", + " DDCDCDD ", " CCCCDCCDCCDCCCC ", + " DDDDDDD ", " CCCCDCCDCCDCCCC ", + " DDCDCDD ", " DDDDD ", + " C C ", " C C ", + " C C ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " C C ", " C C ", + " D ", " D ", + " DDDDDDD ", " DD DD ", + " D EEE D ", " CCC D EAAAE D CCC ", + " DDD EAAAE DDD ", " CCC D EAAAE D CCC ", + " D EEE D ", " DD DD ", + " DDDDDDD ", " D ", + " D ", " C C ", + " C C ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " D ", " D ", + " ", " ", + " ", " ", + " ", " CC CC ", + " DD DD ", " CC CC ", + " ", " ", + " ", " ", + " ", " D ", + " D ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " C C ", + " CCCCC ", " D ", + " B ", " B ", + " ", " ", + " ", " ", + " C C ", " CC CC ", + " CDBB BBDC ", " CC CC ", + " C C ", " ", + " ", " ", + " ", " B ", + " B ", " D ", + " CCCCC ", " C C ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " C C ", " C C ", + " D ", " EEEBEEE ", + " ", " ", + " ", " ", + " ", " E E ", + " E E ", " CC E E CC ", + " DB BD ", " CC E E CC ", + " E E ", " E E ", + " ", " ", + " ", " ", + " ", " EEEBEEE ", + " D ", " C C ", + " C C ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " C C ", + " CCCCC ", " D ", + " B ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " CC CC ", + " CDB BDC ", " CC CC ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " B ", " D ", + " CCCCC ", " C C ", + " ", " ", + " " }, + { " ", " ", + " C C ", " C C ", + " D ", " EEEBEEE ", + " ", " ", + " ", " ", + " ", " ", + " ", " E E ", + " E E ", " CC E E CC ", + " DB BD ", " CC E E CC ", + " E E ", " E E ", + " ", " ", + " ", " ", + " ", " ", + " ", " EEEBEEE ", + " D ", " C C ", + " C C ", " ", + " " }, + { " ", " ", + " C C ", " D ", + " B ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " DB BD ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " B ", " D ", + " C C ", " ", + " " }, + { " ", " C C ", + " C C ", " D ", + " B ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " CC CC ", + " DB BD ", " CC CC ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " B ", " D ", + " C C ", " C C ", + " " }, + { " ", " C C ", + " D ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " D D ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " D ", " C C ", + " " }, + { " ", " C C ", + " D ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " D D ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " D ", " C C ", + " " }, + { " CCCCCCC ", " C C ", + " DDDDDDD ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " D D ", + " D D ", "CCD DCC", + " D D ", "CCD DCC", + " D D ", " D D ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " DDDDDDD ", " C C ", + " C C " }, + { " CCHHHHHCC ", " DDDDD ", + " DD DD ", " ", + " ", " E E ", + " ", " E E ", + " ", " ", + " ", " ", + " D D ", " D D ", + " D D ", "CD DC", + " D D ", "CD DC", + " D D ", " D D ", + " D D ", " ", + " ", " ", + " ", " E E ", + " ", " E E ", + " ", " ", + " DD DD ", " DDDDD ", + " C C " }, + { " CHHHHHHHC ", " DDCDCDD ", + " D EEE D ", " ", + " C C ", " E E ", + " C C ", " E E ", + " ", " ", + " ", " ", + " D D ", " D D ", + " D D ", "CCE ECC", + " DE ED ", "CCE ECC", + " D D ", " D D ", + " D D ", " ", + " ", " ", + " ", " E E ", + " C C ", " E E ", + " C C ", " ", + " D EEE D ", " DDCDCDD ", + " C C " }, + { " CHHFFFHHC ", " CCCCDCCDCCDCCCC ", + " CCC D EAAAE D CCC ", " CC CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " C C ", " CC CC ", + " C C ", " C C ", + "CCD DCC", "CD DC", + "CCE ECC", "CCA ACC", + "CDA ADC", "CCA ACC", + "CCE ECC", "CD DC", + "CCD DCC", " C C ", + " C C ", " CC CC ", + " C C ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC CC ", + " CCC D EAAAE D CCC ", " CCCCDCCDCCDCCCC ", + " CCCCCCCCC " }, + { " CHHF~FHHC ", " DDDDDDD ", + " DDD EAAAE DDD ", " DD DD ", + " CDBB BBDC ", " DB BD ", + " CDB BDC ", " DB BD ", + " DB BD ", " DB BD ", + " D D ", " D D ", + " D D ", " D D ", + " DE ED ", "CDA ADC", + " DA AD ", "CDA ADC", + " DE ED ", " D D ", + " D D ", " D D ", + " D D ", " DB BD ", + " DB BD ", " DB BD ", + " CDB BDC ", " DB BD ", + " CDBB BBDC ", " DD DD ", + " DDD EAAAE DDD ", " DDDDDDD ", + " C C " }, + { " CHHFFFHHC ", " CCCCDCCDCCDCCCC ", + " CCC D EAAAE D CCC ", " CC CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " C C ", " CC CC ", + " C C ", " C C ", + "CCD DCC", "CD DC", + "CCE ECC", "CCA ACC", + "CDA ADC", "CCA ACC", + "CCE ECC", "CD DC", + "CCD DCC", " C C ", + " C C ", " CC CC ", + " C C ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC CC ", + " CCC D EAAAE D CCC ", " CCCCDCCDCCDCCCC ", + " CCCCCCCCC " }, + { " CHHHHHHHC ", " DDCDCDD ", + " D EEE D ", " ", + " C C ", " E E ", + " C C ", " E E ", + " ", " ", + " ", " ", + " D D ", " D D ", + " D D ", "CCE ECC", + " DE ED ", "CCE ECC", + " D D ", " D D ", + " D D ", " ", + " ", " ", + " ", " E E ", + " C C ", " E E ", + " C C ", " ", + " D EEE D ", " DDCDCDD ", + " C C " }, + { " CCHHHHHCC ", " DDDDD ", + " DD DD ", " ", + " ", " E E ", + " ", " E E ", + " ", " ", + " ", " ", + " D D ", " D D ", + " D D ", "CD DC", + " D D ", "CD DC", + " D D ", " D D ", + " D D ", " ", + " ", " ", + " ", " E E ", + " ", " E E ", + " ", " ", + " DD DD ", " DDDDD ", + " C C " }, + { " CCCCCCC ", " C C ", + " DDDDDDD ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " D D ", + " D D ", "CCD DCC", + " D D ", "CCD DCC", + " D D ", " D D ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " DDDDDDD ", " C C ", + " C C " }, + { " ", " C C ", + " D ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " D D ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " D ", " C C ", + " " }, + { " ", " C C ", + " D ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " D D ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " D ", " C C ", + " " }, + { " ", " C C ", + " C C ", " D ", + " B ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " CC CC ", + " DB BD ", " CC CC ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " B ", " D ", + " C C ", " C C ", + " " }, + { " ", " ", + " C C ", " D ", + " B ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " DB BD ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " B ", " D ", + " C C ", " ", + " " }, + { " ", " ", + " C C ", " C C ", + " D ", " EEEBEEE ", + " ", " ", + " ", " ", + " ", " ", + " ", " E E ", + " E E ", " CC E E CC ", + " DB BD ", " CC E E CC ", + " E E ", " E E ", + " ", " ", + " ", " ", + " ", " ", + " ", " EEEBEEE ", + " D ", " C C ", + " C C ", " ", + " " }, + { " ", " ", + " ", " C C ", + " CCCCC ", " D ", + " B ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " CC CC ", + " CDB BDC ", " CC CC ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " B ", " D ", + " CCCCC ", " C C ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " C C ", " C C ", + " D ", " EEEBEEE ", + " ", " ", + " ", " ", + " ", " E E ", + " E E ", " CC E E CC ", + " DB BD ", " CC E E CC ", + " E E ", " E E ", + " ", " ", + " ", " ", + " ", " EEEBEEE ", + " D ", " C C ", + " C C ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " C C ", + " CCCCC ", " D ", + " B ", " B ", + " ", " ", + " ", " ", + " C C ", " CC CC ", + " CDBB BBDC ", " CC CC ", + " C C ", " ", + " ", " ", + " ", " B ", + " B ", " D ", + " CCCCC ", " C C ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " D ", " D ", + " ", " ", + " ", " ", + " ", " CC CC ", + " DD DD ", " CC CC ", + " ", " ", + " ", " D ", + " D ", " D ", + " D ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " C C ", " C C ", + " D ", " D ", + " DDDDDDD ", " DD DD ", + " D EEE D ", " CCC D EAAAE D CCC ", + " DDD EAAAE DDD ", " CCC D EAAAE D CCC ", + " D EEE D ", " DD DD ", + " DDDDDDD ", " D ", + " D ", " C C ", + " C C ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " C C ", " C C ", + " C C ", " DDDDD ", + " DDCDCDD ", " CCCCDCCDCCDCCCC ", + " DDDDDDD ", " CCCCDCCDCCDCCCC ", + " DDCDCDD ", " DDDDD ", + " C C ", " C C ", + " C C ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " C C ", " CCCCCCCCC ", + " C C ", " CCCCCCCCC ", + " C C ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " } })) + .addShape( + "main_t2", + transpose( + new String[][] { + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " C C ", " CCCCCCCCC ", + " C C ", " CCCCCCCCC ", + " C C ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " GGC CGG ", " GGGC CGGG ", + " GGGGC CGGGG ", " GGGGDDDDDGGGG ", + " GGGDDCDCDDGGG ", " CCCCDCCDCCDCCCC ", + " DDDDDDD ", " CCCCDCCDCCDCCCC ", + " GGGDDCDCDDGGG ", " GGGGDDDDDGGGG ", + " GGGGC CGGGG ", " GGGC CGGG ", + " GGC CGG ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " GGC CGG ", " GGGGC CGGGG ", + " GGG D GGG ", " GGG D GGG ", + " GG DDDDDDD GG ", " GG DD DD GG ", + " GG D EEE D GG ", " CCC D EAAAE D CCC ", + " DDD EAAAE DDD ", " CCC D EAAAE D CCC ", + " GG D EEE D GG ", " GG DD DD GG ", + " GG DDDDDDD GG ", " GGG D GGG ", + " GGG D GGG ", " GGGGC CGGGG ", + " GGC CGG ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " C C ", " GGGC CGGG ", + " GGG D GGG ", " GG D GG ", + " GG GG ", " G G ", + " GG GG ", " G G ", + " G G ", " CC CC ", + " DD DD ", " CC CC ", + " G G ", " G G ", + " GG GG ", " G G ", + " GG GG ", " GG D GG ", + " GGG D GGG ", " GGGC CGGG ", + " C C ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " C C ", + " GGGCCCCCGGG ", " GGG D GGG ", + " GG B GG ", " GG B GG ", + " G G ", " GG GG ", + " G G ", " G G ", + " C C ", " CC CC ", + " CDBB BBDC ", " CC CC ", + " C C ", " G G ", + " G G ", " GG GG ", + " G G ", " GG B GG ", + " GG B GG ", " GGG D GGG ", + " GGGCCCCCGGG ", " C C ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " C C ", " GGGGGC CGGGGG ", + " GGG D GGG ", " GG EEEBEEE GG ", + " GG GG ", " G G ", + " GG GG ", " G G ", + " G G ", " G E E G ", + " G E E G ", " CC E E CC ", + " DB BD ", " CC E E CC ", + " G E E G ", " G E E G ", + " G G ", " G G ", + " GG GG ", " G G ", + " GG GG ", " GG EEEBEEE GG ", + " GGG D GGG ", " GGGGGC CGGGGG ", + " C C ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " C C ", + " GGGCCCCCGGG ", " GGG D GGG ", + " GG B GG ", " G G ", + " GG GG ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " C C ", " CC CC ", + " CDB BDC ", " CC CC ", + " C C ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " GG GG ", " G G ", + " GG B GG ", " GGG D GGG ", + " GGGCCCCCGGG ", " C C ", + " ", " ", + " " }, + { " ", " ", + " C C ", " GGGC CGGG ", + " GGG D GGG ", " GG EEEBEEE GG ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G E E G ", + " G E E G ", " CC E E CC ", + " DB BD ", " CC E E CC ", + " G E E G ", " G E E G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " GG EEEBEEE GG ", + " GGG D GGG ", " GGGC CGGG ", + " C C ", " ", + " " }, + { " ", " ", + " GGC CGG ", " GGG D GGG ", + " GG B GG ", " GG GG ", + " GG GG ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " C C ", + " DB BD ", " C C ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " GG GG ", " GG GG ", + " GG B GG ", " GGG D GGG ", + " GGC CGG ", " ", + " " }, + { " ", " C C ", + " GGGGC CGGGG ", " GG D GG ", + " GG B GG ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " CC CC ", + " DB BD ", " CC CC ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " GG B GG ", " GG D GG ", + " GGGGC CGGGG ", " C C ", + " " }, + { " ", " GGC CGG ", + " GGG D GGG ", " GG GG ", + " G G ", " GG GG ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " C C ", + " D D ", " C C ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " GG GG ", + " G G ", " GG GG ", + " GGG D GGG ", " GGC CGG ", + " " }, + { " ", " GGGC CGGG ", + " GGG D GGG ", " G G ", + " GG GG ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " C C ", + " D D ", " C C ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " GG GG ", " G G ", + " GGG D GGG ", " GGGC CGGG ", + " " }, + { " CCCCCCC ", " GGGGC CGGGG ", + " GG DDDDDDD GG ", " GG GG ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " GD DG ", + " GD DG ", "CCD DCC", + " D D ", "CCD DCC", + " GD DG ", " GD DG ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " GG GG ", + " GG DDDDDDD GG ", " GGGGC CGGGG ", + " C C " }, + { " CCHHHHHCC ", " GGGGDDDDDGGGG ", + " GG DD DD GG ", " G G ", + " G G ", " G E E G ", + " G G ", " G E E G ", + " G G ", " G G ", + " G G ", " G G ", + " GD DG ", " GD DG ", + " D D ", "CD DC", + " D D ", "CD DC", + " D D ", " GD DG ", + " GD DG ", " G G ", + " G G ", " G G ", + " G G ", " G E E G ", + " G G ", " G E E G ", + " G G ", " G G ", + " GG DD DD GG ", " GGGGDDDDDGGGG ", + " C C " }, + { " CHHHHHHHC ", " GGGDDCDCDDGGG ", + " GG D EEE D GG ", " G G ", + " C C ", " G E E G ", + " C C ", " G E E G ", + " G G ", " G G ", + " G G ", " G G ", + " GD DG ", " D D ", + " D D ", "CCE ECC", + " DE ED ", "CCE ECC", + " D D ", " D D ", + " GD DG ", " G G ", + " G G ", " G G ", + " G G ", " G E E G ", + " C C ", " G E E G ", + " C C ", " G G ", + " GG D EEE D GG ", " GGGDDCDCDDGGG ", + " C C " }, + { " CHHFFFHHC ", " CCCCDCCDCCDCCCC ", + " CCC D EAAAE D CCC ", " CC CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " C C ", " CC CC ", + " C C ", " C C ", + "CCD DCC", "CD DC", + "CCE ECC", "CCA ACC", + "CDA ADC", "CCA ACC", + "CCE ECC", "CD DC", + "CCD DCC", " C C ", + " C C ", " CC CC ", + " C C ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC CC ", + " CCC D EAAAE D CCC ", " CCCCDCCDCCDCCCC ", + " CCCCCCCCC " }, + { " CHHF~FHHC ", " DDDDDDD ", + " DDD EAAAE DDD ", " DD DD ", + " CDBB BBDC ", " DB BD ", + " CDB BDC ", " DB BD ", + " DB BD ", " DB BD ", + " D D ", " D D ", + " D D ", " D D ", + " DE ED ", "CDA ADC", + " DA AD ", "CDA ADC", + " DE ED ", " D D ", + " D D ", " D D ", + " D D ", " DB BD ", + " DB BD ", " DB BD ", + " CDB BDC ", " DB BD ", + " CDBB BBDC ", " DD DD ", + " DDD EAAAE DDD ", " DDDDDDD ", + " C C " }, + { " CHHFFFHHC ", " CCCCDCCDCCDCCCC ", + " CCC D EAAAE D CCC ", " CC CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " C C ", " CC CC ", + " C C ", " C C ", + "CCD DCC", "CD DC", + "CCE ECC", "CCA ACC", + "CDA ADC", "CCA ACC", + "CCE ECC", "CD DC", + "CCD DCC", " C C ", + " C C ", " CC CC ", + " C C ", " CC E E CC ", + " CC CC ", " CC E E CC ", + " CC CC ", " CC CC ", + " CCC D EAAAE D CCC ", " CCCCDCCDCCDCCCC ", + " CCCCCCCCC " }, + { " CHHHHHHHC ", " GGGDDCDCDDGGG ", + " GG D EEE D GG ", " G G ", + " C C ", " G E E G ", + " C C ", " G E E G ", + " G G ", " G G ", + " G G ", " G G ", + " GD DG ", " D D ", + " D D ", "CCE ECC", + " DE ED ", "CCE ECC", + " D D ", " D D ", + " GD DG ", " G G ", + " G G ", " G G ", + " G G ", " G E E G ", + " C C ", " G E E G ", + " C C ", " G G ", + " GG D EEE D GG ", " GGGDDCDCDDGGG ", + " C C " }, + { " CCHHHHHCC ", " GGGGDDDDDGGGG ", + " GG DD DD GG ", " G G ", + " G G ", " G E E G ", + " G G ", " G E E G ", + " G G ", " G G ", + " G G ", " G G ", + " GD DG ", " GD DG ", + " D D ", "CD DC", + " D D ", "CD DC", + " D D ", " GD DG ", + " GD DG ", " G G ", + " G G ", " G G ", + " G G ", " G E E G ", + " G G ", " G E E G ", + " G G ", " G G ", + " GG DD DD GG ", " GGGGDDDDDGGGG ", + " C C " }, + { " CCCCCCC ", " GGGGC CGGGG ", + " GG DDDDDDD GG ", " GG GG ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " GD DG ", + " GD DG ", "CCD DCC", + " D D ", "CCD DCC", + " GD DG ", " GD DG ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " GG GG ", + " GG DDDDDDD GG ", " GGGGC CGGGG ", + " C C " }, + { " ", " GGGC CGGG ", + " GGG D GGG ", " G G ", + " GG GG ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " C C ", + " D D ", " C C ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " GG GG ", " G G ", + " GGG D GGG ", " GGGC CGGG ", + " " }, + { " ", " GGC CGG ", + " GGG D GGG ", " GG GG ", + " G G ", " GG GG ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " C C ", + " D D ", " C C ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " GG GG ", + " G G ", " GG GG ", + " GGG D GGG ", " GGC CGG ", + " " }, + { " ", " C C ", + " GGGGC CGGGG ", " GG D GG ", + " GG B GG ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " CC CC ", + " DB BD ", " CC CC ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " GG B GG ", " GG D GG ", + " GGGGC CGGGG ", " C C ", + " " }, + { " ", " ", + " GGC CGG ", " GGG D GGG ", + " GG B GG ", " GG GG ", + " GG GG ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " C C ", + " DB BD ", " C C ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " GG GG ", " GG GG ", + " GG B GG ", " GGG D GGG ", + " GGC CGG ", " ", + " " }, + { " ", " ", + " C C ", " GGGC CGGG ", + " GGG D GGG ", " GG EEEBEEE GG ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G E E G ", + " G E E G ", " CC E E CC ", + " DB BD ", " CC E E CC ", + " G E E G ", " G E E G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " G G ", " GG EEEBEEE GG ", + " GGG D GGG ", " GGGC CGGG ", + " C C ", " ", + " " }, + { " ", " ", + " ", " C C ", + " GGGCCCCCGGG ", " GGG D GGG ", + " GG B GG ", " G G ", + " GG GG ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " C C ", " CC CC ", + " CDB BDC ", " CC CC ", + " C C ", " G G ", + " G G ", " G G ", + " G G ", " G G ", + " GG GG ", " G G ", + " GG B GG ", " GGG D GGG ", + " GGGCCCCCGGG ", " C C ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " C C ", " GGGGGC CGGGGG ", + " GGG D GGG ", " GG EEEBEEE GG ", + " GG GG ", " G G ", + " GG GG ", " G G ", + " G G ", " G E E G ", + " G E E G ", " CC E E CC ", + " DB BD ", " CC E E CC ", + " G E E G ", " G E E G ", + " G G ", " G G ", + " GG GG ", " G G ", + " GG GG ", " GG EEEBEEE GG ", + " GGG D GGG ", " GGGGGC CGGGGG ", + " C C ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " C C ", + " GGGCCCCCGGG ", " GGG D GGG ", + " GG B GG ", " GG B GG ", + " G G ", " GG GG ", + " G G ", " G G ", + " C C ", " CC CC ", + " CDBB BBDC ", " CC CC ", + " C C ", " G G ", + " G G ", " GG GG ", + " G G ", " GG B GG ", + " GG B GG ", " GGG D GGG ", + " GGGCCCCCGGG ", " C C ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " C C ", " GGGC CGGG ", + " GGG D GGG ", " GG D GG ", + " GG GG ", " G G ", + " GG GG ", " G G ", + " G G ", " CC CC ", + " DD DD ", " CC CC ", + " G G ", " G G ", + " GG GG ", " G D G ", + " GG D GG ", " GG D GG ", + " GGG D GGG ", " GGGC CGGG ", + " C C ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " GGC CGG ", " GGGGC CGGGG ", + " GGG D GGG ", " GGG D GGG ", + " GG DDDDDDD GG ", " GG DD DD GG ", + " GG D EEE D GG ", " CCC D EAAAE D CCC ", + " DDD EAAAE DDD ", " CCC D EAAAE D CCC ", + " GG D EEE D GG ", " GG DD DD GG ", + " GG DDDDDDD GG ", " GGG D GGG ", + " GGG D GGG ", " GGGGC CGGGG ", + " GGC CGG ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " C C ", + " GGC CGG ", " GGGC CGGG ", + " GGGGC CGGGG ", " GGGGDDDDDGGGG ", + " GGGDDCDCDDGGG ", " CCCCDCCDCCDCCCC ", + " DDDDDDD ", " CCCCDCCDCCDCCCC ", + " GGGDDCDCDDGGG ", " GGGGDDDDDGGGG ", + " GGGGC CGGGG ", " GGGC CGGG ", + " GGC CGG ", " C C ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " }, + { " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " C C ", " C C ", + " C C ", " CCCCCCCCC ", + " C C ", " CCCCCCCCC ", + " C C ", " C C ", + " C C ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " " } })) + .addElement('A', ofBlock(sBlockCasingsTT, 10)).addElement('B', ofBlock(sBlockCasingsTT, 11)) + .addElement('C', ofBlock(sBlockCasingsTT, 12)).addElement('D', ofBlock(sBlockCasingsTT, 13)) + .addElement('E', ofBlock(sBlockCasingsTT, 14)).addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'H', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_bhg::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'F', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_bhg::addElementalToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .build(); @Override public IStructureDefinition<GT_MetaTileEntity_EM_bhg> getStructure_EM() { @@ -2398,13 +1213,13 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E } private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.blackholegenerator.hint.0"), // 1 - Classic Hatches or High Power - // Casing - translateToLocal( - "gt.blockmachines.multimachine.em.blackholegenerator.hint.1"), // 2 - Elemental Hatches or Molecular - // Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.hint.0"), // 1 - Classic Hatches or + // High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.hint.1"), // 2 - Elemental Hatches or + // Molecular + // Casing }; // endregion @@ -2547,25 +1362,26 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.blackholegenerator.name")) // Machine Type: Black Hole + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.name")) // Machine Type: + // Black Hole // Generator - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.blackholegenerator.desc.0")) // Controller block of + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.desc.0")) // Controller + // block of // the Black Hole // Generator - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.blackholegenerator.desc.1")) // Uses a black hole to + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.desc.1")) // Uses a black + // hole to // generate power .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(33, 33, 33, false) - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing1D"), - 1) // Energy Hatch: Any High Power Casing with 1 dot - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing1D"), - 1) // Maintenance Hatch: Any High Power Casing with 1 dot + .addSeparator().beginStructureBlock(33, 33, 33, false) + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing1D"), 1) // Energy Hatch: Any + // High Power Casing + // with 1 dot + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing1D"), 1) // Maintenance + // Hatch: Any + // High Power + // Casing with 1 + // dot .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -2579,20 +1395,13 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][12], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][12]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12] }; } @Override 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 1a66eaf46d..3c47c91e5b 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 @@ -11,6 +11,17 @@ import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; + 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; @@ -22,6 +33,7 @@ import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructa import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.util.Vec3Impl; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -34,21 +46,13 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.IGT_HatchAdder; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockBase_EM implements ISurvivalConstructable { + // region variables private final ArrayList<GT_MetaTileEntity_Hatch_Rack> eRacks = new ArrayList<>(); @@ -58,59 +62,54 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.computer.hint.0"), // 1 - Classic/Data Hatches or Computer casing - translateToLocal( - "gt.blockmachines.multimachine.em.computer.hint.1"), // 2 - Rack Hatches or Advanced computer casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.computer.hint.0"), // 1 - Classic/Data Hatches or + // Computer casing + translateToLocal("gt.blockmachines.multimachine.em.computer.hint.1"), // 2 - Rack Hatches or Advanced + // computer casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_computer> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_computer>builder() - .addShape("front", transpose(new String[][] {{" AA"}, {" AA"}, {" ~A"}, {" AA"}})) - .addShape("cap", transpose(new String[][] {{"-CB"}, {" DD"}, {" DD"}, {"-CB"}})) - .addShape("slice", transpose(new String[][] {{"-CB"}, {" ED"}, {" ED"}, {"-CB"}})) - .addShape("back", transpose(new String[][] {{" AA"}, {" AA"}, {" AA"}, {" AA"}})) - .addElement('B', ofBlock(sBlockCasingsTT, 1)) - .addElement('C', ofBlock(sBlockCasingsTT, 2)) - .addElement('D', ofBlock(sBlockCasingsTT, 3)) - .addElement( - 'A', - buildHatchAdder(GT_MetaTileEntity_EM_computer.class) - .atLeast( - Energy.or(HatchElement.EnergyMulti), - Maintenance, - HatchElement.Uncertainty, - HatchElement.OutputData) - .casingIndex(textureOffset + 1) - .dot(1) - .buildAndChain(ofBlock(sBlockCasingsTT, 1))) - .addElement( - 'E', - ofChain( - RackHatchElement.INSTANCE.newAny(textureOffset + 3, 2), - ofBlock(sBlockCasingsTT, 3))) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_computer> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_computer>builder() + .addShape("front", transpose(new String[][] { { " AA" }, { " AA" }, { " ~A" }, { " AA" } })) + .addShape("cap", transpose(new String[][] { { "-CB" }, { " DD" }, { " DD" }, { "-CB" } })) + .addShape("slice", transpose(new String[][] { { "-CB" }, { " ED" }, { " ED" }, { "-CB" } })) + .addShape("back", transpose(new String[][] { { " AA" }, { " AA" }, { " AA" }, { " AA" } })) + .addElement('B', ofBlock(sBlockCasingsTT, 1)).addElement('C', ofBlock(sBlockCasingsTT, 2)) + .addElement('D', ofBlock(sBlockCasingsTT, 3)) + .addElement( + 'A', + buildHatchAdder(GT_MetaTileEntity_EM_computer.class) + .atLeast( + Energy.or(HatchElement.EnergyMulti), + Maintenance, + HatchElement.Uncertainty, + HatchElement.OutputData) + .casingIndex(textureOffset + 1).dot(1).buildAndChain(ofBlock(sBlockCasingsTT, 1))) + .addElement( + 'E', + ofChain(RackHatchElement.INSTANCE.newAny(textureOffset + 3, 2), ofBlock(sBlockCasingsTT, 3))) + .build(); // endregion // region parameters protected Parameters.Group.ParameterIn overclock, overvolt; protected Parameters.Group.ParameterOut maxCurrentTemp, availableData; - private static final INameFunction<GT_MetaTileEntity_EM_computer> OC_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.0"); // Overclock ratio - private static final INameFunction<GT_MetaTileEntity_EM_computer> OV_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.1"); // Overvoltage ratio - private static final INameFunction<GT_MetaTileEntity_EM_computer> MAX_TEMP_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.0"); // Current max. heat - private static final INameFunction<GT_MetaTileEntity_EM_computer> COMPUTE_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.1"); // Produced computation - private static final IStatusFunction<GT_MetaTileEntity_EM_computer> OC_STATUS = - (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 1, 3); - private static final IStatusFunction<GT_MetaTileEntity_EM_computer> OV_STATUS = - (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), .7, .8, 1.2, 2); - private static final IStatusFunction<GT_MetaTileEntity_EM_computer> MAX_TEMP_STATUS = - (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), -10000, 0, 0, 5000); + private static final INameFunction<GT_MetaTileEntity_EM_computer> OC_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.0"); // Overclock ratio + private static final INameFunction<GT_MetaTileEntity_EM_computer> OV_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.1"); // Overvoltage ratio + private static final INameFunction<GT_MetaTileEntity_EM_computer> MAX_TEMP_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.0"); // Current max. heat + private static final INameFunction<GT_MetaTileEntity_EM_computer> COMPUTE_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.1"); // Produced computation + private static final IStatusFunction<GT_MetaTileEntity_EM_computer> OC_STATUS = (base, p) -> LedStatus + .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 1, 3); + private static final IStatusFunction<GT_MetaTileEntity_EM_computer> OV_STATUS = (base, p) -> LedStatus + .fromLimitsInclusiveOuterBoundary(p.get(), .7, .8, 1.2, 2); + private static final IStatusFunction<GT_MetaTileEntity_EM_computer> MAX_TEMP_STATUS = (base, p) -> LedStatus + .fromLimitsInclusiveOuterBoundary(p.get(), -10000, 0, 0, 5000); private static final IStatusFunction<GT_MetaTileEntity_EM_computer> COMPUTE_STATUS = (base, p) -> { if (base.eAvailableData < 0) { return STATUS_TOO_LOW; @@ -206,8 +205,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); - if (aBaseMetaTileEntity.isServerSide() - && mMachine + if (aBaseMetaTileEntity.isServerSide() && mMachine && !aBaseMetaTileEntity.isActive() && aTick % 20 == MULTI_CHECK_AT) { double maxTemp = 0; @@ -319,15 +317,14 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.computer.name")) // Machine Type: Quantum Computer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.computer.desc.0")) // Controller block of the Quantum Computer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.computer.desc.1")) // Used to generate computation (and heat) + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.computer.name")) // Machine Type: Quantum + // Computer + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.computer.desc.0")) // Controller block of + // the Quantum Computer + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.computer.desc.1")) // Used to generate + // computation (and heat) .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginVariableStructureBlock(2, 2, 4, 4, 5, 16, false) + .addSeparator().beginVariableStructureBlock(2, 2, 4, 4, 5, 16, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.certain.tier.07.name"), translateToLocal("tt.keyword.Structure.AnyComputerCasingFirstOrLastSlice"), @@ -345,12 +342,26 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB translateToLocal("tt.keyword.Structure.Optional") + " " + translateToLocal("tt.keyword.Structure.AnyComputerCasingFirstOrLastSlice"), 2) // Parametrizer: (optional) Any Computer Casing on first or last slice - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyComputerCasingFirstOrLastSlice"), - 1) // Energy Hatch: Any Computer Casing on first or last slice - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyComputerCasingFirstOrLastSlice"), - 1) // Maintenance Hatch: Any Computer Casing on first or last slice + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyComputerCasingFirstOrLastSlice"), 1) // Energy + // Hatch: + // Any + // Computer + // Casing + // on + // first + // or + // last + // slice + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyComputerCasingFirstOrLastSlice"), 1) // Maintenance + // Hatch: + // Any + // Computer + // Casing + // on + // first + // or + // last + // slice .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -364,20 +375,13 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][3], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][3], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][3]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][3] }; } @Override @@ -489,6 +493,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB } private enum RackHatchElement implements IHatchElement<GT_MetaTileEntity_EM_computer> { + INSTANCE; @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java index 293baacb54..b9c6ec98d7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java @@ -8,12 +8,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; 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; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -21,14 +26,12 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region variables private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; @@ -38,59 +41,49 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal( - "gt.blockmachines.multimachine.em.crafter.hint.1"), // 2 - Elemental Hatches or Molecular Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.1"), // 2 - Elemental Hatches or Molecular + // Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_crafting> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_crafting>builder() - .addShape("main", transpose(new String[][] { - { - " AAA ", "AAAAA", "A A", "BBBBB", "BGCGB", "BGGGB", "BGCGB", "BBBBB", "A A", "AAAAA", - " AAA " - }, - { - "AHHHA", "AAAAA", " FFF ", "BBBBB", "GGGGG", "GGGGG", "GGGGG", "BBBBB", " FFF ", "AAAAA", - "AHHHA" - }, - { - "AH~HA", "AAAAA", " FEF ", "BBEBB", "CGEGC", "GGDGG", "CGEGC", "BBEBB", " FEF ", "AAAAA", - "AHHHA" - }, - { - "AHHHA", "AAAAA", " FFF ", "BBBBB", "GGGGG", "GGGGG", "GGGGG", "BBBBB", " FFF ", "AAAAA", - "AHHHA" - }, - { - " AAA ", "AAAAA", "A A", "BBBBB", "BGCGB", "BGGGB", "BGCGB", "BBBBB", "A A", "AAAAA", - " AAA " - } - })) - .addElement('A', ofBlock(sBlockCasingsTT, 4)) - .addElement('B', ofBlock(sBlockCasingsTT, 5)) - .addElement('C', ofBlock(sBlockCasingsTT, 6)) - .addElement('D', ofBlock(sBlockCasingsTT, 9)) - .addElement('E', ofBlock(sBlockCasingsTT, 10)) - .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'H', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_crafting::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'F', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_crafting::addElementalToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_crafting> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_crafting>builder() + .addShape( + "main", + transpose( + new String[][] { + { " AAA ", "AAAAA", "A A", "BBBBB", "BGCGB", "BGGGB", "BGCGB", "BBBBB", "A A", + "AAAAA", " AAA " }, + { "AHHHA", "AAAAA", " FFF ", "BBBBB", "GGGGG", "GGGGG", "GGGGG", "BBBBB", " FFF ", + "AAAAA", "AHHHA" }, + { "AH~HA", "AAAAA", " FEF ", "BBEBB", "CGEGC", "GGDGG", "CGEGC", "BBEBB", " FEF ", + "AAAAA", "AHHHA" }, + { "AHHHA", "AAAAA", " FFF ", "BBBBB", "GGGGG", "GGGGG", "GGGGG", "BBBBB", " FFF ", + "AAAAA", "AHHHA" }, + { " AAA ", "AAAAA", "A A", "BBBBB", "BGCGB", "BGGGB", "BGCGB", "BBBBB", "A A", + "AAAAA", " AAA " } })) + .addElement('A', ofBlock(sBlockCasingsTT, 4)).addElement('B', ofBlock(sBlockCasingsTT, 5)) + .addElement('C', ofBlock(sBlockCasingsTT, 6)).addElement('D', ofBlock(sBlockCasingsTT, 9)) + .addElement('E', ofBlock(sBlockCasingsTT, 10)).addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'H', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_crafting::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'F', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_crafting::addElementalToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .build(); // endregion public GT_MetaTileEntity_EM_crafting(int aID, String aName, String aNameRegional) { @@ -122,42 +115,33 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.crafter.name")) // Machine Type: Matter Assembler - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.crafter.desc.0")) // Controller block of the Matter Assembler + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.crafter.name")) // Machine Type: Matter + // Assembler + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.crafter.desc.0")) // Controller block of the + // Matter Assembler .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(5, 5, 11, false) + .addSeparator().beginStructureBlock(5, 5, 11, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.Elemental"), translateToLocal("tt.keyword.Structure.AnyMolecularCasing2D"), 2) // Elemental Hatch: Any Molecular Casing with 2 dot - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][12], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][12]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12] }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java index c663fea79b..077f77337a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java @@ -10,6 +10,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.mechanics.dataTransport.InventoryDataPacket; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputDataItems; @@ -20,6 +31,7 @@ import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -31,18 +43,10 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.IGT_HatchAdder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockBase_EM implements ISurvivalConstructable { + // region variables private final ArrayList<GT_MetaTileEntity_Hatch_OutputDataItems> eStacksDataOutputs = new ArrayList<>(); private final ArrayList<IInventory> eDataAccessHatches = new ArrayList<>(); @@ -51,34 +55,31 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.databank.hint.0"), // 1 - Classic Hatches or high power casing - translateToLocal( - "gt.blockmachines.multimachine.em.databank.hint.1"), // 2 - Data Access/Data Bank Master Hatches or - // computer casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.databank.hint.0"), // 1 - Classic Hatches or high power + // casing + translateToLocal("gt.blockmachines.multimachine.em.databank.hint.1"), // 2 - Data Access/Data Bank Master + // Hatches or + // computer casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_dataBank> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_dataBank>builder() - .addShape("main", transpose(new String[][] { - {"BCCCB", "BDDDB", "BDDDB"}, - {"BC~CB", "BAAAB", "BDDDB"}, - {"BCCCB", "BDDDB", "BDDDB"} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 1)) - .addElement('B', ofBlock(sBlockCasingsTT, 2)) - .addElement('C', classicHatches(textureOffset, 1, sBlockCasingsTT, 0)) - .addElement( - 'D', - buildHatchAdder(GT_MetaTileEntity_EM_dataBank.class) - .atLeast(DataBankHatches.OutboundConnector, DataBankHatches.InboundConnector) - .casingIndex(textureOffset + 1) - .dot(2) - .buildAndChain( - DataBankHatches.DataStick.newAny(textureOffset + 1, 2), - ofBlock(sBlockCasingsTT, 1))) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_dataBank> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_dataBank>builder() + .addShape( + "main", + transpose( + new String[][] { { "BCCCB", "BDDDB", "BDDDB" }, { "BC~CB", "BAAAB", "BDDDB" }, + { "BCCCB", "BDDDB", "BDDDB" } })) + .addElement('A', ofBlock(sBlockCasingsTT, 1)).addElement('B', ofBlock(sBlockCasingsTT, 2)) + .addElement('C', classicHatches(textureOffset, 1, sBlockCasingsTT, 0)) + .addElement( + 'D', + buildHatchAdder(GT_MetaTileEntity_EM_dataBank.class) + .atLeast(DataBankHatches.OutboundConnector, DataBankHatches.InboundConnector) + .casingIndex(textureOffset + 1).dot(2).buildAndChain( + DataBankHatches.DataStick.newAny(textureOffset + 1, 2), + ofBlock(sBlockCasingsTT, 1))) + .build(); // endregion public GT_MetaTileEntity_EM_dataBank(int aID, String aName, String aNameRegional) { @@ -98,18 +99,17 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.databank.name")) // Machine Type: Data Bank - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.databank.desc.0")) // Controller block of the Data Bank - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.databank.desc.1")) // Used to supply Assembling Lines + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.databank.desc.0")) // Controller block of + // the Data Bank + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.databank.desc.1")) // Used to supply + // Assembling Lines // with more Data Sticks - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.databank.desc.2")) // and give multiple Assembling + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.databank.desc.2")) // and give multiple + // Assembling // Lines access to the same Data // Stick .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(5, 3, 3, false) + .addSeparator().beginStructureBlock(5, 3, 3, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.DataAccessHatch"), translateToLocal("tt.keyword.Structure.AnyComputerCasing"), @@ -118,12 +118,11 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB translateToLocal("gt.blockmachines.hatch.dataoutass.tier.07.name"), translateToLocal("tt.keyword.Structure.AnyComputerCasing"), 2) // Data Bank Master Connector: Any Computer Casing - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -173,23 +172,15 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][1], - new TT_RenderedExtendedFacingTexture( - aActive - ? GT_MetaTileEntity_MultiblockBase_EM.ScreenON - : GT_MetaTileEntity_MultiblockBase_EM.ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][1], + new TT_RenderedExtendedFacingTexture( + aActive ? GT_MetaTileEntity_MultiblockBase_EM.ScreenON + : GT_MetaTileEntity_MultiblockBase_EM.ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][1]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][1] }; } public static final ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_hi_freq"); @@ -213,13 +204,14 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB return eStacksDataOutputs.add((GT_MetaTileEntity_Hatch_OutputDataItems) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DataAccess && !(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputDataItems)) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return eDataAccessHatches.add(aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputDataItems) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - slave = true; - return eDataAccessHatches.add(aMetaTileEntity); - } + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return eDataAccessHatches.add(aMetaTileEntity); + } else + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputDataItems) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + slave = true; + return eDataAccessHatches.add(aMetaTileEntity); + } return false; } @@ -245,19 +237,23 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB } private enum DataBankHatches implements IHatchElement<GT_MetaTileEntity_EM_dataBank> { + DataStick(GT_MetaTileEntity_Hatch_DataAccess.class) { + @Override public long count(GT_MetaTileEntity_EM_dataBank t) { return t.eDataAccessHatches.size(); } }, OutboundConnector(GT_MetaTileEntity_Hatch_OutputDataItems.class) { + @Override public long count(GT_MetaTileEntity_EM_dataBank t) { return t.eStacksDataOutputs.size(); } }, InboundConnector(GT_MetaTileEntity_Hatch_InputDataItems.class) { + @Override public long count(GT_MetaTileEntity_EM_dataBank t) { return t.eDataAccessHatches.size(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java index 3c69391f17..888ca8f818 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java @@ -13,6 +13,14 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; @@ -25,6 +33,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_Rend import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -37,26 +46,20 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; import ic2.core.init.MainConfig; import ic2.core.util.ConfigUtil; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region variables private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; public static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10 * EM_COUNT_PER_MATERIAL_AMOUNT; - private static final double URANIUM_MASS_TO_EU_PARTIAL = - ConfigUtil.getDouble(MainConfig.get(), "balance/energy/generator/nuclear") - * 3_000_000.0 - / URANIUM_INGOT_MASS_DIFF; + private static final double URANIUM_MASS_TO_EU_PARTIAL = ConfigUtil + .getDouble(MainConfig.get(), "balance/energy/generator/nuclear") * 3_000_000.0 + / URANIUM_INGOT_MASS_DIFF; public static final double URANIUM_MASS_TO_EU_INSTANT = URANIUM_MASS_TO_EU_PARTIAL * 20; private String clientLocale = "en_US"; @@ -64,47 +67,50 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal("gt.blockmachines.multimachine.em.decay.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal("gt.blockmachines.multimachine.em.decay.hint.1"), // 2 - Elemental Hatches or Molecular Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.decay.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.decay.hint.1"), // 2 - Elemental Hatches or Molecular + // Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_decay> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_decay>builder() - .addShape("main", transpose(new String[][] { - {"A A", "AAAAA", "A A", "ABBBA", "ABCBA", "ABBBA", "A A", "AAAAA", "A A"}, - {" FFF ", "AAAAA", " EEE ", "BDDDB", "BDDDB", "BDDDB", " EEE ", "AAAAA", " FFF "}, - {" F~F ", "AAAAA", " EAE ", "BDDDB", "CDDDC", "BDDDB", " EAE ", "AAAAA", " FFF "}, - {" FFF ", "AAAAA", " EEE ", "BDDDB", "BDDDB", "BDDDB", " EEE ", "AAAAA", " FFF "}, - {"A A", "AAAAA", "A A", "ABBBA", "ABCBA", "ABBBA", "A A", "AAAAA", "A A"} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 4)) - .addElement('B', ofBlock(sBlockCasingsTT, 5)) - .addElement('C', ofBlock(sBlockCasingsTT, 6)) - .addElement('D', ofBlock(sBlockCasingsTT, 8)) - .addElement( - 'F', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_decay::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'E', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_decay::addElementalToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_decay> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_decay>builder() + .addShape( + "main", + transpose( + new String[][] { + { "A A", "AAAAA", "A A", "ABBBA", "ABCBA", "ABBBA", "A A", "AAAAA", "A A" }, + { " FFF ", "AAAAA", " EEE ", "BDDDB", "BDDDB", "BDDDB", " EEE ", "AAAAA", " FFF " }, + { " F~F ", "AAAAA", " EAE ", "BDDDB", "CDDDC", "BDDDB", " EAE ", "AAAAA", " FFF " }, + { " FFF ", "AAAAA", " EEE ", "BDDDB", "BDDDB", "BDDDB", " EEE ", "AAAAA", " FFF " }, + { "A A", "AAAAA", "A A", "ABBBA", "ABCBA", "ABBBA", "A A", "AAAAA", + "A A" } })) + .addElement('A', ofBlock(sBlockCasingsTT, 4)).addElement('B', ofBlock(sBlockCasingsTT, 5)) + .addElement('C', ofBlock(sBlockCasingsTT, 6)).addElement('D', ofBlock(sBlockCasingsTT, 8)) + .addElement( + 'F', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_decay::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'E', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_decay::addElementalToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .build(); // endregion // region parameters protected Parameters.Group.ParameterIn ampereFlow; - private static final INameFunction<GT_MetaTileEntity_EM_decay> FLOW_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.decay.conf"); // Ampere divider + private static final INameFunction<GT_MetaTileEntity_EM_decay> FLOW_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.em.decay.conf"); // Ampere divider private static final IStatusFunction<GT_MetaTileEntity_EM_decay> FLOW_STATUS = (base, p) -> { if (base.eAmpereFlow <= 0) { return STATUS_TOO_LOW; @@ -151,11 +157,10 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase outputEM[1] = new EMInstanceStackMap(); for (EMInstanceStack stack : outputEM[0].valuesToArray()) { - if (stack.getEnergy() == 0 - && stack.getDefinition().decayMakesEnergy(1) - && getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - (long) (stack.getEnergySettingCost(1) * URANIUM_MASS_TO_EU_INSTANT), false)) { + if (stack.getEnergy() == 0 && stack.getDefinition().decayMakesEnergy(1) + && getBaseMetaTileEntity().decreaseStoredEnergyUnits( + (long) (stack.getEnergySettingCost(1) * URANIUM_MASS_TO_EU_INSTANT), + false)) { stack.setEnergy(1); } else if (!stack.getDefinition().decayMakesEnergy(stack.getEnergy())) { outputEM[0].removeKey(stack.getDefinition()); @@ -184,15 +189,14 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.decay.name")) // Machine Type: Decay Generator - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.decay.desc.0")) // Controller block of the Decay Generator - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.decay.desc.1")) // Decays elemental matter to generate power + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.decay.name")) // Machine Type: Decay + // Generator + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.decay.desc.0")) // Controller block of the + // Decay Generator + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.decay.desc.1")) // Decays elemental matter + // to generate power .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(5, 5, 9, false) + .addSeparator().beginStructureBlock(5, 5, 9, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.Elemental"), translateToLocal("tt.keyword.Structure.AnyMolecularCasing2D"), @@ -202,12 +206,11 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase translateToLocal("tt.keyword.Structure.Optional") + " " + translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Parametrizer: (optional) Any High Power Casing - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -229,43 +232,75 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase } } - return new String[] { - translateToLocalFormatted("tt.keyword.Progress", clientLocale) + ":", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " - + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(mMaxProgresstime / 20) - + EnumChatFormatting.RESET + " s", - translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " - + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET - + " EU", - (mEUt <= 0 - ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " - : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t at " - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(eAmpereFlow) + EnumChatFormatting.RESET + " A", - translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW - + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN - + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) - + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(eMaxAmpereFlow) + EnumChatFormatting.RESET + " A", - translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED - + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) - + ": " + EnumChatFormatting.YELLOW - + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", - translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE - + ePowerPass + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) - + ": " + EnumChatFormatting.BLUE - + eSafeVoid, - translateToLocalFormatted("tt.keyword.Computation", clientLocale) + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(eAvailableData) + EnumChatFormatting.RESET + " / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(eRequiredData) + EnumChatFormatting.RESET, - }; + return new String[] { translateToLocalFormatted("tt.keyword.Progress", clientLocale) + ":", + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mProgresstime / 20) + + EnumChatFormatting.RESET + + " s / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(mMaxProgresstime / 20) + + EnumChatFormatting.RESET + + " s", + translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + + EnumChatFormatting.RESET + + " EU / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEnergy) + + EnumChatFormatting.RESET + + " EU", + (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " + : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(Math.abs(mEUt)) + + EnumChatFormatting.RESET + + " EU/t at " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(eAmpereFlow) + + EnumChatFormatting.RESET + + " A", + translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + + EnumChatFormatting.YELLOW + + VN[getMaxEnergyInputTier_EM()] + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.GREEN + + VN[getMinEnergyInputTier_EM()] + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(eMaxAmpereFlow) + + EnumChatFormatting.RESET + + " A", + translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + + EnumChatFormatting.RED + + (getIdealStatus() - getRepairStatus()) + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + + ": " + + EnumChatFormatting.YELLOW + + mEfficiency / 100.0F + + EnumChatFormatting.RESET + + " %", + translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + + EnumChatFormatting.BLUE + + ePowerPass + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + + ": " + + EnumChatFormatting.BLUE + + eSafeVoid, + translateToLocalFormatted("tt.keyword.Computation", clientLocale) + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(eAvailableData) + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(eRequiredData) + + EnumChatFormatting.RESET, }; } @Override @@ -277,20 +312,13 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][12], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][12]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][12] }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java index d2132869ee..77901be6fb 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java @@ -12,6 +12,14 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; @@ -24,17 +32,12 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEnt import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; /** * Created by danie_000 on 17.12.2016. @@ -43,48 +46,47 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo // region structure // use multi A energy inputs, use less power the longer it runs - private static final IStructureDefinition<GT_MetaTileEntity_EM_dequantizer> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_dequantizer>builder() - .addShape("main", transpose(new String[][] { - {"CCC", "ABA", "EEE", "BDB"}, - {"C~C", "BBB", "EBE", "DFD"}, - {"CCC", "ABA", "EEE", "BDB"} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 0)) - .addElement('B', ofBlock(sBlockCasingsTT, 4)) - .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'C', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_dequantizer::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'F', - ofHatchAdder( - GT_MetaTileEntity_EM_dequantizer::addElementalInputToMachineList, - textureOffset + 4, - 2)) - .addElement( - 'E', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_dequantizer::addElementalMufflerToMachineList, - textureOffset + 4, - 3, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_dequantizer> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_dequantizer>builder() + .addShape( + "main", + transpose( + new String[][] { { "CCC", "ABA", "EEE", "BDB" }, { "C~C", "BBB", "EBE", "DFD" }, + { "CCC", "ABA", "EEE", "BDB" } })) + .addElement('A', ofBlock(sBlockCasingsTT, 0)).addElement('B', ofBlock(sBlockCasingsTT, 4)) + .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'C', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_dequantizer::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'F', + ofHatchAdder( + GT_MetaTileEntity_EM_dequantizer::addElementalInputToMachineList, + textureOffset + 4, + 2)) + .addElement( + 'E', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_dequantizer::addElementalMufflerToMachineList, + textureOffset + 4, + 3, + sBlockCasingsTT, + 4)) + .build(); private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.emtomatter.hint.0"), // 1 - Classic Hatches or High Power Casing" - translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.1"), // 2 - Elemental Input Hatch - translateToLocal( - "gt.blockmachines.multimachine.em.emtomatter.hint.2"), // 3 - Elemental Overflow Hatches or Molecular - // Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.0"), // 1 - Classic Hatches or High Power + // Casing" + translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.1"), // 2 - Elemental Input Hatch + translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.2"), // 3 - Elemental Overflow Hatches or + // Molecular + // Casing }; // endregion @@ -124,21 +126,20 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) { EMInstanceStackMap map = in.getContentHandler(); for (EMInstanceStack stack : map.valuesToArray()) { - EMDequantizationInfo emDequantizationInfo = - TecTech.transformationInfo.getInfoMap().get(stack.getDefinition()); - if (emDequantizationInfo != null - && emDequantizationInfo.getStack() != null + EMDequantizationInfo emDequantizationInfo = TecTech.transformationInfo.getInfoMap() + .get(stack.getDefinition()); + if (emDequantizationInfo != null && emDequantizationInfo.getStack() != null && map.removeAllAmounts(emDequantizationInfo.getInput())) { Object out = emDequantizationInfo.getStack(); if (out instanceof ItemStack) { - mOutputItems = new ItemStack[] {emDequantizationInfo.getItem()}; + mOutputItems = new ItemStack[] { emDequantizationInfo.getItem() }; } else if (out instanceof FluidStack) { - mOutputFluids = new FluidStack[] {emDequantizationInfo.getFluid()}; + mOutputFluids = new FluidStack[] { emDequantizationInfo.getFluid() }; } else if (out instanceof OreDictionaryStack) { - ArrayList<ItemStack> items = OreDictionary.getOres(OreDictionary.getOreName( - emDequantizationInfo.getOre().getOreId())); + ArrayList<ItemStack> items = OreDictionary + .getOres(OreDictionary.getOreName(emDequantizationInfo.getOre().getOreId())); if (items != null && !items.isEmpty()) { - mOutputItems = new ItemStack[] {items.get(0)}; + mOutputItems = new ItemStack[] { items.get(0) }; } } startRecipe(emDequantizationInfo.getInput(), stack.getEnergy()); @@ -152,17 +153,16 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.emtomatter.name")) // Machine Type: Matter Dequantizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.emtomatter.desc.0")) // Controller block of the Matter + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.emtomatter.name")) // Machine Type: Matter + // Dequantizer + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.emtomatter.desc.0")) // Controller block of + // the Matter // Dequantizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.emtomatter.desc.1")) // Transforms elemental matter + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.emtomatter.desc.1")) // Transforms elemental + // matter // back into items .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(3, 3, 4, false) + .addSeparator().beginStructureBlock(3, 3, 4, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.ElementalInput"), translateToLocal("tt.keyword.Structure.BackCenter"), @@ -171,15 +171,19 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo translateToLocal("tt.keyword.Structure.ElementalOverflow"), translateToLocal("tt.keyword.Structure.AnyOuterMolecularCasing3rd"), 3) // Elemental Overflow Hatch: Any outer Molecular Casing on the 3rd slice - .addOutputBus( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Output Bus: Any High Power Casing on the front side - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Energy Hatch: Any High Power Casing on the front side - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Maintenance Hatch: Any High Power Casing on the front side + .addOutputBus(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Output Bus: Any + // High Power Casing + // on the front side + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Energy Hatch: + // Any High Power + // Casing on the + // front side + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Maintenance + // Hatch: Any + // High Power + // Casing on + // the front + // side .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java index de338c53e8..9faf3f9c43 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java @@ -9,13 +9,21 @@ import static gregtech.api.GregTech_API.mEUtoRF; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + import cofh.api.energy.IEnergyContainerItem; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Materials; @@ -25,11 +33,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; /** * Created by danie_000 on 17.12.2016. @@ -42,30 +45,28 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal("gt.blockmachines.multimachine.em.infuser.hint"), // 1 - Classic Hatches or High Power Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.infuser.hint"), // 1 - Classic Hatches or High Power + // Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_infuser> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_infuser>builder() - .addShape("main", transpose(new String[][] { - {"CCC", "CCC", "CCC"}, - {"BBB", "BAB", "BBB"}, - {"A~A", "AAA", "AAA"}, - {"BBB", "BAB", "BBB"}, - {"CCC", "CCC", "CCC"} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 4)) - .addElement('B', ofBlock(sBlockCasingsTT, 7)) - .addElement( - 'C', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_infuser::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_infuser> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_infuser>builder() + .addShape( + "main", + transpose( + new String[][] { { "CCC", "CCC", "CCC" }, { "BBB", "BAB", "BBB" }, { "A~A", "AAA", "AAA" }, + { "BBB", "BAB", "BBB" }, { "CCC", "CCC", "CCC" } })) + .addElement('A', ofBlock(sBlockCasingsTT, 4)).addElement('B', ofBlock(sBlockCasingsTT, 7)) + .addElement( + 'C', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_infuser::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .build(); // endregion public GT_MetaTileEntity_EM_infuser(int aID, String aName, String aNameRegional) { @@ -124,8 +125,8 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa private long doChargeItemStackRF(IEnergyContainerItem item, ItemStack stack) { try { - long RF = - Math.min(item.getMaxEnergyStored(stack) - item.getEnergyStored(stack), getEUVar() * mEUtoRF / 100L); + long RF = Math + .min(item.getMaxEnergyStored(stack) - item.getEnergyStored(stack), getEUVar() * mEUtoRF / 100L); RF = item.receiveEnergy(stack, RF > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) RF, false); RF = RF * 100L / mEUtoRF; setEUVar(getEUVar() - RF); @@ -194,16 +195,14 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa } else { if (item.isRepairable()) { FluidStack uum = getStoredFluids().stream() - .filter(fluid -> Materials.UUMatter.getFluid(1) - .isFluidEqual(fluid)) - .findAny() - .orElse(null); + .filter(fluid -> Materials.UUMatter.getFluid(1).isFluidEqual(fluid)) + .findAny().orElse(null); if (uum != null) { - int repairedDamage = - Math.min(item.getDamage(itemStackInBus), maxRepairedDamagePerOperation); + int repairedDamage = Math + .min(item.getDamage(itemStackInBus), maxRepairedDamagePerOperation); long euCost = repairedDamage * usedEuPerDurability; - if (getEUVar() >= euCost - && depleteInput(new FluidStack( + if (getEUVar() >= euCost && depleteInput( + new FluidStack( Materials.UUMatter.mFluid, repairedDamage * usedUumPerDurability))) { item.setDamage( @@ -235,41 +234,39 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.infuser.name")) // Machine Type: Energy Infuser - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.infuser.desc.0")) // Controller block of the Energy Infuser - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.infuser.desc.1")) // Can be used to charge items (lossless) - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.infuser.desc.2")) // Can be fed with UU-Matter to repair items - .addSeparator() - .beginStructureBlock(3, 5, 3, false) - .addController( - translateToLocal("tt.keyword.Structure.FrontCenter3rd")) // Controller: Front 3rd layer center + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.infuser.name")) // Machine Type: Energy + // Infuser + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.0")) // Controller block of the + // Energy Infuser + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.1")) // Can be used to charge + // items (lossless) + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.2")) // Can be fed with + // UU-Matter to repair + // items + .addSeparator().beginStructureBlock(3, 5, 3, false) + .addController(translateToLocal("tt.keyword.Structure.FrontCenter3rd")) // Controller: Front 3rd layer + // center .addOtherStructurePart( translateToLocal("gt.blockcasingsTT.0.name"), - translateToLocal( - "gt.blockmachines.multimachine.em.infuser.Structure.HighPowerCasing")) // High Power + translateToLocal("gt.blockmachines.multimachine.em.infuser.Structure.HighPowerCasing")) // High + // Power // Casing: Layer // 1 and 5 .addOtherStructurePart( translateToLocal("gt.blockcasingsTT.7.name"), - translateToLocal( - "gt.blockmachines.multimachine.em.infuser.Structure.MolecularCoil")) // Molecular Coil: + translateToLocal("gt.blockmachines.multimachine.em.infuser.Structure.MolecularCoil")) // Molecular + // Coil: // Layer 2 and 4 .addOtherStructurePart( translateToLocal("gt.blockcasingsTT.4.name"), - translateToLocal( - "gt.blockmachines.multimachine.em.infuser.Structure.MolecularCasing")) // Molecular + translateToLocal("gt.blockmachines.multimachine.em.infuser.Structure.MolecularCasing")) // Molecular // Casing: Layer // 3 (hollow) - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_GENERAL); return tt; } 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 5342393157..833fd7112f 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 @@ -8,6 +8,9 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputElemental; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; @@ -17,68 +20,64 @@ 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; + import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region structure // use multi A energy inputs, use less power the longer it runs private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.junction.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal( - "gt.blockmachines.multimachine.em.junction.hint.1"), // 2 - Elemental Hatches or Molecular Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.junction.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.junction.hint.1"), // 2 - Elemental Hatches or Molecular + // Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_junction> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_junction>builder() - .addShape("main", new String[][] { - {"CCC", "C~C", "CCC"}, - {"AAA", "AAA", "AAA"}, - {"DDD", "DAD", "DDD"}, - {"DDD", "DDD", "DDD"} - }) - .addShape("mainBig", new String[][] { - {" A ", " CCC ", "AC~CA", " CCC ", " A "}, - {" DDD ", "DAAAD", "DAAAD", "DAAAD", " DDD "}, - {"ADDDA", "DAAAD", "DABAD", "DAAAD", "ADDDA"}, - {" DDD ", "DAAAD", "DAAAD", "DAAAD", " DDD "}, - {" A ", "DDDDD", "ADDDA", "DDDDD", " A "} - }) - .addElement('A', ofBlock(sBlockCasingsTT, 4)) - .addElement('B', ofBlock(sBlockCasingsTT, 5)) - .addElement( - 'C', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_junction::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'D', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_junction::addElementalToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_junction> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_junction>builder() + .addShape( + "main", + new String[][] { { "CCC", "C~C", "CCC" }, { "AAA", "AAA", "AAA" }, { "DDD", "DAD", "DDD" }, + { "DDD", "DDD", "DDD" } }) + .addShape( + "mainBig", + new String[][] { { " A ", " CCC ", "AC~CA", " CCC ", " A " }, + { " DDD ", "DAAAD", "DAAAD", "DAAAD", " DDD " }, + { "ADDDA", "DAAAD", "DABAD", "DAAAD", "ADDDA" }, + { " DDD ", "DAAAD", "DAAAD", "DAAAD", " DDD " }, + { " A ", "DDDDD", "ADDDA", "DDDDD", " A " } }) + .addElement('A', ofBlock(sBlockCasingsTT, 4)).addElement('B', ofBlock(sBlockCasingsTT, 5)) + .addElement( + 'C', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_junction::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'D', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_junction::addElementalToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .build(); // endregion // region parameters - private static final INameFunction<GT_MetaTileEntity_EM_junction> ROUTE_NAME = (base, p) -> (p.parameterId() == 0 - ? translateToLocal("tt.keyword.Source") + " " - : translateToLocal("tt.keyword.Destination") + " ") - + p.hatchId(); + private static final INameFunction<GT_MetaTileEntity_EM_junction> ROUTE_NAME = (base, + p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Source") + " " + : translateToLocal("tt.keyword.Destination") + " ") + p.hatchId(); private static final IStatusFunction<GT_MetaTileEntity_EM_junction> SRC_STATUS = (base, p) -> { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; @@ -119,8 +118,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - int meta = iGregTechTileEntity.getMetaIDAtSideAndDistance( - GT_Utility.getOppositeSide(iGregTechTileEntity.getFrontFacing()), 2); + int meta = iGregTechTileEntity + .getMetaIDAtSideAndDistance(GT_Utility.getOppositeSide(iGregTechTileEntity.getFrontFacing()), 2); if (meta == 4) { return structureCheck_EM("main", 1, 1, 0); } else if (meta == 5) { @@ -174,18 +173,17 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.junction.name")) // Machine Type: Matter Junction - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.junction.desc.0")) // Controller block of the Matter Junction - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.junction.desc.1")) // Used to route and distribute + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.junction.name")) // Machine Type: Matter + // Junction + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.junction.desc.0")) // Controller block of + // the Matter Junction + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.junction.desc.1")) // Used to route and + // distribute // elemental matter - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.junction.desc.2")) // Needs a Parametrizer to be configured + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.junction.desc.2")) // Needs a Parametrizer + // to be configured .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(3, 3, 4, false) + .addSeparator().beginStructureBlock(3, 3, 4, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.ElementalOutput"), translateToLocal("tt.keyword.Structure.AnyOuterMolecularCasing3rd4th"), @@ -199,12 +197,16 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB translateToLocal("tt.keyword.Structure.Optional") + " " + translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 2) // Parametrizer: (optional) Any High Power Casing on the front side - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Energy Hatch: Any High Power Casing on the front side - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Maintenance Hatch: Any High Power Casing on the front side + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Energy Hatch: + // Any High Power + // Casing on the + // front side + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Maintenance + // Hatch: Any + // High Power + // Casing on + // the front + // side .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java index 4de9308ec5..66c51ff0d1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java @@ -17,6 +17,14 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; @@ -30,67 +38,59 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEnt import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region structure // use multi A energy inputs, use less power the longer it runs - private static final IStructureDefinition<GT_MetaTileEntity_EM_quantizer> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_quantizer>builder() - .addShape("main", transpose(new String[][] { - {"CCC", "BAB", "EEE", "DBD"}, - {"C~C", "ABA", "EBE", "BFB"}, - {"CCC", "BAB", "EEE", "DBD"} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 0)) - .addElement('B', ofBlock(sBlockCasingsTT, 4)) - .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'C', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_quantizer::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'F', - ofHatchAdder( - GT_MetaTileEntity_EM_quantizer::addElementalOutputToMachineList, - textureOffset + 4, - 2)) - .addElement( - 'E', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_quantizer::addElementalMufflerToMachineList, - textureOffset + 4, - 3, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_quantizer> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_quantizer>builder() + .addShape( + "main", + transpose( + new String[][] { { "CCC", "BAB", "EEE", "DBD" }, { "C~C", "ABA", "EBE", "BFB" }, + { "CCC", "BAB", "EEE", "DBD" } })) + .addElement('A', ofBlock(sBlockCasingsTT, 0)).addElement('B', ofBlock(sBlockCasingsTT, 4)) + .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'C', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_quantizer::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'F', + ofHatchAdder(GT_MetaTileEntity_EM_quantizer::addElementalOutputToMachineList, textureOffset + 4, 2)) + .addElement( + 'E', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_quantizer::addElementalMufflerToMachineList, + textureOffset + 4, + 3, + sBlockCasingsTT, + 4)) + .build(); private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.mattertoem.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.1"), // 2 - Elemental Output Hatch - translateToLocal( - "gt.blockmachines.multimachine.em.mattertoem.hint.2"), // 3 - Elemental Overflow Hatches or Molecular - // Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.1"), // 2 - Elemental Output Hatch + translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.2"), // 3 - Elemental Overflow Hatches or + // Molecular + // Casing }; // endregion @@ -120,12 +120,10 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock if (inI.length > 0) { for (ItemStack is : inI) { // ITEM STACK quantization - EMItemQuantizationInfo aIQI = TecTech.transformationInfo - .getItemQuantization() + EMItemQuantizationInfo aIQI = TecTech.transformationInfo.getItemQuantization() .get(new EMItemQuantizationInfo(is, false, null)); if (aIQI == null) { - aIQI = TecTech.transformationInfo - .getItemQuantization() + aIQI = TecTech.transformationInfo.getItemQuantization() .get(new EMItemQuantizationInfo(is, true, null)); // todo check if works? } if (aIQI == null) { @@ -134,26 +132,26 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock for (int ID : oreIDs) { if (DEBUG_MODE) { TecTech.LOGGER.info( - "Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + '.' - + is.getItemDamage() + ' ' + OreDictionary.getOreName(ID)); + "Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + + '.' + + is.getItemDamage() + + ' ' + + OreDictionary.getOreName(ID)); } - EMOredictQuantizationInfo aOQI = TecTech.transformationInfo - .getOredictQuantization() + EMOredictQuantizationInfo aOQI = TecTech.transformationInfo.getOredictQuantization() .get(ID); if (aOQI == null) { continue; } IEMStack into = aOQI.getOut(); - if (into != null - && isInputEqual( - true, - false, - nullFluid, - new ItemStack[] { - new ItemStack(is.getItem(), aOQI.getAmount(), is.getItemDamage()) - }, - null, - inI)) { + if (into != null && isInputEqual( + true, + false, + nullFluid, + new ItemStack[] { + new ItemStack(is.getItem(), aOQI.getAmount(), is.getItemDamage()) }, + null, + inI)) { startRecipe(into); return true; } @@ -161,20 +159,20 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock } else { // Do ITEM STACK quantization if (DEBUG_MODE) { - TecTech.LOGGER.info("Quantifier-Item-recipe " - + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage()); + TecTech.LOGGER.info( + "Quantifier-Item-recipe " + is.getItem().getUnlocalizedName() + + '.' + + is.getItemDamage()); } IEMStack into = aIQI.output(); - if (into != null - && isInputEqual( - true, - false, - nullFluid, - new ItemStack[] { - new ItemStack(is.getItem(), aIQI.input().stackSize, is.getItemDamage()) - }, - null, - inI)) { + if (into != null && isInputEqual( + true, + false, + nullFluid, + new ItemStack[] { + new ItemStack(is.getItem(), aIQI.input().stackSize, is.getItemDamage()) }, + null, + inI)) { startRecipe(into); return true; } @@ -185,17 +183,20 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock FluidStack[] inF = storedFluids.toArray(nullFluid); if (inF.length > 0) { for (FluidStack fs : inF) { - EMFluidQuantizationInfo aFQI = TecTech.transformationInfo - .getFluidQuantization() + EMFluidQuantizationInfo aFQI = TecTech.transformationInfo.getFluidQuantization() .get(fs.getFluid().getID()); if (aFQI == null) { continue; } IEMStack into = aFQI.output(); - if (into != null - && fs.amount >= aFQI.input().amount + if (into != null && fs.amount >= aFQI.input().amount && isInputEqual( - true, false, new FluidStack[] {aFQI.input()}, nullItem, inF, (ItemStack[]) null)) { + true, + false, + new FluidStack[] { aFQI.input() }, + nullItem, + inF, + (ItemStack[]) null)) { startRecipe(into); return true; } @@ -218,10 +219,8 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock mEUt = (int) -V[6]; } outputEM = new EMInstanceStackMap[] { - into instanceof EMInstanceStack - ? new EMInstanceStackMap((EMInstanceStack) into) - : new EMInstanceStackMap(new EMInstanceStack(into.getDefinition(), into.getAmount())) - }; + into instanceof EMInstanceStack ? new EMInstanceStackMap((EMInstanceStack) into) + : new EMInstanceStackMap(new EMInstanceStack(into.getDefinition(), into.getAmount())) }; } @Override @@ -237,17 +236,16 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.mattertoem.name")) // Machine Type: Matter Quantizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.mattertoem.desc.0")) // Controller block of the Matter + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.mattertoem.name")) // Machine Type: Matter + // Quantizer + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.mattertoem.desc.0")) // Controller block of + // the Matter // Quantizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.mattertoem.desc.1")) // Transforms items into their + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.mattertoem.desc.1")) // Transforms items + // into their // elemental form .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(3, 3, 4, false) + .addSeparator().beginStructureBlock(3, 3, 4, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.ElementalOutput"), translateToLocal("tt.keyword.Structure.BackCenter"), @@ -256,15 +254,19 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock translateToLocal("tt.keyword.Structure.ElementalOverflow"), translateToLocal("tt.keyword.Structure.AnyOuterMolecularCasing3rd"), 3) // Elemental Overflow Hatch: Any outer Molecular Casing on the 3rd slice - .addInputBus( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Input Bus: Any High Power Casing on the front side - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Energy Hatch: Any High Power Casing on the front side - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), - 1) // Maintenance Hatch: Any High Power Casing on the front side + .addInputBus(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Input Bus: Any High + // Power Casing on the + // front side + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Energy Hatch: + // Any High Power + // Casing on the + // front side + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasingFront"), 1) // Maintenance + // Hatch: Any + // High Power + // Casing on + // the front + // side .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } 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 0508a24889..e460737c2d 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 @@ -18,6 +18,26 @@ import static mcp.mobius.waila.api.SpecialChars.RESET; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; + +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.recipe.TT_recipe; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Holder; @@ -27,6 +47,7 @@ import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; @@ -39,28 +60,13 @@ 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 java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockBase_EM implements ISurvivalConstructable { + // region variables private final ArrayList<GT_MetaTileEntity_Hatch_Holder> eHolders = new ArrayList<>(); private GT_Recipe.GT_Recipe_AssemblyLine tRecipe; @@ -73,39 +79,36 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB private static LinkedHashMap<String, String> lServerNames; private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.research.hint.0"), // 1 - Classic/Data Hatches or Computer casing - translateToLocal("gt.blockmachines.multimachine.em.research.hint.1"), // 2 - Holder Hatch + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.research.hint.0"), // 1 - Classic/Data Hatches or + // Computer casing + translateToLocal("gt.blockmachines.multimachine.em.research.hint.1"), // 2 - Holder Hatch }; private String clientLocale = "en_US"; // endregion // region structure - private static final IStructureDefinition<GT_MetaTileEntity_EM_research> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_research>builder() - .addShape("main", transpose(new String[][] { - {" ", " A ", " A ", "AAA", "AAA", "AAA", "AAA"}, - {"AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB"}, - {" ", " C ", " ", " ", "ACA", "CCC", "DDD"}, - {" ", " E ", " ", " ", "A~A", "CCC", "DDD"}, - {" ", " C ", " ", " ", "ACA", "CCC", "DDD"}, - {"AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB"}, - {" ", " A ", " A ", "AAA", "AAA", "AAA", "AAA"} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 1)) - .addElement('B', ofBlock(sBlockCasingsTT, 2)) - .addElement('C', ofBlock(sBlockCasingsTT, 3)) - .addElement( - 'D', - buildHatchAdder(GT_MetaTileEntity_EM_research.class) - .atLeast(Energy.or(HatchElement.EnergyMulti), Maintenance, HatchElement.InputData) - .casingIndex(textureOffset + 1) - .dot(1) - .buildAndChain(ofBlock(sBlockCasingsTT, 1))) - .addElement('E', HolderHatchElement.INSTANCE.newAny(textureOffset + 3, 2)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_research> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_research>builder() + .addShape( + "main", + transpose( + new String[][] { { " ", " A ", " A ", "AAA", "AAA", "AAA", "AAA" }, + { "AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB" }, + { " ", " C ", " ", " ", "ACA", "CCC", "DDD" }, + { " ", " E ", " ", " ", "A~A", "CCC", "DDD" }, + { " ", " C ", " ", " ", "ACA", "CCC", "DDD" }, + { "AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB" }, + { " ", " A ", " A ", "AAA", "AAA", "AAA", "AAA" } })) + .addElement('A', ofBlock(sBlockCasingsTT, 1)).addElement('B', ofBlock(sBlockCasingsTT, 2)) + .addElement('C', ofBlock(sBlockCasingsTT, 3)) + .addElement( + 'D', + buildHatchAdder(GT_MetaTileEntity_EM_research.class) + .atLeast(Energy.or(HatchElement.EnergyMulti), Maintenance, HatchElement.InputData) + .casingIndex(textureOffset + 1).dot(1).buildAndChain(ofBlock(sBlockCasingsTT, 1))) + .addElement('E', HolderHatchElement.INSTANCE.newAny(textureOffset + 3, 2)).build(); // endregion public GT_MetaTileEntity_EM_research(int aID, String aName, String aNameRegional) { @@ -136,22 +139,42 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } tNBT.setString( "author", - EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.WHITE + EnumChatFormatting.BLUE + "Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.WHITE + " Assembling Line Recipe Generator"); NBTTagList tNBTList = new NBTTagList(); - tNBTList.appendTag(new NBTTagString("Construction plan for " + tRecipe.mOutput.stackSize + ' ' - + GT_LanguageManager.getTranslation(tRecipe.mOutput.getDisplayName()) + ". Needed EU/t: " + tRecipe.mEUt - + " Production time: " + tRecipe.mDuration / 20)); + tNBTList.appendTag( + new NBTTagString( + "Construction plan for " + tRecipe.mOutput.stackSize + + ' ' + + GT_LanguageManager.getTranslation(tRecipe.mOutput.getDisplayName()) + + ". Needed EU/t: " + + tRecipe.mEUt + + " Production time: " + + tRecipe.mDuration / 20)); for (int i = 0; i < tRecipe.mInputs.length; i++) { if (tRecipe.mInputs[i] != null) { - tNBTList.appendTag(new NBTTagString("Input Bus " + (i + 1) + ": " + tRecipe.mInputs[i].stackSize + ' ' - + GT_LanguageManager.getTranslation(tRecipe.mInputs[i].getDisplayName()))); + tNBTList.appendTag( + new NBTTagString( + "Input Bus " + (i + 1) + + ": " + + tRecipe.mInputs[i].stackSize + + ' ' + + GT_LanguageManager.getTranslation(tRecipe.mInputs[i].getDisplayName()))); } } for (int i = 0; i < tRecipe.mFluidInputs.length; i++) { if (tRecipe.mFluidInputs[i] != null) { - tNBTList.appendTag(new NBTTagString("Input Hatch " + (i + 1) + ": " + tRecipe.mFluidInputs[i].amount - + "L " + GT_LanguageManager.getTranslation(tRecipe.mFluidInputs[i].getLocalizedName()))); + tNBTList.appendTag( + new NBTTagString( + "Input Hatch " + (i + 1) + + ": " + + tRecipe.mFluidInputs[i].amount + + "L " + + GT_LanguageManager + .getTranslation(tRecipe.mFluidInputs[i].getLocalizedName()))); } } tNBT.setTag("pages", tNBTList); @@ -160,8 +183,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB static { try { Class GT_Assemblyline_Server = Class.forName("gregtech.api.util.GT_Assemblyline_Server"); - lServerNames = (LinkedHashMap<String, String>) - GT_Assemblyline_Server.getField("lServerNames").get(null); + lServerNames = (LinkedHashMap<String, String>) GT_Assemblyline_Server.getField("lServerNames").get(null); } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { lServerNames = null; } @@ -204,8 +226,13 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } tNBT.setString( "author", - EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.WHITE + ' ' - + machineType + " Recipe Generator"); + EnumChatFormatting.BLUE + "Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.WHITE + + ' ' + + machineType + + " Recipe Generator"); NBTTagList tNBTList = new NBTTagList(); s = tRecipe.mOutput.getDisplayName(); if (getBaseMetaTileEntity().isServerSide()) { @@ -214,8 +241,15 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB s = tRecipe.mOutput.getDisplayName(); } } - tNBTList.appendTag(new NBTTagString("Construction plan for " + tRecipe.mOutput.stackSize + " " + s - + ". Needed EU/t: " + tRecipe.mEUt + " Production time: " + (tRecipe.mDuration / 20))); + tNBTList.appendTag( + new NBTTagString( + "Construction plan for " + tRecipe.mOutput.stackSize + + " " + + s + + ". Needed EU/t: " + + tRecipe.mEUt + + " Production time: " + + (tRecipe.mDuration / 20))); for (int i = 0; i < tRecipe.mInputs.length; i++) { if (tRecipe.mOreDictAlt[i] != null) { int count = 0; @@ -228,10 +262,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB if (s == null) s = tStack.getDisplayName(); } - tBuilder.append(count == 0 ? "" : "\nOr ") - .append(tStack.stackSize) - .append(" ") - .append(s); + tBuilder.append(count == 0 ? "" : "\nOr ").append(tStack.stackSize).append(" ").append(s); count++; } } @@ -370,7 +401,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB eHolders.get(0).mInventory[0] = null; mInventory[1].setStackDisplayName( - GT_LanguageManager.getTranslation(aRecipe.mOutputs[0].getDisplayName()) + ' ' + machineType + GT_LanguageManager.getTranslation(aRecipe.mOutputs[0].getDisplayName()) + ' ' + + machineType + " Construction Data"); NBTTagCompound tNBT = mInventory[1].getTagCompound(); // code above makes it not null @@ -379,8 +411,13 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB tNBT.setString(E_RECIPE_ID, uid + ":" + aRecipe.mOutputs[0].getItemDamage()); tNBT.setString( "author", - EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" - + EnumChatFormatting.WHITE + ' ' + machineType + " Recipe Generator"); + EnumChatFormatting.BLUE + "Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.WHITE + + ' ' + + machineType + + " Recipe Generator"); } } computationRequired = computationRemaining = 0; @@ -392,21 +429,20 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.research.name")) // Machine Type: Research Station - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.research.desc.0")) // Controller block of the Research Station - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.research.desc.1")) // Used to scan Data Sticks for + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.research.name")) // Machine Type: Research + // Station + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.0")) // Controller block of + // the Research Station + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.1")) // Used to scan Data + // Sticks for // Assembling Line Recipes - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.research.desc.2")) // Needs to be fed with computation to work - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.research.desc.3")) // Does not consume the item until + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.2")) // Needs to be fed with + // computation to work + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.3")) // Does not consume the + // item until // the Data Stick is written .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(3, 7, 7, false) + .addSeparator().beginStructureBlock(3, 7, 7, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.holder.tier.09.name"), translateToLocal("tt.keyword.Structure.CenterPillar"), @@ -415,12 +451,20 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB translateToLocal("tt.keyword.Structure.DataConnector"), translateToLocal("tt.keyword.Structure.AnyComputerCasingBackMain"), 1) // Optical Connector: Any Computer Casing on the backside of the main body - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyComputerCasingBackMain"), - 1) // Energy Hatch: Any Computer Casing on the backside of the main body - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyComputerCasingBackMain"), - 1) // Maintenance Hatch: Any Computer Casing on the backside of the main body + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyComputerCasingBackMain"), 1) // Energy Hatch: + // Any Computer + // Casing on the + // backside of + // the main body + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyComputerCasingBackMain"), 1) // Maintenance + // Hatch: + // Any + // Computer + // Casing on + // the + // backside + // of the + // main body .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -442,64 +486,87 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } } - return new String[] { - translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " - + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET - + " EU", - (mEUt <= 0 - ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " - : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t " - + translateToLocalFormatted("tt.keyword.at", clientLocale) - + " " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(eAmpereFlow) + EnumChatFormatting.RESET + " A", - translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW - + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN - + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) - + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(eMaxAmpereFlow) + EnumChatFormatting.RESET + " A", - translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED - + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) - + ": " + EnumChatFormatting.YELLOW - + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", - translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE - + ePowerPass + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) - + ": " + EnumChatFormatting.BLUE - + eSafeVoid, - translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " - + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(eAvailableData) + EnumChatFormatting.RESET + " / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(eRequiredData) + EnumChatFormatting.RESET, - translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(computationRemaining / 20L) + EnumChatFormatting.RESET - + " / " + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(computationRequired / 20L) - }; + return new String[] { translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + + EnumChatFormatting.RESET + + " EU / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEnergy) + + EnumChatFormatting.RESET + + " EU", + (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " + : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(Math.abs(mEUt)) + + EnumChatFormatting.RESET + + " EU/t " + + translateToLocalFormatted("tt.keyword.at", clientLocale) + + " " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(eAmpereFlow) + + EnumChatFormatting.RESET + + " A", + translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + + EnumChatFormatting.YELLOW + + VN[getMaxEnergyInputTier_EM()] + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.GREEN + + VN[getMinEnergyInputTier_EM()] + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(eMaxAmpereFlow) + + EnumChatFormatting.RESET + + " A", + translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + + EnumChatFormatting.RED + + (getIdealStatus() - getRepairStatus()) + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + + ": " + + EnumChatFormatting.YELLOW + + mEfficiency / 100.0F + + EnumChatFormatting.RESET + + " %", + translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + + EnumChatFormatting.BLUE + + ePowerPass + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + + ": " + + EnumChatFormatting.BLUE + + eSafeVoid, + translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(eAvailableData) + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(eRequiredData) + + EnumChatFormatting.RESET, + translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":", + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(computationRemaining / 20L) + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(computationRequired / 20L) }; } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][3], - new TT_RenderedExtendedFacingTexture( - aActive - ? GT_MetaTileEntity_MultiblockBase_EM.ScreenON - : GT_MetaTileEntity_MultiblockBase_EM.ScreenOFF) - }; - } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][3]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][3], + new TT_RenderedExtendedFacingTexture( + aActive ? GT_MetaTileEntity_MultiblockBase_EM.ScreenON + : GT_MetaTileEntity_MultiblockBase_EM.ScreenOFF) }; + } + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][3] }; } @Override @@ -555,7 +622,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB // @Override // public boolean isFacingValid(byte aFacing) { - // return aFacing >= 2; + // return aFacing >= 2; // } @Override @@ -566,8 +633,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB tRecipe = null; if (holdItem != null) { if (ItemList.Tool_DataStick.isStackEqual(mInventory[1], false, true)) { - for (GT_Recipe.GT_Recipe_AssemblyLine tRecipe : - TT_recipe.GT_Recipe_MapTT.sAssemblylineRecipes) { + for (GT_Recipe.GT_Recipe_AssemblyLine tRecipe : TT_recipe.GT_Recipe_MapTT.sAssemblylineRecipes) { if (GT_Utility.areStacksEqual(tRecipe.mResearchItem, holdItem, true)) { this.tRecipe = tRecipe; machineType = assembly; @@ -575,8 +641,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } } } else if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { - for (TT_recipe.TT_assLineRecipe assRecipeTT : - TT_recipe.TT_Recipe_Map.sMachineRecipes.recipeList()) { + for (TT_recipe.TT_assLineRecipe assRecipeTT : TT_recipe.TT_Recipe_Map.sMachineRecipes + .recipeList()) { if (GT_Utility.areStacksEqual(assRecipeTT.mResearchItem, holdItem, true)) { aRecipe = assRecipeTT; machineType = machine; @@ -584,8 +650,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } } if (aRecipe == null) { - for (TT_recipe.TT_assLineRecipe assRecipeTT : - TT_recipe.TT_Recipe_Map.sCrafterRecipes.recipeList()) { + for (TT_recipe.TT_assLineRecipe assRecipeTT : TT_recipe.TT_Recipe_Map.sCrafterRecipes + .recipeList()) { if (GT_Utility.areStacksEqual(assRecipeTT.mResearchItem, holdItem, true)) { aRecipe = assRecipeTT; machineType = crafter; @@ -654,8 +720,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } @Override - public void getWailaNBTData( - EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, int z) { + public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, + int z) { tag.setBoolean("hasProblems", (getIdealStatus() - getRepairStatus()) > 0); tag.setFloat("efficiency", mEfficiency / 100.0F); tag.setBoolean("incompleteStructure", (getBaseMetaTileEntity().getErrorDisplayID() & 64) != 0); @@ -664,18 +730,24 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } @Override - public void getWailaBody( - ItemStack itemStack, List<String> currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public void getWailaBody(ItemStack itemStack, List<String> currentTip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { final NBTTagCompound tag = accessor.getNBTData(); if (tag.getBoolean("incompleteStructure")) { currentTip.add(RED + "** INCOMPLETE STRUCTURE **" + RESET); } - currentTip.add((tag.getBoolean("hasProblems") ? (RED + "** HAS PROBLEMS **") : GREEN + "Running Fine") + RESET - + " Efficiency: " + tag.getFloat("efficiency") + "%"); - - currentTip.add(String.format( - "Computation: %,d / %,d", tag.getInteger("computation"), tag.getInteger("computationRequired"))); + currentTip.add( + (tag.getBoolean("hasProblems") ? (RED + "** HAS PROBLEMS **") : GREEN + "Running Fine") + RESET + + " Efficiency: " + + tag.getFloat("efficiency") + + "%"); + + currentTip.add( + String.format( + "Computation: %,d / %,d", + tag.getInteger("computation"), + tag.getInteger("computationRequired"))); } @Override @@ -705,6 +777,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } private enum HolderHatchElement implements IHatchElement<GT_MetaTileEntity_EM_research> { + INSTANCE; @Override 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 25c8610388..f165903f08 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 @@ -14,6 +14,15 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.util.ForgeDirection; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; @@ -29,6 +38,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.*; import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import gregtech.api.enums.ItemList; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -38,35 +48,20 @@ 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 net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region variables - public static final int SCAN_DO_NOTHING = 0, - SCAN_GET_NOMENCLATURE = 1 << 0, - SCAN_GET_DEPTH_LEVEL = 1 << 1, - SCAN_GET_AMOUNT = 1 << 2, - SCAN_GET_CHARGE = 1 << 3, - SCAN_GET_MASS = 1 << 4, - SCAN_GET_ENERGY = 1 << 5, - SCAN_GET_ENERGY_LEVEL = 1 << 6, - SCAN_GET_TIMESPAN_INFO = 1 << 7, - SCAN_GET_ENERGY_STATES = 1 << 8, - SCAN_GET_COLORABLE = 1 << 9, - SCAN_GET_COLOR_VALUE = 1 << 10, - SCAN_GET_AGE = 1 << 11, - SCAN_GET_TIMESPAN_MULT = 1 << 12, - SCAN_GET_CLASS_TYPE = 1 << 13, - SCAN_GET_TOO_BIG = 1 << 14; // should be the sum of all flags +1 + public static final int SCAN_DO_NOTHING = 0, SCAN_GET_NOMENCLATURE = 1 << 0, SCAN_GET_DEPTH_LEVEL = 1 << 1, + SCAN_GET_AMOUNT = 1 << 2, SCAN_GET_CHARGE = 1 << 3, SCAN_GET_MASS = 1 << 4, SCAN_GET_ENERGY = 1 << 5, + SCAN_GET_ENERGY_LEVEL = 1 << 6, SCAN_GET_TIMESPAN_INFO = 1 << 7, SCAN_GET_ENERGY_STATES = 1 << 8, + SCAN_GET_COLORABLE = 1 << 9, SCAN_GET_COLOR_VALUE = 1 << 10, SCAN_GET_AGE = 1 << 11, + SCAN_GET_TIMESPAN_MULT = 1 << 12, SCAN_GET_CLASS_TYPE = 1 << 13, SCAN_GET_TOO_BIG = 1 << 14; // should be + // the sum of + // all flags +1 private TT_recipe.TT_EMRecipe.TT_EMRecipe eRecipe; private EMDefinitionStack objectResearched; @@ -80,61 +75,58 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal( - "gt.blockmachines.multimachine.em.scanner.hint.1"), // 2 - Elemental Input Hatches or Molecular Casing - translateToLocal( - "gt.blockmachines.multimachine.em.scanner.hint.2"), // 3 - Elemental Output Hatches or Molecular Casing - translateToLocal( - "gt.blockmachines.multimachine.em.scanner.hint.3"), // 4 - Elemental Overflow Hatches or Molecular - // Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.1"), // 2 - Elemental Input Hatches or + // Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.2"), // 3 - Elemental Output Hatches or + // Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.3"), // 4 - Elemental Overflow Hatches or + // Molecular + // Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_scanner> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_scanner>builder() - .addShape("main", transpose(new String[][] { - {"CCCCC", "BBBBB", "BBDBB", "BDDDB", "BDDDB", "BDDDB", "BBDBB", "EEEEE"}, - {"CAAAC", "BBBBB", "BDDDB", "D---D", "D---D", "D---D", "BDDDB", "EBBBE"}, - {"CA~AC", "BBBBB", "DDDDD", "D---D", "D- -D", "D---D", "DDGDD", "EBFBE"}, - {"CAAAC", "BBBBB", "BDDDB", "D---D", "D---D", "D---D", "BDDDB", "EBBBE"}, - {"CCCCC", "BBBBB", "BBDBB", "BDDDB", "BDDDB", "BDDDB", "BBDBB", "EEEEE"} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 0)) - .addElement('B', ofBlock(sBlockCasingsTT, 4)) - .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'C', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_scanner::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'F', - ofHatchAdder( - GT_MetaTileEntity_EM_scanner::addElementalInputToMachineList, textureOffset + 4, 2)) - .addElement( - 'G', - ofHatchAdder( - GT_MetaTileEntity_EM_scanner::addElementalOutputToMachineList, - textureOffset + 4, - 3)) - .addElement( - 'E', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_scanner::addElementalMufflerToMachineList, - textureOffset + 4, - 4, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_scanner> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_scanner>builder() + .addShape( + "main", + transpose( + new String[][] { { "CCCCC", "BBBBB", "BBDBB", "BDDDB", "BDDDB", "BDDDB", "BBDBB", "EEEEE" }, + { "CAAAC", "BBBBB", "BDDDB", "D---D", "D---D", "D---D", "BDDDB", "EBBBE" }, + { "CA~AC", "BBBBB", "DDDDD", "D---D", "D- -D", "D---D", "DDGDD", "EBFBE" }, + { "CAAAC", "BBBBB", "BDDDB", "D---D", "D---D", "D---D", "BDDDB", "EBBBE" }, + { "CCCCC", "BBBBB", "BBDBB", "BDDDB", "BDDDB", "BDDDB", "BBDBB", "EEEEE" } })) + .addElement('A', ofBlock(sBlockCasingsTT, 0)).addElement('B', ofBlock(sBlockCasingsTT, 4)) + .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'C', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_scanner::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'F', + ofHatchAdder(GT_MetaTileEntity_EM_scanner::addElementalInputToMachineList, textureOffset + 4, 2)) + .addElement( + 'G', + ofHatchAdder(GT_MetaTileEntity_EM_scanner::addElementalOutputToMachineList, textureOffset + 4, 3)) + .addElement( + 'E', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_scanner::addElementalMufflerToMachineList, + textureOffset + 4, + 4, + sBlockCasingsTT, + 4)) + .build(); // endregion // region parameters - private static final INameFunction<GT_MetaTileEntity_EM_scanner> CONFIG_NAME = - (base, p) -> "Config at Depth: " + (p.hatchId() * 2 + p.parameterId()); + private static final INameFunction<GT_MetaTileEntity_EM_scanner> CONFIG_NAME = (base, p) -> "Config at Depth: " + + (p.hatchId() * 2 + p.parameterId()); private static final IStatusFunction<GT_MetaTileEntity_EM_scanner> CONFIG_STATUS = (base, p) -> { double v = p.get(); if (Double.isNaN(v)) { @@ -228,8 +220,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa if (!structureCheck_EM("main", 2, 2, 0)) { return false; } - return eInputHatches.size() == 1 - && eOutputHatches.size() == 1 + return eInputHatches.size() == 1 && eOutputHatches.size() == 1 && eOutputHatches.get(0).getBaseMetaTileEntity().getFrontFacing() == iGregTechTileEntity.getFrontFacing(); } @@ -237,8 +228,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public boolean checkRecipe_EM(ItemStack itemStack) { eRecipe = null; - if (!eInputHatches.isEmpty() - && eInputHatches.get(0).getContentHandler().hasStacks() + if (!eInputHatches.isEmpty() && eInputHatches.get(0).getContentHandler().hasStacks() && !eOutputHatches.isEmpty()) { EMInstanceStackMap researchEM = eInputHatches.get(0).getContentHandler(); if (ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) { @@ -320,14 +310,17 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa public void outputAfterRecipe_EM() { if (eRecipe != null && ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { - mInventory[1].setStackDisplayName(GT_LanguageManager.getTranslation(eRecipe.mOutputs[0].getDisplayName()) - + ' ' + machineType + " Construction Data"); + mInventory[1].setStackDisplayName( + GT_LanguageManager.getTranslation(eRecipe.mOutputs[0].getDisplayName()) + ' ' + + machineType + + " Construction Data"); NBTTagCompound tNBT = mInventory[1].getTagCompound(); // code above makes it not null tNBT.setString("eMachineType", machineType); tNBT.setTag(E_RECIPE_ID, objectResearched.toNBT(TecTech.definitionsRegistry)); tNBT.setString( - "author", TEC_MARK_SHORT + EnumChatFormatting.WHITE + ' ' + machineType + " EM Recipe Generator"); + "author", + TEC_MARK_SHORT + EnumChatFormatting.WHITE + ' ' + machineType + " EM Recipe Generator"); } else if (objectsScanned != null && CustomItemList.scanContainer.isStackEqual(mInventory[1], false, true)) { ElementalDefinitionScanStorage_EM.setContent(mInventory[1], objectsScanned, scanComplexity); } @@ -338,13 +331,12 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.scanner.name")) // Machine Type: Elemental Scanner - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.scanner.desc.0")) // Controller block of the Elemental Scanner + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.scanner.name")) // Machine Type: Elemental + // Scanner + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.scanner.desc.0")) // Controller block of the + // Elemental Scanner .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(5, 5, 8, false) + .addSeparator().beginStructureBlock(5, 5, 8, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.ElementalInput"), translateToLocal("tt.keyword.Structure.BackCenter"), @@ -353,12 +345,14 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa translateToLocal("tt.keyword.Structure.ElementalOutput"), translateToLocal("tt.keyword.Structure.AnyMolecularCasing3D"), 3) // Elemental Output Hatch: Any Molecular Casing with 3 dot - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing1D"), - 1) // Energy Hatch: Any High Power Casing with 1 dot - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing1D"), - 1) // Maintenance Hatch: Any High Power Casing with 1 dot + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing1D"), 1) // Energy Hatch: Any + // High Power Casing + // with 1 dot + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing1D"), 1) // Maintenance + // Hatch: Any + // High Power + // Casing with 1 + // dot .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -380,44 +374,75 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } } - return new String[] { - translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " - + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET - + " EU", - (mEUt <= 0 - ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " - : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t " - + translateToLocalFormatted("tt.keyword.at", clientLocale) - + " " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(eAmpereFlow) + EnumChatFormatting.RESET + " A", - translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW - + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN - + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) - + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(eMaxAmpereFlow) + EnumChatFormatting.RESET + " A", - translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED - + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) - + ": " + EnumChatFormatting.YELLOW - + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", - translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE - + ePowerPass + EnumChatFormatting.RESET + " " - + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) - + ": " + EnumChatFormatting.BLUE - + eSafeVoid, - translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " - + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(eAvailableData) + EnumChatFormatting.RESET + " / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(eRequiredData) + EnumChatFormatting.RESET, - translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(computationRemaining / 20L) + EnumChatFormatting.RESET - + " / " + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(computationRequired / 20L) - }; + return new String[] { translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + + EnumChatFormatting.RESET + + " EU / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEnergy) + + EnumChatFormatting.RESET + + " EU", + (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " + : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(Math.abs(mEUt)) + + EnumChatFormatting.RESET + + " EU/t " + + translateToLocalFormatted("tt.keyword.at", clientLocale) + + " " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(eAmpereFlow) + + EnumChatFormatting.RESET + + " A", + translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + + EnumChatFormatting.YELLOW + + VN[getMaxEnergyInputTier_EM()] + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.GREEN + + VN[getMinEnergyInputTier_EM()] + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(eMaxAmpereFlow) + + EnumChatFormatting.RESET + + " A", + translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + + EnumChatFormatting.RED + + (getIdealStatus() - getRepairStatus()) + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + + ": " + + EnumChatFormatting.YELLOW + + mEfficiency / 100.0F + + EnumChatFormatting.RESET + + " %", + translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + + EnumChatFormatting.BLUE + + ePowerPass + + EnumChatFormatting.RESET + + " " + + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + + ": " + + EnumChatFormatting.BLUE + + eSafeVoid, + translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(eAvailableData) + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(eRequiredData) + + EnumChatFormatting.RESET, + translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":", + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(computationRemaining / 20L) + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(computationRequired / 20L) }; } @Override @@ -477,8 +502,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } try { if (aNBT.hasKey("eScanObjects")) { - objectsScanned = - EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry, aNBT.getCompoundTag("eScanObjects")); + objectsScanned = EMInstanceStackMap + .fromNBT(TecTech.definitionsRegistry, aNBT.getCompoundTag("eScanObjects")); } } catch (EMException e) { objectsScanned = new EMInstanceStackMap(); @@ -502,8 +527,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa if (eRecipe != null) { machineType = machine; } else { - eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe( - objectResearched.getDefinition()); + eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM + .findRecipe(objectResearched.getDefinition()); if (eRecipe != null) { machineType = crafter; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java index dad18a6388..2bbaeb9dfe 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java @@ -7,61 +7,63 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.stabilizer.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal( - "gt.blockmachines.multimachine.em.stabilizer.hint.1"), // 2 - Elemental Hatches or Molecular Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.1"), // 2 - Elemental Hatches or + // Molecular Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_stabilizer> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_stabilizer>builder() - .addShape("main", transpose(new String[][] { - {" AFA ", "BCBCB", "FBGBF", "BCBCB", " AFA "}, - {"AEEEA", "CBBBC", "BBDBB", "CBBBC", "AEEEA"}, - {"FE~EF", "BBBBB", "GDDDG", "BBBBB", "FEEEF"}, - {"AEEEA", "CBBBC", "BBDBB", "CBBBC", "AEEEA"}, - {" AFA ", "BCBCB", "FBGBF", "BCBCB", " AFA "} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 4)) - .addElement('B', ofBlock(sBlockCasingsTT, 5)) - .addElement('C', ofBlock(sBlockCasingsTT, 6)) - .addElement('D', ofBlock(sBlockCasingsTT, 9)) - .addElement('F', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'E', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_stabilizer::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'G', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_stabilizer::addElementalToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_stabilizer> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_stabilizer>builder() + .addShape( + "main", + transpose( + new String[][] { { " AFA ", "BCBCB", "FBGBF", "BCBCB", " AFA " }, + { "AEEEA", "CBBBC", "BBDBB", "CBBBC", "AEEEA" }, + { "FE~EF", "BBBBB", "GDDDG", "BBBBB", "FEEEF" }, + { "AEEEA", "CBBBC", "BBDBB", "CBBBC", "AEEEA" }, + { " AFA ", "BCBCB", "FBGBF", "BCBCB", " AFA " } })) + .addElement('A', ofBlock(sBlockCasingsTT, 4)).addElement('B', ofBlock(sBlockCasingsTT, 5)) + .addElement('C', ofBlock(sBlockCasingsTT, 6)).addElement('D', ofBlock(sBlockCasingsTT, 9)) + .addElement('F', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'E', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_stabilizer::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'G', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_stabilizer::addElementalToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .build(); // endregion public GT_MetaTileEntity_EM_stabilizer(int aID, String aName, String aNameRegional) { @@ -85,24 +87,22 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.stabilizer.name")) // Machine Type: Elemental Stabilizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.stabilizer.desc.0")) // Controller block of the + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.stabilizer.name")) // Machine Type: + // Elemental Stabilizer + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.stabilizer.desc.0")) // Controller block of + // the // Elemental Stabilizer .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(5, 5, 5, false) + .addSeparator().beginStructureBlock(5, 5, 5, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.Elemental"), translateToLocal("tt.keyword.Structure.SideCenter"), 2) // Elemental Hatch: Side center - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } 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 7896899cc5..6db7bcb5ce 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 @@ -10,6 +10,10 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData; @@ -23,6 +27,7 @@ import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.util.Vec3Impl; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -30,44 +35,41 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - "1 - Classic/Data Hatches or Computer casing", // 1 - Classic/Data Hatches or Computer casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + "1 - Classic/Data Hatches or Computer casing", // 1 - Classic/Data Hatches or Computer casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_switch> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_switch>builder() - .addShape("main", transpose(new String[][] { - {"BBB", "BBB", "BBB"}, - {"B~B", "BAB", "BBB"}, - {"BBB", "BBB", "BBB"} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 3)) - .addElement( - 'B', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_switch::addClassicToMachineList, - textureOffset + 1, - 1, - sBlockCasingsTT, - 1)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_switch> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_switch>builder() + .addShape( + "main", + transpose( + new String[][] { + { "BBB", "BBB", "BBB" }, { "B~B", "BAB", "BBB" }, { "BBB", "BBB", "BBB" } })) + .addElement('A', ofBlock(sBlockCasingsTT, 3)) + .addElement( + 'B', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_switch::addClassicToMachineList, + textureOffset + 1, + 1, + sBlockCasingsTT, + 1)) + .build(); // endregion // region parameters - private static final INameFunction<GT_MetaTileEntity_EM_switch> ROUTE_NAME = (base, p) -> (p.parameterId() == 0 - ? translateToLocal("tt.keyword.Destination") + " " - : translateToLocal("tt.keyword.Weight") + " ") - + p.hatchId(); + private static final INameFunction<GT_MetaTileEntity_EM_switch> ROUTE_NAME = (base, + p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Destination") + " " + : translateToLocal("tt.keyword.Weight") + " ") + p.hatchId(); private static final IStatusFunction<GT_MetaTileEntity_EM_switch> WEI_STATUS = (base, p) -> { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; @@ -199,17 +201,16 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.switch.name")) // Machine Type: Network Switch With QoS - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.switch.desc.0")) // Controller block of the Network + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.switch.name")) // Machine Type: Network + // Switch With QoS + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.switch.desc.0")) // Controller block of the + // Network // Switch With QoS - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.switch.desc.1")) // Used to route and distribute computation - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.switch.desc.2")) // Needs a Parametrizer to be configured - .addSeparator() - .beginStructureBlock(3, 3, 3, false) + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.switch.desc.1")) // Used to route and + // distribute computation + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.switch.desc.2")) // Needs a Parametrizer to + // be configured + .addSeparator().beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center .addCasingInfo(translateToLocal("gt.blockcasingsTT.1.name"), 0) // 0x Computer Casing (minimum) .addOtherStructurePart( @@ -223,34 +224,25 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas translateToLocal("gt.blockmachines.hatch.param.tier.05.name"), translateToLocal("tt.keyword.Structure.AnyComputerCasing"), 2) // Parametrizer: Any Computer Casing - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyComputerCasing"), - 1) // Energy Hatch: Any Computer Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyComputerCasing"), - 1) // Maintenance Hatch: Any Computer Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyComputerCasing"), 1) // Energy Hatch: Any + // Computer Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyComputerCasing"), 1) // Maintenance + // Hatch: Any + // Computer Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][1], - new TT_RenderedExtendedFacingTexture( - aActive - ? GT_MetaTileEntity_MultiblockBase_EM.ScreenON - : GT_MetaTileEntity_MultiblockBase_EM.ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][1], + new TT_RenderedExtendedFacingTexture( + aActive ? GT_MetaTileEntity_MultiblockBase_EM.ScreenON + : GT_MetaTileEntity_MultiblockBase_EM.ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][1]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][1] }; } public static final ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_hi_freq"); 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 faf94436ce..7bf8a119c9 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 @@ -12,6 +12,11 @@ import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; @@ -19,6 +24,7 @@ import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -26,44 +32,31 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_MultiblockBase_EM implements ISurvivalConstructable { + // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.transformer.hint"), // 1 - Energy IO Hatches or High Power Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.transformer.hint"), // 1 - Energy IO Hatches or High + // Power Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_transformer> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_transformer>builder() - .addShape("main", new String[][] { - { - "111", "1~1", "111", - }, - { - "111", "101", "111", - }, - { - "111", "111", "111", - }, - }) - .addElement('0', ofBlock(sBlockCasings1, 15)) - .addElement( - '1', - buildHatchAdder(GT_MetaTileEntity_EM_transformer.class) - .atLeast(Energy, EnergyMulti, Dynamo, DynamoMulti) - .casingIndex(textureOffset) - .dot(1) - .buildAndChain(onElementPass(t -> t.casingCount++, ofBlock(sBlockCasingsTT, 0)))) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_transformer> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_transformer>builder() + .addShape( + "main", + new String[][] { { "111", "1~1", "111", }, { "111", "101", "111", }, { "111", "111", "111", }, }) + .addElement('0', ofBlock(sBlockCasings1, 15)) + .addElement( + '1', + buildHatchAdder(GT_MetaTileEntity_EM_transformer.class) + .atLeast(Energy, EnergyMulti, Dynamo, DynamoMulti).casingIndex(textureOffset).dot(1) + .buildAndChain(onElementPass(t -> t.casingCount++, ofBlock(sBlockCasingsTT, 0)))) + .build(); private int casingCount = 0; @Override @@ -122,52 +115,43 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.transformer.name")) // Machine Type: Transformer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.transformer.desc.0")) // Controller block of the + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.transformer.name")) // Machine Type: + // Transformer + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.0")) // Controller block of + // the // Active Transformer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.transformer.desc.1")) // Can transform to and from any voltage - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.transformer.desc.2")) // Only 0.004% power loss, HAYO! - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.transformer.desc.3")) // Will explode if broken while running - .addSeparator() - .beginStructureBlock(3, 3, 3, false) + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.1")) // Can transform to + // and from any + // voltage + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.2")) // Only 0.004% power + // loss, HAYO! + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.3")) // Will explode if + // broken while + // running + .addSeparator().beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center .addCasingInfo(translateToLocal("gt.blockcasingsTT.0.name"), 5) // 5x High Power Casing (minimum) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.SuperconductingCoilBlock"), translateToLocal("tt.keyword.Structure.Center")) // SuperconductingCoilBlock: Center - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addDynamoHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Dynamo Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addDynamoHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Dynamo Hatch: Any + // High Power Casing .toolTipFinisher(CommonValues.TEC_MARK_GENERAL); return tt; } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][0], - new TT_RenderedExtendedFacingTexture( - aActive - ? GT_MetaTileEntity_MultiblockBase_EM.ScreenON - : GT_MetaTileEntity_MultiblockBase_EM.ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][0], + new TT_RenderedExtendedFacingTexture( + aActive ? GT_MetaTileEntity_MultiblockBase_EM.ScreenON + : GT_MetaTileEntity_MultiblockBase_EM.ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][0]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][0] }; } public static final ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_noise"); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java index 97b98c859e..62cbcae101 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java @@ -8,12 +8,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; 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; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -21,172 +26,75 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 17.12.2016. */ -public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockBase_EM - implements IConstructable { // TODO MAKE COMPATIBLE WITH STARGATES XD +public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { // TODO + // MAKE + // COMPATIBLE + // WITH + // STARGATES + // XD // region variables + private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; // endregion // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.wormhole.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal( - "gt.blockmachines.multimachine.em.wormhole.hint.1"), // 2 - Elemental Hatches or Molecular Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.1"), // 2 - Elemental Hatches or Molecular + // Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_wormhole> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_wormhole>builder() - .addShape("main", transpose(new String[][] { - { - " ", - " ", - " ", - " ", - " ", - " D ", - " DDDDD ", - " DGGGD ", - " DGGGD ", - " DGGGD ", - " DDDDD " - }, - { - " ", - " ", - " ", - " D ", - " D ", - " D ", - " DDAAADD ", - " EABBBAE ", - " EABBBAE ", - " EABBBAE ", - " DDAAADD " - }, - { - " ", - " D ", - " D ", - " D ", - " ", - " ", - "DDA ADD", - "DABFFFBAD", - "DABCCCBAD", - "DABFFFBAD", - "DDA ADD" - }, - { - " EEE ", - " DDD ", - " F F ", - " ", - " ", - " ", - "DA AD", - "GBF FBG", - "GBC CBG", - "GBF FBG", - "DA AD" - }, - { - " E~E ", - " DDBDD ", - " D D ", - " DD DD ", - " D D ", - "DD DD", - "DA AD", - "GBF FBG", - "GBC CBG", - "GBF FBG", - "DA AD" - }, - { - " EEE ", - " DDD ", - " F F ", - " ", - " ", - " ", - "DA AD", - "GBF FBG", - "GBC CBG", - "GBF FBG", - "DA AD" - }, - { - " ", - " D ", - " D ", - " D ", - " ", - " ", - "DDA ADD", - "DABFFFBAD", - "DABCCCBAD", - "DABFFFBAD", - "DDA ADD" - }, - { - " ", - " ", - " ", - " D ", - " D ", - " D ", - " DDAAADD ", - " EABBBAE ", - " EABBBAE ", - " EABBBAE ", - " DDAAADD " - }, - { - " ", - " ", - " ", - " ", - " ", - " D ", - " DDDDD ", - " DGGGD ", - " DGGGD ", - " DGGGD ", - " DDDDD " - } - })) - .addElement('A', ofBlock(sBlockCasingsTT, 5)) - .addElement('B', ofBlock(sBlockCasingsTT, 10)) - .addElement('C', ofBlock(sBlockCasingsTT, 11)) - .addElement('D', ofBlock(sBlockCasingsTT, 12)) - .addElement('F', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'E', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_wormhole::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'G', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_wormhole::addElementalToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_wormhole> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_wormhole>builder() + .addShape( + "main", + transpose( + new String[][] { + { " ", " ", " ", " ", " ", " D ", + " DDDDD ", " DGGGD ", " DGGGD ", " DGGGD ", " DDDDD " }, + { " ", " ", " ", " D ", " D ", " D ", + " DDAAADD ", " EABBBAE ", " EABBBAE ", " EABBBAE ", " DDAAADD " }, + { " ", " D ", " D ", " D ", " ", " ", + "DDA ADD", "DABFFFBAD", "DABCCCBAD", "DABFFFBAD", "DDA ADD" }, + { " EEE ", " DDD ", " F F ", " ", " ", " ", + "DA AD", "GBF FBG", "GBC CBG", "GBF FBG", "DA AD" }, + { " E~E ", " DDBDD ", " D D ", " DD DD ", " D D ", "DD DD", + "DA AD", "GBF FBG", "GBC CBG", "GBF FBG", "DA AD" }, + { " EEE ", " DDD ", " F F ", " ", " ", " ", + "DA AD", "GBF FBG", "GBC CBG", "GBF FBG", "DA AD" }, + { " ", " D ", " D ", " D ", " ", " ", + "DDA ADD", "DABFFFBAD", "DABCCCBAD", "DABFFFBAD", "DDA ADD" }, + { " ", " ", " ", " D ", " D ", " D ", + " DDAAADD ", " EABBBAE ", " EABBBAE ", " EABBBAE ", " DDAAADD " }, + { " ", " ", " ", " ", " ", " D ", + " DDDDD ", " DGGGD ", " DGGGD ", " DGGGD ", " DDDDD " } })) + .addElement('A', ofBlock(sBlockCasingsTT, 5)).addElement('B', ofBlock(sBlockCasingsTT, 10)) + .addElement('C', ofBlock(sBlockCasingsTT, 11)).addElement('D', ofBlock(sBlockCasingsTT, 12)) + .addElement('F', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'E', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_wormhole::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'G', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_wormhole::addElementalToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .build(); // endregion public GT_MetaTileEntity_EM_wormhole(int aID, String aName, String aNameRegional) { @@ -211,21 +119,19 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.wormhole.name")) // Machine Type: Wormhole - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.wormhole.desc.0")) // Controller block of the Wormhole + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.wormhole.desc.0")) // Controller block of + // the Wormhole .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(9, 9, 11, false) + .addSeparator().beginStructureBlock(9, 9, 11, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.Elemental"), translateToLocal("tt.keyword.Structure.AnyMolecularCasing"), 2) // Elemental Hatch: Any Molecular Casing - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -239,20 +145,13 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][4], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][4], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][4]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][4] }; } @Override 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 d910d02939..6521249766 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 @@ -10,6 +10,16 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.AxisAlignedBB.getBoundingBox; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.ArrayList; +import java.util.HashSet; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +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.render.TT_RenderedExtendedFacingTexture; @@ -17,6 +27,7 @@ import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.util.Vec3Impl; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -24,19 +35,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import java.util.HashSet; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region variables private boolean hasBeenPausedThisCycle = false; // endregion @@ -44,45 +48,50 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock // region structure // use multi A energy inputs, use less power the longer it runs private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.hint.0"), // 1 - Classic Hatches or Clean Stainless Steel - // Casing - translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.hint.1"), // Also acts like a hopper so give it an Output - // Bus + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.0"), // 1 - Classic Hatches or Clean + // Stainless Steel + // Casing + translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.1"), // Also acts like a hopper so give it + // an Output + // Bus }; - private static final IStructureDefinition<GT_MetaTileEntity_TM_microwave> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_TM_microwave>builder() - .addShape("main", transpose(new String[][] { - {"AAAAA", "A---A", "A---A", "A---A", "AAAAA"}, - {"AAAAA", "A---A", "A---A", "A---A", "AAAAA"}, - {"AA~AA", "A---A", "A---A", "A---A", "AAAAA"}, - {"ABBBA", "BAAAB", "BAAAB", "BAAAB", "ABBBA"} - })) - .addElement('A', ofBlock(sBlockCasings4, 1)) - .addElement( - 'B', - ofHatchAdderOptional( - GT_MetaTileEntity_TM_microwave::addClassicToMachineList, 49, 1, sBlockCasings4, 1)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_TM_microwave> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_TM_microwave>builder() + .addShape( + "main", + transpose( + new String[][] { { "AAAAA", "A---A", "A---A", "A---A", "AAAAA" }, + { "AAAAA", "A---A", "A---A", "A---A", "AAAAA" }, + { "AA~AA", "A---A", "A---A", "A---A", "AAAAA" }, + { "ABBBA", "BAAAB", "BAAAB", "BAAAB", "ABBBA" } })) + .addElement('A', ofBlock(sBlockCasings4, 1)) + .addElement( + 'B', + ofHatchAdderOptional( + GT_MetaTileEntity_TM_microwave::addClassicToMachineList, + 49, + 1, + sBlockCasings4, + 1)) + .build(); // endregion // region parameters protected Parameters.Group.ParameterIn powerSetting, timerSetting; protected Parameters.Group.ParameterOut timerValue, remainingTime; - private static final INameFunction<GT_MetaTileEntity_TM_microwave> POWER_SETTING_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgi.0"); // Power setting - private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_SETTING_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgi.1"); // Timer setting - - private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_VALUE_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.0"); // Timer value - private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_REMAINING_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.1"); // Timer remaining - private static final IStatusFunction<GT_MetaTileEntity_TM_microwave> POWER_STATUS = - (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), 300, 1000, 1000, Double.POSITIVE_INFINITY); + private static final INameFunction<GT_MetaTileEntity_TM_microwave> POWER_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgi.0"); // Power setting + private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgi.1"); // Timer setting + + private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_VALUE_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.0"); // Timer value + private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_REMAINING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.1"); // Timer remaining + private static final IStatusFunction<GT_MetaTileEntity_TM_microwave> POWER_STATUS = (base, p) -> LedStatus + .fromLimitsInclusiveOuterBoundary(p.get(), 300, 1000, 1000, Double.POSITIVE_INFINITY); private static final IStatusFunction<GT_MetaTileEntity_TM_microwave> TIMER_STATUS = (base, p) -> { double value = p.get(); if (Double.isNaN(value)) return STATUS_WRONG; @@ -142,11 +151,11 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock double zPos = mte.getZCoord() + 0.5f + xyzOffsets.get2(); AxisAlignedBB aabb = getBoundingBox(-2, -2, -2, 2, 2, 2).offset(xPos, yPos, zPos); xyzOffsets = getExtendedFacing().getWorldOffset(new Vec3Impl(0, -4, 0)); - Vec3Impl xyzExpansion = - getExtendedFacing().getWorldOffset(new Vec3Impl(1, 0, 1)).abs(); + Vec3Impl xyzExpansion = getExtendedFacing().getWorldOffset(new Vec3Impl(1, 0, 1)).abs(); int power = (int) powerSetting.get(); - int damagingFactor = - Math.min(power >> 6, 8) + Math.min(power >> 8, 24) + Math.min(power >> 12, 48) + (power >> 18); + int damagingFactor = Math.min(power >> 6, 8) + Math.min(power >> 8, 24) + + Math.min(power >> 12, 48) + + (power >> 18); ArrayList<ItemStack> itemsToOutput = new ArrayList<>(); HashSet<Entity> tickedStuff = new HashSet<>(); @@ -158,9 +167,13 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock if (tickedStuff.add((Entity) entity)) { if (inside && entity instanceof EntityItem) { GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMicrowaveRecipes.findRecipe( - mte, null, true, 128, null, null, new ItemStack[] { - ((EntityItem) entity).getEntityItem() - }); + mte, + null, + true, + 128, + null, + null, + new ItemStack[] { ((EntityItem) entity).getEntityItem() }); if (tRecipe == null || tRecipe.mInputs[0].stackSize != 1) { itemsToOutput.add(((EntityItem) entity).getEntityItem()); } else { @@ -195,30 +208,28 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.name")) // Machine Type: Microwave Grinder - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.desc.0")) // Controller block of the + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.tm.microwave.name")) // Machine Type: + // Microwave Grinder + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.0")) // Controller block of + // the // Microwave Grinder - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.desc.1")) // Starts a timer when enabled - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.desc.2")) // While the timer is running + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.1")) // Starts a timer when + // enabled + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.2")) // While the timer is + // running // anything inside the machine // will take damage - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.desc.3")) // The machine will also collect + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.3")) // The machine will also + // collect // any items inside of it - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.desc.4")) // Can be configured with a Parametrizer - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.microwave.desc.5")) // (Do not insert a Wither) - .addSeparator() - .beginStructureBlock(5, 4, 5, true) + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.4")) // Can be configured + // with a Parametrizer + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.5")) // (Do not insert a + // Wither) + .addSeparator().beginStructureBlock(5, 4, 5, true) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center - .addCasingInfo( - translateToLocal("tt.keyword.Structure.StainlessSteelCasing"), - 60) // 60x Stainless Steel Casing (minimum) + .addCasingInfo(translateToLocal("tt.keyword.Structure.StainlessSteelCasing"), 60) // 60x Stainless Steel + // Casing (minimum) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.DataConnector"), translateToLocal("tt.keyword.Structure.AnyOuterCasingOnBottom"), @@ -228,39 +239,32 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock translateToLocal("tt.keyword.Structure.Optional") + " " + translateToLocal("tt.keyword.Structure.AnyOuterCasingOnBottom"), 2) // Parametrizer: (optional) Any outer casing on the bottom layer - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyOuterCasingOnBottom"), - 1) // Energy Hatch: Any outer casing on the bottom layer - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyOuterCasingOnBottom"), - 1) // Maintenance Hatch: Any outer casing on the bottom layer + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyOuterCasingOnBottom"), 1) // Energy Hatch: Any + // outer casing on + // the bottom layer + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyOuterCasingOnBottom"), 1) // Maintenance + // Hatch: Any + // outer casing + // on the + // bottom layer .toolTipFinisher(CommonValues.THETA_MOVEMENT); return tt; } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[0][49], - new TT_RenderedExtendedFacingTexture( - aActive - ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE - : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[0][49], + new TT_RenderedExtendedFacingTexture( + aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE + : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE) }; } else if (aSide == GT_Utility.getOppositeSide(aFacing)) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[0][49], - aActive ? Textures.BlockIcons.casingTexturePages[0][52] : Textures.BlockIcons.casingTexturePages[0][53] - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[0][49], + aActive ? Textures.BlockIcons.casingTexturePages[0][52] + : Textures.BlockIcons.casingTexturePages[0][53] }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[0][49]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[0][49] }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java index fcbb23a1cd..7db8482ebd 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java @@ -1,15 +1,18 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; +import net.minecraft.item.ItemStack; + import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.item.ItemStack; @Deprecated public class GT_MetaTileEntity_TM_proccessingStack extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + protected GT_MetaTileEntity_TM_proccessingStack(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @@ -32,104 +35,42 @@ public class GT_MetaTileEntity_TM_proccessingStack extends GT_MetaTileEntity_Mul return null; } /* - //region variables - private boolean hasBeenPausedThisCycle = false; - //endregion - - //region structure - //use multi A energy inputs, use less power the longer it runs - private static final String[][] base = new String[][]{ - {" ",}, - {" 0 ",}, - {" ",}, - }; - private static final String[][] slice = new String[][]{ - {"111",}, - {"101",}, - {"111",}, - }; - private static final String[][] cap = new String[][]{ - {" ",}, - {" 0 ",}, - {" ",}, - }; - private static final Block[] blockType = new Block[]{sBlockCasings4}; - private static final byte[] blockMeta = new byte[]{1}; - - private static final IHatchAdder<GT_MetaTileEntity_TM_proccessingStack>[] addingMethods = adders( - GT_MetaTileEntity_TM_proccessingStack::addClassicToMachineList); - private static final short[] casingTextures = new short[]{49}; - private static final Block[] blockTypeFallback = new Block[]{sBlockCasings4}; - private static final byte[] blockMetaFallback = new byte[]{1}; - private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.hint.0"), - translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.hint.1"), - }; - //endregion - - public GT_MetaTileEntity_TM_proccessingStack(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GT_MetaTileEntity_TM_proccessingStack(String aName) { - super(aName); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TM_proccessingStack(mName); - } - - @Override - public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - return false; - //return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 0, 0); - } - - @Override - public boolean checkRecipe_EM(ItemStack itemStack) { - return true; - } - - @Override - public void outputAfterRecipe_EM() { - - } - - @Override - public String[] getDescription() { - return new String[]{ - CommonValues.BASS_MARK, - translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.0"), - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.1"), - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.2"), - }; - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][49], new TT_RenderedExtendedFacingTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; - } else if (aSide == GT_Utility.getOppositeSide(aFacing)) { - return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][49], aActive ? Textures.BlockIcons.casingTexturePages[0][52] : Textures.BlockIcons.casingTexturePages[0][53]}; - } - return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][49]}; - } - - @Override - public boolean onRunningTick(ItemStack aStack) { - return true; - } - - @Override - public void construct(ItemStack stackSize, boolean hintsOnly) { - //StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), this, hintsOnly); - } - - @Override - public String[] getStructureDescription(ItemStack stackSize) { - return description; - } - */ + * //region variables private boolean hasBeenPausedThisCycle = false; //endregion //region structure //use multi A + * energy inputs, use less power the longer it runs private static final String[][] base = new String[][]{ {" ",}, + * {" 0 ",}, {" ",}, }; private static final String[][] slice = new String[][]{ {"111",}, {"101",}, {"111",}, }; + * private static final String[][] cap = new String[][]{ {" ",}, {" 0 ",}, {" ",}, }; private static final + * Block[] blockType = new Block[]{sBlockCasings4}; private static final byte[] blockMeta = new byte[]{1}; private + * static final IHatchAdder<GT_MetaTileEntity_TM_proccessingStack>[] addingMethods = adders( + * GT_MetaTileEntity_TM_proccessingStack::addClassicToMachineList); private static final short[] casingTextures = + * new short[]{49}; private static final Block[] blockTypeFallback = new Block[]{sBlockCasings4}; private static + * final byte[] blockMetaFallback = new byte[]{1}; private static final String[] description = new String[]{ + * EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + * translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.hint.0"), + * translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.hint.1"), }; //endregion public + * GT_MetaTileEntity_TM_proccessingStack(int aID, String aName, String aNameRegional) { super(aID, aName, + * aNameRegional); } public GT_MetaTileEntity_TM_proccessingStack(String aName) { super(aName); } + * @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new + * GT_MetaTileEntity_TM_proccessingStack(mName); } + * @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { return + * false; //return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, + * blockMetaFallback, 1, 0, 0); } + * @Override public boolean checkRecipe_EM(ItemStack itemStack) { return true; } + * @Override public void outputAfterRecipe_EM() { } + * @Override public String[] getDescription() { return new String[]{ CommonValues.BASS_MARK, + * translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.0"), EnumChatFormatting.AQUA.toString() + * + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.1"), + * EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.2"), }; } + * @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte + * aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { return new + * ITexture[]{Textures.BlockIcons.casingTexturePages[0][49], new TT_RenderedExtendedFacingTexture(aActive ? + * Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : + * Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; } else if (aSide == + * GT_Utility.getOppositeSide(aFacing)) { return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][49], + * aActive ? Textures.BlockIcons.casingTexturePages[0][52] : Textures.BlockIcons.casingTexturePages[0][53]}; } + * return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][49]}; } + * @Override public boolean onRunningTick(ItemStack aStack) { return true; } + * @Override public void construct(ItemStack stackSize, boolean hintsOnly) { //StructureBuilderExtreme(shape, + * blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), this, hintsOnly); } + * @Override public String[] getStructureDescription(ItemStack stackSize) { return description; } + */ } 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 7bc6888cfb..3fcb54d809 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 @@ -15,6 +15,26 @@ 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.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.tuple.Pair; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.loader.NetworkDispatcher; import com.github.technus.tectech.mechanics.spark.RendererMessage; @@ -41,6 +61,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureElement; import com.gtnewhorizon.structurelib.structure.StructureUtility; import com.gtnewhorizon.structurelib.util.ItemStackPredicate; import com.gtnewhorizon.structurelib.util.Vec3Impl; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Materials; @@ -57,57 +78,40 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.api.util.IGT_HatchAdder; import gregtech.common.blocks.GT_Item_Machines; -import java.util.*; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.tuple.Pair; public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_MultiblockBase_EM implements ISurvivalConstructable, ITeslaConnectable { + // Interface fields - private final Multimap<Integer, ITeslaConnectableSimple> teslaNodeMap = - MultimapBuilder.treeKeys().linkedListValues().build(); + private final Multimap<Integer, ITeslaConnectableSimple> teslaNodeMap = MultimapBuilder.treeKeys() + .linkedListValues().build(); private final HashSet<ThaumSpark> sparkList = new HashSet<>(); private int sparkCount = 10; // region variables - private static final int transferRadiusTowerFromConfig = - TecTech.configTecTech.TESLA_MULTI_RANGE_TOWER; // Default is 32 - private static final int transferRadiusTransceiverFromConfig = - TecTech.configTecTech.TESLA_MULTI_RANGE_TRANSCEIVER; // Default is 16 - private static final int transferRadiusCoverUltimateFromConfig = - TecTech.configTecTech.TESLA_MULTI_RANGE_COVER; // Default is 16 - private static final int plasmaRangeMultiT1 = - TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1; // Default is 2 - private static final int plasmaRangeMultiT2 = - TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2; // Default is 4 - private static final int heliumUse = - TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM; // Default is 100 - private static final int nitrogenUse = - TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN; // Default is 50 + private static final int transferRadiusTowerFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_TOWER; // Default + // is 32 + private static final int transferRadiusTransceiverFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_TRANSCEIVER; // Default + // is + // 16 + private static final int transferRadiusCoverUltimateFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_COVER; // Default + // is + // 16 + private static final int plasmaRangeMultiT1 = TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1; // Default + // is 2 + private static final int plasmaRangeMultiT2 = TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2; // Default + // is 4 + private static final int heliumUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM; // Default is + // 100 + private static final int nitrogenUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN; // Default + // is 50 private static final int radonUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON; // Default is 50 private static final boolean visualEffect = TecTech.configTecTech.TESLA_VISUAL_EFFECT; // Default is true // Default is {1, 1, 1} - private static final int[] plasmaTierLoss = new int[] { - TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T0, - TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T1, - TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T2 - }; - private static final float overDriveLoss = - TecTech.configTecTech.TESLA_MULTI_LOSS_FACTOR_OVERDRIVE; // Default is 0.25F; + private static final int[] plasmaTierLoss = new int[] { TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T0, + TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T1, TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T2 }; + private static final float overDriveLoss = TecTech.configTecTech.TESLA_MULTI_LOSS_FACTOR_OVERDRIVE; // Default is + // 0.25F; private static final boolean doFluidOutput = TecTech.configTecTech.TESLA_MULTI_GAS_OUTPUT; // Default is false // Face icons @@ -117,12 +121,16 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock private int mTier = 0; // Determines max voltage (LV to ZPM) private int plasmaTier = 0; // 0 is None, 1 is Helium or Nitrogen, 2 is Radon (Does not match actual plasma tiers) - private FluidStack[] - mOutputFluidsQueue; // Used to buffer the fluid outputs, so the tesla takes a second to 'cool' any plasma it + private FluidStack[] mOutputFluidsQueue; // Used to buffer the fluid outputs, so the tesla takes a second to 'cool' + // any plasma it // would output as a gas - private final ArrayList<GT_MetaTileEntity_Hatch_Capacitor> eCapacitorHatches = - new ArrayList<>(); // Capacitor hatches which determine the max voltage tier and count of amps + private final ArrayList<GT_MetaTileEntity_Hatch_Capacitor> eCapacitorHatches = new ArrayList<>(); // Capacitor + // hatches which + // determine the + // max voltage + // tier and count + // of amps private long energyCapacity = 0; // Total energy storage limited by capacitors private long outputVoltageMax = 0; // Tesla voltage output limited by capacitors @@ -142,217 +150,190 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.hint.0"), // 1 - Classic Hatches, Capacitor Hatches or Tesla - // Base Casing - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.1"), // 2 - ""Titanium frames"" + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.0"), // 1 - Classic Hatches, Capacitor + // Hatches or Tesla + // Base Casing + translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.1"), // 2 - ""Titanium frames"" }; - private static final IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_TM_teslaCoil>builder() - .addShape("main", transpose(new String[][] { - {" ", " ", " BBB ", " BBB ", " BBB ", " ", " "}, - {" ", " BBB ", " BBBBB ", " BBBBB ", " BBBBB ", " BBB ", " "}, - {" ", " BBB ", " BBBBB ", " BBBBB ", " BBBBB ", " BBB ", " "}, - {" ", " BBB ", " BBBBB ", " BBBBB ", " BBBBB ", " BBB ", " "}, - {" ", " ", " BBB ", " BCB ", " BBB ", " ", " "}, - {" ", " ", " ", " C ", " ", " ", " "}, - {" ", " BBB ", " B F B ", " BFCFB ", " B F B ", " BBB ", " "}, - {" ", " ", " ", " C ", " ", " ", " "}, - {" ", " BBB ", " B F B ", " BFCFB ", " B F B ", " BBB ", " "}, - {" ", " ", " ", " C ", " ", " ", " "}, - {" ", " BBB ", " B F B ", " BFCFB ", " B F B ", " BBB ", " "}, - {" ", " ", " ", " C ", " ", " ", " "}, - {" ", " BBB ", " B F B ", " BFCFB ", " B F B ", " BBB ", " "}, - {" ", " ", " ", " C ", " ", " ", " "}, - {" ", " ", " ", " C ", " ", " ", " "}, - {" ", " DDD ", " D D ", " D C D ", " D D ", " DDD ", " "}, - {" EE~EE ", "EAAAAAE", "EADDDAE", "EADADAE", "EADDDAE", "EAAAAAE", " EEEEE "} - })) - .addElement('A', ofBlock(sBlockCasingsBA0, 6)) - .addElement('B', ofBlock(sBlockCasingsBA0, 7)) - .addElement('C', ofBlock(sBlockCasingsBA0, 8)) - .addElement( - 'D', - ofBlocksTiered( - (block, meta) -> - block != sBlockCasingsBA0 ? -1 : meta <= 5 ? meta : meta == 9 ? 6 : -1, - IntStream.range(0, 7) - .map(tier -> tier == 6 ? 9 : tier) - .mapToObj(meta -> Pair.of(sBlockCasingsBA0, meta)) - .collect(Collectors.toList()), - -1, - (t, v) -> t.mTier = v, - t -> t.mTier)) - .addElement( - 'E', - buildHatchAdder(GT_MetaTileEntity_TM_teslaCoil.class) - .atLeast( - CapacitorHatchElement.INSTANCE, - EnergyMulti, - Energy, - DynamoMulti, - Dynamo, - InputHatch, - OutputHatch, - Param, - Maintenance) - .dot(1) - .casingIndex(textureOffset + 16 + 6) - .buildAndChain(sBlockCasingsBA0, 6)) - .addElement('F', new IStructureElement<GT_MetaTileEntity_TM_teslaCoil>() { - private IIcon[] mIcons; - - @Override - public boolean check(GT_MetaTileEntity_TM_teslaCoil t, World world, int x, int y, int z) { - TileEntity tBase = world.getTileEntity(x, y, z); - if (tBase instanceof BaseMetaPipeEntity) { - BaseMetaPipeEntity tPipeBase = (BaseMetaPipeEntity) tBase; - if (tPipeBase.isInvalidTileEntity()) return false; - return tPipeBase.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame; - } - return false; - } - - @Override - public boolean spawnHint( - GT_MetaTileEntity_TM_teslaCoil t, World world, int x, int y, int z, ItemStack trigger) { - if (mIcons == null) { - mIcons = new IIcon[6]; - Arrays.fill( - mIcons, - Materials._NULL.mIconSet.mTextures[OrePrefixes.frameGt.mTextureIndex] - .getIcon()); - } - StructureLibAPI.hintParticleTinted(world, x, y, z, mIcons, Materials._NULL.mRGBa); - return true; - } - - @Override - public boolean placeBlock( - GT_MetaTileEntity_TM_teslaCoil t, World world, int x, int y, int z, ItemStack trigger) { - ItemStack tFrameStack = - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1); - if (!GT_Utility.isStackValid(tFrameStack) || !(tFrameStack.getItem() instanceof ItemBlock)) - return false; - ItemBlock tFrameStackItem = (ItemBlock) tFrameStack.getItem(); - return tFrameStackItem.placeBlockAt( - tFrameStack, - null, - world, - x, - y, - z, - 6, - 0, - 0, - 0, - Items.feather.getDamage(tFrameStack)); - } - - @Override - public PlaceResult survivalPlaceBlock( - GT_MetaTileEntity_TM_teslaCoil t, - World world, - int x, - int y, - int z, - ItemStack trigger, - IItemSource source, - EntityPlayerMP actor, - Consumer<IChatComponent> chatter) { - if (check(t, world, x, y, z)) return PlaceResult.SKIP; - ItemStack tFrameStack = source.takeOne( - s -> GT_Item_Machines.getMetaTileEntity(s) instanceof GT_MetaPipeEntity_Frame, - true); - if (tFrameStack == null) return PlaceResult.REJECT; - return StructureUtility.survivalPlaceBlock( - tFrameStack, - ItemStackPredicate.NBTMode.IGNORE_KNOWN_INSIGNIFICANT_TAGS, - null, - false, - world, - x, - y, - z, - source, - actor, - chatter); - } - }) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_TM_teslaCoil>builder() + .addShape( + "main", + transpose( + new String[][] { + { " ", " ", " BBB ", " BBB ", " BBB ", " ", " " }, + { " ", " BBB ", " BBBBB ", " BBBBB ", " BBBBB ", " BBB ", " " }, + { " ", " BBB ", " BBBBB ", " BBBBB ", " BBBBB ", " BBB ", " " }, + { " ", " BBB ", " BBBBB ", " BBBBB ", " BBBBB ", " BBB ", " " }, + { " ", " ", " BBB ", " BCB ", " BBB ", " ", " " }, + { " ", " ", " ", " C ", " ", " ", " " }, + { " ", " BBB ", " B F B ", " BFCFB ", " B F B ", " BBB ", " " }, + { " ", " ", " ", " C ", " ", " ", " " }, + { " ", " BBB ", " B F B ", " BFCFB ", " B F B ", " BBB ", " " }, + { " ", " ", " ", " C ", " ", " ", " " }, + { " ", " BBB ", " B F B ", " BFCFB ", " B F B ", " BBB ", " " }, + { " ", " ", " ", " C ", " ", " ", " " }, + { " ", " BBB ", " B F B ", " BFCFB ", " B F B ", " BBB ", " " }, + { " ", " ", " ", " C ", " ", " ", " " }, + { " ", " ", " ", " C ", " ", " ", " " }, + { " ", " DDD ", " D D ", " D C D ", " D D ", " DDD ", " " }, + { " EE~EE ", "EAAAAAE", "EADDDAE", "EADADAE", "EADDDAE", "EAAAAAE", " EEEEE " } })) + .addElement('A', ofBlock(sBlockCasingsBA0, 6)).addElement('B', ofBlock(sBlockCasingsBA0, 7)) + .addElement('C', ofBlock(sBlockCasingsBA0, 8)) + .addElement( + 'D', + ofBlocksTiered( + (block, meta) -> block != sBlockCasingsBA0 ? -1 : meta <= 5 ? meta : meta == 9 ? 6 : -1, + IntStream.range(0, 7).map(tier -> tier == 6 ? 9 : tier) + .mapToObj(meta -> Pair.of(sBlockCasingsBA0, meta)).collect(Collectors.toList()), + -1, + (t, v) -> t.mTier = v, + t -> t.mTier)) + .addElement( + 'E', + buildHatchAdder(GT_MetaTileEntity_TM_teslaCoil.class) + .atLeast( + CapacitorHatchElement.INSTANCE, + EnergyMulti, + Energy, + DynamoMulti, + Dynamo, + InputHatch, + OutputHatch, + Param, + Maintenance) + .dot(1).casingIndex(textureOffset + 16 + 6).buildAndChain(sBlockCasingsBA0, 6)) + .addElement('F', new IStructureElement<GT_MetaTileEntity_TM_teslaCoil>() { + + private IIcon[] mIcons; + + @Override + public boolean check(GT_MetaTileEntity_TM_teslaCoil t, World world, int x, int y, int z) { + TileEntity tBase = world.getTileEntity(x, y, z); + if (tBase instanceof BaseMetaPipeEntity) { + BaseMetaPipeEntity tPipeBase = (BaseMetaPipeEntity) tBase; + if (tPipeBase.isInvalidTileEntity()) return false; + return tPipeBase.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame; + } + return false; + } + + @Override + public boolean spawnHint(GT_MetaTileEntity_TM_teslaCoil t, World world, int x, int y, int z, + ItemStack trigger) { + if (mIcons == null) { + mIcons = new IIcon[6]; + Arrays.fill( + mIcons, + Materials._NULL.mIconSet.mTextures[OrePrefixes.frameGt.mTextureIndex].getIcon()); + } + StructureLibAPI.hintParticleTinted(world, x, y, z, mIcons, Materials._NULL.mRGBa); + return true; + } + + @Override + public boolean placeBlock(GT_MetaTileEntity_TM_teslaCoil t, World world, int x, int y, int z, + ItemStack trigger) { + ItemStack tFrameStack = GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1); + if (!GT_Utility.isStackValid(tFrameStack) || !(tFrameStack.getItem() instanceof ItemBlock)) + return false; + ItemBlock tFrameStackItem = (ItemBlock) tFrameStack.getItem(); + return tFrameStackItem.placeBlockAt( + tFrameStack, + null, + world, + x, + y, + z, + 6, + 0, + 0, + 0, + Items.feather.getDamage(tFrameStack)); + } + + @Override + public PlaceResult survivalPlaceBlock(GT_MetaTileEntity_TM_teslaCoil t, World world, int x, int y, + int z, ItemStack trigger, IItemSource source, EntityPlayerMP actor, + Consumer<IChatComponent> chatter) { + if (check(t, world, x, y, z)) return PlaceResult.SKIP; + ItemStack tFrameStack = source.takeOne( + s -> GT_Item_Machines.getMetaTileEntity(s) instanceof GT_MetaPipeEntity_Frame, + true); + if (tFrameStack == null) return PlaceResult.REJECT; + return StructureUtility.survivalPlaceBlock( + tFrameStack, + ItemStackPredicate.NBTMode.IGNORE_KNOWN_INSIGNIFICANT_TAGS, + null, + false, + world, + x, + y, + z, + source, + actor, + chatter); + } + }).build(); // endregion // region parameters - protected Parameters.Group.ParameterIn popogaSetting, - histLowSetting, - histHighSetting, - transferRadiusTowerSetting, - transferRadiusTransceiverSetting, - transferRadiusCoverUltimateSetting, - outputVoltageSetting, - outputCurrentSetting, - sortTimeMinSetting, - overDriveSetting; - protected Parameters.Group.ParameterOut popogaDisplay, - transferRadiusTowerDisplay, - transferRadiusTransceiverDisplay, - transferRadiusCoverUltimateDisplay, - outputVoltageDisplay, - outputCurrentDisplay, - energyCapacityDisplay, - energyStoredDisplay, - energyFractionDisplay, - sortTimeDisplay; - - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_LOW_SETTING_NAME = (base, p) -> - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.0"); // Hysteresis low setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_HIGH_SETTING_NAME = (base, p) -> - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.1"); // Hysteresis high setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_SETTING_NAME = - (base, p) -> translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.cfgi.2"); // Tesla Towers transfer radius setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_SETTING_NAME = - (base, p) -> translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.cfgi.3"); // Tesla Transceiver transfer radius setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_COVER_ULTIMATE_SETTING_NAME = - (base, p) -> translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.cfgi.4"); // Tesla Ultimate Cover transfer radius + protected Parameters.Group.ParameterIn popogaSetting, histLowSetting, histHighSetting, transferRadiusTowerSetting, + transferRadiusTransceiverSetting, transferRadiusCoverUltimateSetting, outputVoltageSetting, + outputCurrentSetting, sortTimeMinSetting, overDriveSetting; + protected Parameters.Group.ParameterOut popogaDisplay, transferRadiusTowerDisplay, transferRadiusTransceiverDisplay, + transferRadiusCoverUltimateDisplay, outputVoltageDisplay, outputCurrentDisplay, energyCapacityDisplay, + energyStoredDisplay, energyFractionDisplay, sortTimeDisplay; + + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_LOW_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.0"); // Hysteresis low setting + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_HIGH_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.1"); // Hysteresis high setting + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.2"); // Tesla Towers transfer radius + // setting + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.3"); // Tesla Transceiver transfer + // radius setting + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_COVER_ULTIMATE_SETTING_NAME = ( + base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.4"); // Tesla Ultimate Cover + // transfer radius // setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_SETTING_NAME = (base, p) -> - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.5"); // Output voltage setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_CURRENT_SETTING_NAME = (base, p) -> - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.6"); // Output current setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_MIN_SETTING_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.7"); // Scan time Min setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OVERDRIVE_SETTING_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.8"); // Overdrive setting - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> POPOGA_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.9"); // Unused - - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_DISPLAY_NAME = - (base, p) -> translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.cfgo.0"); // Tesla Towers transfer radius display - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_DISPLAY_NAME = - (base, p) -> translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.cfgo.1"); // Tesla Transceiver transfer radius display - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_COVER_ULTIMATE_DISPLAY_NAME = - (base, p) -> translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.cfgo.2"); // Tesla Ultimate Cover transfer radius + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.5"); // Output voltage setting + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_CURRENT_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.6"); // Output current setting + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_MIN_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.7"); // Scan time Min setting + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OVERDRIVE_SETTING_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.8"); // Overdrive setting + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> POPOGA_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.9"); // Unused + + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_DISPLAY_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.0"); // Tesla Towers transfer radius + // display + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_DISPLAY_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.1"); // Tesla Transceiver transfer + // radius display + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_COVER_ULTIMATE_DISPLAY_NAME = ( + base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.2"); // Tesla Ultimate Cover + // transfer radius // display - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_DISPLAY_NAME = (base, p) -> - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.3"); // Output voltage display - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_CURRENT_DISPLAY_NAME = (base, p) -> - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.4"); // Output current display - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_CAPACITY_DISPLAY_NAME = (base, p) -> - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.5"); // Energy Capacity display - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_STORED_DISPLAY_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.6"); // Energy Stored display - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_FRACTION_DISPLAY_NAME = (base, p) -> - translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7"); // Energy Fraction display - private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_DISPLAY_NAME = - (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8"); // Scan time display + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_DISPLAY_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.3"); // Output voltage display + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_CURRENT_DISPLAY_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.4"); // Output current display + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_CAPACITY_DISPLAY_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.5"); // Energy Capacity display + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_STORED_DISPLAY_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.6"); // Energy Stored display + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_FRACTION_DISPLAY_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7"); // Energy Fraction display + private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_DISPLAY_NAME = (base, + p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8"); // Scan time display private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_LOW_STATUS = (base, p) -> { double value = p.get(); @@ -379,35 +360,35 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock if (value < transferRadiusTowerFromConfig) return STATUS_LOW; return STATUS_OK; }; - private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_STATUS = - (base, p) -> { - double value = p.get(); - if (Double.isNaN(value)) return STATUS_WRONG; - value = (int) value; - if (value < 0) return STATUS_TOO_LOW; - if (value > transferRadiusTransceiverFromConfig) return STATUS_HIGH; - if (value < transferRadiusTransceiverFromConfig) return STATUS_LOW; - return STATUS_OK; - }; - private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_COVER_ULTIMATE_STATUS = - (base, p) -> { - double value = p.get(); - if (Double.isNaN(value)) return STATUS_WRONG; - value = (int) value; - if (value < 0) return STATUS_TOO_LOW; - if (value > transferRadiusCoverUltimateFromConfig) return STATUS_HIGH; - if (value < transferRadiusCoverUltimateFromConfig) return STATUS_LOW; - return STATUS_OK; - }; - private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_OR_CURRENT_STATUS = - (base, p) -> { - double value = p.get(); - if (Double.isNaN(value)) return STATUS_WRONG; - value = (long) value; - if (value == -1) return STATUS_OK; - if (value <= 0) return STATUS_TOO_LOW; - return STATUS_OK; - }; + private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_STATUS = (base, + p) -> { + double value = p.get(); + if (Double.isNaN(value)) return STATUS_WRONG; + value = (int) value; + if (value < 0) return STATUS_TOO_LOW; + if (value > transferRadiusTransceiverFromConfig) return STATUS_HIGH; + if (value < transferRadiusTransceiverFromConfig) return STATUS_LOW; + return STATUS_OK; + }; + private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_COVER_ULTIMATE_STATUS = (base, + p) -> { + double value = p.get(); + if (Double.isNaN(value)) return STATUS_WRONG; + value = (int) value; + if (value < 0) return STATUS_TOO_LOW; + if (value > transferRadiusCoverUltimateFromConfig) return STATUS_HIGH; + if (value < transferRadiusCoverUltimateFromConfig) return STATUS_LOW; + return STATUS_OK; + }; + private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_OR_CURRENT_STATUS = (base, + p) -> { + double value = p.get(); + if (Double.isNaN(value)) return STATUS_WRONG; + value = (long) value; + if (value == -1) return STATUS_OK; + if (value <= 0) return STATUS_TOO_LOW; + return STATUS_OK; + }; private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_MIN_STATUS = (base, p) -> { double value = p.get(); if (Double.isNaN(value)) return STATUS_WRONG; @@ -505,27 +486,28 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock && fluidHatch.mFluid.amount >= heliumUse) { fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - heliumUse; if (doFluidOutput) { - mOutputFluidsQueue = new FluidStack[] {Materials.Helium.getGas(heliumUse)}; + mOutputFluidsQueue = new FluidStack[] { Materials.Helium.getGas(heliumUse) }; } plasmaTier = 1; return; } else if (fluidHatch.mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && fluidHatch.mFluid.amount >= nitrogenUse) { - fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - nitrogenUse; - if (doFluidOutput) { - mOutputFluidsQueue = new FluidStack[] {Materials.Nitrogen.getGas(nitrogenUse)}; - } - plasmaTier = 1; - return; - } else if (fluidHatch.mFluid.isFluidEqual(Materials.Radon.getPlasma(1)) - && fluidHatch.mFluid.amount >= radonUse) { - fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - radonUse; - if (doFluidOutput) { - mOutputFluidsQueue = new FluidStack[] {Materials.Radon.getGas(radonUse)}; - } - plasmaTier = 2; - return; - } + fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - nitrogenUse; + if (doFluidOutput) { + mOutputFluidsQueue = new FluidStack[] { Materials.Nitrogen.getGas(nitrogenUse) }; + } + plasmaTier = 1; + return; + } else + if (fluidHatch.mFluid.isFluidEqual(Materials.Radon.getPlasma(1)) + && fluidHatch.mFluid.amount >= radonUse) { + fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - radonUse; + if (doFluidOutput) { + mOutputFluidsQueue = new FluidStack[] { Materials.Radon.getGas(radonUse) }; + } + plasmaTier = 2; + return; + } } } plasmaTier = 0; @@ -566,14 +548,10 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock getBaseMetaTileEntity().getZCoord()); // Calculate coordinates of the middle bottom - posTop = getExtendedFacing() - .getWorldOffset(new Vec3Impl(0, 0, 2)) - .add(posBMTE); + posTop = getExtendedFacing().getWorldOffset(new Vec3Impl(0, 0, 2)).add(posBMTE); // Calculate coordinates of the top sphere - posTop = getExtendedFacing() - .getWorldOffset(new Vec3Impl(0, -14, 2)) - .add(posBMTE); + posTop = getExtendedFacing().getWorldOffset(new Vec3Impl(0, -14, 2)).add(posBMTE); } return true; } @@ -584,15 +562,15 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock public boolean checkRecipe_EM(ItemStack itemStack) { checkPlasmaBoost(); - if (!histHighSetting.getStatus(false).isOk - || !histLowSetting.getStatus(false).isOk + if (!histHighSetting.getStatus(false).isOk || !histLowSetting.getStatus(false).isOk || !transferRadiusTowerSetting.getStatus(false).isOk || !transferRadiusTransceiverSetting.getStatus(false).isOk || !transferRadiusCoverUltimateSetting.getStatus(false).isOk || !outputVoltageSetting.getStatus(false).isOk || !outputCurrentSetting.getStatus(false).isOk || !sortTimeMinSetting.getStatus(false).isOk - || !overDriveSetting.getStatus(false).isOk) return false; + || !overDriveSetting.getStatus(false).isOk) + return false; mEfficiencyIncrease = 10000; mMaxProgresstime = 20; @@ -641,37 +619,37 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.name")) // Machine Type: Tesla Tower - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.desc.0")) // Controller block of the Tesla Tower - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.desc.1")) // Used to transmit power to Tesla + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.name")) // Machine Type: Tesla + // Tower + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.desc.0")) // Controller block of + // the Tesla Tower + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.desc.1")) // Used to transmit + // power to Tesla // Coil Covers and Tesla // Transceivers .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.desc.2")) // Can be fed with // Helium/Nitrogen/Radon Plasma to // increase the range - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.desc.3")) // Transmitted voltage depends on + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.desc.3")) // Transmitted voltage + // depends on // the used Tesla Capacitor tier - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.tm.teslaCoil.desc.4")) // Primary Tesla Windings need to + .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.desc.4")) // Primary Tesla + // Windings need to // be at least the same tier as // the Tesla Capacitor .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(7, 17, 7, false) + .addSeparator().beginStructureBlock(7, 17, 7, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.capacitor.tier.03.name"), translateToLocal("tt.keyword.Structure.AnyTeslaBaseCasingOuter"), 1) // Capacitor Hatch: Any outer Tesla Base Casing - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyTeslaBaseCasingOuter"), - 1) // Energy Hatch: Any outer Tesla Base Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyTeslaBaseCasingOuter"), - 1) // Maintenance Hatch: Any outer Tesla Base Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyTeslaBaseCasingOuter"), 1) // Energy Hatch: + // Any outer Tesla + // Base Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyTeslaBaseCasingOuter"), 1) // Maintenance + // Hatch: Any + // outer Tesla + // Base Casing .toolTipFinisher(CommonValues.THETA_MOVEMENT); return tt; } @@ -685,20 +663,13 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][16 + 6], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][16 + 6], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][16 + 6]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][16 + 6] }; } @Override @@ -732,7 +703,10 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock histHighSetting = hatch_1.makeInParameter(0, 0.75, HYSTERESIS_HIGH_SETTING_NAME, HYSTERESIS_HIGH_STATUS); popogaSetting = hatch_1.makeInParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); transferRadiusTowerSetting = hatch_2.makeInParameter( - 0, transferRadiusTowerFromConfig, TRANSFER_RADIUS_TOWER_SETTING_NAME, TRANSFER_RADIUS_TOWER_STATUS); + 0, + transferRadiusTowerFromConfig, + TRANSFER_RADIUS_TOWER_SETTING_NAME, + TRANSFER_RADIUS_TOWER_STATUS); popogaSetting = hatch_2.makeInParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); transferRadiusTransceiverSetting = hatch_3.makeInParameter( 0, @@ -744,11 +718,11 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock transferRadiusCoverUltimateFromConfig, TRANSFER_RADIUS_COVER_ULTIMATE_SETTING_NAME, TRANSFER_RADIUS_COVER_ULTIMATE_STATUS); - outputVoltageSetting = - hatch_4.makeInParameter(0, -1, OUTPUT_VOLTAGE_SETTING_NAME, OUTPUT_VOLTAGE_OR_CURRENT_STATUS); + outputVoltageSetting = hatch_4 + .makeInParameter(0, -1, OUTPUT_VOLTAGE_SETTING_NAME, OUTPUT_VOLTAGE_OR_CURRENT_STATUS); popogaSetting = hatch_4.makeInParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); - outputCurrentSetting = - hatch_5.makeInParameter(0, -1, OUTPUT_CURRENT_SETTING_NAME, OUTPUT_VOLTAGE_OR_CURRENT_STATUS); + outputCurrentSetting = hatch_5 + .makeInParameter(0, -1, OUTPUT_CURRENT_SETTING_NAME, OUTPUT_VOLTAGE_OR_CURRENT_STATUS); popogaSetting = hatch_5.makeInParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); popogaSetting = hatch_6.makeInParameter(0, 0, POPOGA_NAME, POPOGA_STATUS); popogaSetting = hatch_6.makeInParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); @@ -763,13 +737,16 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock popogaDisplay = hatch_0.makeOutParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); popogaDisplay = hatch_1.makeOutParameter(0, 0, POPOGA_NAME, POPOGA_STATUS); popogaDisplay = hatch_1.makeOutParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); - transferRadiusTowerDisplay = - hatch_2.makeOutParameter(0, 0, TRANSFER_RADIUS_TOWER_DISPLAY_NAME, TRANSFER_RADIUS_TOWER_STATUS); + transferRadiusTowerDisplay = hatch_2 + .makeOutParameter(0, 0, TRANSFER_RADIUS_TOWER_DISPLAY_NAME, TRANSFER_RADIUS_TOWER_STATUS); popogaDisplay = hatch_2.makeOutParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); - transferRadiusTransceiverDisplay = hatch_3.makeOutParameter( - 0, 0, TRANSFER_RADIUS_TRANSCEIVER_DISPLAY_NAME, TRANSFER_RADIUS_TRANSCEIVER_STATUS); + transferRadiusTransceiverDisplay = hatch_3 + .makeOutParameter(0, 0, TRANSFER_RADIUS_TRANSCEIVER_DISPLAY_NAME, TRANSFER_RADIUS_TRANSCEIVER_STATUS); transferRadiusCoverUltimateDisplay = hatch_3.makeOutParameter( - 1, 0, TRANSFER_RADIUS_COVER_ULTIMATE_DISPLAY_NAME, TRANSFER_RADIUS_COVER_ULTIMATE_STATUS); + 1, + 0, + TRANSFER_RADIUS_COVER_ULTIMATE_DISPLAY_NAME, + TRANSFER_RADIUS_COVER_ULTIMATE_STATUS); outputVoltageDisplay = hatch_4.makeOutParameter(0, 0, OUTPUT_VOLTAGE_DISPLAY_NAME, POWER_STATUS); popogaDisplay = hatch_4.makeOutParameter(1, 0, POPOGA_NAME, POPOGA_STATUS); outputCurrentDisplay = hatch_5.makeOutParameter(0, 0, OUTPUT_CURRENT_DISPLAY_NAME, POWER_STATUS); @@ -1056,6 +1033,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } private enum CapacitorHatchElement implements IHatchElement<GT_MetaTileEntity_TM_teslaCoil> { + INSTANCE; @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java index 66d7acf2c2..d537356ab1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java @@ -1,18 +1,21 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.util.TT_Utility; -import gregtech.api.gui.GT_ContainerMetaTile_Machine; -import gregtech.api.gui.GT_Slot_Holo; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.util.TT_Utility; + +import gregtech.api.gui.GT_ContainerMetaTile_Machine; +import gregtech.api.gui.GT_Slot_Holo; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + @Deprecated public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { + public LedStatus[] eParamsInStatus = LedStatus.makeArray(20, LedStatus.STATUS_UNDEFINED); public LedStatus[] eParamsOutStatus = LedStatus.makeArray(20, LedStatus.STATUS_UNDEFINED); public double[] eParamsIn = new double[20]; // number I from parametrizers @@ -24,12 +27,8 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { public final boolean eSafeVoidButton, allowedToWorkButton, ePowerPassButton; public boolean ePowerPassCover; - public GT_Container_MultiMachineEM( - InventoryPlayer aInventoryPlayer, - IGregTechTileEntity aTileEntity, - boolean enablePowerPassButton, - boolean enableSafeVoid, - boolean enablePowerButton) { + public GT_Container_MultiMachineEM(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, + boolean enablePowerPassButton, boolean enableSafeVoid, boolean enablePowerButton) { super(aInventoryPlayer, aTileEntity); ePowerPassButton = enablePowerPassButton; eSafeVoidButton = enableSafeVoid; @@ -40,8 +39,8 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { this(aInventoryPlayer, aTileEntity, true, true, true); } - public GT_Container_MultiMachineEM( - InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean bindInventory) { + public GT_Container_MultiMachineEM(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, + boolean bindInventory) { super(aInventoryPlayer, aTileEntity, bindInventory); ePowerPassButton = eSafeVoidButton = allowedToWorkButton = true; } @@ -75,8 +74,8 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { } Slot tSlot = (Slot) inventorySlots.get(aSlotIndex); if (tSlot != null && mTileEntity.getMetaTileEntity() != null) { - GT_MetaTileEntity_MultiblockBase_EM mte = - (GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity(); + GT_MetaTileEntity_MultiblockBase_EM mte = (GT_MetaTileEntity_MultiblockBase_EM) mTileEntity + .getMetaTileEntity(); IGregTechTileEntity base = mte.getBaseMetaTileEntity(); switch (aSlotIndex) { case 0: @@ -123,11 +122,10 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null || eParamsInStatus == null) { return; } - eParamsInStatus = - ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).parametrization.eParamsInStatus; - eParamsOutStatus = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()) - .parametrization - .eParamsOutStatus; + eParamsInStatus = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity + .getMetaTileEntity()).parametrization.eParamsInStatus; + eParamsOutStatus = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity + .getMetaTileEntity()).parametrization.eParamsOutStatus; eParamsIn = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).parametrization.iParamsIn; eParamsOut = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).parametrization.iParamsOut; eCertainMode = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).eCertainMode; @@ -141,7 +139,9 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { ICrafting var1 = (ICrafting) crafter; for (int i = 100, j = 0; j < eParamsInStatus.length; j++) { var1.sendProgressBarUpdate( - this, i++, (eParamsInStatus[j].getOrdinalByte() | (eParamsOutStatus[j].getOrdinalByte() << 8))); + this, + i++, + (eParamsInStatus[j].getOrdinalByte() | (eParamsOutStatus[j].getOrdinalByte() << 8))); } var1.sendProgressBarUpdate(this, 120, eCertainMode | (eCertainStatus << 8)); var1.sendProgressBarUpdate( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java index cca5eee361..1a26b52606 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java @@ -2,33 +2,33 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base; import static gregtech.api.enums.GT_Values.RES_PATH_GUI; -import com.github.technus.tectech.TecTech; -import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import java.util.List; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.github.technus.tectech.TecTech; + +import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + /** * Created by Tec on 21.02.2017. */ @Deprecated public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Machine { + protected final String mName; protected static byte counter = 0; protected final boolean eSafeVoidButton, allowedToWorkButton, ePowerPassButton; protected final GT_Container_MultiMachineEM mContainer; - protected GT_GUIContainer_MultiMachineEM( - GT_Container_MultiMachineEM container, - String aName, - String aTextureFile, - boolean enablePowerPass, - boolean enableSafeVoid, - boolean enablePowerButton) { + protected GT_GUIContainer_MultiMachineEM(GT_Container_MultiMachineEM container, String aName, String aTextureFile, + boolean enablePowerPass, boolean enableSafeVoid, boolean enablePowerButton) { super(container, RES_PATH_GUI + "multimachines/" + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile)); mContainer = (GT_Container_MultiMachineEM) super.mContainer; mName = aName; @@ -39,13 +39,8 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach xSize = 198; } - public GT_GUIContainer_MultiMachineEM( - InventoryPlayer aInventoryPlayer, - IGregTechTileEntity aTileEntity, - String aName, - String aTextureFile, - boolean enablePowerPass, - boolean enableSafeVoid, + public GT_GUIContainer_MultiMachineEM(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, + String aName, String aTextureFile, boolean enablePowerPass, boolean enableSafeVoid, boolean enablePowerButton) { this( new GT_Container_MultiMachineEM(aInventoryPlayer, aTileEntity), @@ -60,8 +55,8 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach this(container, aName, aTextureFile, true, true, true); } - public GT_GUIContainer_MultiMachineEM( - InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { + public GT_GUIContainer_MultiMachineEM(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, + String aName, String aTextureFile) { this(new GT_Container_MultiMachineEM(aInventoryPlayer, aTileEntity), aName, aTextureFile); } @@ -152,7 +147,7 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach } x -= 162; y += 96; - for (int i = 0; i < 20; ) { + for (int i = 0; i < 20;) { byte hatch = (byte) (i >>> 1); LEDdrawP(x, y, i, 0, mContainer.eParamsInStatus[hatch]); LEDdrawP(x, y, i++, 1, mContainer.eParamsOutStatus[hatch]); @@ -213,8 +208,7 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach drawTexturedModalRect(x + su * i, y + sv * j, u + su * i, v + sv * (4 + j), su, sv); // green break; case 3: - drawTexturedModalRect( - x + su * i, y + sv * j, u + su * i, v + sv * (6 + j), su, sv); // orangeyello + drawTexturedModalRect(x + su * i, y + sv * j, u + su * i, v + sv * (6 + j), su, sv); // orangeyello break; case 4: drawTexturedModalRect(x + su * i, y + sv * j, u + su * i, v + sv * (8 + j), su, sv); // redd @@ -272,12 +266,12 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach case STATUS_UNUSED: default: // if (GregTech_API.sColoredGUI && this.mContainer.mTileEntity != null) { - // int tColor = this.mContainer.mTileEntity.getColorization() & 15; - // if (tColor < ItemDye.field_150922_c.length) { - // tColor = ItemDye.field_150922_c[tColor]; - // GL11.glColor4f((float)(tColor >> 16 & 255) / 255.0F, (float)(tColor >> 8 & 255) / 255.0F, + // int tColor = this.mContainer.mTileEntity.getColorization() & 15; + // if (tColor < ItemDye.field_150922_c.length) { + // tColor = ItemDye.field_150922_c[tColor]; + // GL11.glColor4f((float)(tColor >> 16 & 255) / 255.0F, (float)(tColor >> 8 & 255) / 255.0F, // (float)(tColor & 255) / 255.0F, 1F); - // } + // } // } // drawTexturedModalRect(x + su * i, y + sv * j, 212, 96, su+2, sv+2); // GL11.glColor4f(1f, 1f, 1f, 1f); @@ -307,7 +301,7 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach if (x < (u += su)) { if (y < v) { // if(mContainer.eParamsInStatus[hatch + (10*param)]==STATUS_UNUSED){ - // return; + // return; // } hoveringText( ((GT_MetaTileEntity_MultiblockBase_EM) mte) @@ -318,7 +312,7 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach return; } else if (y >= v && y < v + sv) { // if(mContainer.eParamsOutStatus[hatch + (10*param)]==STATUS_UNUSED){ - // return; + // return; // } hoveringText( ((GT_MetaTileEntity_MultiblockBase_EM) mte) 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 9961b04fcd..f3b6ec754f 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 @@ -10,6 +10,25 @@ import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static java.lang.Math.min; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; @@ -42,6 +61,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.api.widget.Widget; import com.gtnewhorizons.modularui.common.widget.*; import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; + import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -57,22 +77,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.*; import gregtech.api.util.*; import gregtech.common.GT_Pollution; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; /** * Created by danie_000 on 27.10.2016. @@ -129,8 +133,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt protected boolean eDismantleBoom = false; // what is the amount of A required - public long eAmpereFlow = - 1; // analogue of EU/t but for amperes used (so eu/t is actually eu*A/t) USE ONLY POSITIVE NUMBERS! + public long eAmpereFlow = 1; // analogue of EU/t but for amperes used (so eu/t is actually eu*A/t) USE ONLY POSITIVE + // NUMBERS! // set to what you need it to be in check recipe // data required to operate @@ -233,8 +237,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } @Override - public boolean onWrenchRightClick( - byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public boolean onWrenchRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, + float aZ) { if (aWrenchingSide != getBaseMetaTileEntity().getFrontFacing()) return super.onWrenchRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ); if (aPlayer.isSneaking()) { @@ -272,88 +276,72 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt public final boolean structureCheck_EM(String piece, int horizontalOffset, int verticalOffset, int depthOffset) { IGregTechTileEntity baseMetaTileEntity = getBaseMetaTileEntity(); - return getStructure_EM_Internal() - .check( - this, - piece, - baseMetaTileEntity.getWorld(), - getExtendedFacing(), - baseMetaTileEntity.getXCoord(), - baseMetaTileEntity.getYCoord(), - baseMetaTileEntity.getZCoord(), - horizontalOffset, - verticalOffset, - depthOffset, - !mMachine); - } - - public final boolean structureBuild_EM( - String piece, - int horizontalOffset, - int verticalOffset, - int depthOffset, - ItemStack trigger, - boolean hintsOnly) { + return getStructure_EM_Internal().check( + this, + piece, + baseMetaTileEntity.getWorld(), + getExtendedFacing(), + baseMetaTileEntity.getXCoord(), + baseMetaTileEntity.getYCoord(), + baseMetaTileEntity.getZCoord(), + horizontalOffset, + verticalOffset, + depthOffset, + !mMachine); + } + + public final boolean structureBuild_EM(String piece, int horizontalOffset, int verticalOffset, int depthOffset, + ItemStack trigger, boolean hintsOnly) { IGregTechTileEntity baseMetaTileEntity = getBaseMetaTileEntity(); - return getStructure_EM_Internal() - .buildOrHints( - this, - trigger, - piece, - baseMetaTileEntity.getWorld(), - getExtendedFacing(), - baseMetaTileEntity.getXCoord(), - baseMetaTileEntity.getYCoord(), - baseMetaTileEntity.getZCoord(), - horizontalOffset, - verticalOffset, - depthOffset, - hintsOnly); - } - - protected final int survivialBuildPiece( - String piece, - ItemStack trigger, - int horizontalOffset, - int verticalOffset, - int depthOffset, - int elementsBudget, - IItemSource source, - EntityPlayerMP actor, - boolean check) { + return getStructure_EM_Internal().buildOrHints( + this, + trigger, + piece, + baseMetaTileEntity.getWorld(), + getExtendedFacing(), + baseMetaTileEntity.getXCoord(), + baseMetaTileEntity.getYCoord(), + baseMetaTileEntity.getZCoord(), + horizontalOffset, + verticalOffset, + depthOffset, + hintsOnly); + } + + protected final int survivialBuildPiece(String piece, ItemStack trigger, int horizontalOffset, int verticalOffset, + int depthOffset, int elementsBudget, IItemSource source, EntityPlayerMP actor, boolean check) { final IGregTechTileEntity tTile = getBaseMetaTileEntity(); - return getStructure_EM_Internal() - .survivalBuild( - this, - trigger, - piece, - tTile.getWorld(), - getExtendedFacing(), - tTile.getXCoord(), - tTile.getYCoord(), - tTile.getZCoord(), - horizontalOffset, - verticalOffset, - depthOffset, - elementsBudget, - source, - actor, - check); - } - - protected final int survivialBuildPiece( - String piece, - ItemStack trigger, - int horizontalOffset, - int verticalOffset, - int depthOffset, - int elementsBudget, - IItemSource source, - EntityPlayerMP actor, - boolean check, + return getStructure_EM_Internal().survivalBuild( + this, + trigger, + piece, + tTile.getWorld(), + getExtendedFacing(), + tTile.getXCoord(), + tTile.getYCoord(), + tTile.getZCoord(), + horizontalOffset, + verticalOffset, + depthOffset, + elementsBudget, + source, + actor, + check); + } + + protected final int survivialBuildPiece(String piece, ItemStack trigger, int horizontalOffset, int verticalOffset, + int depthOffset, int elementsBudget, IItemSource source, EntityPlayerMP actor, boolean check, boolean checkIfPlaced) { int built = survivialBuildPiece( - piece, trigger, horizontalOffset, verticalOffset, depthOffset, elementsBudget, source, actor, check); + piece, + trigger, + horizontalOffset, + verticalOffset, + depthOffset, + elementsBudget, + source, + actor, + check); if (checkIfPlaced && built > 0) checkStructure(true, getBaseMetaTileEntity()); return built; } @@ -385,14 +373,11 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } /** - * Put EM stuff from outputEM into EM output hatches here - * or do other stuff - it is basically on recipe succeded + * Put EM stuff from outputEM into EM output hatches here or do other stuff - it is basically on recipe succeded * <p> - * based on "machine state" do output, - * this must move to outputEM to EM output hatches - * and can also modify output items/fluids/EM, remaining EM is NOT overflowed. - * (Well it can be overflowed if machine didn't finished, soft-hammered/disabled/not enough EU) - * Setting available data processing + * based on "machine state" do output, this must move to outputEM to EM output hatches and can also modify output + * items/fluids/EM, remaining EM is NOT overflowed. (Well it can be overflowed if machine didn't finished, + * soft-hammered/disabled/not enough EU) Setting available data processing */ public void outputAfterRecipe_EM() {} // endregion @@ -406,14 +391,23 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt */ public ArrayList<String> getFullLedDescriptionIn(int hatchNo, int paramID) { ArrayList<String> list = new ArrayList<>(); - list.add(EnumChatFormatting.WHITE + "ID: " + EnumChatFormatting.AQUA - + hatchNo + EnumChatFormatting.YELLOW - + ":" + EnumChatFormatting.AQUA - + paramID + EnumChatFormatting.YELLOW - + ":" + EnumChatFormatting.AQUA - + "I " + parametrization.getStatusIn(hatchNo, paramID).name.get()); - list.add(EnumChatFormatting.WHITE + "Value: " + EnumChatFormatting.AQUA - + TT_Utility.doubleToString(parametrization.getIn(hatchNo, paramID))); + list.add( + EnumChatFormatting.WHITE + "ID: " + + EnumChatFormatting.AQUA + + hatchNo + + EnumChatFormatting.YELLOW + + ":" + + EnumChatFormatting.AQUA + + paramID + + EnumChatFormatting.YELLOW + + ":" + + EnumChatFormatting.AQUA + + "I " + + parametrization.getStatusIn(hatchNo, paramID).name.get()); + list.add( + EnumChatFormatting.WHITE + "Value: " + + EnumChatFormatting.AQUA + + TT_Utility.doubleToString(parametrization.getIn(hatchNo, paramID))); try { list.add(parametrization.groups[hatchNo].parameterIn[paramID].getBrief()); } catch (NullPointerException | IndexOutOfBoundsException e) { @@ -429,14 +423,23 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt */ public ArrayList<String> getFullLedDescriptionOut(int hatchNo, int paramID) { ArrayList<String> list = new ArrayList<>(); - list.add(EnumChatFormatting.WHITE + "ID: " + EnumChatFormatting.AQUA - + hatchNo + EnumChatFormatting.YELLOW - + ":" + EnumChatFormatting.AQUA - + paramID + EnumChatFormatting.YELLOW - + ":" + EnumChatFormatting.AQUA - + "O " + parametrization.getStatusOut(hatchNo, paramID).name.get()); - list.add(EnumChatFormatting.WHITE + "Value: " + EnumChatFormatting.AQUA - + TT_Utility.doubleToString(parametrization.getOut(hatchNo, paramID))); + list.add( + EnumChatFormatting.WHITE + "ID: " + + EnumChatFormatting.AQUA + + hatchNo + + EnumChatFormatting.YELLOW + + ":" + + EnumChatFormatting.AQUA + + paramID + + EnumChatFormatting.YELLOW + + ":" + + EnumChatFormatting.AQUA + + "O " + + parametrization.getStatusOut(hatchNo, paramID).name.get()); + list.add( + EnumChatFormatting.WHITE + "Value: " + + EnumChatFormatting.AQUA + + TT_Utility.doubleToString(parametrization.getOut(hatchNo, paramID))); try { list.add(parametrization.groups[hatchNo].parameterOut[paramID].getBrief()); } catch (NullPointerException | IndexOutOfBoundsException e) { @@ -474,33 +477,63 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } } - return new String[] { - "Progress:", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " - + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(mMaxProgresstime / 20) - + EnumChatFormatting.RESET + " s", - "Energy Hatches:", - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " - + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET - + " EU", - (mEUt * eAmpereFlow <= 0 ? "Probably uses: " : "Probably makes: ") + EnumChatFormatting.RED - + GT_Utility.formatNumbers(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t at " - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(eAmpereFlow) + EnumChatFormatting.RESET + " A", - "Tier Rating: " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET - + " / " + EnumChatFormatting.GREEN - + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + " Amp Rating: " - + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eMaxAmpereFlow) + EnumChatFormatting.RESET - + " A", - "Problems: " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET - + " Efficiency: " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET - + " %", - "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + " SafeVoid: " - + EnumChatFormatting.BLUE + eSafeVoid, - "Computation: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eAvailableData) - + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(eRequiredData) + EnumChatFormatting.RESET - }; + return new String[] { "Progress:", + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mProgresstime / 20) + + EnumChatFormatting.RESET + + " s / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(mMaxProgresstime / 20) + + EnumChatFormatting.RESET + + " s", + "Energy Hatches:", + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + + EnumChatFormatting.RESET + + " EU / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEnergy) + + EnumChatFormatting.RESET + + " EU", + (mEUt * eAmpereFlow <= 0 ? "Probably uses: " : "Probably makes: ") + EnumChatFormatting.RED + + GT_Utility.formatNumbers(Math.abs(mEUt)) + + EnumChatFormatting.RESET + + " EU/t at " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(eAmpereFlow) + + EnumChatFormatting.RESET + + " A", + "Tier Rating: " + EnumChatFormatting.YELLOW + + VN[getMaxEnergyInputTier_EM()] + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.GREEN + + VN[getMinEnergyInputTier_EM()] + + EnumChatFormatting.RESET + + " Amp Rating: " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(eMaxAmpereFlow) + + EnumChatFormatting.RESET + + " A", + "Problems: " + EnumChatFormatting.RED + + (getIdealStatus() - getRepairStatus()) + + EnumChatFormatting.RESET + + " Efficiency: " + + EnumChatFormatting.YELLOW + + mEfficiency / 100.0F + + EnumChatFormatting.RESET + + " %", + "PowerPass: " + EnumChatFormatting.BLUE + + ePowerPass + + EnumChatFormatting.RESET + + " SafeVoid: " + + EnumChatFormatting.BLUE + + eSafeVoid, + "Computation: " + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(eAvailableData) + + EnumChatFormatting.RESET + + " / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(eRequiredData) + + EnumChatFormatting.RESET }; } /** @@ -542,20 +575,13 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt * @return */ @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][4], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][4], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][4]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][4] }; } /** @@ -653,14 +679,12 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } /** - * prevents spontaneous explosions when the chunks unloading would cause them - * should cover 3 chunks radius + * prevents spontaneous explosions when the chunks unloading would cause them should cover 3 chunks radius * * @return */ protected boolean areChunksAroundLoaded_EM() { - if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(this) - && getBaseMetaTileEntity().isServerSide()) { + if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(this) && getBaseMetaTileEntity().isServerSide()) { IGregTechTileEntity base = getBaseMetaTileEntity(); return base.getWorld().doChunksNearChunkExist(base.getXCoord(), base.getYCoord(), base.getZCoord(), 3); // todo check if it is actually checking if chunks are loaded @@ -675,9 +699,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt protected void parametersInstantiation_EM() {} /** - * It is automatically called OFTEN - * update status of parameters in guis (and "machine state" if u wish) - * Called before check recipe, before outputting, and every second the machine is complete + * It is automatically called OFTEN update status of parameters in guis (and "machine state" if u wish) Called + * before check recipe, before outputting, and every second the machine is complete * <p> * good place to update parameter statuses, default implementation handles it well * @@ -716,7 +739,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt protected void hatchInit_EM(boolean mMachine) {} /** - * called when the multiblock is exploding - if u want to add more EXPLOSIONS, for ex. new types of hatches also have to explode + * called when the multiblock is exploding - if u want to add more EXPLOSIONS, for ex. new types of hatches also + * have to explode */ protected void extraExplosions_EM() {} // For that extra hatches explosions, and maybe some MOORE EXPLOSIONS @@ -729,7 +753,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt long result = 0; IGregTechTileEntity baseMetaTileEntity = getBaseMetaTileEntity(); Vec3Impl pos = new Vec3Impl( - baseMetaTileEntity.getXCoord(), baseMetaTileEntity.getYCoord(), baseMetaTileEntity.getZCoord()); + baseMetaTileEntity.getXCoord(), + baseMetaTileEntity.getYCoord(), + baseMetaTileEntity.getZCoord()); for (GT_MetaTileEntity_Hatch_InputData in : eInputData) { if (in.q != null) { Long value = in.q.contentIfNotInTrace(pos); @@ -742,8 +768,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } /** - * Extra hook on cyclic updates (not really needed for machines smaller than 1 chunk) - * BUT NEEDED WHEN - machine blocks are not touching each other or they don't implement IMachineBlockUpdateable (ex. air,stone,weird TE's) + * Extra hook on cyclic updates (not really needed for machines smaller than 1 chunk) BUT NEEDED WHEN - machine + * blocks are not touching each other or they don't implement IMachineBlockUpdateable (ex. air,stone,weird TE's) */ protected boolean cyclicUpdate_EM() { return mUpdate <= -1000; // set to false to disable cyclic update @@ -772,10 +798,11 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } /** - * triggered if machine is not allowed to work after completing a recipe, override to make it not shutdown for instance (like turbines). - * bu just replacing it with blank - active transformer is doing it + * triggered if machine is not allowed to work after completing a recipe, override to make it not shutdown for + * instance (like turbines). bu just replacing it with blank - active transformer is doing it * <p> - * CALLED DIRECTLY when soft hammered to offline state - usually should stop the machine unless some other mechanics should do it + * CALLED DIRECTLY when soft hammered to offline state - usually should stop the machine unless some other mechanics + * should do it */ protected void notAllowedToWork_stopMachine_EM() { stopMachine(); @@ -928,8 +955,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt for (int i = 0; i < outputEM.length; i++) { if (compound.hasKey(Integer.toString(i))) { try { - outputEM[i] = EMInstanceStackMap.fromNBT( - TecTech.definitionsRegistry, compound.getCompoundTag(Integer.toString(i))); + outputEM[i] = EMInstanceStackMap + .fromNBT(TecTech.definitionsRegistry, compound.getCompoundTag(Integer.toString(i))); } catch (EMException e) { if (DEBUG_MODE) { e.printStackTrace(); @@ -999,8 +1026,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt // region RATHER LEAVE ALONE Section /** - * Override if needed but usually call super method at start! - * On machine stop - NOT called directly when soft hammered to offline state! - it SHOULD cause a full stop like power failure does + * Override if needed but usually call super method at start! On machine stop - NOT called directly when soft + * hammered to offline state! - it SHOULD cause a full stop like power failure does */ @Override public void stopMachine() { @@ -1022,8 +1049,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } /** - * After recipe check failed - * helper method so i don't have to set that params to nothing at all times + * After recipe check failed helper method so i don't have to set that params to nothing at all times */ protected void afterRecipeCheckFailed() { cleanOrExplode(); @@ -1227,8 +1253,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt mEfficiency = 0; } - if (--mUpdate == 0 - || --mStartUpCheck == 0 + if (--mUpdate == 0 || --mStartUpCheck == 0 || cyclicUpdate() || aBaseMetaTileEntity.hasWorkJustBeenEnabled()) { clearHatches_EM(); @@ -1299,8 +1324,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt stopMachine(); } - if (mMaxProgresstime > 0 - && ++mProgresstime >= mMaxProgresstime) { // progress increase and done + if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) { // progress increase + // and done hatchesStatusUpdate_EM(); outputAfterRecipe_EM(); @@ -1330,8 +1355,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } } } // else {//failed to consume power/resources - inside on running tick - // stopMachine(); - // } + // stopMachine(); + // } } else if (RECIPE_AT == Tick || aBaseMetaTileEntity.hasWorkJustBeenEnabled()) { if (aBaseMetaTileEntity.isAllowedToWork()) { if (checkRecipe(mInventory[1])) { @@ -1355,16 +1380,16 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } } - aBaseMetaTileEntity.setErrorDisplayID(aBaseMetaTileEntity.getErrorDisplayID() & -512 - | (mWrench ? 0 : 1) - | (mScrewdriver ? 0 : 2) - | (mSoftHammer ? 0 : 4) - | (mHardHammer ? 0 : 8) - | (mSolderingTool ? 0 : 16) - | (mCrowbar ? 0 : 32) - | (mMachine ? 0 : 64) - | (eCertainStatus == 0 ? 0 : 128) - | (eParameters ? 0 : 256)); + aBaseMetaTileEntity.setErrorDisplayID( + aBaseMetaTileEntity.getErrorDisplayID() & -512 | (mWrench ? 0 : 1) + | (mScrewdriver ? 0 : 2) + | (mSoftHammer ? 0 : 4) + | (mHardHammer ? 0 : 8) + | (mSolderingTool ? 0 : 16) + | (mCrowbar ? 0 : 32) + | (mMachine ? 0 : 64) + | (eCertainStatus == 0 ? 0 : 128) + | (eParameters ? 0 : 256)); aBaseMetaTileEntity.setActive(mMaxProgresstime > 0); boolean active = aBaseMetaTileEntity.isActive() && mPollution > 0; for (GT_MetaTileEntity_Hatch_Muffler aMuffler : mMufflerHatches) { @@ -1571,8 +1596,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } protected void setupEnergyHatchesVariables_EM() { - if (!mEnergyHatches.isEmpty() - || !eEnergyMulti.isEmpty() + if (!mEnergyHatches.isEmpty() || !eEnergyMulti.isEmpty() || !mDynamoHatches.isEmpty() || !eDynamoMulti.isEmpty()) { maxEUinputMin = V[15]; @@ -1663,9 +1687,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { euVar = tHatch.maxEUOutput() * tHatch.maxAmperesOut(); - if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar - && aBaseMetaTileEntity.decreaseStoredEnergyUnits( - euVar + Math.max(euVar / 24576, tHatch.maxAmperesOut()), false)) { + if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar && aBaseMetaTileEntity + .decreaseStoredEnergyUnits(euVar + Math.max(euVar / 24576, tHatch.maxAmperesOut()), false)) { tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar); } } @@ -1673,9 +1696,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt for (GT_MetaTileEntity_Hatch_DynamoMulti tHatch : eDynamoMulti) { if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { euVar = tHatch.maxEUOutput() * tHatch.maxAmperesOut(); - if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar - && aBaseMetaTileEntity.decreaseStoredEnergyUnits( - euVar + Math.max(euVar / 24576, tHatch.maxAmperesOut()), false)) { + if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar && aBaseMetaTileEntity + .decreaseStoredEnergyUnits(euVar + Math.max(euVar / 24576, tHatch.maxAmperesOut()), false)) { tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar); } } @@ -1696,9 +1718,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt for (GT_MetaTileEntity_Hatch_DynamoMulti tHatch : eDynamoMulti) { if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { euVar = tHatch.maxEUOutput() * tHatch.Amperes; - if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar - && aBaseMetaTileEntity.decreaseStoredEnergyUnits( - euVar + Math.max(euVar / 24576, tHatch.Amperes), false)) { + if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar && aBaseMetaTileEntity + .decreaseStoredEnergyUnits(euVar + Math.max(euVar / 24576, tHatch.Amperes), false)) { tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar); } } @@ -1794,7 +1815,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt return true; } if (!drainEnergyInput_EM( - mEUt, (long) mEUt * getMaxEfficiency(aStack) / Math.max(1000L, mEfficiency), eAmpereFlow)) { + mEUt, + (long) mEUt * getMaxEfficiency(aStack) / Math.max(1000L, mEfficiency), + eAmpereFlow)) { criticalStopMachine(); return false; } @@ -1819,16 +1842,16 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } // public final boolean energyFlowWithoutEffieciencyComputation(int eu,long ampere) { - // long temp = eu * ampere;//quick scope sign - // if (temp > 0) { - // this.addEnergyOutput_EM(eu, ampere); - // } else if (temp < 0) { - // if (!this.drainEnergyInput_EM(eu,eu, ampere)) { - // stopMachine(); - // return false; - // } - // } - // return true; + // long temp = eu * ampere;//quick scope sign + // if (temp > 0) { + // this.addEnergyOutput_EM(eu, ampere); + // } else if (temp < 0) { + // if (!this.drainEnergyInput_EM(eu,eu, ampere)) { + // stopMachine(); + // return false; + // } + // } + // return true; // } @Override @@ -1921,21 +1944,27 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt if (EUuse < 0) { EUuse = -EUuse; } - if (EUuse > getEUVar() - || // not enough power - (EUtTierVoltage == 0 - ? EUuse > getMaxInputEnergy() - : (EUtTierVoltage > maxEUinputMax) - || // TIER IS BASED ON BEST HATCH! not total EUtEffective input - (EUtTierVoltage * Amperes - 1) / maxEUinputMin + 1 - > eMaxAmpereFlow)) { // EUuse==0? --> (EUuse - 1) / maxEUinputMin + 1 = 1! //if + if (EUuse > getEUVar() || // not enough power + (EUtTierVoltage == 0 ? EUuse > getMaxInputEnergy() : (EUtTierVoltage > maxEUinputMax) || // TIER IS + // BASED ON + // BEST HATCH! + // not total + // EUtEffective + // input + (EUtTierVoltage * Amperes - 1) / maxEUinputMin + 1 > eMaxAmpereFlow)) { // EUuse==0? --> (EUuse + // - 1) / maxEUinputMin + // + 1 = 1! //if // not too much A if (DEBUG_MODE) { TecTech.LOGGER.debug("L1 " + EUuse + ' ' + getEUVar() + ' ' + (EUuse > getEUVar())); TecTech.LOGGER.debug("L2 " + EUtEffective + ' ' + maxEUinputMax + ' ' + (EUtEffective > maxEUinputMax)); TecTech.LOGGER.debug("L3 " + Amperes + ' ' + getMaxInputEnergy()); - TecTech.LOGGER.debug("L4 " + ((EUuse - 1) / maxEUinputMin + 1) + ' ' + eMaxAmpereFlow + ' ' - + ((EUuse - 1) / maxEUinputMin + 1 > eMaxAmpereFlow)); + TecTech.LOGGER.debug( + "L4 " + ((EUuse - 1) / maxEUinputMin + 1) + + ' ' + + eMaxAmpereFlow + + ' ' + + ((EUuse - 1) / maxEUinputMin + 1 > eMaxAmpereFlow)); } return false; } @@ -1956,9 +1985,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt EUuse = -EUuse; } // not enough power - if (EUuse > getEUVar() - || EUuse - > getMaxInputEnergy()) { // EUuse==0? --> (EUuse - 1) / maxEUinputMin + 1 = 1! //if not too much + if (EUuse > getEUVar() || EUuse > getMaxInputEnergy()) { // EUuse==0? --> (EUuse - 1) / maxEUinputMin + 1 = 1! + // //if not too much // A return false; } @@ -1979,9 +2007,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt while (tempEUt < tempTier) { tempEUt <<= 2; time >>= 1; - EU = time == 0 - ? EU >> 1 - : EU << 2; // U know, if the time is less than 1 tick make the machine use less power + EU = time == 0 ? EU >> 1 : EU << 2; // U know, if the time is less than 1 tick make the machine use less + // power } if (EU > Integer.MAX_VALUE || EU < Integer.MIN_VALUE) { mEUt = Integer.MAX_VALUE - 1; @@ -2165,8 +2192,10 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt explodedThisTick = true; if (!TecTech.configTecTech.BOOM_ENABLE) { TecTech.proxy.broadcast( - "Multi Explode BOOM! " + getBaseMetaTileEntity().getXCoord() + ' ' - + getBaseMetaTileEntity().getYCoord() + ' ' + "Multi Explode BOOM! " + getBaseMetaTileEntity().getXCoord() + + ' ' + + getBaseMetaTileEntity().getYCoord() + + ' ' + getBaseMetaTileEntity().getZCoord()); StackTraceElement[] ste = Thread.currentThread().getStackTrace(); TecTech.proxy.broadcast("Multi Explode BOOM! " + ste[2].toString()); @@ -2205,8 +2234,10 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt public void doExplosion(long aExplosionPower) { if (!TecTech.configTecTech.BOOM_ENABLE) { TecTech.proxy.broadcast( - "Multi DoExplosion BOOM! " + getBaseMetaTileEntity().getXCoord() + ' ' - + getBaseMetaTileEntity().getYCoord() + ' ' + "Multi DoExplosion BOOM! " + getBaseMetaTileEntity().getXCoord() + + ' ' + + getBaseMetaTileEntity().getYCoord() + + ' ' + getBaseMetaTileEntity().getZCoord()); StackTraceElement[] ste = Thread.currentThread().getStackTrace(); TecTech.proxy.broadcast("Multi DoExplosion BOOM! " + ste[2].toString()); @@ -2215,7 +2246,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt explodeMultiblock(); super.doExplosion(aExplosionPower); } // Redirecting to explodemultiblock - // endregion + // endregion // region adder methods @Override @@ -2717,13 +2748,11 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt HatchElement.InputData, HatchElement.OutputData, HatchElement.Uncertainty) - .casingIndex(casingIndex) - .dot(dot) - .buildAndChain(casingBlock, casingMeta); + .casingIndex(casingIndex).dot(dot).buildAndChain(casingBlock, casingMeta); } - protected static <T extends GT_MetaTileEntity_MultiblockBase_EM> IStructureElement<T> allHatches( - int casingIndex, int dot, Block casingBlock, int casingMeta) { + protected static <T extends GT_MetaTileEntity_MultiblockBase_EM> IStructureElement<T> allHatches(int casingIndex, + int dot, Block casingBlock, int casingMeta) { return GT_HatchElementBuilder.<T>builder() .atLeast( InputBus, @@ -2740,89 +2769,88 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt HatchElement.InputElemental, HatchElement.OutputElemental, HatchElement.OverflowElemental) - .casingIndex(casingIndex) - .dot(dot) - .buildAndChain(casingBlock, casingMeta); + .casingIndex(casingIndex).dot(dot).buildAndChain(casingBlock, casingMeta); } public enum HatchElement implements IHatchElement<GT_MetaTileEntity_MultiblockBase_EM> { - InputElemental( - GT_MetaTileEntity_MultiblockBase_EM::addElementalInputToMachineList, + + InputElemental(GT_MetaTileEntity_MultiblockBase_EM::addElementalInputToMachineList, GT_MetaTileEntity_Hatch_InputElemental.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eInputHatches.size(); } }, - OutputElemental( - GT_MetaTileEntity_MultiblockBase_EM::addElementalOutputToMachineList, + OutputElemental(GT_MetaTileEntity_MultiblockBase_EM::addElementalOutputToMachineList, GT_MetaTileEntity_Hatch_OutputElemental.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eOutputHatches.size(); } }, - OverflowElemental( - GT_MetaTileEntity_MultiblockBase_EM::addElementalMufflerToMachineList, + OverflowElemental(GT_MetaTileEntity_MultiblockBase_EM::addElementalMufflerToMachineList, GT_MetaTileEntity_Hatch_OverflowElemental.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eMufflerHatches.size(); } }, Param(GT_MetaTileEntity_MultiblockBase_EM::addParametrizerToMachineList, GT_MetaTileEntity_Hatch_Param.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eParamHatches.size(); } }, - Uncertainty( - GT_MetaTileEntity_MultiblockBase_EM::addUncertainToMachineList, + Uncertainty(GT_MetaTileEntity_MultiblockBase_EM::addUncertainToMachineList, GT_MetaTileEntity_Hatch_Uncertainty.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eUncertainHatches.size(); } }, - EnergyMulti( - GT_MetaTileEntity_MultiblockBase_EM::addEnergyInputToMachineList, + EnergyMulti(GT_MetaTileEntity_MultiblockBase_EM::addEnergyInputToMachineList, GT_MetaTileEntity_Hatch_EnergyMulti.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eEnergyMulti.size(); } }, - DynamoMulti( - GT_MetaTileEntity_MultiblockBase_EM::addDynamoToMachineList, + DynamoMulti(GT_MetaTileEntity_MultiblockBase_EM::addDynamoToMachineList, GT_MetaTileEntity_Hatch_DynamoMulti.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eDynamoMulti.size(); } }, - InputData( - GT_MetaTileEntity_MultiblockBase_EM::addDataConnectorToMachineList, + InputData(GT_MetaTileEntity_MultiblockBase_EM::addDataConnectorToMachineList, GT_MetaTileEntity_Hatch_InputData.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eInputData.size(); } }, - OutputData( - GT_MetaTileEntity_MultiblockBase_EM::addDataConnectorToMachineList, + OutputData(GT_MetaTileEntity_MultiblockBase_EM::addDataConnectorToMachineList, GT_MetaTileEntity_Hatch_OutputData.class) { + @Override public long count(GT_MetaTileEntity_MultiblockBase_EM t) { return t.eOutputData.size(); } - }, - ; + },; + private final List<Class<? extends IMetaTileEntity>> mteClasses; private final IGT_HatchAdder<GT_MetaTileEntity_MultiblockBase_EM> adder; @SafeVarargs - HatchElement( - IGT_HatchAdder<GT_MetaTileEntity_MultiblockBase_EM> adder, + HatchElement(IGT_HatchAdder<GT_MetaTileEntity_MultiblockBase_EM> adder, Class<? extends IMetaTileEntity>... mteClasses) { this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses)); this.adder = adder; @@ -2838,7 +2866,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } } - /** Check if the computation timeout is still active + /** + * Check if the computation timeout is still active * * @return True if the timeout is still active or false if the machine should fail */ @@ -2863,8 +2892,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt @Override public void bindPlayerInventoryUI(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.bindPlayerInventory( - buildContext.getPlayer(), new Pos2d(7, 109), getGUITextureSet().getItemSlot()); + builder.bindPlayerInventory(buildContext.getPlayer(), new Pos2d(7, 109), getGUITextureSet().getItemSlot()); } public boolean isPowerPassButtonEnabled() { @@ -2881,10 +2909,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO_DARK) - .setSize(18, 18) - .setPos(173, 74)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_TECTECH_LOGO_DARK).setSize(18, 18) + .setPos(173, 74)); } private static byte LEDCounter = 0; @@ -2892,25 +2919,22 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { if (doesBindPlayerInventory()) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE) - .setPos(4, 4) - .setSize(190, 91)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE).setPos(4, 4) + .setSize(190, 91)); } else { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE_NO_INVENTORY) - .setPos(4, 4) - .setSize(190, 171)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE_NO_INVENTORY).setPos(4, 4) + .setSize(190, 171)); } final SlotWidget inventorySlot = new SlotWidget(inventoryHandler, 1); if (doesBindPlayerInventory()) { - builder.widget(inventorySlot - .setBackground(getGUITextureSet().getItemSlot(), TecTechUITextures.OVERLAY_SLOT_MESH) + builder.widget( + inventorySlot.setBackground(getGUITextureSet().getItemSlot(), TecTechUITextures.OVERLAY_SLOT_MESH) .setPos(173, 167)) - .widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_HEAT_SINK_SMALL) - .setPos(173, 185) - .setSize(18, 6)); + .widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_HEAT_SINK_SMALL).setPos(173, 185) + .setSize(18, 6)); } final DynamicPositionedColumn screenElements = new DynamicPositionedColumn(); @@ -2926,75 +2950,69 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt .widget(new FakeSyncWidget.BooleanSyncer(() -> eSafeVoid, val -> eSafeVoid = val)); Widget powerSwitchButton = createPowerSwitchButton(); builder.widget(powerSwitchButton) - .widget(new FakeSyncWidget.BooleanSyncer( - () -> getBaseMetaTileEntity().isAllowedToWork(), val -> { - if (val) getBaseMetaTileEntity().enableWorking(); - else getBaseMetaTileEntity().disableWorking(); - })); + .widget(new FakeSyncWidget.BooleanSyncer(() -> getBaseMetaTileEntity().isAllowedToWork(), val -> { + if (val) getBaseMetaTileEntity().enableWorking(); + else getBaseMetaTileEntity().disableWorking(); + })); - builder.widget( - new DrawableWidget() { - @Override - public void draw(float partialTicks) { - super.draw(partialTicks); - LEDCounter = (byte) ((1 + LEDCounter) % 6); - } - }.setDrawable(TecTechUITextures.PICTURE_PARAMETER_BLANK) - .setPos(5, doesBindPlayerInventory() ? 96 : 176) - .setSize(166, 12)); + builder.widget(new DrawableWidget() { + + @Override + public void draw(float partialTicks) { + super.draw(partialTicks); + LEDCounter = (byte) ((1 + LEDCounter) % 6); + } + }.setDrawable(TecTechUITextures.PICTURE_PARAMETER_BLANK).setPos(5, doesBindPlayerInventory() ? 96 : 176) + .setSize(166, 12)); for (int hatch = 0; hatch < 10; hatch++) { for (int param = 0; param < 2; param++) { int ledID = hatch + param * 10; - buildContext.addSyncedWindow( - LED_WINDOW_BASE_ID + ledID, (player) -> createLEDConfigurationWindow(ledID)); + buildContext + .addSyncedWindow(LED_WINDOW_BASE_ID + ledID, (player) -> createLEDConfigurationWindow(ledID)); addParameterLED(builder, hatch, param, true); addParameterLED(builder, hatch, param, false); } } if (doesBindPlayerInventory()) { - builder.widget(new DrawableWidget() - .setDrawable(TecTechUITextures.PICTURE_UNCERTAINTY_MONITOR_MULTIMACHINE) - .setPos(173, 96) - .setSize(18, 18)); + builder.widget( + new DrawableWidget().setDrawable(TecTechUITextures.PICTURE_UNCERTAINTY_MONITOR_MULTIMACHINE) + .setPos(173, 96).setSize(18, 18)); for (int i = 0; i < 9; i++) { final int index = i; - builder.widget(new DrawableWidget() - .setDrawable(() -> { - UITexture valid = TecTechUITextures.PICTURE_UNCERTAINTY_VALID[index]; - UITexture invalid = TecTechUITextures.PICTURE_UNCERTAINTY_INVALID[index]; - switch (eCertainMode) { - case 1: // ooo oxo ooo - if (index == 4) return eCertainStatus == 0 ? valid : invalid; - break; - case 2: // ooo xox ooo - if (index == 3) return (eCertainStatus & 1) == 0 ? valid : invalid; - if (index == 5) return (eCertainStatus & 2) == 0 ? valid : invalid; - break; - case 3: // oxo xox oxo - if (index == 1) return (eCertainStatus & 1) == 0 ? valid : invalid; - if (index == 3) return (eCertainStatus & 2) == 0 ? valid : invalid; - if (index == 5) return (eCertainStatus & 4) == 0 ? valid : invalid; - if (index == 7) return (eCertainStatus & 8) == 0 ? valid : invalid; - break; - case 4: // xox ooo xox - if (index == 0) return (eCertainStatus & 1) == 0 ? valid : invalid; - if (index == 2) return (eCertainStatus & 2) == 0 ? valid : invalid; - if (index == 6) return (eCertainStatus & 4) == 0 ? valid : invalid; - if (index == 8) return (eCertainStatus & 8) == 0 ? valid : invalid; - break; - case 5: // xox oxo xox - if (index == 0) return (eCertainStatus & 1) == 0 ? valid : invalid; - if (index == 2) return (eCertainStatus & 2) == 0 ? valid : invalid; - if (index == 4) return (eCertainStatus & 4) == 0 ? valid : invalid; - if (index == 6) return (eCertainStatus & 8) == 0 ? valid : invalid; - if (index == 8) return (eCertainStatus & 16) == 0 ? valid : invalid; - break; - } - return null; - }) - .setPos(174 + (index % 3) * 6, 97 + (index / 3) * 6) - .setSize(4, 4)); + builder.widget(new DrawableWidget().setDrawable(() -> { + UITexture valid = TecTechUITextures.PICTURE_UNCERTAINTY_VALID[index]; + UITexture invalid = TecTechUITextures.PICTURE_UNCERTAINTY_INVALID[index]; + switch (eCertainMode) { + case 1: // ooo oxo ooo + if (index == 4) return eCertainStatus == 0 ? valid : invalid; + break; + case 2: // ooo xox ooo + if (index == 3) return (eCertainStatus & 1) == 0 ? valid : invalid; + if (index == 5) return (eCertainStatus & 2) == 0 ? valid : invalid; + break; + case 3: // oxo xox oxo + if (index == 1) return (eCertainStatus & 1) == 0 ? valid : invalid; + if (index == 3) return (eCertainStatus & 2) == 0 ? valid : invalid; + if (index == 5) return (eCertainStatus & 4) == 0 ? valid : invalid; + if (index == 7) return (eCertainStatus & 8) == 0 ? valid : invalid; + break; + case 4: // xox ooo xox + if (index == 0) return (eCertainStatus & 1) == 0 ? valid : invalid; + if (index == 2) return (eCertainStatus & 2) == 0 ? valid : invalid; + if (index == 6) return (eCertainStatus & 4) == 0 ? valid : invalid; + if (index == 8) return (eCertainStatus & 8) == 0 ? valid : invalid; + break; + case 5: // xox oxo xox + if (index == 0) return (eCertainStatus & 1) == 0 ? valid : invalid; + if (index == 2) return (eCertainStatus & 2) == 0 ? valid : invalid; + if (index == 4) return (eCertainStatus & 4) == 0 ? valid : invalid; + if (index == 6) return (eCertainStatus & 8) == 0 ? valid : invalid; + if (index == 8) return (eCertainStatus & 16) == 0 ? valid : invalid; + break; + } + return null; + }).setPos(174 + (index % 3) * 6, 97 + (index / 3) * 6).setSize(4, 4)); } builder.widget(new FakeSyncWidget.ByteSyncer(() -> eCertainMode, val -> eCertainMode = val)) .widget(new FakeSyncWidget.ByteSyncer(() -> eCertainStatus, val -> eCertainStatus = val)); @@ -3002,37 +3020,32 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } protected ButtonWidget createPowerPassButton() { - Widget button = new ButtonWidget() - .setOnClick((clickData, widget) -> { - if (isPowerPassButtonEnabled() || ePowerPassCover) { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - ePowerPass = !ePowerPass; - if (!isAllowedToWorkButtonEnabled()) { // TRANSFORMER HACK - if (ePowerPass) { - getBaseMetaTileEntity().enableWorking(); - } else { - getBaseMetaTileEntity().disableWorking(); - } - } - } - }) - .setPlayClickSound(false) - .setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - if (!isPowerPassButtonEnabled() && !ePowerPassCover) { - ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_PASS_DISABLED); + Widget button = new ButtonWidget().setOnClick((clickData, widget) -> { + if (isPowerPassButtonEnabled() || ePowerPassCover) { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + ePowerPass = !ePowerPass; + if (!isAllowedToWorkButtonEnabled()) { // TRANSFORMER HACK + if (ePowerPass) { + getBaseMetaTileEntity().enableWorking(); } else { - if (ePowerPass) { - ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_PASS_ON); - } else { - ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_PASS_OFF); - } + getBaseMetaTileEntity().disableWorking(); } - return ret.toArray(new IDrawable[0]); - }) - .setPos(174, doesBindPlayerInventory() ? 116 : 140) - .setSize(16, 16); + } + } + }).setPlayClickSound(false).setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); + if (!isPowerPassButtonEnabled() && !ePowerPassCover) { + ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_PASS_DISABLED); + } else { + if (ePowerPass) { + ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_PASS_ON); + } else { + ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_PASS_OFF); + } + } + return ret.toArray(new IDrawable[0]); + }).setPos(174, doesBindPlayerInventory() ? 116 : 140).setSize(16, 16); if (isPowerPassButtonEnabled()) { button.addTooltip("Power Pass").setTooltipShowUpDelay(TOOLTIP_DELAY); } @@ -3040,30 +3053,25 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } protected ButtonWidget createSafeVoidButton() { - Widget button = new ButtonWidget() - .setOnClick((clickData, widget) -> { - if (isSafeVoidButtonEnabled()) { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - eSafeVoid = !eSafeVoid; - } - }) - .setPlayClickSound(false) - .setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - if (!isSafeVoidButtonEnabled()) { - ret.add(TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_DISABLED); - } else { - if (eSafeVoid) { - ret.add(TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_ON); - } else { - ret.add(TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_OFF); - } - } - return ret.toArray(new IDrawable[0]); - }) - .setPos(174, doesBindPlayerInventory() ? 132 : 156) - .setSize(16, 16); + Widget button = new ButtonWidget().setOnClick((clickData, widget) -> { + if (isSafeVoidButtonEnabled()) { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + eSafeVoid = !eSafeVoid; + } + }).setPlayClickSound(false).setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); + if (!isSafeVoidButtonEnabled()) { + ret.add(TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_DISABLED); + } else { + if (eSafeVoid) { + ret.add(TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_ON); + } else { + ret.add(TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_OFF); + } + } + return ret.toArray(new IDrawable[0]); + }).setPos(174, doesBindPlayerInventory() ? 132 : 156).setSize(16, 16); if (isSafeVoidButtonEnabled()) { button.addTooltip("Safe Void").setTooltipShowUpDelay(TOOLTIP_DELAY); } @@ -3071,34 +3079,29 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } protected ButtonWidget createPowerSwitchButton() { - Widget button = new ButtonWidget() - .setOnClick((clickData, widget) -> { - if (isAllowedToWorkButtonEnabled()) { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - if (getBaseMetaTileEntity().isAllowedToWork()) { - getBaseMetaTileEntity().disableWorking(); - } else { - getBaseMetaTileEntity().enableWorking(); - } - } - }) - .setPlayClickSound(false) - .setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - if (!isAllowedToWorkButtonEnabled()) { - ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_DISABLED); - } else { - if (getBaseMetaTileEntity().isAllowedToWork()) { - ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON); - } else { - ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF); - } - } - return ret.toArray(new IDrawable[0]); - }) - .setPos(174, doesBindPlayerInventory() ? 148 : 172) - .setSize(16, 16); + Widget button = new ButtonWidget().setOnClick((clickData, widget) -> { + if (isAllowedToWorkButtonEnabled()) { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + if (getBaseMetaTileEntity().isAllowedToWork()) { + getBaseMetaTileEntity().disableWorking(); + } else { + getBaseMetaTileEntity().enableWorking(); + } + } + }).setPlayClickSound(false).setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); + if (!isAllowedToWorkButtonEnabled()) { + ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_DISABLED); + } else { + if (getBaseMetaTileEntity().isAllowedToWork()) { + ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON); + } else { + ret.add(TecTechUITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF); + } + } + return ret.toArray(new IDrawable[0]); + }).setPos(174, doesBindPlayerInventory() ? 148 : 172).setSize(16, 16); if (isAllowedToWorkButtonEnabled()) { button.addTooltip("Power Switch").setTooltipShowUpDelay(TOOLTIP_DELAY); } @@ -3106,32 +3109,25 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } private ModularWindow createLEDConfigurationWindow(int ledID) { - return ModularWindow.builder(100, 40) - .setBackground(TecTechUITextures.BACKGROUND_SCREEN_BLUE) - .setPos((screenSize, mainWindow) -> new Pos2d( - (screenSize.width / 2 - mainWindow.getSize().width / 2) - 110, - (screenSize.height / 2 - mainWindow.getSize().height / 2))) + return ModularWindow.builder(100, 40).setBackground(TecTechUITextures.BACKGROUND_SCREEN_BLUE) + .setPos( + (screenSize, mainWindow) -> new Pos2d( + (screenSize.width / 2 - mainWindow.getSize().width / 2) - 110, + (screenSize.height / 2 - mainWindow.getSize().height / 2))) .widget(ButtonWidget.closeWindowButton(true).setPos(85, 3)) - .widget(new TextFieldWidget() - .setTextColor(Color.LIGHT_BLUE.normal) - .setNumbersDouble((val) -> val) - .setGetter(() -> Double.toString(parametrization.iParamsIn[ledID])) - .setSetter(val -> { - try { - parametrization.iParamsIn[ledID] = Double.parseDouble(val); - } catch (Exception e) { - e.printStackTrace(); - } - }) - .setTextAlignment(Alignment.CenterLeft) - .setFocusOnGuiOpen(true) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) - .setPos(5, 20) - .setSize(90, 15)) - .widget(new TextWidget((ledID % 10) + ":" + (ledID / 10) + ":I") - .setDefaultColor(Color.WHITE.normal) - .setTextAlignment(Alignment.Center) - .setPos(5, 5)) + .widget( + new TextFieldWidget().setTextColor(Color.LIGHT_BLUE.normal).setNumbersDouble((val) -> val) + .setGetter(() -> Double.toString(parametrization.iParamsIn[ledID])).setSetter(val -> { + try { + parametrization.iParamsIn[ledID] = Double.parseDouble(val); + } catch (Exception e) { + e.printStackTrace(); + } + }).setTextAlignment(Alignment.CenterLeft).setFocusOnGuiOpen(true) + .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD).setPos(5, 20).setSize(90, 15)) + .widget( + new TextWidget((ledID % 10) + ":" + (ledID / 10) + ":I").setDefaultColor(Color.WHITE.normal) + .setTextAlignment(Alignment.Center).setPos(5, 5)) .build(); } @@ -3139,11 +3135,11 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt final int parameterIndex = hatch + param * 10; final int posIndex = hatch * 2 + param; ButtonWidget ledWidget = new ButtonWidget() { + @Override public void draw(float partialTicks) { IDrawable texture = null; - final LedStatus status = input - ? parametrization.eParamsInStatus[parameterIndex] + final LedStatus status = input ? parametrization.eParamsInStatus[parameterIndex] : parametrization.eParamsOutStatus[parameterIndex]; switch (status) { case STATUS_WTF: { @@ -3223,8 +3219,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt GL11.glColor4f(1f, 1f, 1f, 1f); } }.setOnClick((clickData, widget) -> { - if (!widget.isClient() - && input + if (!widget.isClient() && input && parametrization.eParamsInStatus[parameterIndex] != LedStatus.STATUS_UNUSED) { // We don't use CloseAllButMain here in case MB implementation adds their own window for (int i = 0; i < parametrization.eParamsInStatus.length; i++) { @@ -3233,34 +3228,35 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt widget.getContext().openSyncedWindow(LED_WINDOW_BASE_ID + parameterIndex); } }); - builder.widget(ledWidget - .dynamicTooltip(() -> { - if (input) { - return getFullLedDescriptionIn(hatch, param); - } else { - return getFullLedDescriptionOut(hatch, param); - } - }) - .setPos(12 + posIndex * 8, (doesBindPlayerInventory() ? 97 : 177) + (input ? 0 : 1) * 6) - .setSize(6, 4)); + builder.widget(ledWidget.dynamicTooltip(() -> { + if (input) { + return getFullLedDescriptionIn(hatch, param); + } else { + return getFullLedDescriptionOut(hatch, param); + } + }).setPos(12 + posIndex * 8, (doesBindPlayerInventory() ? 97 : 177) + (input ? 0 : 1) * 6).setSize(6, 4)); if (input) { - builder.widget(new FakeSyncWidget.ByteSyncer( - () -> parametrization.eParamsInStatus[parameterIndex].getOrdinalByte(), - val -> parametrization.eParamsInStatus[parameterIndex] = LedStatus.getStatus(val)) - .setOnClientUpdate(val -> ledWidget.notifyTooltipChange())) - .widget(new FakeSyncWidget.DoubleSyncer( + builder.widget( + new FakeSyncWidget.ByteSyncer( + () -> parametrization.eParamsInStatus[parameterIndex].getOrdinalByte(), + val -> parametrization.eParamsInStatus[parameterIndex] = LedStatus.getStatus(val)) + .setOnClientUpdate(val -> ledWidget.notifyTooltipChange())) + .widget( + new FakeSyncWidget.DoubleSyncer( () -> parametrization.iParamsIn[parameterIndex], val -> parametrization.iParamsIn[parameterIndex] = val) - .setOnClientUpdate(val -> ledWidget.notifyTooltipChange())); + .setOnClientUpdate(val -> ledWidget.notifyTooltipChange())); } else { - builder.widget(new FakeSyncWidget.ByteSyncer( - () -> parametrization.eParamsOutStatus[parameterIndex].getOrdinalByte(), - val -> parametrization.eParamsOutStatus[parameterIndex] = LedStatus.getStatus(val)) - .setOnClientUpdate(val -> ledWidget.notifyTooltipChange())) - .widget(new FakeSyncWidget.DoubleSyncer( + builder.widget( + new FakeSyncWidget.ByteSyncer( + () -> parametrization.eParamsOutStatus[parameterIndex].getOrdinalByte(), + val -> parametrization.eParamsOutStatus[parameterIndex] = LedStatus.getStatus(val)) + .setOnClientUpdate(val -> ledWidget.notifyTooltipChange())) + .widget( + new FakeSyncWidget.DoubleSyncer( () -> parametrization.iParamsOut[parameterIndex], val -> parametrization.iParamsOut[parameterIndex] = val) - .setOnClientUpdate(val -> ledWidget.notifyTooltipChange())); + .setOnClientUpdate(val -> ledWidget.notifyTooltipChange())); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/INameFunction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/INameFunction.java index 3de1d25cdc..11867c067a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/INameFunction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/INameFunction.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base; public interface INameFunction<T extends GT_MetaTileEntity_MultiblockBase_EM> { + String apply(T t, Parameters.IParameter iParameter); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/IStatusFunction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/IStatusFunction.java index 862d6c1726..37d5664d20 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/IStatusFunction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/IStatusFunction.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base; public interface IStatusFunction<T extends GT_MetaTileEntity_MultiblockBase_EM> { + LedStatus apply(T t, Parameters.IParameter iParameter); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/LedStatus.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/LedStatus.java index 98ac63b2d4..d253978bff 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/LedStatus.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/LedStatus.java @@ -1,10 +1,13 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base; -import com.github.technus.tectech.TecTech; import java.util.function.Supplier; + import net.minecraft.util.EnumChatFormatting; +import com.github.technus.tectech.TecTech; + public enum LedStatus { + STATUS_UNUSED(() -> EnumChatFormatting.DARK_GRAY + "Unused", true), // STATUS_TOO_LOW(() -> EnumChatFormatting.BLUE + "Too Low", false), // STATUS_LOW(() -> EnumChatFormatting.AQUA + "Low", true), // @@ -14,11 +17,7 @@ public enum LedStatus { STATUS_HIGH(() -> EnumChatFormatting.GOLD + "High", true), // STATUS_UNDEFINED(() -> EnumChatFormatting.GRAY + "Unknown", false), STATUS_NEUTRAL(() -> EnumChatFormatting.WHITE + "Neutral", true), // - STATUS_WTF( - () -> { - return LedStatus.values()[TecTech.RANDOM.nextInt(9)].name.get(); - }, - false); // + STATUS_WTF(() -> { return LedStatus.values()[TecTech.RANDOM.nextInt(9)].name.get(); }, false); // public final Supplier<String> name; public final boolean isOk; @@ -48,8 +47,8 @@ public enum LedStatus { return statuses; } - public static LedStatus fromLimitsInclusiveOuterBoundary( - double value, double min, double low, double high, double max, double... excludedNumbers) { + public static LedStatus fromLimitsInclusiveOuterBoundary(double value, double min, double low, double high, + double max, double... excludedNumbers) { if (value < min) return STATUS_TOO_LOW; if (value > max) return STATUS_TOO_HIGH; @@ -62,8 +61,8 @@ public enum LedStatus { return STATUS_OK; } - public static LedStatus fromLimitsExclusiveOuterBoundary( - double value, double min, double low, double high, double max, double... excludedNumbers) { + public static LedStatus fromLimitsExclusiveOuterBoundary(double value, double min, double low, double high, + double max, double... excludedNumbers) { if (value <= min) return STATUS_TOO_LOW; if (value >= max) return STATUS_TOO_HIGH; @@ -76,8 +75,8 @@ public enum LedStatus { return STATUS_OK; } - public static LedStatus fromLimitsInclusiveBoundary( - double value, double min, double max, double... excludedNumbers) { + public static LedStatus fromLimitsInclusiveBoundary(double value, double min, double max, + double... excludedNumbers) { if (value < min) return STATUS_TOO_LOW; if (value > max) return STATUS_TOO_HIGH; @@ -88,8 +87,8 @@ public enum LedStatus { return STATUS_OK; } - public static LedStatus fromLimitsExclusiveBoundary( - double value, double min, double max, double... excludedNumbers) { + public static LedStatus fromLimitsExclusiveBoundary(double value, double min, double max, + double... excludedNumbers) { if (value <= min) return STATUS_TOO_LOW; if (value >= max) return STATUS_TOO_HIGH; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/MultiblockControl.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/MultiblockControl.java index fad1169bff..26d49f6314 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/MultiblockControl.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/MultiblockControl.java @@ -4,6 +4,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base; * Created by danie_000 on 23.12.2017. */ public class MultiblockControl<T> { + private final boolean shouldExplode; private final T value; private final int eUt; @@ -14,16 +15,8 @@ public class MultiblockControl<T> { private final int pollutionToAdd; private final double excessMass; - public MultiblockControl( - T value, - int eUt, - int amperes, - int requiredData, - int effIncrease, - int maxProgressTime, - int pollutionToAdd, - double excessMass, - boolean shouldExplode) { + public MultiblockControl(T value, int eUt, int amperes, int requiredData, int effIncrease, int maxProgressTime, + int pollutionToAdd, double excessMass, boolean shouldExplode) { this.value = value; this.eUt = eUt; this.amperes = amperes; @@ -35,15 +28,8 @@ public class MultiblockControl<T> { this.shouldExplode = shouldExplode; } - public MultiblockControl( - T value, - int eUt, - int amperes, - int requiredData, - int effIncrease, - int maxProgressTime, - int pollutionToAdd, - double excessMass) { + public MultiblockControl(T value, int eUt, int amperes, int requiredData, int effIncrease, int maxProgressTime, + int pollutionToAdd, double excessMass) { this(value, eUt, amperes, requiredData, effIncrease, maxProgressTime, pollutionToAdd, excessMass, false); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java index c2bf711b86..2e6f0d9839 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java @@ -6,6 +6,7 @@ import java.util.ArrayList; * Instantiate parameters as field in parametersInstantiation_EM(); */ public class Parameters { + private static final IStatusFunction LED_STATUS_FUNCTION_DEFAULT = (b, p) -> LedStatus.STATUS_UNDEFINED; private static final INameFunction NAME_FUNCTION_DEFAULT = (b, p) -> "Undefined"; @@ -121,6 +122,7 @@ public class Parameters { } public interface IParameter { + double get(); double getDefault(); @@ -142,6 +144,7 @@ public class Parameters { * most likely used locally in parametersInstantiation_EM() */ public class Group { + private final int hatchNo; final ParameterIn[] parameterIn = new ParameterIn[2]; final ParameterOut[] parameterOut = new ParameterOut[2]; @@ -156,13 +159,13 @@ public class Parameters { groups[hatchNo] = this; } - public ParameterIn makeInParameter( - int paramID, double defaultValue, INameFunction name, IStatusFunction status) { + public ParameterIn makeInParameter(int paramID, double defaultValue, INameFunction name, + IStatusFunction status) { return new ParameterIn(paramID, defaultValue, name, status); } - public ParameterOut makeOutParameter( - int paramID, double defaultValue, INameFunction name, IStatusFunction status) { + public ParameterOut makeOutParameter(int paramID, double defaultValue, INameFunction name, + IStatusFunction status) { return new ParameterOut(paramID, defaultValue, name, status); } @@ -197,6 +200,7 @@ public class Parameters { * Make a field out of this... */ public class ParameterOut implements IParameter { + public final int id; public final double defaultValue; IStatusFunction status; @@ -274,6 +278,7 @@ public class Parameters { * Make a field out of this... */ public class ParameterIn implements IParameter { + public final int id; public final double defaultValue; IStatusFunction status; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/SoundLoop.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/SoundLoop.java index fc6b5d276b..8416c4fe4a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/SoundLoop.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/SoundLoop.java @@ -1,23 +1,25 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.MovingSound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + @SideOnly(Side.CLIENT) public class SoundLoop extends MovingSound { + private final boolean whileActive; private final boolean whileInactive; private final int worldID; private boolean fadeMe = false; - public SoundLoop( - ResourceLocation p_i45104_1_, IGregTechTileEntity base, boolean stopWhenActive, boolean stopWhenInactive) { + public SoundLoop(ResourceLocation p_i45104_1_, IGregTechTileEntity base, boolean stopWhenActive, + boolean stopWhenInactive) { super(p_i45104_1_); this.whileActive = stopWhenActive; this.whileInactive = stopWhenInactive; @@ -44,9 +46,8 @@ public class SoundLoop extends MovingSound { volume += 0.0625f; } World world = Minecraft.getMinecraft().thePlayer.worldObj; - donePlaying = world.provider.dimensionId != worldID - || !world.checkChunksExist( - (int) xPosF, (int) yPosF, (int) zPosF, (int) xPosF, (int) yPosF, (int) zPosF); + donePlaying = world.provider.dimensionId != worldID || !world + .checkChunksExist((int) xPosF, (int) yPosF, (int) zPosF, (int) xPosF, (int) yPosF, (int) zPosF); if (donePlaying) return; TileEntity tile = world.getTileEntity((int) xPosF, (int) yPosF, (int) zPosF); if (!(tile instanceof IGregTechTileEntity)) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java index 6a7aea9cb3..a178940ba4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java @@ -5,13 +5,9 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.common.render.GT_RenderedTexture; public class TT_RenderedExtendedFacingTexture extends GT_RenderedTexture { - public TT_RenderedExtendedFacingTexture( - IIconContainer aIcon, - short[] aRGBa, - boolean allowAlpha, - boolean glow, - boolean stdOrient, - boolean extFacing) { + + public TT_RenderedExtendedFacingTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow, + boolean stdOrient, boolean extFacing) { super(aIcon, aRGBa, allowAlpha, glow, stdOrient, extFacing); } 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 4973f6f37a..14d789fd57 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 @@ -12,6 +12,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.HashMap; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.util.ForgeDirection; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition; import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition; @@ -34,6 +42,7 @@ import com.github.technus.tectech.util.CommonValues; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -41,17 +50,12 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import java.util.HashMap; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region variables private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; @@ -77,6 +81,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB FUSE_HANDLERS.put( ((long) EMAtomDefinition.getClassTypeStatic() << 16) | EMAtomDefinition.getClassTypeStatic(), new IColliderHandler() { + @Override public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) { try { @@ -109,6 +114,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB FUSE_HANDLERS.put( ((long) EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() { + @Override public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) { try { @@ -137,6 +143,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB FUSE_HANDLERS.put( ((long) EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() { + @Override public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) { try { @@ -169,11 +176,11 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB FUSE_HANDLERS.put( ((long) EMPrimitiveTemplate.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() { + @Override public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) { IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get( - in1.getDefinition().getClass().getName() - + '\0' + in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName()); if (collisionHandler != null) { collisionHandler.collide(in2, in1, out); @@ -188,14 +195,14 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB } }); - PRIMITIVE_FUSE_HANDLERS.put( - EMQuarkDefinition.class.getName() + '\0' + EMQuarkDefinition.class.getName(), (in1, in2, out) -> { + PRIMITIVE_FUSE_HANDLERS + .put(EMQuarkDefinition.class.getName() + '\0' + EMQuarkDefinition.class.getName(), (in1, in2, out) -> { try { EMDefinitionStackMap defs = new EMDefinitionStackMap(); defs.putUnifyExact(in1.getDefinition().getStackForm(1)); defs.putUnifyExact(in2.getDefinition().getStackForm(1)); - EMHadronDefinition hadron = - new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree()); + EMHadronDefinition hadron = new EMHadronDefinition( + defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree()); out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount()))); } catch (Exception e) { out.putUnifyAll(in1, in2); @@ -224,8 +231,8 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB EMDefinitionStackMap defs = new EMDefinitionStackMap(); defs.putUnifyExact(in1.getDefinition().getStackForm(1)); defs.putUnifyExact(in2.getDefinition().getStackForm(1)); - EMComplexAspectDefinition aspect = - new EMComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree()); + EMComplexAspectDefinition aspect = new EMComplexAspectDefinition( + defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree()); out.putUnify(new EMInstanceStack(aspect, Math.min(in1.getAmount(), in2.getAmount()))); } catch (Exception e) { out.putUnifyAll(in1, in2); @@ -238,6 +245,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB FUSE_HANDLERS.put( ((long) EMComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() { + @Override public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) { if (fuseAspects(in1, in2, out)) return; @@ -256,8 +264,9 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB } private static void registerSimpleAtomFuse(int classTypeStatic) { - FUSE_HANDLERS.put( - ((long) EMAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() { + FUSE_HANDLERS + .put(((long) EMAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() { + @Override public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) { try { @@ -319,207 +328,123 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB // region structure // use multi A energy inputs, use less power the longer it runs private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.collider.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal( - "gt.blockmachines.multimachine.em.collider.hint.1"), // 2 - Elemental Input Hatches or Molecular Casing - translateToLocal( - "gt.blockmachines.multimachine.em.collider.hint.2"), // 3 - Elemental Output Hatches or Molecular Casing - translateToLocal( - "gt.blockmachines.multimachine.em.collider.hint.3"), // 4 - Elemental Overflow Hatches or Molecular - // Casing - translateToLocal( - "gt.blockmachines.multimachine.em.collider.hint.4"), // General - Another Controller facing opposite - // direction + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.1"), // 2 - Elemental Input Hatches or + // Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.2"), // 3 - Elemental Output Hatches or + // Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.3"), // 4 - Elemental Overflow Hatches or + // Molecular + // Casing + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"), // General - Another Controller facing + // opposite + // direction }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_collider>builder() - .addShape("tier1", transpose(new String[][] { - { - " A A A ", - " AAAAAAA ", - " bbbbIIIbbbb ", - " bAAAAAAAAAAAb ", - " bAAAA AAAAb ", - " bAAA AAAb ", - " bAAA AAAb ", - " bAA AAb ", - " AbAA AAbA ", - "AAbA AbAA", - " AIA AIA ", - "AAIA AIAA", - " AIA AIA ", - "AAbA AbAA", - " AbAA AAbA ", - " bAA AAb ", - " bAAA AAAb ", - " bAAA AAAb ", - " bAAAAbJJJbAAAAb ", - " bAHHbbbbbHHAb ", - " bbbbGFGbbbb " - }, - { - " AAAAA ", - " AADDDDDAA ", - " cDDeeeeeDDc ", - " cDeeDDDDDeeDc ", - " cDeDD DDeDc ", - " cDeD DeDc ", - " cDeD DeDc ", - " ADeD DeDA ", - " ADeD DeDA ", - "ADeD DeDA", - "ADeD DeDA", - "ADeD DeDA", - "ADeD DeDA", - "ADeD DeDA", - " ADeD DeDA ", - " ADeD DeDA ", - " cDeD DeDc ", - " cDeD DeDc ", - " cDeDDbJ~JbDDeDc ", - " cDeeDDDDDeeDc ", - " cDDeeeeeDDc " - }, - { - " A A A ", - " AAAAAAA ", - " bbbbIIIbbbb ", - " bAAAAAAAAAAAb ", - " bAAAA AAAAb ", - " bAAA AAAb ", - " bAAA AAAb ", - " bAA AAb ", - " AbAA AAbA ", - "AAbA AbAA", - " AIA AIA ", - "AAIA AIAA", - " AIA AIA ", - "AAbA AbAA", - " AbAA AAbA ", - " bAA AAb ", - " bAAA AAAb ", - " bAAA AAAb ", - " bAAAAbJJJbAAAAb ", - " bAHHbbbbbHHAb ", - " bbbbGFGbbbb " - } - })) - .addShape("tier2", transpose(new String[][] { - { - " A A A ", - " AAAAAAA ", - " BBBBIIIBBBB ", - " BAAAAAAAAAAAB ", - " BAAAA AAAAB ", - " BAAA AAAB ", - " BAAA AAAB ", - " BAA AAB ", - " ABAA AABA ", - "AABA ABAA", - " AIA AIA ", - "AAIA AIAA", - " AIA AIA ", - "AABA ABAA", - " ABAA AABA ", - " BAA AAB ", - " BAAA AAAB ", - " BAAA AAAB ", - " BAAAABJJJBAAAAB ", - " BAHHBBBBBHHAB ", - " BBBBGFGBBBB " - }, - { - " AAAAA ", - " AADDDDDAA ", - " CDDEEEEEDDC ", - " CDEEDDDDDEEDC ", - " CDEDD DDEDC ", - " CDED DEDC ", - " CDED DEDC ", - " ADED DEDA ", - " ADED DEDA ", - "ADED DEDA", - "ADED DEDA", - "ADED DEDA", - "ADED DEDA", - "ADED DEDA", - " ADED DEDA ", - " ADED DEDA ", - " CDED DEDC ", - " CDED DEDC ", - " CDEDDBJ~JBDDEDC ", - " CDEEDDDDDEEDC ", - " CDDEEEEEDDC " - }, - { - " A A A ", - " AAAAAAA ", - " BBBBIIIBBBB ", - " BAAAAAAAAAAAB ", - " BAAAA AAAAB ", - " BAAA AAAB ", - " BAAA AAAB ", - " BAA AAB ", - " ABAA AABA ", - "AABA ABAA", - " AIA AIA ", - "AAIA AIAA", - " AIA AIA ", - "AABA ABAA", - " ABAA AABA ", - " BAA AAB ", - " BAAA AAAB ", - " BAAA AAAB ", - " BAAAABJJJBAAAAB ", - " BAHHBBBBBHHAB ", - " BBBBGFGBBBB " - } - })) - .addElement('A', ofBlock(sBlockCasingsTT, 4)) - .addElement('b', ofBlock(sBlockCasingsTT, 4)) - .addElement('B', ofBlock(sBlockCasingsTT, 5)) - .addElement('c', ofBlock(sBlockCasingsTT, 4)) - .addElement('C', ofBlock(sBlockCasingsTT, 6)) - .addElement('D', ofBlock(sBlockCasingsTT, 7)) - .addElement('e', ofBlock(sBlockCasingsTT, 8)) - .addElement('E', ofBlock(sBlockCasingsTT, 9)) - .addElement('I', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'J', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_collider::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'H', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_collider::addElementalInputToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .addElement( - 'F', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList, - textureOffset + 4, - 3, - sBlockCasingsTT, - 4)) - .addElement( - 'G', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList, - textureOffset + 4, - 4, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_collider>builder() + .addShape( + "tier1", + transpose( + new String[][] { { " A A A ", " AAAAAAA ", + " bbbbIIIbbbb ", " bAAAAAAAAAAAb ", " bAAAA AAAAb ", + " bAAA AAAb ", " bAAA AAAb ", " bAA AAb ", + " AbAA AAbA ", "AAbA AbAA", " AIA AIA ", + "AAIA AIAA", " AIA AIA ", "AAbA AbAA", + " AbAA AAbA ", " bAA AAb ", " bAAA AAAb ", + " bAAA AAAb ", " bAAAAbJJJbAAAAb ", " bAHHbbbbbHHAb ", + " bbbbGFGbbbb " }, + { " AAAAA ", " AADDDDDAA ", " cDDeeeeeDDc ", + " cDeeDDDDDeeDc ", " cDeDD DDeDc ", + " cDeD DeDc ", " cDeD DeDc ", + " ADeD DeDA ", " ADeD DeDA ", + "ADeD DeDA", "ADeD DeDA", + "ADeD DeDA", "ADeD DeDA", + "ADeD DeDA", " ADeD DeDA ", + " ADeD DeDA ", " cDeD DeDc ", + " cDeD DeDc ", " cDeDDbJ~JbDDeDc ", + " cDeeDDDDDeeDc ", " cDDeeeeeDDc " }, + { " A A A ", " AAAAAAA ", " bbbbIIIbbbb ", + " bAAAAAAAAAAAb ", " bAAAA AAAAb ", + " bAAA AAAb ", " bAAA AAAb ", + " bAA AAb ", " AbAA AAbA ", + "AAbA AbAA", " AIA AIA ", + "AAIA AIAA", " AIA AIA ", + "AAbA AbAA", " AbAA AAbA ", + " bAA AAb ", " bAAA AAAb ", + " bAAA AAAb ", " bAAAAbJJJbAAAAb ", + " bAHHbbbbbHHAb ", " bbbbGFGbbbb " } })) + .addShape( + "tier2", + transpose( + new String[][] { { " A A A ", " AAAAAAA ", + " BBBBIIIBBBB ", " BAAAAAAAAAAAB ", " BAAAA AAAAB ", + " BAAA AAAB ", " BAAA AAAB ", " BAA AAB ", + " ABAA AABA ", "AABA ABAA", " AIA AIA ", + "AAIA AIAA", " AIA AIA ", "AABA ABAA", + " ABAA AABA ", " BAA AAB ", " BAAA AAAB ", + " BAAA AAAB ", " BAAAABJJJBAAAAB ", " BAHHBBBBBHHAB ", + " BBBBGFGBBBB " }, + { " AAAAA ", " AADDDDDAA ", " CDDEEEEEDDC ", + " CDEEDDDDDEEDC ", " CDEDD DDEDC ", + " CDED DEDC ", " CDED DEDC ", + " ADED DEDA ", " ADED DEDA ", + "ADED DEDA", "ADED DEDA", + "ADED DEDA", "ADED DEDA", + "ADED DEDA", " ADED DEDA ", + " ADED DEDA ", " CDED DEDC ", + " CDED DEDC ", " CDEDDBJ~JBDDEDC ", + " CDEEDDDDDEEDC ", " CDDEEEEEDDC " }, + { " A A A ", " AAAAAAA ", " BBBBIIIBBBB ", + " BAAAAAAAAAAAB ", " BAAAA AAAAB ", + " BAAA AAAB ", " BAAA AAAB ", + " BAA AAB ", " ABAA AABA ", + "AABA ABAA", " AIA AIA ", + "AAIA AIAA", " AIA AIA ", + "AABA ABAA", " ABAA AABA ", + " BAA AAB ", " BAAA AAAB ", + " BAAA AAAB ", " BAAAABJJJBAAAAB ", + " BAHHBBBBBHHAB ", " BBBBGFGBBBB " } })) + .addElement('A', ofBlock(sBlockCasingsTT, 4)).addElement('b', ofBlock(sBlockCasingsTT, 4)) + .addElement('B', ofBlock(sBlockCasingsTT, 5)).addElement('c', ofBlock(sBlockCasingsTT, 4)) + .addElement('C', ofBlock(sBlockCasingsTT, 6)).addElement('D', ofBlock(sBlockCasingsTT, 7)) + .addElement('e', ofBlock(sBlockCasingsTT, 8)).addElement('E', ofBlock(sBlockCasingsTT, 9)) + .addElement('I', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'J', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_collider::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'H', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_collider::addElementalInputToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .addElement( + 'F', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList, + textureOffset + 4, + 3, + sBlockCasingsTT, + 4)) + .addElement( + 'G', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList, + textureOffset + 4, + 4, + sBlockCasingsTT, + 4)) + .build(); @Override public IStructureDefinition<GT_MetaTileEntity_EM_collider> getStructure_EM() { @@ -537,8 +462,8 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB } public static void setValues(int heliumPlasmaValue) { - double MASS_TO_EU_PARTIAL = - heliumPlasmaValue / (1.75893000478707E07 * EM_COUNT_PER_MATERIAL_AMOUNT); // mass diff + double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07 * EM_COUNT_PER_MATERIAL_AMOUNT); // mass + // diff MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20; STARTUP_COST = -heliumPlasmaValue * 10000; KEEPUP_COST = -heliumPlasmaValue; @@ -555,21 +480,22 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB EMInstanceStackMap map = new EMInstanceStackMap(); IColliderHandler colliderHandler; - if (stack2.getDefinition().getMatterMassType() - > stack.getDefinition().getMatterMassType()) { // always bigger first - colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getMatterMassType() << 16) - | stack.getDefinition().getMatterMassType()); + if (stack2.getDefinition().getMatterMassType() > stack.getDefinition().getMatterMassType()) { // always + // bigger + // first + colliderHandler = FUSE_HANDLERS.get( + (stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } else { - colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getMatterMassType() << 16) - | stack2.getDefinition().getMatterMassType()); + colliderHandler = FUSE_HANDLERS.get( + (stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } for (EMInstanceStack newStack : map.valuesToArray()) { check &= newStack.getDefinition().fusionMakesEnergy(newStack.getEnergy()); } // System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass()); - outputEM = new EMInstanceStackMap[] {map}; + outputEM = new EMInstanceStackMap[] { map }; partner.stack = stack = null; // System.out.println("check = " + check); @@ -587,18 +513,19 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB EMInstanceStackMap map = new EMInstanceStackMap(); IColliderHandler colliderHandler; - if (stack2.getDefinition().getMatterMassType() - > stack.getDefinition().getMatterMassType()) { // always bigger first - colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getMatterMassType() << 16) - | stack.getDefinition().getMatterMassType()); + if (stack2.getDefinition().getMatterMassType() > stack.getDefinition().getMatterMassType()) { // always + // bigger + // first + colliderHandler = FUSE_HANDLERS.get( + (stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } else { - colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getMatterMassType() << 16) - | stack2.getDefinition().getMatterMassType()); + colliderHandler = FUSE_HANDLERS.get( + (stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } // System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass()); - outputEM = new EMInstanceStackMap[] {map}; + outputEM = new EMInstanceStackMap[] { map }; partner.stack = stack = null; // System.out.println("check = " + check); @@ -613,7 +540,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB colliderHandler.collide(stack2, stack, map); } else { map.putUnifyAll(stack, stack2); - outputEM = new EMInstanceStackMap[] {map}; + outputEM = new EMInstanceStackMap[] { map }; return true; } return false; @@ -628,10 +555,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB if (gregTechBaseTileEntity != null) { IMetaTileEntity gregTechMetaTileEntity = gregTechBaseTileEntity.getMetaTileEntity(); return gregTechMetaTileEntity instanceof GT_MetaTileEntity_EM_collider - && ((GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity).mMachine - && gregTechBaseTileEntity.getBackFacing() == iGregTechTileEntity.getFrontFacing() - ? (GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity - : null; + && ((GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity).mMachine + && gregTechBaseTileEntity.getBackFacing() == iGregTechTileEntity.getFrontFacing() + ? (GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity + : null; } return null; } @@ -657,9 +584,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB stack.nextColor(); return null; } else { - stack = newInstances - .getOutput() - .removeKey(newInstances.getOutput().getLast().getDefinition()); + stack = newInstances.getOutput().removeKey(newInstances.getOutput().getLast().getDefinition()); return newInstances.getOutput(); } } @@ -708,12 +633,8 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB continue; } stack = container.removeKey(container.getFirst().getDefinition()); - long eut = KEEPUP_COST - + (long) (KEEPUP_COST - * Math.abs(stack.getMass() - / EMAtomDefinition.getSomethingHeavy() - .getMass())) - / 2; + long eut = KEEPUP_COST + (long) (KEEPUP_COST + * Math.abs(stack.getMass() / EMAtomDefinition.getSomethingHeavy().getMass())) / 2; if (eut < Integer.MIN_VALUE + 7) { return false; } @@ -784,23 +705,22 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.collider.name")) // Machine Type: Matter Collider - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.collider.desc.0")) // Controller block of the Matter Collider - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.collider.desc.1")) // This machine needs a mirrored + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.collider.name")) // Machine Type: Matter + // Collider + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.collider.desc.0")) // Controller block of + // the Matter Collider + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.collider.desc.1")) // This machine needs a + // mirrored // copy of it to work - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.collider.desc.2")) // One needs to be set to 'Fuse + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.collider.desc.2")) // One needs to be set to + // 'Fuse // Mode' and the other to 'Collide // Mode' - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.collider.desc.3")) // Fuses two elemental matter to + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.collider.desc.3")) // Fuses two elemental + // matter to // create another (and power) .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(21, 3, 23, false) + .addSeparator().beginStructureBlock(21, 3, 23, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.multimachine.em.collider.name"), translateToLocal("gt.blockmachines.multimachine.em.collider.Structure.AdditionalCollider"), @@ -817,12 +737,11 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB translateToLocal("tt.keyword.Structure.ElementalOverflow"), translateToLocal("tt.keyword.Structure.AnyMolecularCasing4D"), 2) // Elemental Overflow Hatch: Any Molecular Casing with 4 dots - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } @@ -838,27 +757,18 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aSide == aFacing) { if (aFacing % 2 == 0) { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][4], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][4], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF) }; } else { - return new ITexture[] { - Textures.BlockIcons.casingTexturePages[texturePage][4], - new TT_RenderedExtendedFacingTexture(aActive ? ScreenON_Slave : ScreenOFF_Slave) - }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][4], + new TT_RenderedExtendedFacingTexture(aActive ? ScreenON_Slave : ScreenOFF_Slave) }; } } - return new ITexture[] {Textures.BlockIcons.casingTexturePages[texturePage][4]}; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[texturePage][4] }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java index 0114ac847b..84af177acb 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_collider; public interface IColliderHandler extends IPrimitiveColliderHandler { + byte getRequiredTier(); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java index 3c4438b5e1..718e087870 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java @@ -4,5 +4,6 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; public interface IPrimitiveColliderHandler { + void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out); } 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 9b02645de6..de95c88386 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 @@ -6,6 +6,8 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat import static com.github.technus.tectech.util.CommonValues.V; import static com.github.technus.tectech.util.DoubleCount.*; +import java.util.Arrays; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; @@ -14,12 +16,12 @@ 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 java.util.Arrays; /** * Created by danie_000 on 24.12.2017. */ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehaviour { + private final byte tier; private double maxRPM; private final double radius; @@ -27,66 +29,44 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav private final double maxForce; private final double maxCapacity; private Parameters.Group.ParameterIn settingRPM, settingFraction; - private static final INameFunction<GT_MetaTileEntity_EM_machine> rpmName = - (gt_metaTileEntity_em_machine, iParameter) -> "RPM Setting"; - private final IStatusFunction<GT_MetaTileEntity_EM_machine> rpmStatus = - (gt_metaTileEntity_em_machine, iParameter) -> { - double v = iParameter.get(); - if (Double.isNaN(v)) { - return STATUS_WRONG; - } - if (v <= 0) { - return STATUS_TOO_LOW; - } else if (v > maxRPM) { - return STATUS_TOO_HIGH; - } - return STATUS_OK; - }; - private static final INameFunction<GT_MetaTileEntity_EM_machine> fractionName = - (gt_metaTileEntity_em_machine, iParameter) -> "Fraction Count"; - private static final IStatusFunction<GT_MetaTileEntity_EM_machine> fractionStatus = - (gt_metaTileEntity_em_machine, iParameter) -> { - double v = iParameter.get(); - if (Double.isNaN(v)) { - return STATUS_WRONG; - } - v = (int) v; - if (v <= 1) { - return STATUS_TOO_LOW; - } else if (v > 6) { - return STATUS_TOO_HIGH; - } - return STATUS_OK; - }; + private static final INameFunction<GT_MetaTileEntity_EM_machine> rpmName = (gt_metaTileEntity_em_machine, + iParameter) -> "RPM Setting"; + private final IStatusFunction<GT_MetaTileEntity_EM_machine> rpmStatus = (gt_metaTileEntity_em_machine, + iParameter) -> { + double v = iParameter.get(); + if (Double.isNaN(v)) { + return STATUS_WRONG; + } + if (v <= 0) { + return STATUS_TOO_LOW; + } else if (v > maxRPM) { + return STATUS_TOO_HIGH; + } + return STATUS_OK; + }; + private static final INameFunction<GT_MetaTileEntity_EM_machine> fractionName = (gt_metaTileEntity_em_machine, + iParameter) -> "Fraction Count"; + private static final IStatusFunction<GT_MetaTileEntity_EM_machine> fractionStatus = (gt_metaTileEntity_em_machine, + iParameter) -> { + double v = iParameter.get(); + if (Double.isNaN(v)) { + return STATUS_WRONG; + } + v = (int) v; + if (v <= 1) { + return STATUS_TOO_LOW; + } else if (v > 6) { + return STATUS_TOO_HIGH; + } + return STATUS_OK; + }; // private final static String[] DESCRIPTION_O =new String[]{"RPM Setting","RCF Setting","Radius [mm]","Max // RPM","Max Force [eV/c^2 * m/s]","Max Capacity [eV/c^2]","Max Power Usage[EU/t]","Max Recipe Rime [tick]"}; - private static final double[ /*tier+5*/][ /*outputHatches+2*/] MIXING_FACTORS = new double[][] { - { - .45, .85, .95, 1, 1, - }, - { - .4, .75, .9, .95, 1, - }, - { - .35, .45, .75, .9, .95, - }, - { - .25, .3, .45, .75, .9, - }, - { - .2, .25, .3, .45, .75, - }, - { - .1, .15, .2, .3, .45, - }, - { - .05, .1, .15, .2, .25, - }, - { - .01, .05, .1, .15, .2, - }, - }; + private static final double[ /* tier+5 */][ /* outputHatches+2 */] MIXING_FACTORS = new double[][] { + { .45, .85, .95, 1, 1, }, { .4, .75, .9, .95, 1, }, { .35, .45, .75, .9, .95, }, { .25, .3, .45, .75, .9, }, + { .2, .25, .3, .45, .75, }, { .1, .15, .2, .3, .45, }, { .05, .1, .15, .2, .25, }, + { .01, .05, .1, .15, .2, }, }; // 6 to 12 recommended public Behaviour_Centrifuge(int desiredTier) { @@ -113,9 +93,9 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav } // int remainingAmount = (int) (me.amount % fractionCount); // while (remainingAmount > 0) { - // int amountToAdd = TecTech.RANDOM.nextInt(remainingAmount) + 1; - // stacks[TecTech.RANDOM.nextInt(fractionCount)].amount += amountToAdd; - // remainingAmount -= amountToAdd; + // int amountToAdd = TecTech.RANDOM.nextInt(remainingAmount) + 1; + // stacks[TecTech.RANDOM.nextInt(fractionCount)].amount += amountToAdd; + // remainingAmount -= amountToAdd; // } } @@ -132,8 +112,8 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav } @Override - public MultiblockControl<EMInstanceStackMap[]> process( - EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) { + public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, + Parameters parameters) { EMInstanceStackMap input = inputs[0]; if (input == null || input.isEmpty()) return null; // nothing in only valid input @@ -204,27 +184,24 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav } } // if(DEBUG_MODE){ - // TecTech.LOGGER.info("absMass "+absMassPerOutput); + // TecTech.LOGGER.info("absMass "+absMassPerOutput); // } absMassPerOutput = div(absMassPerOutput, fractionCount); if (DEBUG_MODE) { TecTech.LOGGER.info("absMassPerOutput " + absMassPerOutput); } - nextFraction: - for (int fraction = 0; fraction < fractionCount - 1; fraction++) { + nextFraction: for (int fraction = 0; fraction < fractionCount - 1; fraction++) { double remaining = absMassPerOutput; for (int stackNo = 0; stackNo < stacks.length; stackNo++) { if (stacks[stackNo] != null) { double stackMass = Math.abs(stacks[stackNo].getMass()); - double amount = div( - remaining, - Math.abs(stacks[stackNo].getDefinition().getMass())); + double amount = div(remaining, Math.abs(stacks[stackNo].getDefinition().getMass())); // if(DEBUG_MODE){ - // TecTech.LOGGER.info("stackMass "+stackMass); - // TecTech.LOGGER.info("defMass "+stacks[stackNo].definition.getMass()); - // TecTech.LOGGER.info("remaining "+remaining); - // TecTech.LOGGER.info("amountToMoveAvailable "+amount+"/"+stacks[stackNo].amount); + // TecTech.LOGGER.info("stackMass "+stackMass); + // TecTech.LOGGER.info("defMass "+stacks[stackNo].definition.getMass()); + // TecTech.LOGGER.info("remaining "+remaining); + // TecTech.LOGGER.info("amountToMoveAvailable "+amount+"/"+stacks[stackNo].amount); // } if (stackMass == 0) { addRandomly(stacks[stackNo], outputs, fractionCount); @@ -234,16 +211,14 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav outputs[fraction].putUnify(stacks[stackNo]); stacks[stackNo] = null; } else if (amount > 0) { - remaining = sub( - remaining, - mul(amount, stacks[stackNo].getDefinition().getMass())); + remaining = sub(remaining, mul(amount, stacks[stackNo].getDefinition().getMass())); EMInstanceStack clone = stacks[stackNo].clone(); clone.setAmount(amount); outputs[fraction].putUnify(clone); stacks[stackNo].setAmount(sub(stacks[stackNo].getAmount(), amount)); // if(DEBUG_MODE){ - // TecTech.LOGGER.info("remainingAfter "+remaining); - // TecTech.LOGGER.info("amountCloneAfter "+clone.amount+"/"+stacks[stackNo].amount); + // TecTech.LOGGER.info("remainingAfter "+remaining); + // TecTech.LOGGER.info("amountCloneAfter "+clone.amount+"/"+stacks[stackNo].amount); // } } else { continue nextFraction; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java index 0bff2797a3..b28e50eece 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java @@ -8,6 +8,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; * Created by danie_000 on 24.12.2017. */ public class Behaviour_Electrolyzer implements GT_MetaTileEntity_EM_machine.IBehaviour { + final int tier; public Behaviour_Electrolyzer(int tier) { @@ -23,8 +24,8 @@ public class Behaviour_Electrolyzer implements GT_MetaTileEntity_EM_machine.IBeh } @Override - public MultiblockControl<EMInstanceStackMap[]> process( - EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) { + public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, + Parameters parameters) { return null; } } 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 bd8d0d0b7a..22ffa72b15 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 @@ -19,6 +19,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; * Created by danie_000 on 24.12.2017. */ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_machine.IBehaviour { + private final byte tier; private int ticks; private byte precisionFull, precisionMinimal; @@ -26,69 +27,69 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_ private double maxCharge; private int offsetMax; private Parameters.Group.ParameterIn fullSetting, minimalSetting, offsetSetting; - private static final INameFunction<GT_MetaTileEntity_EM_machine> fullName = - (gt_metaTileEntity_em_machine, iParameter) -> "Full Precision Input [e/3]"; - private final IStatusFunction<GT_MetaTileEntity_EM_machine> fullStatus = - (gt_metaTileEntity_em_machine, iParameter) -> { - double v = iParameter.get(); - if (Double.isNaN(v)) { - return STATUS_WRONG; - } - v = (int) v; - if (Double.isInfinite(v) && v > 0) { - return STATUS_TOO_HIGH; - } else if (v > precisionFull) { - return STATUS_HIGH; - } else if (v < precisionFull) { - return STATUS_TOO_LOW; - } + private static final INameFunction<GT_MetaTileEntity_EM_machine> fullName = (gt_metaTileEntity_em_machine, + iParameter) -> "Full Precision Input [e/3]"; + private final IStatusFunction<GT_MetaTileEntity_EM_machine> fullStatus = (gt_metaTileEntity_em_machine, + iParameter) -> { + double v = iParameter.get(); + if (Double.isNaN(v)) { + return STATUS_WRONG; + } + v = (int) v; + if (Double.isInfinite(v) && v > 0) { + return STATUS_TOO_HIGH; + } else if (v > precisionFull) { + return STATUS_HIGH; + } else if (v < precisionFull) { + return STATUS_TOO_LOW; + } + return STATUS_OK; + }; + private static final INameFunction<GT_MetaTileEntity_EM_machine> minimalName = (gt_metaTileEntity_em_machine, + iParameter) -> "Minimal Precision Input [e/3]"; + private final IStatusFunction<GT_MetaTileEntity_EM_machine> minimalStatus = (gt_metaTileEntity_em_machine, + iParameter) -> { + double minimal = iParameter.get(); + double full = fullSetting.get(); + if (Double.isInfinite(minimal) && minimal > 0) { + return STATUS_TOO_HIGH; + } else if (minimal > precisionMinimal) { + if (minimal > full) { + return STATUS_TOO_HIGH; + } else { + return STATUS_HIGH; + } + } else if (minimal == precisionMinimal) { + if (minimal > full) { + return STATUS_TOO_HIGH; + } else { return STATUS_OK; - }; - private static final INameFunction<GT_MetaTileEntity_EM_machine> minimalName = - (gt_metaTileEntity_em_machine, iParameter) -> "Minimal Precision Input [e/3]"; - private final IStatusFunction<GT_MetaTileEntity_EM_machine> minimalStatus = - (gt_metaTileEntity_em_machine, iParameter) -> { - double minimal = iParameter.get(); - double full = fullSetting.get(); - if (Double.isInfinite(minimal) && minimal > 0) { - return STATUS_TOO_HIGH; - } else if (minimal > precisionMinimal) { - if (minimal > full) { - return STATUS_TOO_HIGH; - } else { - return STATUS_HIGH; - } - } else if (minimal == precisionMinimal) { - if (minimal > full) { - return STATUS_TOO_HIGH; - } else { - return STATUS_OK; - } - } else if (minimal < precisionMinimal) { - return STATUS_TOO_LOW; - } else { - return STATUS_WRONG; - } - }; - private static final INameFunction<GT_MetaTileEntity_EM_machine> offsetName = - (gt_metaTileEntity_em_machine, iParameter) -> "Offset Input [e/3]"; - private final IStatusFunction<GT_MetaTileEntity_EM_machine> offsetStatus = - (gt_metaTileEntity_em_machine, iParameter) -> { - double offset = iParameter.get(); - if (offset > offsetMax) { - return STATUS_TOO_HIGH; - } else if (offset > 0) { - return STATUS_HIGH; - } else if (offset == 0) { - return STATUS_OK; - } else if (offset >= -offsetMax) { - return STATUS_LOW; - } else if (offset < -offsetMax) { - return STATUS_TOO_LOW; - } else { - return STATUS_WRONG; - } - }; + } + } else if (minimal < precisionMinimal) { + return STATUS_TOO_LOW; + } else { + return STATUS_WRONG; + } + }; + private static final INameFunction<GT_MetaTileEntity_EM_machine> offsetName = (gt_metaTileEntity_em_machine, + iParameter) -> "Offset Input [e/3]"; + private final IStatusFunction<GT_MetaTileEntity_EM_machine> offsetStatus = (gt_metaTileEntity_em_machine, + iParameter) -> { + double offset = iParameter.get(); + if (offset > offsetMax) { + return STATUS_TOO_HIGH; + } else if (offset > 0) { + return STATUS_HIGH; + } else if (offset == 0) { + return STATUS_OK; + } else if (offset >= -offsetMax) { + return STATUS_LOW; + } else if (offset < -offsetMax) { + return STATUS_TOO_LOW; + } else { + return STATUS_WRONG; + } + }; // private final static String[] DESCRIPTION_O =new String[]{"Full Precision Limit [e/3]","Minimal Precision Limit // [e/3]","Offset Limit [e/3]",null,"Max Charge [e/3]","Max Capacity [eV/c^2]","Max Power Usage[EU/t]","Max Recipe // Rime [tick]"}; @@ -96,8 +97,8 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_ public Behaviour_ElectromagneticSeparator(int desiredTier) { tier = (byte) desiredTier; ticks = Math.max(20, (1 << (12 - desiredTier)) * 20); - maxCapacity = - EMAtomDefinition.getSomethingHeavy().getMass() * (2 << tier) * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED; + maxCapacity = EMAtomDefinition.getSomethingHeavy().getMass() * (2 << tier) + * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED; maxCharge = 144D * (1 << (tier - 5)); switch (tier) { case 12: @@ -149,14 +150,13 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_ @Override public boolean checkParametersInAndSetStatuses(GT_MetaTileEntity_EM_machine te, Parameters parameters) { - return fullSetting.getStatus(true).isOk - && minimalSetting.getStatus(true).isOk + return fullSetting.getStatus(true).isOk && minimalSetting.getStatus(true).isOk && offsetSetting.getStatus(true).isOk; } @Override - public MultiblockControl<EMInstanceStackMap[]> process( - EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) { + public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, + Parameters parameters) { EMInstanceStackMap input = inputs[0]; if (input == null || input.isEmpty()) return null; // nothing in only valid input @@ -208,9 +208,8 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_ } else if (charge <= -precisionFullIn) { outputs[0].putReplace(stack); } else { - double amount = mul( - stack.getAmount(), - (Math.abs(charge) - precisionMinimalIn + 1D) / levelsCountPlus1); // todo check + double amount = mul(stack.getAmount(), (Math.abs(charge) - precisionMinimalIn + 1D) / levelsCountPlus1); // todo + // check if (amount < stack.getAmount()) { EMInstanceStack clone = stack.clone(); clone.setAmount(sub(clone.getAmount(), amount)); @@ -227,6 +226,13 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_ } return new MultiblockControl<>( - outputs, mEut, 1 + ((int) Math.abs(offsetIn)) / 3, 0, 10000, mTicks, 0, excessMass); + outputs, + mEut, + 1 + ((int) Math.abs(offsetIn)) / 3, + 0, + 10000, + mTicks, + 0, + excessMass); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java index e8049d5052..d8c82c5762 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java @@ -8,6 +8,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; * Created by danie_000 on 24.12.2017. */ public class Behaviour_PrecisionLaser implements GT_MetaTileEntity_EM_machine.IBehaviour { + final int tier; public Behaviour_PrecisionLaser(int tier) { @@ -23,8 +24,8 @@ public class Behaviour_PrecisionLaser implements GT_MetaTileEntity_EM_machine.IB } @Override - public MultiblockControl<EMInstanceStackMap[]> process( - EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) { + public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, + Parameters parameters) { return null; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java index 5c0cd5acc0..644ee52ec3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java @@ -10,6 +10,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; * Created by danie_000 on 24.12.2017. */ public class Behaviour_Recycler implements GT_MetaTileEntity_EM_machine.IBehaviour { + private final int tier; private final double coeff; @@ -27,8 +28,8 @@ public class Behaviour_Recycler implements GT_MetaTileEntity_EM_machine.IBehavio } @Override - public MultiblockControl<EMInstanceStackMap[]> process( - EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) { + public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, + Parameters parameters) { double mass = 0; for (EMInstanceStackMap input : inputs) { if (input != null) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java index 873e5d7615..8e3036b0a0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java @@ -8,6 +8,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; * Created by danie_000 on 24.12.2017. */ public class Behaviour_Scanner implements GT_MetaTileEntity_EM_machine.IBehaviour { + final int tier; public Behaviour_Scanner(int tier) { @@ -23,8 +24,8 @@ public class Behaviour_Scanner implements GT_MetaTileEntity_EM_machine.IBehaviou } @Override - public MultiblockControl<EMInstanceStackMap[]> process( - EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) { + public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, + Parameters parameters) { return null; } } 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 38c4393c64..e0237836e0 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 @@ -8,6 +8,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.HashMap; +import java.util.function.Supplier; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +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; @@ -16,20 +24,16 @@ import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import java.util.HashMap; -import java.util.function.Supplier; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + // region variables public static final String machine = "EM Machinery"; @@ -39,43 +43,42 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa // region structure private static final String[] description = new String[] { - EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - translateToLocal( - "gt.blockmachines.multimachine.em.processing.hint.0"), // 1 - Classic Hatches or High Power Casing - translateToLocal( - "gt.blockmachines.multimachine.em.processing.hint.1"), // 2 - Elemental Hatches or Molecular Casing + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.processing.hint.0"), // 1 - Classic Hatches or High Power + // Casing + translateToLocal("gt.blockmachines.multimachine.em.processing.hint.1"), // 2 - Elemental Hatches or + // Molecular Casing }; - private static final IStructureDefinition<GT_MetaTileEntity_EM_machine> STRUCTURE_DEFINITION = - IStructureDefinition.<GT_MetaTileEntity_EM_machine>builder() - .addShape("main", transpose(new String[][] { - {" A ", " AAA ", " EBE ", " ECE ", " EBE ", " AAA ", " A "}, - {" DDD ", "AAAAA", "E---E", "E---E", "E---E", "AAAAA", " FFF "}, - {"AD-DA", "AA~AA", "B---B", "C- -C", "B---B", "AA-AA", "AFFFA"}, - {" DDD ", "AAAAA", "E---E", "E---E", "E---E", "AAAAA", " FFF "}, - {" A ", " AAA ", " EBE ", " ECE ", " EBE ", " AAA ", " A "} - })) - .addElement('A', ofBlock(sBlockCasingsTT, 4)) - .addElement('B', ofBlock(sBlockCasingsTT, 5)) - .addElement('C', ofBlock(sBlockCasingsTT, 6)) - .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0)) - .addElement( - 'D', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_machine::addClassicToMachineList, - textureOffset, - 1, - sBlockCasingsTT, - 0)) - .addElement( - 'F', - ofHatchAdderOptional( - GT_MetaTileEntity_EM_machine::addElementalToMachineList, - textureOffset + 4, - 2, - sBlockCasingsTT, - 4)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_EM_machine> STRUCTURE_DEFINITION = IStructureDefinition + .<GT_MetaTileEntity_EM_machine>builder() + .addShape( + "main", + transpose( + new String[][] { { " A ", " AAA ", " EBE ", " ECE ", " EBE ", " AAA ", " A " }, + { " DDD ", "AAAAA", "E---E", "E---E", "E---E", "AAAAA", " FFF " }, + { "AD-DA", "AA~AA", "B---B", "C- -C", "B---B", "AA-AA", "AFFFA" }, + { " DDD ", "AAAAA", "E---E", "E---E", "E---E", "AAAAA", " FFF " }, + { " A ", " AAA ", " EBE ", " ECE ", " EBE ", " AAA ", " A " } })) + .addElement('A', ofBlock(sBlockCasingsTT, 4)).addElement('B', ofBlock(sBlockCasingsTT, 5)) + .addElement('C', ofBlock(sBlockCasingsTT, 6)).addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0)) + .addElement( + 'D', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_machine::addClassicToMachineList, + textureOffset, + 1, + sBlockCasingsTT, + 0)) + .addElement( + 'F', + ofHatchAdderOptional( + GT_MetaTileEntity_EM_machine::addElementalToMachineList, + textureOffset + 4, + 2, + sBlockCasingsTT, + 4)) + .build(); // endregion // region parameters @@ -102,10 +105,9 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa } return STATUS_NEUTRAL; }; - private static final INameFunction<GT_MetaTileEntity_EM_machine> ROUTE_NAME = (base, p) -> (p.parameterId() == 0 - ? translateToLocal("tt.keyword.Source") + " " - : translateToLocal("tt.keyword.Destination") + " ") - + p.hatchId(); + private static final INameFunction<GT_MetaTileEntity_EM_machine> ROUTE_NAME = (base, + p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Source") + " " + : translateToLocal("tt.keyword.Destination") + " ") + p.hatchId(); // endregion public GT_MetaTileEntity_EM_machine(int aID, String aName, String aNameRegional) { @@ -122,8 +124,8 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa return false; } loadedMachine = newMachine; - Supplier<IBehaviour> behaviourSupplier = - GT_MetaTileEntity_EM_machine.BEHAVIOUR_MAP.get(new TT_Utility.ItemStack_NoNBT(newMachine)); + Supplier<IBehaviour> behaviourSupplier = GT_MetaTileEntity_EM_machine.BEHAVIOUR_MAP + .get(new TT_Utility.ItemStack_NoNBT(newMachine)); if (currentBehaviour == null && behaviourSupplier == null) { return false; } @@ -149,11 +151,14 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa public static void registerBehaviour(Supplier<IBehaviour> behaviour, ItemStack is) { BEHAVIOUR_MAP.put(new TT_Utility.ItemStack_NoNBT(is), behaviour); - TecTech.LOGGER.info("Registered EM machine behaviour " - + behaviour.get().getClass().getSimpleName() + ' ' + new TT_Utility.ItemStack_NoNBT(is).toString()); + TecTech.LOGGER.info( + "Registered EM machine behaviour " + behaviour.get().getClass().getSimpleName() + + ' ' + + new TT_Utility.ItemStack_NoNBT(is).toString()); } public interface IBehaviour { + /** * instantiate parameters, u can also check machine tier here * @@ -178,8 +183,8 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa * @param parameters array passed from previous method! * @return null if recipe should not start, control object to set machine state and start recipe */ - MultiblockControl<EMInstanceStackMap[]> process( - EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters); + MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, + Parameters parameters); } @Override @@ -222,14 +227,13 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(translateToLocal( - "gt.blockmachines.multimachine.em.processing.name")) // Machine Type: Quantum Processing machine - .addInfo(translateToLocal( - "gt.blockmachines.multimachine.em.processing.desc.0")) // Controller block of the + tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.processing.name")) // Machine Type: Quantum + // Processing machine + .addInfo(translateToLocal("gt.blockmachines.multimachine.em.processing.desc.0")) // Controller block of + // the // Quantum Processing machine .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() - .beginStructureBlock(5, 5, 7, false) + .addSeparator().beginStructureBlock(5, 5, 7, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.Elemental"), translateToLocal("tt.keyword.Structure.AnyMolecularCasing2D"), @@ -238,12 +242,11 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa translateToLocal("tt.keyword.Parametrizer"), translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Parametrizer: Any High Power Casing - .addEnergyHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Energy Hatch: Any High Power Casing - .addMaintenanceHatch( - translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), - 1) // Maintenance Hatch: Any High Power Casing + .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Energy Hatch: Any + // High Power Casing + .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance + // Hatch: Any High + // Power Casing .toolTipFinisher(CommonValues.TEC_MARK_EM); return tt; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java index 1b8cbcec50..aed8ba71b7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java @@ -1,10 +1,11 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + public class GT_MetaTileEntity_PipeBlock_Data extends GT_MetaTileEntity_Pipe_Data { public GT_MetaTileEntity_PipeBlock_Data(int aID, String aName, String aNameRegional) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java index a7f9225755..af23d7ff5c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java @@ -1,10 +1,11 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + public class GT_MetaTileEntity_PipeBlock_EM extends GT_MetaTileEntity_Pipe_EM { public GT_MetaTileEntity_PipeBlock_EM(int aID, String aName, String aNameRegional) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java index acd1d68530..052425dc0a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java @@ -1,10 +1,11 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + public class GT_MetaTileEntity_PipeBlock_Energy extends GT_MetaTileEntity_Pipe_Energy { public GT_MetaTileEntity_PipeBlock_Energy(int aID, String aName, String aNameRegional) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java index 2975d28fa5..26d8207a1f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java @@ -3,12 +3,22 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; import static gregtech.api.enums.Dyes.MACHINE_METAL; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.loader.NetworkDispatcher; import com.github.technus.tectech.mechanics.pipe.IActivePipe; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; import com.github.technus.tectech.mechanics.pipe.PipeActivityMessage; import com.github.technus.tectech.util.CommonValues; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.GT_Mod; @@ -22,19 +32,12 @@ import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Client; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; /** * Created by Tec on 26.02.2017. */ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConnectsToDataPipe, IActivePipe { + private static Textures.BlockIcons.CustomIcon EMpipe; private static Textures.BlockIcons.CustomIcon EMbar, EMbarActive; public byte connectionCount = 0; @@ -64,18 +67,12 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aConnections, - byte aColorIndex, - boolean aConnected, - boolean aRedstone) { - return new ITexture[] { - new GT_RenderedTexture(EMpipe), - new GT_RenderedTexture( - getActive() ? EMbarActive : EMbar, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA())) - }; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, + byte aColorIndex, boolean aConnected, boolean aRedstone) { + return new ITexture[] { new GT_RenderedTexture(EMpipe), + new GT_RenderedTexture( + getActive() ? EMbarActive : EMbar, + Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA())) }; } @Override @@ -110,16 +107,16 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.pipe.datastream.desc.0"), // Advanced data transmission - EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockmachines.pipe.datastream.desc.1"), // Don't stare at the beam! - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.pipe.datastream.desc.2"), // Must be painted to work - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.pipe.datastream.desc.3") // Do not cross or split + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.pipe.datastream.desc.0"), // Advanced + // data + // transmission + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockmachines.pipe.datastream.desc.1"), // Don't stare at the beam! + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.pipe.datastream.desc.2"), // Must be + // painted to + // work + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.pipe.datastream.desc.3") // Do not cross or + // split }; } @@ -276,8 +273,8 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn tSide5 = 1f; } - return AxisAlignedBB.getBoundingBox( - aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); + return AxisAlignedBB + .getBoundingBox(aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java index 4a5679e759..4b97776a65 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java @@ -3,12 +3,22 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; import static gregtech.api.enums.Dyes.MACHINE_METAL; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.loader.NetworkDispatcher; import com.github.technus.tectech.mechanics.pipe.IActivePipe; import com.github.technus.tectech.mechanics.pipe.IConnectsToElementalPipe; import com.github.technus.tectech.mechanics.pipe.PipeActivityMessage; import com.github.technus.tectech.util.CommonValues; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.GT_Mod; @@ -23,19 +33,12 @@ import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Client; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; /** * Created by Tec on 26.02.2017. */ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnectsToElementalPipe, IActivePipe { + private static Textures.BlockIcons.CustomIcon EMpipe; static Textures.BlockIcons.CustomIcon EMcandy, EMCandyActive; public byte connectionCount = 0; @@ -65,18 +68,12 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aConnections, - byte aColorIndex, - boolean aConnected, - boolean aRedstone) { - return new ITexture[] { - new GT_RenderedTexture(EMpipe), - new GT_RenderedTexture( - getActive() ? EMCandyActive : EMcandy, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA())) - }; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, + byte aColorIndex, boolean aConnected, boolean aRedstone) { + return new ITexture[] { new GT_RenderedTexture(EMpipe), + new GT_RenderedTexture( + getActive() ? EMCandyActive : EMcandy, + Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA())) }; } @Override @@ -111,16 +108,17 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.pipe.elementalmatter.desc.0"), // Quantum tunneling device. - EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockmachines.pipe.elementalmatter.desc.1"), // Not a portal!!! - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.pipe.elementalmatter.desc.2"), // Must be painted to work - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.pipe.elementalmatter.desc.3") // Do not cross, split or turn + return new String[] { CommonValues.TEC_MARK_EM, + translateToLocal("gt.blockmachines.pipe.elementalmatter.desc.0"), // Quantum tunneling device. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockmachines.pipe.elementalmatter.desc.1"), // Not a portal!!! + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.pipe.elementalmatter.desc.2"), // Must be + // painted + // to work + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.pipe.elementalmatter.desc.3") // Do not + // cross, + // split or + // turn }; } @@ -171,25 +169,25 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec && ((IConnectsToElementalPipe) tTileEntity).canConnect(b1)) { mConnections |= 1 << b0; connectionCount++; - } else if (tTileEntity instanceof IGregTechTileEntity - && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() - instanceof IConnectsToElementalPipe) { - if ( // ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(b1).alwaysLookConnected(b1, - // ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(b1), ((IGregTechTileEntity) - // tTileEntity).getCoverDataAtSide(b1), ((IGregTechTileEntity) tTileEntity)) || - ((IConnectsToElementalPipe) ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()) - .canConnect(b1)) { - mConnections |= 1 << b0; - connectionCount++; - } - } + } else if (tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity) tTileEntity) + .getMetaTileEntity() instanceof IConnectsToElementalPipe) { + if ( // ((IGregTechTileEntity) + // tTileEntity).getCoverBehaviorAtSide(b1).alwaysLookConnected(b1, + // ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(b1), ((IGregTechTileEntity) + // tTileEntity).getCoverDataAtSide(b1), ((IGregTechTileEntity) tTileEntity)) || + ((IConnectsToElementalPipe) ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()) + .canConnect(b1)) { + mConnections |= 1 << b0; + connectionCount++; + } + } // } // else { - // mConnections |= (1 << b0); - // if (mOld != mConnections) { - // connectionCount++; - // mOld = mConnections; - // } + // mConnections |= (1 << b0); + // if (mOld != mConnections) { + // connectionCount++; + // mOld = mConnections; + // } // } } } @@ -258,8 +256,8 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec tSide5 = 1f; } - return AxisAlignedBB.getBoundingBox( - aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); + return AxisAlignedBB + .getBoundingBox(aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java index e83a358f78..43f6e9236c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java @@ -5,12 +5,22 @@ import static com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEn import static gregtech.api.enums.Dyes.MACHINE_METAL; import static net.minecraft.util.StatCollector.translateToLocal; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.loader.NetworkDispatcher; import com.github.technus.tectech.mechanics.pipe.IActivePipe; import com.github.technus.tectech.mechanics.pipe.IConnectsToEnergyTunnel; import com.github.technus.tectech.mechanics.pipe.PipeActivityMessage; import com.github.technus.tectech.util.CommonValues; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.GT_Mod; @@ -25,16 +35,9 @@ import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Client; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements IConnectsToEnergyTunnel, IActivePipe { + private static Textures.BlockIcons.CustomIcon EMpipe; public byte connectionCount = 0; @@ -61,18 +64,12 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aConnections, - byte aColorIndex, - boolean aConnected, - boolean aRedstone) { - return new ITexture[] { - new GT_RenderedTexture(EMpipe), - new GT_RenderedTexture( - getActive() ? EMCandyActive : EMcandy, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA())) - }; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, + byte aColorIndex, boolean aConnected, boolean aRedstone) { + return new ITexture[] { new GT_RenderedTexture(EMpipe), + new GT_RenderedTexture( + getActive() ? EMCandyActive : EMcandy, + Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA())) }; } @Override @@ -107,16 +104,16 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_EM, - translateToLocal("gt.blockmachines.pipe.energystream.desc.0"), // Laser tunneling device. - EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD - + translateToLocal("gt.blockmachines.pipe.energystream.desc.1"), // Bright Vacuum!!! - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.pipe.energystream.desc.2"), // Must be painted to work - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.pipe.energystream.desc.3") // Do not split or turn + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.pipe.energystream.desc.0"), // Laser + // tunneling + // device. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + translateToLocal("gt.blockmachines.pipe.energystream.desc.1"), // Bright Vacuum!!! + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.pipe.energystream.desc.2"), // Must be + // painted to + // work + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.pipe.energystream.desc.3") // Do not split + // or turn }; } @@ -167,25 +164,25 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo && ((IConnectsToEnergyTunnel) tTileEntity).canConnect(b1)) { mConnections |= 1 << b0; connectionCount++; - } else if (tTileEntity instanceof IGregTechTileEntity - && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() - instanceof IConnectsToEnergyTunnel) { - if ( // ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(b1).alwaysLookConnected(b1, - // ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(b1), ((IGregTechTileEntity) - // tTileEntity).getCoverDataAtSide(b1), ((IGregTechTileEntity) tTileEntity)) || - ((IConnectsToEnergyTunnel) ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()) - .canConnect(b1)) { - mConnections |= 1 << b0; - connectionCount++; - } - } + } else if (tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity) tTileEntity) + .getMetaTileEntity() instanceof IConnectsToEnergyTunnel) { + if ( // ((IGregTechTileEntity) + // tTileEntity).getCoverBehaviorAtSide(b1).alwaysLookConnected(b1, + // ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(b1), ((IGregTechTileEntity) + // tTileEntity).getCoverDataAtSide(b1), ((IGregTechTileEntity) tTileEntity)) || + ((IConnectsToEnergyTunnel) ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()) + .canConnect(b1)) { + mConnections |= 1 << b0; + connectionCount++; + } + } // } // else { - // mConnections |= (1 << b0); - // if (mOld != mConnections) { - // connectionCount++; - // mOld = mConnections; - // } + // mConnections |= (1 << b0); + // if (mOld != mConnections) { + // connectionCount++; + // mOld = mConnections; + // } // } } } @@ -273,8 +270,8 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo tSide5 = 1f; } - return AxisAlignedBB.getBoundingBox( - aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); + return AxisAlignedBB + .getBoundingBox(aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); } @Override 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 63c5e142e0..a348354186 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 @@ -4,6 +4,14 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; import static com.github.technus.tectech.util.CommonValues.VN; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.function.Consumer; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; import com.gtnewhorizons.modularui.api.drawable.IDrawable; @@ -12,6 +20,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -25,15 +34,10 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; -import java.util.function.Consumer; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets, IAddGregtechLogo { + private static GT_RenderedTexture BUCK, BUCK_ACTIVE; public int EUT = 0, AMP = 0; @@ -61,21 +65,12 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { - return new ITexture[] { - MACHINE_CASINGS_TT[mTier][aColorIndex + 1], - aSide == aFacing - ? (aActive ? BUCK_ACTIVE : BUCK) - : (aSide == GT_Utility.getOppositeSide(aFacing) - ? OVERLAYS_ENERGY_IN_POWER_TT[mTier] - : (aActive ? OVERLAYS_ENERGY_OUT_POWER_TT[mTier] : OVERLAYS_ENERGY_IN_POWER_TT[mTier])) - }; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], aSide == aFacing + ? (aActive ? BUCK_ACTIVE : BUCK) + : (aSide == GT_Utility.getOppositeSide(aFacing) ? OVERLAYS_ENERGY_IN_POWER_TT[mTier] + : (aActive ? OVERLAYS_ENERGY_OUT_POWER_TT[mTier] : OVERLAYS_ENERGY_IN_POWER_TT[mTier])) }; } @Override @@ -129,13 +124,13 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.machine.tt.buck.desc.0"), // Electronic voltage regulator - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.machine.tt.buck.desc.1"), // Adjustable step down transformer - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.machine.tt.buck.desc.2") // Switching power supply... + return new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.machine.tt.buck.desc.0"), // Electronic voltage regulator + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.buck.desc.1"), // Adjustable + // step down + // transformer + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.buck.desc.2") // Switching power + // supply... }; } @@ -161,8 +156,7 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac @Override public boolean isOutputFacing(byte aSide) { - return getBaseMetaTileEntity().isActive() - && aSide != getBaseMetaTileEntity().getFrontFacing() + return getBaseMetaTileEntity().isActive() && aSide != getBaseMetaTileEntity().getFrontFacing() && aSide != getBaseMetaTileEntity().getBackFacing(); } @@ -213,30 +207,27 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY) - .setSize(17, 17) - .setPos(113, 56)); + builder.widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY).setSize(17, 17) + .setPos(113, 56)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) - .setSize(90, 72) - .setPos(43, 4)) - .widget(TextWidget.dynamicString(() -> "EUT: " + EUT) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 8)) - .widget(TextWidget.dynamicString(() -> "TIER: " + VN[TT_Utility.getTier(Math.abs(EUT))]) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 16)) - .widget(TextWidget.dynamicString(() -> "AMP: " + AMP) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 24)) - .widget(TextWidget.dynamicString(() -> "SUM: " + (long) AMP * EUT) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 32)); + builder.widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setSize(90, 72).setPos(43, 4)) + .widget( + TextWidget.dynamicString(() -> "EUT: " + EUT).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 8)) + .widget( + TextWidget.dynamicString(() -> "TIER: " + VN[TT_Utility.getTier(Math.abs(EUT))]) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 16)) + .widget( + TextWidget.dynamicString(() -> "AMP: " + AMP).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 24)) + .widget( + TextWidget.dynamicString(() -> "SUM: " + (long) AMP * EUT) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 32)); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> EUT -= val, 512, 64, 7, 4); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> EUT /= val, 512, 64, 7, 22); @@ -259,21 +250,11 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> AMP *= val, 512, 64, 151, 58); } - private void addChangeNumberButton( - ModularWindow.Builder builder, - IDrawable overlay, - Consumer<Integer> setter, - int changeNumberShift, - int changeNumber, - int xPos, - int yPos) { - builder.widget(new ButtonWidget() - .setOnClick((clickData, widget) -> { - setter.accept(clickData.shift ? changeNumberShift : changeNumber); - getBaseMetaTileEntity().setActive((long) AMP * EUT >= 0); - }) - .setBackground(GT_UITextures.BUTTON_STANDARD, overlay) - .setSize(18, 18) - .setPos(xPos, yPos)); + private void addChangeNumberButton(ModularWindow.Builder builder, IDrawable overlay, Consumer<Integer> setter, + int changeNumberShift, int changeNumber, int xPos, int yPos) { + builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { + setter.accept(clickData.shift ? changeNumberShift : changeNumber); + getBaseMetaTileEntity().setActive((long) AMP * EUT >= 0); + }).setBackground(GT_UITextures.BUTTON_STANDARD, overlay).setSize(18, 18).setPos(xPos, yPos)); } } 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 03a98d53bf..619adf6c8c 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,7 +3,14 @@ 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; + import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -12,15 +19,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtech.api.objects.GT_RenderedTexture; -import java.util.*; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.EnumChatFormatting; /** * Created by Tec on 23.03.2017. */ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine { + public static GT_RenderedTexture READER_ONLINE, READER_OFFLINE; public GT_MetaTileEntity_DataReader(int aID, String aName, String aNameRegional, int aTier) { @@ -47,30 +51,23 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aBaseMetaTileEntity.getWorld() == null) { if (aSide == aFacing) { - return new ITexture[] { - MACHINE_CASINGS_TT[mTier][aColorIndex + 1], aActive ? READER_ONLINE : READER_OFFLINE - }; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + aActive ? READER_ONLINE : READER_OFFLINE }; } - return new ITexture[] {MACHINE_CASINGS_TT[mTier][aColorIndex + 1]}; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1] }; } if (aSide == mMainFacing) { - return new ITexture[] {MACHINE_CASINGS_TT[mTier][aColorIndex + 1], aActive ? READER_ONLINE : READER_OFFLINE - }; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + aActive ? READER_ONLINE : READER_OFFLINE }; } else if (aSide == aFacing) { - return new ITexture[] { - MACHINE_CASINGS_TT[mTier][aColorIndex + 1], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) - }; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } - return new ITexture[] {MACHINE_CASINGS_TT[mTier][aColorIndex + 1]}; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1] }; } @Override @@ -106,7 +103,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine @Override public String[] getDescription() { - return new String[] {EnumChatFormatting.DARK_RED + "Deprecated"}; + return new String[] { EnumChatFormatting.DARK_RED + "Deprecated" }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java index 6a48095d55..120baad074 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java @@ -3,6 +3,14 @@ package com.github.technus.tectech.thing.metaTileEntity.single; import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.function.Consumer; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OverflowElemental; import com.github.technus.tectech.util.CommonValues; @@ -13,6 +21,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -26,18 +35,13 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; import gregtech.common.GT_Pollution; -import java.util.function.Consumer; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; /** * Created by Tec on 23.03.2017. */ public class GT_MetaTileEntity_DebugPollutor extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets, IAddGregtechLogo { + private static GT_RenderedTexture POLLUTOR; public int pollution = 0; public float anomaly = 0; @@ -65,21 +69,13 @@ public class GT_MetaTileEntity_DebugPollutor extends GT_MetaTileEntity_TieredMac } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { - return new ITexture[] { - MACHINE_CASINGS_TT[mTier][aColorIndex + 1], - aSide != aFacing - ? aActive - ? new GT_RenderedTexture(GT_MetaTileEntity_Hatch_OverflowElemental.MufflerEM) - : new GT_RenderedTexture(GT_MetaTileEntity_Hatch_OverflowElemental.MufflerEMidle) - : POLLUTOR - }; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + aSide != aFacing + ? aActive ? new GT_RenderedTexture(GT_MetaTileEntity_Hatch_OverflowElemental.MufflerEM) + : new GT_RenderedTexture(GT_MetaTileEntity_Hatch_OverflowElemental.MufflerEMidle) + : POLLUTOR }; } @Override @@ -153,13 +149,12 @@ public class GT_MetaTileEntity_DebugPollutor extends GT_MetaTileEntity_TieredMac @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.0"), // Shit genny broke! - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.1"), // Infinite Producer/Consumer - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.2") // Since i wanted one? + return new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.0"), // Shit genny broke! + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.1"), // Infinite + // Producer/Consumer + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.2") // Since i + // wanted one? }; } @@ -175,73 +170,108 @@ public class GT_MetaTileEntity_DebugPollutor extends GT_MetaTileEntity_TieredMac @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY) - .setSize(17, 17) - .setPos(113, 56)); + builder.widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY).setSize(17, 17) + .setPos(113, 56)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) - .setSize(90, 72) - .setPos(43, 4)) - .widget(TextWidget.dynamicString(() -> "Pollution: " + pollution) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 8)) - .widget(TextWidget.dynamicString(() -> "Anomaly: " + anomaly) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 16)); + builder.widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setSize(90, 72).setPos(43, 4)) + .widget( + TextWidget.dynamicString(() -> "Pollution: " + pollution) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 8)) + .widget( + TextWidget.dynamicString(() -> "Anomaly: " + anomaly).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 16)); addChangeNumberButton( - builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> pollution -= val, 512, 64, 7, 4); + builder, + GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, + val -> pollution -= val, + 512, + 64, + 7, + 4); addChangeNumberButton( - builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> pollution /= val, 512, 64, 7, 22); + builder, + GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, + val -> pollution /= val, + 512, + 64, + 7, + 22); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> anomaly -= val, 512, 64, 7, 40); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> anomaly /= val, 512, 64, 7, 58); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, val -> pollution -= val, 16, 1, 25, 4); addChangeNumberButton( - builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, val -> pollution /= val, 16, 2, 25, 22); + builder, + GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, + val -> pollution /= val, + 16, + 2, + 25, + 22); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, val -> anomaly -= val, 16, 1, 25, 40); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, val -> anomaly /= val, 16, 2, 25, 58); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, val -> pollution += val, 16, 1, 133, 4); addChangeNumberButton( - builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, val -> pollution *= val, 16, 2, 133, 22); + builder, + GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, + val -> pollution *= val, + 16, + 2, + 133, + 22); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, val -> anomaly += val, 16, 1, 133, 40); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, val -> anomaly *= val, 16, 2, 133, 58); addChangeNumberButton( - builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> pollution += val, 512, 64, 151, 4); + builder, + GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, + val -> pollution += val, + 512, + 64, + 151, + 4); addChangeNumberButton( - builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> pollution *= val, 512, 64, 151, 22); + builder, + GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, + val -> pollution *= val, + 512, + 64, + 151, + 22); addChangeNumberButton( - builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> anomaly += val, 512, 64, 151, 40); + builder, + GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, + val -> anomaly += val, + 512, + 64, + 151, + 40); addChangeNumberButton( - builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> anomaly *= val, 512, 64, 151, 58); - } - - private void addChangeNumberButton( - ModularWindow.Builder builder, - IDrawable overlay, - Consumer<Integer> setter, - int changeNumberShift, - int changeNumber, - int xPos, - int yPos) { - builder.widget(new ButtonWidget() - .setOnClick((clickData, widget) -> { - setter.accept(clickData.shift ? changeNumberShift : changeNumber); - if (anomaly == Float.POSITIVE_INFINITY) { - anomaly = Float.MAX_VALUE; - } else if (anomaly == Float.NEGATIVE_INFINITY) { - anomaly = -Float.MAX_VALUE; - } - }) - .setBackground(GT_UITextures.BUTTON_STANDARD, overlay) - .setSize(18, 18) - .setPos(xPos, yPos)); + builder, + GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, + val -> anomaly *= val, + 512, + 64, + 151, + 58); + } + + private void addChangeNumberButton(ModularWindow.Builder builder, IDrawable overlay, Consumer<Integer> setter, + int changeNumberShift, int changeNumber, int xPos, int yPos) { + builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { + setter.accept(clickData.shift ? changeNumberShift : changeNumber); + if (anomaly == Float.POSITIVE_INFINITY) { + anomaly = Float.MAX_VALUE; + } else if (anomaly == Float.NEGATIVE_INFINITY) { + anomaly = -Float.MAX_VALUE; + } + }).setBackground(GT_UITextures.BUTTON_STANDARD, overlay).setSize(18, 18).setPos(xPos, yPos)); } } 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 dc5398a254..14d169d358 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 @@ -5,6 +5,15 @@ 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; +import java.util.function.Consumer; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; + import com.github.technus.tectech.mechanics.pipe.IConnectsToEnergyTunnel; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Energy; @@ -16,6 +25,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -30,19 +40,13 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; -import java.util.function.Consumer; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; /** * Created by Tec on 23.03.2017. */ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_TieredMachineBlock implements IConnectsToEnergyTunnel, IAddUIWidgets, IAddGregtechLogo { + private static GT_RenderedTexture GENNY; private boolean LASER = false; public int EUT = 0, AMP = 0; @@ -53,8 +57,8 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_DebugPowerGenerator( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_DebugPowerGenerator(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); TT_Utility.setTier(aTier, this); } @@ -80,21 +84,13 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { - return new ITexture[] { - MACHINE_CASINGS_TT[mTier][aColorIndex + 1], - aSide != aFacing - ? LASER - ? (aActive ? OVERLAYS_ENERGY_OUT_LASER_TT[mTier] : OVERLAYS_ENERGY_IN_LASER_TT[mTier]) - : (aActive ? OVERLAYS_ENERGY_OUT_POWER_TT[mTier] : OVERLAYS_ENERGY_IN_POWER_TT[mTier]) - : GENNY - }; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + aSide != aFacing + ? LASER ? (aActive ? OVERLAYS_ENERGY_OUT_LASER_TT[mTier] : OVERLAYS_ENERGY_IN_LASER_TT[mTier]) + : (aActive ? OVERLAYS_ENERGY_OUT_POWER_TT[mTier] : OVERLAYS_ENERGY_IN_POWER_TT[mTier]) + : GENNY }; } @Override @@ -173,14 +169,14 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.debug.tt.genny.desc.0"), // Power from nothing - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.genny.desc.3"), // - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.debug.tt.genny.desc.1"), // Infinite Producer/Consumer - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.debug.tt.genny.desc.2") // Since i wanted one... + return new String[] { CommonValues.TEC_MARK_GENERAL, translateToLocal("gt.blockmachines.debug.tt.genny.desc.0"), // Power + // from + // nothing + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.genny.desc.3"), // + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.genny.desc.1"), // Infinite + // Producer/Consumer + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.genny.desc.2") // Since i wanted + // one... }; } @@ -259,8 +255,8 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie if (face == aBaseMetaTileEntity.getFrontFacing()) continue; byte opposite = GT_Utility.getOppositeSide(face); for (short dist = 1; dist < 1000; dist++) { - IGregTechTileEntity tGTTileEntity = - aBaseMetaTileEntity.getIGregTechTileEntityAtSideAndDistance(face, dist); + IGregTechTileEntity tGTTileEntity = aBaseMetaTileEntity + .getIGregTechTileEntityAtSideAndDistance(face, dist); if (tGTTileEntity != null) { IMetaTileEntity aMetaTileEntity = tGTTileEntity.getMetaTileEntity(); if (aMetaTileEntity != null) { @@ -273,19 +269,13 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie AMP * 20L * maxEUOutput(), Math.min( ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUStore() - - aMetaTileEntity - .getBaseMetaTileEntity() - .getStoredEU(), + - aMetaTileEntity.getBaseMetaTileEntity().getStoredEU(), aBaseMetaTileEntity.getStoredEU())); ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity) - .setEUVar(aMetaTileEntity - .getBaseMetaTileEntity() - .getStoredEU() - + diff); + .setEUVar(aMetaTileEntity.getBaseMetaTileEntity().getStoredEU() + diff); } } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Energy) { - if (((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).connectionCount < 2) { - } else { + if (((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).connectionCount < 2) {} else { ((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).markUsed(); } } @@ -302,30 +292,27 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY) - .setSize(17, 17) - .setPos(113, 56)); + builder.widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY).setSize(17, 17) + .setPos(113, 56)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) - .setSize(90, 72) - .setPos(43, 4)) - .widget(TextWidget.dynamicString(() -> "EUT: " + EUT) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 8)) - .widget(TextWidget.dynamicString(() -> "TIER: " + VN[TT_Utility.getTier(Math.abs(EUT))]) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 16)) - .widget(TextWidget.dynamicString(() -> "AMP: " + AMP) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 24)) - .widget(TextWidget.dynamicString(() -> "SUM: " + (long) AMP * EUT) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 32)); + builder.widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setSize(90, 72).setPos(43, 4)) + .widget( + TextWidget.dynamicString(() -> "EUT: " + EUT).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 8)) + .widget( + TextWidget.dynamicString(() -> "TIER: " + VN[TT_Utility.getTier(Math.abs(EUT))]) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 16)) + .widget( + TextWidget.dynamicString(() -> "AMP: " + AMP).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 24)) + .widget( + TextWidget.dynamicString(() -> "SUM: " + (long) AMP * EUT) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 32)); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> EUT -= val, 512, 64, 7, 4); addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, val -> EUT /= val, 512, 64, 7, 22); @@ -348,21 +335,11 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie addChangeNumberButton(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, val -> AMP *= val, 512, 64, 151, 58); } - private void addChangeNumberButton( - ModularWindow.Builder builder, - IDrawable overlay, - Consumer<Integer> setter, - int changeNumberShift, - int changeNumber, - int xPos, - int yPos) { - builder.widget(new ButtonWidget() - .setOnClick((clickData, widget) -> { - setter.accept(clickData.shift ? changeNumberShift : changeNumber); - producing = (long) AMP * EUT >= 0; - }) - .setBackground(GT_UITextures.BUTTON_STANDARD, overlay) - .setSize(18, 18) - .setPos(xPos, yPos)); + private void addChangeNumberButton(ModularWindow.Builder builder, IDrawable overlay, Consumer<Integer> setter, + int changeNumberShift, int changeNumber, int xPos, int yPos) { + builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { + setter.accept(clickData.shift ? changeNumberShift : changeNumber); + producing = (long) AMP * EUT >= 0; + }).setBackground(GT_UITextures.BUTTON_STANDARD, overlay).setSize(18, 18).setPos(xPos, yPos)); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java index f7b4db02fd..f9be1cee74 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java @@ -3,6 +3,15 @@ package com.github.technus.tectech.thing.metaTileEntity.single; import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; import static net.minecraft.util.StatCollector.translateToLocal; +import java.util.function.Consumer; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.util.ForgeDirection; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; @@ -14,6 +23,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -26,31 +36,25 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; -import java.util.function.Consumer; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; /** * Created by Tec on 23.03.2017. */ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets, IAddGregtechLogo { + private static GT_RenderedTexture MARK; public short[] numbers = new short[6]; public boolean size = false; - public String[] result = new String[] {"Undefined"}; + public String[] result = new String[] { "Undefined" }; public GT_MetaTileEntity_DebugStructureWriter(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 0, ""); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_DebugStructureWriter( - String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_DebugStructureWriter(String aName, int aTier, String aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); TT_Utility.setTier(aTier, this); } @@ -68,17 +72,10 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { - return new ITexture[] { - MACHINE_CASINGS_TT[mTier][aColorIndex + 1], - aSide != aFacing ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : MARK - }; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + aSide != aFacing ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : MARK }; } @Override @@ -124,13 +121,13 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isAllowedToWork()) { - // String pseudoJavaCode = StructureUtility.getPseudoJavaCode(aBaseMetaTileEntity.getWorld(), + // String pseudoJavaCode = StructureUtility.getPseudoJavaCode(aBaseMetaTileEntity.getWorld(), // // ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())), - // aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), + // aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), // aBaseMetaTileEntity.getZCoord(), - // numbers[0], numbers[1], numbers[2], - // numbers[3], numbers[4], numbers[5],false); + // numbers[0], numbers[1], numbers[2], + // numbers[3], numbers[4], numbers[5],false); String pseudoJavaCode = StructureUtility.getPseudoJavaCode( aBaseMetaTileEntity.getWorld(), ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())), @@ -154,12 +151,12 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { IGregTechTileEntity aBaseMetaTileEntity = getBaseMetaTileEntity(); - // String pseudoJavaCode = StructureUtility.getPseudoJavaCode(aBaseMetaTileEntity.getWorld(), - // ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())), - // aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), + // String pseudoJavaCode = StructureUtility.getPseudoJavaCode(aBaseMetaTileEntity.getWorld(), + // ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())), + // aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), // aBaseMetaTileEntity.getZCoord(), - // numbers[0], numbers[1], numbers[2], - // numbers[3], numbers[4], numbers[5],true); + // numbers[0], numbers[1], numbers[2], + // numbers[3], numbers[4], numbers[5],true); String pseudoJavaCode = StructureUtility.getPseudoJavaCode( aBaseMetaTileEntity.getWorld(), ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())), @@ -202,14 +199,16 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.debug.tt.writer.desc.0"), // Scans Blocks Around - EnumChatFormatting.BLUE - + translateToLocal( - "gt.blockmachines.debug.tt.writer.desc.1"), // Prints Multiblock NonTE structure check code - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.debug.tt.writer.desc.2") // ABC axises aligned to machine front + return new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.debug.tt.writer.desc.0"), // Scans Blocks Around + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.writer.desc.1"), // Prints + // Multiblock + // NonTE + // structure + // check code + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.writer.desc.2") // ABC axises + // aligned to + // machine front }; } @@ -230,33 +229,30 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY) - .setSize(17, 17) - .setPos(113, 56)); + builder.widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY).setSize(17, 17) + .setPos(113, 56)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) - .setSize(90, 72) - .setPos(43, 4)) - .widget(TextWidget.dynamicString(() -> size ? "Structure size" : "My position") - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 8)) - .widget(TextWidget.dynamicString(() -> size ? "(Changing scan size)" : "(Moving origin)") - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 16)) - .widget(TextWidget.dynamicString(() -> "A: " + numbers[size ? 3 : 0]) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 24)) - .widget(TextWidget.dynamicString(() -> "B: " + numbers[size ? 4 : 1]) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 32)) - .widget(TextWidget.dynamicString(() -> "C: " + numbers[size ? 5 : 2]) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(46, 40)); + builder.widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setSize(90, 72).setPos(43, 4)) + .widget( + TextWidget.dynamicString(() -> size ? "Structure size" : "My position") + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 8)) + .widget( + TextWidget.dynamicString(() -> size ? "(Changing scan size)" : "(Moving origin)") + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 16)) + .widget( + TextWidget.dynamicString(() -> "A: " + numbers[size ? 3 : 0]) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 24)) + .widget( + TextWidget.dynamicString(() -> "B: " + numbers[size ? 4 : 1]) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 32)) + .widget( + TextWidget.dynamicString(() -> "C: " + numbers[size ? 5 : 2]) + .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 40)); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25); @@ -264,37 +260,42 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_LARGE, 512, 16, 151); } - private void addChangeNumberButtons( - ModularWindow.Builder builder, IDrawable overlay, int addNumberShift, int addNumber, int xPos) { + private void addChangeNumberButtons(ModularWindow.Builder builder, IDrawable overlay, int addNumberShift, + int addNumber, int xPos) { addChangeNumberButton( - builder, overlay, val -> numbers[size ? 3 : 0] += val, addNumberShift, addNumber, xPos, 4); + builder, + overlay, + val -> numbers[size ? 3 : 0] += val, + addNumberShift, + addNumber, + xPos, + 4); addChangeNumberButton( - builder, overlay, val -> numbers[size ? 4 : 1] += val, addNumberShift, addNumber, xPos, 22); + builder, + overlay, + val -> numbers[size ? 4 : 1] += val, + addNumberShift, + addNumber, + xPos, + 22); addChangeNumberButton( - builder, overlay, val -> numbers[size ? 5 : 2] += val, addNumberShift, addNumber, xPos, 40); - builder.widget(new ButtonWidget() - .setOnClick((clickData, widget) -> { - size = !size; - }) - .setBackground(GT_UITextures.BUTTON_STANDARD, overlay) - .setSize(18, 18) - .setPos(xPos, 58)); + builder, + overlay, + val -> numbers[size ? 5 : 2] += val, + addNumberShift, + addNumber, + xPos, + 40); + builder.widget( + new ButtonWidget().setOnClick((clickData, widget) -> { size = !size; }) + .setBackground(GT_UITextures.BUTTON_STANDARD, overlay).setSize(18, 18).setPos(xPos, 58)); } - private void addChangeNumberButton( - ModularWindow.Builder builder, - IDrawable overlay, - Consumer<Integer> setter, - int changeNumberShift, - int changeNumber, - int xPos, - int yPos) { - builder.widget(new ButtonWidget() - .setOnClick((clickData, widget) -> { - setter.accept(clickData.shift ? changeNumberShift : changeNumber); - }) - .setBackground(GT_UITextures.BUTTON_STANDARD, overlay) - .setSize(18, 18) - .setPos(xPos, yPos)); + private void addChangeNumberButton(ModularWindow.Builder builder, IDrawable overlay, Consumer<Integer> setter, + int changeNumberShift, int changeNumber, int xPos, int yPos) { + builder.widget( + new ButtonWidget().setOnClick( + (clickData, widget) -> { setter.accept(clickData.shift ? changeNumberShift : changeNumber); }) + .setBackground(GT_UITextures.BUTTON_STANDARD, overlay).setSize(18, 18).setPos(xPos, yPos)); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java index 82b1295351..b8a14763ad 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java @@ -4,6 +4,9 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_C import static com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DataReader.READER_OFFLINE; import static com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DataReader.READER_ONLINE; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import com.github.technus.avrClone.AvrCore; import com.github.technus.avrClone.instructions.ExecutionEvent; import com.github.technus.avrClone.instructions.Instruction; @@ -16,16 +19,16 @@ import com.github.technus.avrClone.memory.program.ProgramMemory; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.avr.SidedRedstone; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class GT_MetaTileEntity_MicroController extends GT_MetaTileEntity_TieredMachineBlock { + public static final int OPS_PER_TICK_MAX = 512; static { @@ -73,12 +76,13 @@ public class GT_MetaTileEntity_MicroController extends GT_MetaTileEntity_TieredM if (avr.hasKey("instructions")) { InstructionRegistry registry = InstructionRegistry.REGISTRIES.get(avr.getString("instructionRegistry")); if (registry != null) { - core.setProgramMemory(new ProgramMemory( - registry, - avr.getBoolean("immersive"), - avr.getIntArray("instructions"), - avr.getIntArray("param0"), - avr.getIntArray("param1"))); + core.setProgramMemory( + new ProgramMemory( + registry, + avr.getBoolean("immersive"), + avr.getIntArray("instructions"), + avr.getIntArray("param0"), + avr.getIntArray("param1"))); } } if (avr.hasKey("eepromSize")) { @@ -128,7 +132,7 @@ public class GT_MetaTileEntity_MicroController extends GT_MetaTileEntity_TieredM core.interruptsHandle(); if (core.awoken) { delay = 0; - for (int load = 0; load < maxLoad; ) { + for (int load = 0; load < maxLoad;) { load += core.getInstruction().getCost(core); ExecutionEvent executionEvent = core.cpuCycleForce(); if (executionEvent != null) { @@ -165,30 +169,23 @@ public class GT_MetaTileEntity_MicroController extends GT_MetaTileEntity_TieredM } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { if (aBaseMetaTileEntity.getWorld() == null) { if (aSide == aFacing) { - return new ITexture[] { - MACHINE_CASINGS_TT[mTier][aColorIndex + 1], aActive ? READER_ONLINE : READER_OFFLINE - }; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + aActive ? READER_ONLINE : READER_OFFLINE }; } - return new ITexture[] {MACHINE_CASINGS_TT[mTier][aColorIndex + 1]}; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1] }; } if (aSide == aBaseMetaTileEntity.getFrontFacing()) { - return new ITexture[] {MACHINE_CASINGS_TT[mTier][aColorIndex + 1], aActive ? READER_ONLINE : READER_OFFLINE - }; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + aActive ? READER_ONLINE : READER_OFFLINE }; } else if (aSide == aFacing) { - return new ITexture[] { - MACHINE_CASINGS_TT[mTier][aColorIndex + 1], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) - }; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } - return new ITexture[] {MACHINE_CASINGS_TT[mTier][aColorIndex + 1]}; + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1] }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java index b628a1121f..e26459fd2c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java @@ -5,9 +5,19 @@ import static com.github.technus.tectech.util.CommonValues.RECIPE_AT; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -17,18 +27,12 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import org.apache.commons.lang3.reflect.FieldUtils; /** * Created by Tec on 23.03.2017. */ public class GT_MetaTileEntity_OwnerDetector extends GT_MetaTileEntity_TieredMachineBlock { + private static GT_RenderedTexture OWNER_ONLINE, OWNER_OFFLINE; private String uuid; private boolean interdimensional = true; @@ -57,14 +61,9 @@ public class GT_MetaTileEntity_OwnerDetector extends GT_MetaTileEntity_TieredMac } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { - return new ITexture[] {MACHINE_CASINGS_TT[mTier][aColorIndex + 1], aActive ? OWNER_ONLINE : OWNER_OFFLINE}; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { + return new ITexture[] { MACHINE_CASINGS_TT[mTier][aColorIndex + 1], aActive ? OWNER_ONLINE : OWNER_OFFLINE }; } @Override @@ -114,10 +113,8 @@ public class GT_MetaTileEntity_OwnerDetector extends GT_MetaTileEntity_TieredMac @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide() && aTick % 20 == RECIPE_AT) { - boolean detected = TecTech.proxy.isOnlineUUID(uuid) - || (uuid != null - && uuid.length() > 0 - && TecTech.proxy.isOnlineName(aBaseMetaTileEntity.getOwnerName())); + boolean detected = TecTech.proxy.isOnlineUUID(uuid) || (uuid != null && uuid.length() > 0 + && TecTech.proxy.isOnlineName(aBaseMetaTileEntity.getOwnerName())); aBaseMetaTileEntity.setActive(detected); aBaseMetaTileEntity.setGenericRedstoneOutput(detected); byte value = (byte) (detected ? 15 : 0); @@ -139,8 +136,7 @@ public class GT_MetaTileEntity_OwnerDetector extends GT_MetaTileEntity_TieredMac interdimensional ^= true; GT_Utility.sendChatToPlayer( aPlayer, - interdimensional - ? translateToLocalFormatted("tt.keyphrase.Running_interdimensional_scan", clientLocale) + interdimensional ? translateToLocalFormatted("tt.keyphrase.Running_interdimensional_scan", clientLocale) : translateToLocalFormatted("tt.keyphrase.Running_local_dimension_scan", clientLocale)); } @@ -156,13 +152,16 @@ public class GT_MetaTileEntity_OwnerDetector extends GT_MetaTileEntity_TieredMac @Override public String[] getDescription() { - return new String[] { - CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.0"), // Screwdrive to change mode - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.1"), // Looks for his pa - EnumChatFormatting.BLUE - + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.2") // Emits signal when happy + return new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.0"), // Screwdrive to change mode + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.1"), // Looks + // for + // his + // pa + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.2") // Emits + // signal + // when + // happy }; } 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 0e997f1eb0..d18972306f 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 @@ -5,12 +5,14 @@ import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; public class GT_MetaTileEntity_TT_Transformer extends GT_MetaTileEntity_Transformer { + public GT_MetaTileEntity_TT_Transformer(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, ""); TT_Utility.setTier(aTier, this); @@ -30,27 +32,30 @@ public class GT_MetaTileEntity_TT_Transformer extends GT_MetaTileEntity_Transfor public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new ITexture[12][17][]; for (byte b = -1; b < 16; b++) { - rTextures[0][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; - rTextures[1][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; - rTextures[2][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; - rTextures[3][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; - rTextures[4][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; - rTextures[5][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; - rTextures[6][b + 1] = new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; - rTextures[7][b + 1] = new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; - rTextures[8][b + 1] = new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; - rTextures[9][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; - rTextures[10][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; - rTextures[11][b + 1] = - new ITexture[] {MACHINE_CASINGS_TT[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; + rTextures[0][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_OUT_MULTI_TT[mTier] }; + rTextures[1][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_OUT_MULTI_TT[mTier] }; + rTextures[2][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_OUT_MULTI_TT[mTier] }; + rTextures[3][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1] }; + rTextures[4][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1] }; + rTextures[5][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1] }; + rTextures[6][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_IN_MULTI_TT[mTier] }; + rTextures[7][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_IN_MULTI_TT[mTier] }; + rTextures[8][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_IN_MULTI_TT[mTier] }; + rTextures[9][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1] }; + rTextures[10][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1] }; + rTextures[11][b + 1] = new ITexture[] { MACHINE_CASINGS_TT[mTier][b + 1], + OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1] }; } return rTextures; } @@ -58,8 +63,7 @@ public class GT_MetaTileEntity_TT_Transformer extends GT_MetaTileEntity_Transfor @Override public String[] getDescription() { return new String[] { - translateToLocal("gt.blockmachines.tt.transformer.tier." + (mTier > 9 ? "" : "0") + mTier + ".desc"), - CommonValues.TEC_MARK_GENERAL - }; + translateToLocal("gt.blockmachines.tt.transformer.tier." + (mTier > 9 ? "" : "0") + mTier + ".desc"), + CommonValues.TEC_MARK_GENERAL }; } } 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 ff3410d29b..260a02d3a4 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 @@ -7,6 +7,17 @@ import static java.lang.Math.round; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; +import java.util.Arrays; +import java.util.HashSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.technus.tectech.TecTech; import com.github.technus.tectech.loader.NetworkDispatcher; import com.github.technus.tectech.mechanics.spark.RendererMessage; @@ -18,32 +29,26 @@ import com.github.technus.tectech.util.TT_Utility; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import com.gtnewhorizon.structurelib.util.Vec3Impl; + import eu.usrv.yamcore.auxiliary.PlayerChatHelper; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer; -import java.util.Arrays; -import java.util.HashSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.reflect.FieldUtils; public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryBuffer implements ITeslaConnectable { + // Interface fields - private final Multimap<Integer, ITeslaConnectableSimple> teslaNodeMap = - MultimapBuilder.treeKeys().linkedListValues().build(); + private final Multimap<Integer, ITeslaConnectableSimple> teslaNodeMap = MultimapBuilder.treeKeys() + .linkedListValues().build(); private final HashSet<ThaumSpark> sparkList = new HashSet<>(); private int sparkCount = 10; private static final int transferRadiusMax = TecTech.configTecTech.TESLA_SINGLE_RANGE; // Default is 20 private static final int perBlockLoss = TecTech.configTecTech.TESLA_SINGLE_LOSS_PER_BLOCK; // Default is 1 - private static final float overDriveLoss = - TecTech.configTecTech.TESLA_SINGLE_LOSS_FACTOR_OVERDRIVE; // Default is 0.25F + private static final float overDriveLoss = TecTech.configTecTech.TESLA_SINGLE_LOSS_FACTOR_OVERDRIVE; // Default is + // 0.25F private static final int transferRadiusMin = 4; // Minimum user configurable private int transferRadius = transferRadiusMax; // Default transferRadius setting @@ -53,10 +58,10 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB private int histSettingHigh = 15; // Hysteresis High Limit private static final int histLowLimit = 1; // How low can you configure it? private static final int histHighLimit = 19; // How high can you configure it? - private float histLow = - (float) histSettingLow / histSteps; // Power pass is disabled if power is under this fraction - private float histHigh = - (float) histSettingHigh / histSteps; // Power pass is enabled if power is over this fraction + private float histLow = (float) histSettingLow / histSteps; // Power pass is disabled if power is under this + // fraction + private float histHigh = (float) histSettingHigh / histSteps; // Power pass is enabled if power is over this + // fraction private final long outputVoltage = V[mTier]; private boolean overdriveToggle = false; @@ -68,18 +73,18 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_TeslaCoil( - String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) { + public GT_MetaTileEntity_TeslaCoil(String aName, int aTier, String aDescription, ITexture[][][] aTextures, + int aSlotCount) { super(aName, aTier, aDescription, aTextures, aSlotCount); } @Override public String[] getDescription() { - String[] jargon = new String[] { - CommonValues.THETA_MOVEMENT, - translateToLocal("gt.blockmachines.machine.tt.tesla.desc.0"), // Your Tesla I/O machine of choice - EnumChatFormatting.AQUA - + translateToLocal("gt.blockmachines.machine.tt.tesla.desc.1") // Lightning stoves for the rich + String[] jargon = new String[] { CommonValues.THETA_MOVEMENT, + translateToLocal("gt.blockmachines.machine.tt.tesla.desc.0"), // Your Tesla I/O machine of choice + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.machine.tt.tesla.desc.1") // Lightning + // stoves for the + // rich }; String[] sDesc = super.getDescription(); sDesc = Arrays.copyOfRange(sDesc, 1, sDesc.length); // Removes first element from array @@ -87,16 +92,16 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB } @Override - public boolean onSolderingToolRightClick( - byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, + float aZ) { if (overdriveToggle) { overdriveToggle = false; - PlayerChatHelper.SendInfo( - aPlayer, translateToLocalFormatted("tt.keyphrase.Overdrive_disengaged", clientLocale)); + PlayerChatHelper + .SendInfo(aPlayer, translateToLocalFormatted("tt.keyphrase.Overdrive_disengaged", clientLocale)); } else { overdriveToggle = true; - PlayerChatHelper.SendInfo( - aPlayer, translateToLocalFormatted("tt.keyphrase.Overdrive_engaged", clientLocale)); + PlayerChatHelper + .SendInfo(aPlayer, translateToLocalFormatted("tt.keyphrase.Overdrive_engaged", clientLocale)); } return true; } @@ -113,7 +118,8 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB PlayerChatHelper.SendInfo( aPlayer, translateToLocalFormatted("tt.keyphrase.Hysteresis_high_set_to", clientLocale) + " " - + round(histHigh * 100F) + "%"); + + round(histHigh * 100F) + + "%"); } else { if (histSettingLow > histLowLimit) { histSettingLow--; @@ -124,13 +130,14 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB PlayerChatHelper.SendInfo( aPlayer, translateToLocalFormatted("tt.keyphrase.Hysteresis_low_set_to", clientLocale) + " " - + round(histLow * 100F) + "%"); + + round(histLow * 100F) + + "%"); } } @Override - public boolean onWireCutterRightClick( - byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, + float aZ) { if (aPlayer.isSneaking()) { if (transferRadius > transferRadiusMin) { transferRadius--; @@ -142,7 +149,8 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB } PlayerChatHelper.SendInfo( aPlayer, - translateToLocalFormatted("tt.keyphrase.Tesla_radius_set_to", clientLocale) + " " + transferRadius + translateToLocalFormatted("tt.keyphrase.Tesla_radius_set_to", clientLocale) + " " + + transferRadius + "m"); return false; } @@ -170,8 +178,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB } // And after this cheeky-ness, toss the string XD - return powerPassToggle - ? translateToLocalFormatted("tt.keyphrase.Sending_power", clientLocale) + "!" + return powerPassToggle ? translateToLocalFormatted("tt.keyphrase.Sending_power", clientLocale) + "!" : translateToLocalFormatted("tt.keyphrase.Receiving_power", clientLocale) + "!"; } @@ -184,28 +191,19 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new ITexture[3][17][]; for (byte i = -1; i < 16; ++i) { - rTextures[0][i + 1] = new ITexture[] {MACHINE_CASINGS_TT[this.mTier][i + 1]}; - rTextures[1][i + 1] = new ITexture[] {MACHINE_CASINGS_TT[this.mTier][i + 1], TESLA_TRANSCEIVER_TOP_BA}; - rTextures[2][i + 1] = new ITexture[] { - MACHINE_CASINGS_TT[this.mTier][i + 1], - this.mInventory.length == 16 - ? OVERLAYS_ENERGY_OUT_POWER_TT[this.mTier] - : (this.mInventory.length > 4 - ? OVERLAYS_ENERGY_OUT_MULTI_TT[this.mTier] - : OVERLAYS_ENERGY_OUT_TT[this.mTier]) - }; + rTextures[0][i + 1] = new ITexture[] { MACHINE_CASINGS_TT[this.mTier][i + 1] }; + rTextures[1][i + 1] = new ITexture[] { MACHINE_CASINGS_TT[this.mTier][i + 1], TESLA_TRANSCEIVER_TOP_BA }; + rTextures[2][i + 1] = new ITexture[] { MACHINE_CASINGS_TT[this.mTier][i + 1], + this.mInventory.length == 16 ? OVERLAYS_ENERGY_OUT_POWER_TT[this.mTier] + : (this.mInventory.length > 4 ? OVERLAYS_ENERGY_OUT_MULTI_TT[this.mTier] + : OVERLAYS_ENERGY_OUT_TT[this.mTier]) }; } return rTextures; } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { return this.mTextures[aSide == aFacing ? 2 : aSide == 1 ? 1 : 0][aColorIndex + 1]; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java index 86cc4395fb..3890891d50 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java @@ -4,11 +4,13 @@ import static com.github.technus.tectech.util.CommonValues.V; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.util.CommonValues; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_TT_Transformer { + public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } @@ -25,10 +27,8 @@ public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_TT_Trans @Override public String[] getDescription() { return new String[] { - translateToLocal("gt.blockmachines.wetransformer.tier." + (mTier > 9 ? "" : "0") + mTier + ".desc"), - "Accepts 16A and outputs 64A", - CommonValues.TEC_MARK_GENERAL - }; + translateToLocal("gt.blockmachines.wetransformer.tier." + (mTier > 9 ? "" : "0") + mTier + ".desc"), + "Accepts 16A and outputs 64A", CommonValues.TEC_MARK_GENERAL }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java b/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java index 8f95472cd3..6a7fece48e 100644 --- a/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java +++ b/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java @@ -1,21 +1,24 @@ package com.github.technus.tectech.thing.tileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.Reference; + import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.core.IC2; import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric; import ic2.core.init.MainConfig; import ic2.core.util.ConfigUtil; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; /** * Created by danie_000 on 30.09.2017. */ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { + private boolean hadRedstone = true; @Override @@ -39,38 +42,38 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { } // public int gaugeHeatScaled(int i) { - // return i * this.heat / (this.maxHeat / 100 * 85); + // return i * this.heat / (this.maxHeat / 100 * 85); // } // public void readFromNBT(NBTTagCompound nbttagcompound) { - // super.readFromNBT(nbttagcompound); - // //this.heat = nbttagcompound.getInteger("heat"); - // //this.inputTank.readFromNBT(nbttagcompound.getCompoundTag("inputTank")); - // //this.outputTank.readFromNBT(nbttagcompound.getCompoundTag("outputTank")); - // //this.output = (float)nbttagcompound.getShort("output"); + // super.readFromNBT(nbttagcompound); + // //this.heat = nbttagcompound.getInteger("heat"); + // //this.inputTank.readFromNBT(nbttagcompound.getCompoundTag("inputTank")); + // //this.outputTank.readFromNBT(nbttagcompound.getCompoundTag("outputTank")); + // //this.output = (float)nbttagcompound.getShort("output"); // } // public void writeToNBT(NBTTagCompound nbttagcompound) { - // super.writeToNBT(nbttagcompound); - // //NBTTagCompound inputTankTag = new NBTTagCompound(); - // //this.inputTank.writeToNBT(inputTankTag); - // //nbttagcompound.setTag("inputTank", inputTankTag); - // //NBTTagCompound outputTankTag = new NBTTagCompound(); - // //this.outputTank.writeToNBT(outputTankTag); - // //nbttagcompound.setTag("outputTank", outputTankTag); - // //nbttagcompound.setInteger("heat", this.heat); - // //nbttagcompound.setShort("output", (short)((int)this.getReactorEnergyOutput())); + // super.writeToNBT(nbttagcompound); + // //NBTTagCompound inputTankTag = new NBTTagCompound(); + // //this.inputTank.writeToNBT(inputTankTag); + // //nbttagcompound.setTag("inputTank", inputTankTag); + // //NBTTagCompound outputTankTag = new NBTTagCompound(); + // //this.outputTank.writeToNBT(outputTankTag); + // //nbttagcompound.setTag("outputTank", outputTankTag); + // //nbttagcompound.setInteger("heat", this.heat); + // //nbttagcompound.setShort("output", (short)((int)this.getReactorEnergyOutput())); // } // public void setRedstoneSignal(boolean redstone) { - // this.redstone = redstone; + // this.redstone = redstone; // } // public void drawEnergy(double amount) { // } // public float sendEnergy(float send) { - // return 0.0F; + // return 0.0F; // } @Override @@ -84,61 +87,60 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { } // public int getSourceTier() { - // return 4; + // return 4; // } @Override public double getReactorEUEnergyOutput() { - return getReactorEnergyOutput() - * 5.0F + return getReactorEnergyOutput() * 5.0F * ConfigUtil.getDouble(MainConfig.get(), "balance/energy/generator/nuclear"); } // public List<TileEntity> getSubTiles() { - // if(this.subTiles == null) { - // this.subTiles = new ArrayList(); - // this.subTiles.add(this); - // Direction[] arr$ = Direction.directions; - // int len$ = arr$.length; + // if(this.subTiles == null) { + // this.subTiles = new ArrayList(); + // this.subTiles.add(this); + // Direction[] arr$ = Direction.directions; + // int len$ = arr$.length; // - // for(int i$ = 0; i$ < len$; ++i$) { - // Direction dir = arr$[i$]; - // TileEntity te = dir.applyToTileEntity(this); - // if(te instanceof TileEntityReactorChamberElectric && !te.isInvalid()) { - // this.subTiles.add(te); - // } - // } - // } + // for(int i$ = 0; i$ < len$; ++i$) { + // Direction dir = arr$[i$]; + // TileEntity te = dir.applyToTileEntity(this); + // if(te instanceof TileEntityReactorChamberElectric && !te.isInvalid()) { + // this.subTiles.add(te); + // } + // } + // } // - // return this.subTiles; + // return this.subTiles; // } // private void processfluidsSlots() { - // RecipeOutput outputinputSlot = this.processInputSlot(true); - // if(outputinputSlot != null) { - // this.processInputSlot(false); - // List<ItemStack> outputoutputSlot = outputinputSlot.items; - // this.coolantoutputSlot.add(outputoutputSlot); - // } + // RecipeOutput outputinputSlot = this.processInputSlot(true); + // if(outputinputSlot != null) { + // this.processInputSlot(false); + // List<ItemStack> outputoutputSlot = outputinputSlot.items; + // this.coolantoutputSlot.add(outputoutputSlot); + // } // - // RecipeOutput outputoutputSlot1 = this.processOutputSlot(true); - // if(outputoutputSlot1 != null) { - // this.processOutputSlot(false); - // List<ItemStack> processResult = outputoutputSlot1.items; - // this.hotcoolantoutputSlot.add(processResult); - // } + // RecipeOutput outputoutputSlot1 = this.processOutputSlot(true); + // if(outputoutputSlot1 != null) { + // this.processOutputSlot(false); + // List<ItemStack> processResult = outputoutputSlot1.items; + // this.hotcoolantoutputSlot.add(processResult); + // } // // } // public void refreshChambers() { - // if(this.addedToEnergyNet) { - // MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this)); - // } + // if(this.addedToEnergyNet) { + // MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this)); + // } // - // this.subTiles = null; - // if(this.addedToEnergyNet) { - // MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); - // } + // this.subTiles = null; + // if(this.addedToEnergyNet) { + // MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); + // } // // } @@ -158,43 +160,43 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { } // public void dropAllUnfittingStuff() { - // int i; - // ItemStack stack; - // for(i = 0; i < this.reactorSlot.size(); ++i) { - // stack = this.reactorSlot.get(i); - // if(stack != null && !this.isUsefulItem(stack, false)) { - // this.reactorSlot.put(i, null); - // this.eject(stack); - // } - // } + // int i; + // ItemStack stack; + // for(i = 0; i < this.reactorSlot.size(); ++i) { + // stack = this.reactorSlot.get(i); + // if(stack != null && !this.isUsefulItem(stack, false)) { + // this.reactorSlot.put(i, null); + // this.eject(stack); + // } + // } // - // for(i = this.reactorSlot.size(); i < this.reactorSlot.rawSize(); ++i) { - // stack = this.reactorSlot.get(i); - // this.reactorSlot.put(i, null); - // this.eject(stack); - // } + // for(i = this.reactorSlot.size(); i < this.reactorSlot.rawSize(); ++i) { + // stack = this.reactorSlot.get(i); + // this.reactorSlot.put(i, null); + // this.eject(stack); + // } // // } // public boolean isUsefulItem(ItemStack stack, boolean forInsertion) { - // Item item = stack.getItem(); - // return (item instanceof IReactorComponent || (item == Ic2Items.TritiumCell.getItem() || item == + // Item item = stack.getItem(); + // return (item instanceof IReactorComponent || (item == Ic2Items.TritiumCell.getItem() || item == // Ic2Items.reactorDepletedUraniumSimple.getItem() || item == Ic2Items.reactorDepletedUraniumDual.getItem() || item // == Ic2Items.reactorDepletedUraniumQuad.getItem() || item == Ic2Items.reactorDepletedMOXSimple.getItem() || item // == Ic2Items.reactorDepletedMOXDual.getItem() || item == Ic2Items.reactorDepletedMOXQuad.getItem())); // } // public void eject(ItemStack drop) { - // if(IC2.platform.isSimulating() && drop != null) { - // float f = 0.7F; - // double d = (double)(this.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; - // double d1 = (double)(this.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; - // double d2 = (double)(this.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; - // EntityItem entityitem = new EntityItem(this.worldObj, (double)this.xCoord + d, (double)this.yCoord + d1, + // if(IC2.platform.isSimulating() && drop != null) { + // float f = 0.7F; + // double d = (double)(this.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + // double d1 = (double)(this.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + // double d2 = (double)(this.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + // EntityItem entityitem = new EntityItem(this.worldObj, (double)this.xCoord + d, (double)this.yCoord + d1, // (double)this.zCoord + d2, drop); - // entityitem.delayBeforeCanPickup = 10; - // this.worldObj.spawnEntityInWorld(entityitem); - // } + // entityitem.delayBeforeCanPickup = 10; + // this.worldObj.spawnEntityInWorld(entityitem); + // } // } @Override @@ -209,56 +211,56 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { // Block block; // Material mat; // if(power >= 0.85F && this.worldObj.rand.nextFloat() <= 0.2F * this.hem) { - // coord = this.getRandCoord(2); - // if(coord != null) { - // block = this.worldObj.getBlock(coord[0], coord[1], coord[2]); - // if(block.isAir(this.worldObj, coord[0], coord[1], coord[2])) { - // this.worldObj.setBlock(coord[0], coord[1], coord[2], Blocks.fire, 0, 7); - // } else if(block.getBlockHardness(this.worldObj, coord[0], coord[1], coord[2]) >= 0.0F && + // coord = this.getRandCoord(2); + // if(coord != null) { + // block = this.worldObj.getBlock(coord[0], coord[1], coord[2]); + // if(block.isAir(this.worldObj, coord[0], coord[1], coord[2])) { + // this.worldObj.setBlock(coord[0], coord[1], coord[2], Blocks.fire, 0, 7); + // } else if(block.getBlockHardness(this.worldObj, coord[0], coord[1], coord[2]) >= 0.0F && // this.worldObj.getTileEntity(coord[0], coord[1], coord[2]) == null) { - // mat = block.getMaterial(); - // if(mat != Material.rock && mat != Material.iron && mat != Material.lava && mat != + // mat = block.getMaterial(); + // if(mat != Material.rock && mat != Material.iron && mat != Material.lava && mat != // Material.ground && mat != Material.clay) { - // this.worldObj.setBlock(coord[0], coord[1], coord[2], Blocks.fire, 0, 7); - // } else { - // this.worldObj.setBlock(coord[0], coord[1], coord[2], Blocks.flowing_lava, 15, 7); - // } - // } - // } + // this.worldObj.setBlock(coord[0], coord[1], coord[2], Blocks.fire, 0, 7); + // } else { + // this.worldObj.setBlock(coord[0], coord[1], coord[2], Blocks.flowing_lava, 15, 7); + // } + // } + // } // } // // if(power >= 0.7F) { - // List var5 = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, + // List var5 = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, // AxisAlignedBB.getBoundingBox((double)(this.xCoord - 3), (double)(this.yCoord - 3), // (double)(this.zCoord - 3), (double)(this.xCoord + 4), (double)(this.yCoord + 4), (double)(this.zCoord // + 4))); // - // for(int var6 = 0; var6 < var5.size(); ++var6) { - // Entity var7 = (Entity)var5.get(var6); - // var7.attackEntityFrom(IC2DamageSource.radiation, + // for(int var6 = 0; var6 < var5.size(); ++var6) { + // Entity var7 = (Entity)var5.get(var6); + // var7.attackEntityFrom(IC2DamageSource.radiation, // (float)((int)((float)this.worldObj.rand.nextInt(4) * this.hem))); - // } + // } // } // // if(power >= 0.5F && this.worldObj.rand.nextFloat() <= this.hem) { - // coord = this.getRandCoord(2); - // if(coord != null) { - // block = this.worldObj.getBlock(coord[0], coord[1], coord[2]); - // if(block.getMaterial() == Material.water) { - // this.worldObj.setBlockToAir(coord[0], coord[1], coord[2]); - // } - // } + // coord = this.getRandCoord(2); + // if(coord != null) { + // block = this.worldObj.getBlock(coord[0], coord[1], coord[2]); + // if(block.getMaterial() == Material.water) { + // this.worldObj.setBlockToAir(coord[0], coord[1], coord[2]); + // } + // } // } // // if(power >= 0.4F && this.worldObj.rand.nextFloat() <= this.hem) { - // coord = this.getRandCoord(2); - // if(coord != null && this.worldObj.getTileEntity(coord[0], coord[1], coord[2]) == null) { - // block = this.worldObj.getBlock(coord[0], coord[1], coord[2]); - // mat = block.getMaterial(); - // if(mat == Material.wood || mat == Material.leaves || mat == Material.cloth) { - // this.worldObj.setBlock(coord[0], coord[1], coord[2], Blocks.fire, 0, 7); - // } - // } + // coord = this.getRandCoord(2); + // if(coord != null && this.worldObj.getTileEntity(coord[0], coord[1], coord[2]) == null) { + // block = this.worldObj.getBlock(coord[0], coord[1], coord[2]); + // mat = block.getMaterial(); + // if(mat == Material.wood || mat == Material.leaves || mat == Material.cloth) { + // this.worldObj.setBlock(coord[0], coord[1], coord[2], Blocks.fire, 0, 7); + // } + // } // } return false; } @@ -267,74 +269,74 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { } // public int[] getRandCoord(int radius) { - // if(radius <= 0) { - // return null; - // } else { - // int[] c = new int[]{this.xCoord + this.worldObj.rand.nextInt(2 * radius + 1) - radius, this.yCoord + + // if(radius <= 0) { + // return null; + // } else { + // int[] c = new int[]{this.xCoord + this.worldObj.rand.nextInt(2 * radius + 1) - radius, this.yCoord + // this.worldObj.rand.nextInt(2 * radius + 1) - radius, this.zCoord + this.worldObj.rand.nextInt(2 * radius + 1) - // radius}; - // return c[0] == this.xCoord && c[1] == this.yCoord && c[2] == this.zCoord?null:c; - // } + // return c[0] == this.xCoord && c[1] == this.yCoord && c[2] == this.zCoord?null:c; + // } // } // public void processChambers() { - // short size = this.getReactorSize(); + // short size = this.getReactorSize(); // - // for(int pass = 0; pass < 2; ++pass) { - // for(int y = 0; y < 6; ++y) { - // for(int x = 0; x < size; ++x) { - // ItemStack stack = this.reactorSlot.get(x, y); - // if(stack != null && stack.getItem() instanceof IReactorComponent) { - // IReactorComponent comp = (IReactorComponent)stack.getItem(); - // comp.processChamber(this, stack, x, y, pass == 0); - // } - // } - // } - // } + // for(int pass = 0; pass < 2; ++pass) { + // for(int y = 0; y < 6; ++y) { + // for(int x = 0; x < size; ++x) { + // ItemStack stack = this.reactorSlot.get(x, y); + // if(stack != null && stack.getItem() instanceof IReactorComponent) { + // IReactorComponent comp = (IReactorComponent)stack.getItem(); + // comp.processChamber(this, stack, x, y, pass == 0); + // } + // } + // } + // } // // } // public boolean produceEnergy() { - // return this.receiveredstone() && ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/generator") > + // return this.receiveredstone() && ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/generator") > // 0.0F; // } // NO need // public boolean receiveredstone() { - // return this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord) || this.redstone; + // return this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord) || this.redstone; // } // public short getReactorSize() { - // if(this.worldObj == null) { - // return 9; - // } else { - // short cols = 3; - // Direction[] arr$ = Direction.directions; - // int len$ = arr$.length; + // if(this.worldObj == null) { + // return 9; + // } else { + // short cols = 3; + // Direction[] arr$ = Direction.directions; + // int len$ = arr$.length; // - // for(int i$ = 0; i$ < len$; ++i$) { - // Direction direction = arr$[i$]; - // TileEntity target = direction.applyToTileEntity(this); - // if(target instanceof TileEntityReactorChamberElectric) { - // ++cols; - // } - // } + // for(int i$ = 0; i$ < len$; ++i$) { + // Direction direction = arr$[i$]; + // TileEntity target = direction.applyToTileEntity(this); + // if(target instanceof TileEntityReactorChamberElectric) { + // ++cols; + // } + // } // - // return cols; - // } + // return cols; + // } // } // public int getTickRate() { - // return 20; + // return 20; // } // public ContainerBase<TileEntityNuclearReactorElectric> getGuiContainer(EntityPlayer entityPlayer) { - // return new ContainerNuclearReactor(entityPlayer, this); + // return new ContainerNuclearReactor(entityPlayer, this); // } // @SideOnly(Side.CLIENT) // public GuiScreen getGui(EntityPlayer entityPlayer, boolean isAdmin) { - // return new GuiNuclearReactor(new ContainerNuclearReactor(entityPlayer, this)); + // return new GuiNuclearReactor(new ContainerNuclearReactor(entityPlayer, this)); // } // public void onGuiClosed(EntityPlayer entityPlayer) {} @@ -353,103 +355,103 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { // region no need to change // public void onNetworkUpdate(String field) { - // if(field.equals("output")) { - // if(this.output > 0.0F) { - // if(this.lastOutput <= 0.0F) { - // if(this.audioSourceMain == null) { - // this.audioSourceMain = IC2.audioManager.createSource(this, PositionSpec.Center, + // if(field.equals("output")) { + // if(this.output > 0.0F) { + // if(this.lastOutput <= 0.0F) { + // if(this.audioSourceMain == null) { + // this.audioSourceMain = IC2.audioManager.createSource(this, PositionSpec.Center, // "Generators/NuclearReactor/NuclearReactorLoop.ogg", true, false, IC2.audioManager.getDefaultVolume()); - // } + // } // - // if(this.audioSourceMain != null) { - // this.audioSourceMain.play(); - // } - // } + // if(this.audioSourceMain != null) { + // this.audioSourceMain.play(); + // } + // } // - // if(this.output < 40.0F) { - // if(this.lastOutput <= 0.0F || this.lastOutput >= 40.0F) { - // if(this.audioSourceGeiger != null) { - // this.audioSourceGeiger.remove(); - // } + // if(this.output < 40.0F) { + // if(this.lastOutput <= 0.0F || this.lastOutput >= 40.0F) { + // if(this.audioSourceGeiger != null) { + // this.audioSourceGeiger.remove(); + // } // - // this.audioSourceGeiger = IC2.audioManager.createSource(this, PositionSpec.Center, + // this.audioSourceGeiger = IC2.audioManager.createSource(this, PositionSpec.Center, // "Generators/NuclearReactor/GeigerLowEU.ogg", true, false, IC2.audioManager.getDefaultVolume()); - // if(this.audioSourceGeiger != null) { - // this.audioSourceGeiger.play(); - // } - // } - // } else if(this.output < 80.0F) { - // if(this.lastOutput < 40.0F || this.lastOutput >= 80.0F) { - // if(this.audioSourceGeiger != null) { - // this.audioSourceGeiger.remove(); - // } - // - // this.audioSourceGeiger = IC2.audioManager.createSource(this, PositionSpec.Center, + // if(this.audioSourceGeiger != null) { + // this.audioSourceGeiger.play(); + // } + // } + // } else if(this.output < 80.0F) { + // if(this.lastOutput < 40.0F || this.lastOutput >= 80.0F) { + // if(this.audioSourceGeiger != null) { + // this.audioSourceGeiger.remove(); + // } + // + // this.audioSourceGeiger = IC2.audioManager.createSource(this, PositionSpec.Center, // "Generators/NuclearReactor/GeigerMedEU.ogg", true, false, IC2.audioManager.getDefaultVolume()); - // if(this.audioSourceGeiger != null) { - // this.audioSourceGeiger.play(); - // } - // } - // } else if(this.output >= 80.0F && this.lastOutput < 80.0F) { - // if(this.audioSourceGeiger != null) { - // this.audioSourceGeiger.remove(); - // } - // - // this.audioSourceGeiger = IC2.audioManager.createSource(this, PositionSpec.Center, + // if(this.audioSourceGeiger != null) { + // this.audioSourceGeiger.play(); + // } + // } + // } else if(this.output >= 80.0F && this.lastOutput < 80.0F) { + // if(this.audioSourceGeiger != null) { + // this.audioSourceGeiger.remove(); + // } + // + // this.audioSourceGeiger = IC2.audioManager.createSource(this, PositionSpec.Center, // "Generators/NuclearReactor/GeigerHighEU.ogg", true, false, IC2.audioManager.getDefaultVolume()); - // if(this.audioSourceGeiger != null) { - // this.audioSourceGeiger.play(); - // } - // } - // } else if(this.lastOutput > 0.0F) { - // if(this.audioSourceMain != null) { - // this.audioSourceMain.stop(); - // } + // if(this.audioSourceGeiger != null) { + // this.audioSourceGeiger.play(); + // } + // } + // } else if(this.lastOutput > 0.0F) { + // if(this.audioSourceMain != null) { + // this.audioSourceMain.stop(); + // } // - // if(this.audioSourceGeiger != null) { - // this.audioSourceGeiger.stop(); - // } - // } + // if(this.audioSourceGeiger != null) { + // this.audioSourceGeiger.stop(); + // } + // } // - // this.lastOutput = this.output; - // } + // this.lastOutput = this.output; + // } // - // super.onNetworkUpdate(field); + // super.onNetworkUpdate(field); // } // public float getWrenchDropRate() { - // return 1F; + // return 1F; // } // public ChunkCoordinates getPosition() { - // return new ChunkCoordinates(this.xCoord, this.yCoord, this.zCoord); + // return new ChunkCoordinates(this.xCoord, this.yCoord, this.zCoord); // } // public World getWorld() { - // return this.worldObj; + // return this.worldObj; // } // public int getHeat() { - // return this.heat; + // return this.heat; // } // public void setHeat(int heat1) { - // this.heat = heat1; + // this.heat = heat1; // } // public int addHeat(int amount) { - // this.heat += amount; - // return this.heat; + // this.heat += amount; + // return this.heat; // } // public ItemStack getItemAt(int x, int y) { - // return x >= 0 && x < this.getReactorSize() && y >= 0 && y < 6?this.reactorSlot.get(x, y):null; + // return x >= 0 && x < this.getReactorSize() && y >= 0 && y < 6?this.reactorSlot.get(x, y):null; // } // public void setItemAt(int x, int y, ItemStack item) { - // if(x >= 0 && x < this.getReactorSize() && y >= 0 && y < 6) { - // this.reactorSlot.put(x, y, item); - // } + // if(x >= 0 && x < this.getReactorSize() && y >= 0 && y < 6) { + // this.reactorSlot.put(x, y, item); + // } // } @Override @@ -462,60 +464,60 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { // region no need // public int getMaxHeat() { - // return this.maxHeat; + // return this.maxHeat; // } // public void setMaxHeat(int newMaxHeat) { - // this.maxHeat = newMaxHeat; + // this.maxHeat = newMaxHeat; // } // public float getHeatEffectModifier() { - // return this.hem; + // return this.hem; // } // public void setHeatEffectModifier(float newHEM) { - // this.hem = newHEM; + // this.hem = newHEM; // } // public float getReactorEnergyOutput() { - // return this.output; + // return this.output; // } // public float addOutput(float energy) { - // return this.output += energy; + // return this.output += energy; // } // PRIVATE not used // private RecipeOutput processInputSlot(boolean simulate) { - // if(!this.coolantinputSlot.isEmpty()) { - // MutableObject output = new MutableObject(); - // if(this.coolantinputSlot.transferToTank(this.inputTank, output, simulate) && (output.getValue() == null || + // if(!this.coolantinputSlot.isEmpty()) { + // MutableObject output = new MutableObject(); + // if(this.coolantinputSlot.transferToTank(this.inputTank, output, simulate) && (output.getValue() == null || // this.coolantoutputSlot.canAdd((ItemStack)output.getValue()))) { - // if(output.getValue() == null) { - // return new RecipeOutput(null); - // } + // if(output.getValue() == null) { + // return new RecipeOutput(null); + // } // - // return new RecipeOutput(null, (ItemStack)output.getValue()); - // } - // } + // return new RecipeOutput(null, (ItemStack)output.getValue()); + // } + // } // - // return null; + // return null; // } // private RecipeOutput processOutputSlot(boolean simulate) { - // if(!this.hotcoolinputSlot.isEmpty()) { - // MutableObject output = new MutableObject(); - // if(this.hotcoolinputSlot.transferFromTank(this.outputTank, output, simulate) && (output.getValue() == null + // if(!this.hotcoolinputSlot.isEmpty()) { + // MutableObject output = new MutableObject(); + // if(this.hotcoolinputSlot.transferFromTank(this.outputTank, output, simulate) && (output.getValue() == null // || this.hotcoolantoutputSlot.canAdd((ItemStack)output.getValue()))) { - // if(output.getValue() == null) { - // return new RecipeOutput(null); - // } + // if(output.getValue() == null) { + // return new RecipeOutput(null); + // } // - // return new RecipeOutput(null, (ItemStack)output.getValue()); - // } - // } + // return new RecipeOutput(null, (ItemStack)output.getValue()); + // } + // } // - // return null; + // return null; // } @Override @@ -525,181 +527,181 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric { // !!!Private - removed use cases // private void movefluidinWorld(boolean out) { - // if(out) { - // if(this.inputTank.getFluidAmount() < 1000 && this.outputTank.getFluidAmount() < 1000) { - // this.inputTank.setFluid(null); - // this.outputTank.setFluid(null); - // } else { - // for(int coolantFluid = 1; coolantFluid < 4; ++coolantFluid) { - // for(int coolantBlock = 1; coolantBlock < 4; ++coolantBlock) { - // for(int hotCoolantFluid = 1; hotCoolantFluid < 4; ++hotCoolantFluid) { - // if(this.surroundings[coolantBlock][coolantFluid][hotCoolantFluid] instanceof BlockAir) { - // if(this.inputTank.getFluidAmount() >= 1000) { - // this.worldObj.setBlock(coolantBlock + this.xCoord - 2, coolantFluid + this.yCoord + // if(out) { + // if(this.inputTank.getFluidAmount() < 1000 && this.outputTank.getFluidAmount() < 1000) { + // this.inputTank.setFluid(null); + // this.outputTank.setFluid(null); + // } else { + // for(int coolantFluid = 1; coolantFluid < 4; ++coolantFluid) { + // for(int coolantBlock = 1; coolantBlock < 4; ++coolantBlock) { + // for(int hotCoolantFluid = 1; hotCoolantFluid < 4; ++hotCoolantFluid) { + // if(this.surroundings[coolantBlock][coolantFluid][hotCoolantFluid] instanceof BlockAir) { + // if(this.inputTank.getFluidAmount() >= 1000) { + // this.worldObj.setBlock(coolantBlock + this.xCoord - 2, coolantFluid + this.yCoord // - 2, hotCoolantFluid + this.zCoord - 2, this.inputTank.getFluid().getFluid().getBlock()); - // this.inputTank.drain(1000, true); - // } else if(this.outputTank.getFluidAmount() >= 1000) { - // this.worldObj.setBlock(coolantBlock + this.xCoord - 2, coolantFluid + this.yCoord + // this.inputTank.drain(1000, true); + // } else if(this.outputTank.getFluidAmount() >= 1000) { + // this.worldObj.setBlock(coolantBlock + this.xCoord - 2, coolantFluid + this.yCoord // - 2, hotCoolantFluid + this.zCoord - 2, this.outputTank.getFluid().getFluid().getBlock()); - // this.outputTank.drain(1000, true); - // } - // } - // } - // } - // } - // - // if(this.inputTank.getFluidAmount() < 1000) { - // this.inputTank.setFluid(null); - // } - // - // if(this.outputTank.getFluidAmount() < 1000) { - // this.outputTank.setFluid(null); - // } - // } - // } else { - // Fluid var9 = BlocksItems.getFluid(InternalName.fluidCoolant); - // Block var10 = BlocksItems.getFluidBlock(InternalName.fluidCoolant); - // Fluid var11 = BlocksItems.getFluid(InternalName.fluidHotCoolant); - // Block hotCoolantBlock = BlocksItems.getFluidBlock(InternalName.fluidHotCoolant); - // - // for(int yoffset = 1; yoffset < 4; ++yoffset) { - // for(int xoffset = 1; xoffset < 4; ++xoffset) { - // for(int zoffset = 1; zoffset < 4; ++zoffset) { - // if(this.surroundings[xoffset][yoffset][zoffset] == var10) { - // this.worldObj.setBlock(xoffset + this.xCoord - 2, yoffset + this.yCoord - 2, zoffset + + // this.outputTank.drain(1000, true); + // } + // } + // } + // } + // } + // + // if(this.inputTank.getFluidAmount() < 1000) { + // this.inputTank.setFluid(null); + // } + // + // if(this.outputTank.getFluidAmount() < 1000) { + // this.outputTank.setFluid(null); + // } + // } + // } else { + // Fluid var9 = BlocksItems.getFluid(InternalName.fluidCoolant); + // Block var10 = BlocksItems.getFluidBlock(InternalName.fluidCoolant); + // Fluid var11 = BlocksItems.getFluid(InternalName.fluidHotCoolant); + // Block hotCoolantBlock = BlocksItems.getFluidBlock(InternalName.fluidHotCoolant); + // + // for(int yoffset = 1; yoffset < 4; ++yoffset) { + // for(int xoffset = 1; xoffset < 4; ++xoffset) { + // for(int zoffset = 1; zoffset < 4; ++zoffset) { + // if(this.surroundings[xoffset][yoffset][zoffset] == var10) { + // this.worldObj.setBlock(xoffset + this.xCoord - 2, yoffset + this.yCoord - 2, zoffset + // this.zCoord - 2, Blocks.air); - // this.inputTank.fill(new FluidStack(var9, 1000), true); - // } else if(this.surroundings[xoffset][yoffset][zoffset] == hotCoolantBlock) { - // this.worldObj.setBlock(xoffset + this.xCoord - 2, yoffset + this.yCoord - 2, zoffset + + // this.inputTank.fill(new FluidStack(var9, 1000), true); + // } else if(this.surroundings[xoffset][yoffset][zoffset] == hotCoolantBlock) { + // this.worldObj.setBlock(xoffset + this.xCoord - 2, yoffset + this.yCoord - 2, zoffset + // this.zCoord - 2, Blocks.air); - // this.outputTank.fill(new FluidStack(var11, 1000), true); - // } - // } - // } - // } - // } + // this.outputTank.fill(new FluidStack(var11, 1000), true); + // } + // } + // } + // } + // } // // } // !!!! PRIVATE - removed use cases // private boolean readyforpressurizedreactor() { - // Block coolantBlock = BlocksItems.getFluidBlock(InternalName.fluidCoolant); - // Block hotCoolantBlock = BlocksItems.getFluidBlock(InternalName.fluidHotCoolant); - // - // int xoffset; - // int yoffset; - // int zoffset; - // for(xoffset = -2; xoffset < 3; ++xoffset) { - // for(yoffset = -2; yoffset < 3; ++yoffset) { - // for(zoffset = -2; zoffset < 3; ++zoffset) { - // if(this.worldObj.isAirBlock(xoffset + this.xCoord, yoffset + this.yCoord, zoffset + this.zCoord)) + // Block coolantBlock = BlocksItems.getFluidBlock(InternalName.fluidCoolant); + // Block hotCoolantBlock = BlocksItems.getFluidBlock(InternalName.fluidHotCoolant); + // + // int xoffset; + // int yoffset; + // int zoffset; + // for(xoffset = -2; xoffset < 3; ++xoffset) { + // for(yoffset = -2; yoffset < 3; ++yoffset) { + // for(zoffset = -2; zoffset < 3; ++zoffset) { + // if(this.worldObj.isAirBlock(xoffset + this.xCoord, yoffset + this.yCoord, zoffset + this.zCoord)) // { - // this.surroundings[xoffset + 2][yoffset + 2][zoffset + 2] = Blocks.air; - // } else { - // Block block = this.worldObj.getBlock(xoffset + this.xCoord, yoffset + this.yCoord, zoffset + + // this.surroundings[xoffset + 2][yoffset + 2][zoffset + 2] = Blocks.air; + // } else { + // Block block = this.worldObj.getBlock(xoffset + this.xCoord, yoffset + this.yCoord, zoffset + // this.zCoord); - // if((block == coolantBlock || block == hotCoolantBlock) && + // if((block == coolantBlock || block == hotCoolantBlock) && // this.worldObj.getBlockMetadata(xoffset + this.xCoord, yoffset + this.yCoord, zoffset + this.zCoord) != 0) { - // this.surroundings[xoffset + 2][yoffset + 2][zoffset + 2] = Blocks.air; - // } else { - // this.surroundings[xoffset + 2][yoffset + 2][zoffset + 2] = block; - // } - // } - // } - // } - // } - // - // for(xoffset = 1; xoffset < 4; ++xoffset) { - // for(yoffset = 1; yoffset < 4; ++yoffset) { - // for(zoffset = 1; zoffset < 4; ++zoffset) { - // if(!(this.surroundings[xoffset][yoffset][zoffset] instanceof BlockGenerator) && + // this.surroundings[xoffset + 2][yoffset + 2][zoffset + 2] = Blocks.air; + // } else { + // this.surroundings[xoffset + 2][yoffset + 2][zoffset + 2] = block; + // } + // } + // } + // } + // } + // + // for(xoffset = 1; xoffset < 4; ++xoffset) { + // for(yoffset = 1; yoffset < 4; ++yoffset) { + // for(zoffset = 1; zoffset < 4; ++zoffset) { + // if(!(this.surroundings[xoffset][yoffset][zoffset] instanceof BlockGenerator) && // !(this.surroundings[xoffset][yoffset][zoffset] instanceof BlockReactorChamber) && // this.surroundings[xoffset][yoffset][zoffset] != coolantBlock && this.surroundings[xoffset][yoffset][zoffset] != // hotCoolantBlock && !(this.surroundings[xoffset][yoffset][zoffset] instanceof BlockAir)) { - // return false; - // } - // } - // } - // } - // - // for(xoffset = 0; xoffset < 5; ++xoffset) { - // for(yoffset = 0; yoffset < 5; ++yoffset) { - // if(!(this.surroundings[xoffset][4][yoffset] instanceof BlockReactorVessel) && + // return false; + // } + // } + // } + // } + // + // for(xoffset = 0; xoffset < 5; ++xoffset) { + // for(yoffset = 0; yoffset < 5; ++yoffset) { + // if(!(this.surroundings[xoffset][4][yoffset] instanceof BlockReactorVessel) && // !(this.surroundings[xoffset][4][yoffset] instanceof BlockReactorAccessHatch) && // !(this.surroundings[xoffset][4][yoffset] instanceof BlockReactorRedstonePort) && // !(this.surroundings[xoffset][4][yoffset] instanceof BlockReactorFluidPort)) { - // return false; - // } + // return false; + // } // - // if(!(this.surroundings[xoffset][0][yoffset] instanceof BlockReactorVessel) && + // if(!(this.surroundings[xoffset][0][yoffset] instanceof BlockReactorVessel) && // !(this.surroundings[xoffset][0][yoffset] instanceof BlockReactorAccessHatch) && // !(this.surroundings[xoffset][0][yoffset] instanceof BlockReactorRedstonePort) && // !(this.surroundings[xoffset][0][yoffset] instanceof BlockReactorFluidPort)) { - // return false; - // } + // return false; + // } // - // if(!(this.surroundings[0][xoffset][yoffset] instanceof BlockReactorVessel) && + // if(!(this.surroundings[0][xoffset][yoffset] instanceof BlockReactorVessel) && // !(this.surroundings[0][xoffset][yoffset] instanceof BlockReactorAccessHatch) && // !(this.surroundings[0][xoffset][yoffset] instanceof BlockReactorRedstonePort) && // !(this.surroundings[0][xoffset][yoffset] instanceof BlockReactorFluidPort)) { - // return false; - // } + // return false; + // } // - // if(!(this.surroundings[4][xoffset][yoffset] instanceof BlockReactorVessel) && + // if(!(this.surroundings[4][xoffset][yoffset] instanceof BlockReactorVessel) && // !(this.surroundings[4][xoffset][yoffset] instanceof BlockReactorAccessHatch) && // !(this.surroundings[4][xoffset][yoffset] instanceof BlockReactorRedstonePort) && // !(this.surroundings[4][xoffset][yoffset] instanceof BlockReactorFluidPort)) { - // return false; - // } + // return false; + // } // - // if(!(this.surroundings[yoffset][xoffset][0] instanceof BlockReactorVessel) && + // if(!(this.surroundings[yoffset][xoffset][0] instanceof BlockReactorVessel) && // !(this.surroundings[yoffset][xoffset][0] instanceof BlockReactorAccessHatch) && // !(this.surroundings[yoffset][xoffset][0] instanceof BlockReactorRedstonePort) && // !(this.surroundings[yoffset][xoffset][0] instanceof BlockReactorFluidPort)) { - // return false; - // } + // return false; + // } // - // if(!(this.surroundings[yoffset][xoffset][4] instanceof BlockReactorVessel) && + // if(!(this.surroundings[yoffset][xoffset][4] instanceof BlockReactorVessel) && // !(this.surroundings[yoffset][xoffset][4] instanceof BlockReactorAccessHatch) && // !(this.surroundings[yoffset][xoffset][4] instanceof BlockReactorRedstonePort) && // !(this.surroundings[yoffset][xoffset][4] instanceof BlockReactorFluidPort)) { - // return false; - // } - // } - // } + // return false; + // } + // } + // } // - // return true; + // return true; // } // public int gaugeLiquidScaled(int i, int tank) { - // switch(tank) { - // case 0: - // if(this.inputTank.getFluidAmount() <= 0) { - // return 0; - // } + // switch(tank) { + // case 0: + // if(this.inputTank.getFluidAmount() <= 0) { + // return 0; + // } // - // return this.inputTank.getFluidAmount() * i / this.inputTank.getCapacity(); - // case 1: - // if(this.outputTank.getFluidAmount() <= 0) { - // return 0; - // } + // return this.inputTank.getFluidAmount() * i / this.inputTank.getCapacity(); + // case 1: + // if(this.outputTank.getFluidAmount() <= 0) { + // return 0; + // } // - // return this.outputTank.getFluidAmount() * i / this.outputTank.getCapacity(); - // default: - // return 0; - // } + // return this.outputTank.getFluidAmount() * i / this.outputTank.getCapacity(); + // default: + // return 0; + // } // } // public FluidTank getinputtank() { - // return this.inputTank; + // return this.inputTank; // } // public FluidTank getoutputtank() { - // return this.outputTank; + // return this.outputTank; // } // public FluidTankInfo[] getTankInfo(ForgeDirection from) { - // return new FluidTankInfo[]{this.inputTank.getInfo(), this.outputTank.getInfo()}; + // return new FluidTankInfo[]{this.inputTank.getInfo(), this.outputTank.getInfo()}; // } @Override diff --git a/src/main/java/com/github/technus/tectech/util/CommonValues.java b/src/main/java/com/github/technus/tectech/util/CommonValues.java index 9b3bfebc6b..44f755d6b3 100644 --- a/src/main/java/com/github/technus/tectech/util/CommonValues.java +++ b/src/main/java/com/github/technus/tectech/util/CommonValues.java @@ -1,13 +1,15 @@ package com.github.technus.tectech.util; -import gregtech.api.enums.GT_Values; import net.minecraft.util.EnumChatFormatting; +import gregtech.api.enums.GT_Values; + /** * Created by danie_000 on 11.01.2017. */ @SuppressWarnings("SpellCheckingInspection") public final class CommonValues { + public static final String TEC_MARK_SHORT = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech"; public static final String TEC_MARK_GENERAL = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Interdimensional"; public static final String TEC_MARK_EM = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Elemental Matter"; @@ -25,23 +27,13 @@ public final class CommonValues { public static final byte DISPERSE_AT = 14; // overflow hatches perform disperse public static final byte TRANSFER_AT = 16; - public static final long[] AatV = new long[] { - 268435455, 67108863, 16777215, 4194303, 1048575, 262143, 65535, 16383, 4095, 1023, 255, 63, 15, 3, 1, 1 - }; + public static final long[] AatV = new long[] { 268435455, 67108863, 16777215, 4194303, 1048575, 262143, 65535, + 16383, 4095, 1023, 255, 63, 15, 3, 1, 1 }; public static final String[] VN = GT_Values.VN; public static final long[] V = GT_Values.V; - public static final String[] EOH_TIER_FANCY_NAMES = { - "Crude", - "Primitive", - "Stable", - "Advanced", - "Superb", - "Exotic", - "Perfect", - "Tipler", - EnumChatFormatting.BOLD + "Gallifreyan" - }; + public static final String[] EOH_TIER_FANCY_NAMES = { "Crude", "Primitive", "Stable", "Advanced", "Superb", + "Exotic", "Perfect", "Tipler", EnumChatFormatting.BOLD + "Gallifreyan" }; private CommonValues() {} } 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 c34206b13d..6d3661e148 100644 --- a/src/main/java/com/github/technus/tectech/util/Converter.java +++ b/src/main/java/com/github/technus/tectech/util/Converter.java @@ -3,6 +3,7 @@ package com.github.technus.tectech.util; import java.io.*; public final class Converter { + private Converter() {} public static void writeInts(int[] array, ByteArrayOutputStream byteArrayOutputStream) { diff --git a/src/main/java/com/github/technus/tectech/util/DoubleCount.java b/src/main/java/com/github/technus/tectech/util/DoubleCount.java index 629062c3b9..25fa086d76 100644 --- a/src/main/java/com/github/technus/tectech/util/DoubleCount.java +++ b/src/main/java/com/github/technus/tectech/util/DoubleCount.java @@ -6,6 +6,7 @@ import static java.lang.Math.ulp; import java.util.Arrays; public class DoubleCount { + /** * Distributes count across probabilities * @@ -55,7 +56,7 @@ public class DoubleCount { return output; } case 1: - return new double[] {count}; + return new double[] { count }; case 0: return probabilities; // empty array at hand... } diff --git a/src/main/java/com/github/technus/tectech/util/LightingHelper.java b/src/main/java/com/github/technus/tectech/util/LightingHelper.java index 15a0ab1e51..a3ac23d73e 100644 --- a/src/main/java/com/github/technus/tectech/util/LightingHelper.java +++ b/src/main/java/com/github/technus/tectech/util/LightingHelper.java @@ -1,40 +1,33 @@ /* - * LightingHelper - Derived and adapted from @Mineshopper / carpentersblocks - * Copyright (c) 2013-2021. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * LightingHelper - Derived and adapted from @Mineshopper / carpentersblocks Copyright (c) 2013-2021. This library is + * free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation version 2.1 of the License. This library is distributed in the hope that it + * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of + * the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ package com.github.technus.tectech.util; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + // This is duplicated in newer GT5u on the GTNH Branch inside the gregtech.api.util package // But I include it here as the easiest way to implement backwards compat with non-NH stuff // Yes, it could be done in a cleaner way. If you would like to, you're welcome to make your own PR and @basdxz @SuppressWarnings("unused") @SideOnly(Side.CLIENT) public class LightingHelper { + public static final int NORMAL_BRIGHTNESS = 0xff00ff; public static final int MAX_BRIGHTNESS = 0xf000f0; - protected static final float[] LIGHTNESS = {0.5F, 1.0F, 0.8F, 0.8F, 0.6F, 0.6F}; + protected static final float[] LIGHTNESS = { 0.5F, 1.0F, 0.8F, 0.8F, 0.6F, 0.6F }; private final RenderBlocks renderBlocks; /** * Brightness for side. @@ -92,7 +85,7 @@ public class LightingHelper { float green = color[1] / 255.0F; float blue = color[2] / 255.0F; - return new float[] {red, green, blue}; + return new float[] { red, green, blue }; } /** @@ -195,8 +188,7 @@ public class LightingHelper { } /** - * Sets up the color using lightness, brightness, and the primary color - * value (usually the dye color) for the side. + * Sets up the color using lightness, brightness, and the primary color value (usually the dye color) for the side. * * @param side the side * @param rgba the primary short[] RGBA color array @@ -206,8 +198,7 @@ public class LightingHelper { } /** - * Sets up the color using lightness, brightness, and the primary color - * value (usually the dye color) for the side. + * Sets up the color using lightness, brightness, and the primary color value (usually the dye color) for the side. * * @param side the side * @param hexColor the primary color @@ -228,21 +219,18 @@ public class LightingHelper { if (renderBlocks.hasOverrideBlockTexture()) { - renderBlocks.colorRedTopLeft = renderBlocks.colorRedBottomLeft = - renderBlocks.colorRedBottomRight = renderBlocks.colorRedTopRight = rgb[0]; - renderBlocks.colorGreenTopLeft = renderBlocks.colorGreenBottomLeft = - renderBlocks.colorGreenBottomRight = renderBlocks.colorGreenTopRight = rgb[1]; - renderBlocks.colorBlueTopLeft = renderBlocks.colorBlueBottomLeft = - renderBlocks.colorBlueBottomRight = renderBlocks.colorBlueTopRight = rgb[2]; + renderBlocks.colorRedTopLeft = renderBlocks.colorRedBottomLeft = renderBlocks.colorRedBottomRight = renderBlocks.colorRedTopRight = rgb[0]; + renderBlocks.colorGreenTopLeft = renderBlocks.colorGreenBottomLeft = renderBlocks.colorGreenBottomRight = renderBlocks.colorGreenTopRight = rgb[1]; + renderBlocks.colorBlueTopLeft = renderBlocks.colorBlueBottomLeft = renderBlocks.colorBlueBottomRight = renderBlocks.colorBlueTopRight = rgb[2]; } else { - renderBlocks.colorRedTopLeft = renderBlocks.colorRedBottomLeft = - renderBlocks.colorRedBottomRight = renderBlocks.colorRedTopRight = rgb[0] * lightness; - renderBlocks.colorGreenTopLeft = renderBlocks.colorGreenBottomLeft = - renderBlocks.colorGreenBottomRight = renderBlocks.colorGreenTopRight = rgb[1] * lightness; - renderBlocks.colorBlueTopLeft = renderBlocks.colorBlueBottomLeft = - renderBlocks.colorBlueBottomRight = renderBlocks.colorBlueTopRight = rgb[2] * lightness; + renderBlocks.colorRedTopLeft = renderBlocks.colorRedBottomLeft = renderBlocks.colorRedBottomRight = renderBlocks.colorRedTopRight = rgb[0] + * lightness; + renderBlocks.colorGreenTopLeft = renderBlocks.colorGreenBottomLeft = renderBlocks.colorGreenBottomRight = renderBlocks.colorGreenTopRight = rgb[1] + * lightness; + renderBlocks.colorBlueTopLeft = renderBlocks.colorBlueBottomLeft = renderBlocks.colorBlueBottomRight = renderBlocks.colorBlueTopRight = rgb[2] + * lightness; renderBlocks.colorRedTopLeft *= aoTopLeft; renderBlocks.colorGreenTopLeft *= aoTopLeft; @@ -275,14 +263,13 @@ public class LightingHelper { float green = (color >> 8 & 0xff) / 255.0F; float blue = (color & 0xff) / 255.0F; - return new float[] {red, green, blue}; + return new float[] { red, green, blue }; } /** * Will apply anaglyph color multipliers to RGB float array. * <p> - * If {@link EntityRenderer#anaglyphEnable} is false, - * will do nothing. + * If {@link EntityRenderer#anaglyphEnable} is false, will do nothing. * * @param rgb array containing red, green and blue float values */ @@ -295,8 +282,7 @@ public class LightingHelper { } /** - * Gets mixed ambient occlusion value from two inputs, with a - * ratio applied to the final result. + * Gets mixed ambient occlusion value from two inputs, with a ratio applied to the final result. * * @param ao1 the first ambient occlusion value * @param ao2 the second ambient occlusion value @@ -312,12 +298,11 @@ public class LightingHelper { /** * Sets up lighting for the West face and returns the {@link LightingHelper}. * <p> - * This is a consolidated <code>method</code> that sets side shading - * with respect to the following attributes: + * This is a consolidated <code>method</code> that sets side shading with respect to the following attributes: * <p> * <ul> - * <li>{@link RenderBlocks#enableAO}</li> - * <li>{@link RenderBlocks#partialRenderBounds}</li> + * <li>{@link RenderBlocks#enableAO}</li> + * <li>{@link RenderBlocks#partialRenderBounds}</li> * </ul> * * @param block the block {@link Block} @@ -338,22 +323,22 @@ public class LightingHelper { float ratio = (float) (1.0F - renderBlocks.renderMinX); float aoLightValue = renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); - renderBlocks.aoBrightnessXYNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z); - renderBlocks.aoBrightnessXZNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z - 1); - renderBlocks.aoBrightnessXZNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z + 1); - renderBlocks.aoBrightnessXYNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z); - renderBlocks.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z - 1); - renderBlocks.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z + 1); - renderBlocks.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z - 1); - renderBlocks.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z + 1); + renderBlocks.aoBrightnessXYNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z); + renderBlocks.aoBrightnessXZNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z - 1); + renderBlocks.aoBrightnessXZNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z + 1); + renderBlocks.aoBrightnessXYNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z); + renderBlocks.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z - 1); + renderBlocks.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z + 1); + renderBlocks.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z - 1); + renderBlocks.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z + 1); renderBlocks.aoLightValueScratchXYNN = getMixedAo( renderBlocks.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(), renderBlocks.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(), @@ -408,26 +393,18 @@ public class LightingHelper { renderBlocks.aoBrightnessXYZNPP, mixedBrightness); - float aoMixedXYZNPN = (renderBlocks.aoLightValueScratchXZNN - + aoLightValue - + renderBlocks.aoLightValueScratchXYZNPN - + renderBlocks.aoLightValueScratchXYNP) - / 4.0F; - float aoMixedXYZNNN = (renderBlocks.aoLightValueScratchXYZNNN - + renderBlocks.aoLightValueScratchXYNN - + renderBlocks.aoLightValueScratchXZNN - + aoLightValue) - / 4.0F; - float aoMixedXYZNNP = (renderBlocks.aoLightValueScratchXYNN - + renderBlocks.aoLightValueScratchXYZNNP - + aoLightValue - + renderBlocks.aoLightValueScratchXZNP) - / 4.0F; - float aoMixedXYZNPP = (aoLightValue - + renderBlocks.aoLightValueScratchXZNP - + renderBlocks.aoLightValueScratchXYNP - + renderBlocks.aoLightValueScratchXYZNPP) - / 4.0F; + float aoMixedXYZNPN = (renderBlocks.aoLightValueScratchXZNN + aoLightValue + + renderBlocks.aoLightValueScratchXYZNPN + + renderBlocks.aoLightValueScratchXYNP) / 4.0F; + float aoMixedXYZNNN = (renderBlocks.aoLightValueScratchXYZNNN + renderBlocks.aoLightValueScratchXYNN + + renderBlocks.aoLightValueScratchXZNN + + aoLightValue) / 4.0F; + float aoMixedXYZNNP = (renderBlocks.aoLightValueScratchXYNN + renderBlocks.aoLightValueScratchXYZNNP + + aoLightValue + + renderBlocks.aoLightValueScratchXZNP) / 4.0F; + float aoMixedXYZNPP = (aoLightValue + renderBlocks.aoLightValueScratchXZNP + + renderBlocks.aoLightValueScratchXYNP + + renderBlocks.aoLightValueScratchXYZNPP) / 4.0F; aoTopLeft = (float) (aoMixedXYZNPP * renderBlocks.renderMaxY * renderBlocks.renderMaxZ + aoMixedXYZNPN * renderBlocks.renderMaxY * (1.0D - renderBlocks.renderMaxZ) @@ -490,12 +467,11 @@ public class LightingHelper { /** * Sets up lighting for the East face and returns the {@link LightingHelper}. * <p> - * This is a consolidated <code>method</code> that sets side shading - * with respect to the following attributes: + * This is a consolidated <code>method</code> that sets side shading with respect to the following attributes: * <p> * <ul> - * <li>{@link RenderBlocks#enableAO}</li> - * <li>{@link RenderBlocks#partialRenderBounds}</li> + * <li>{@link RenderBlocks#enableAO}</li> + * <li>{@link RenderBlocks#partialRenderBounds}</li> * </ul> * * @param block the block {@link Block} @@ -515,22 +491,22 @@ public class LightingHelper { float aoLightValue = renderBlocks.blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(); - renderBlocks.aoBrightnessXYPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z); - renderBlocks.aoBrightnessXZPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z - 1); - renderBlocks.aoBrightnessXZPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z + 1); - renderBlocks.aoBrightnessXYPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z); - renderBlocks.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z - 1); - renderBlocks.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z + 1); - renderBlocks.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z - 1); - renderBlocks.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z + 1); + renderBlocks.aoBrightnessXYPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z); + renderBlocks.aoBrightnessXZPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z - 1); + renderBlocks.aoBrightnessXZPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z + 1); + renderBlocks.aoBrightnessXYPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z); + renderBlocks.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z - 1); + renderBlocks.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z + 1); + renderBlocks.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z - 1); + renderBlocks.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z + 1); renderBlocks.aoLightValueScratchXYPN = getMixedAo( renderBlocks.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(), renderBlocks.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(), @@ -585,26 +561,18 @@ public class LightingHelper { renderBlocks.aoBrightnessXYPP, mixedBrightness); - float aoMixedXYZPPP = (aoLightValue - + renderBlocks.aoLightValueScratchXZPP - + renderBlocks.aoLightValueScratchXYPP - + renderBlocks.aoLightValueScratchXYZPPP) - / 4.0F; - float aoMixedXYZPNP = (renderBlocks.aoLightValueScratchXYPN - + renderBlocks.aoLightValueScratchXYZPNP - + aoLightValue - + renderBlocks.aoLightValueScratchXZPP) - / 4.0F; - float aoMixedXYZPNN = (renderBlocks.aoLightValueScratchXYZPNN - + renderBlocks.aoLightValueScratchXYPN - + renderBlocks.aoLightValueScratchXZPN - + aoLightValue) - / 4.0F; - float aoMixedXYZPPN = (renderBlocks.aoLightValueScratchXZPN - + aoLightValue - + renderBlocks.aoLightValueScratchXYZPPN - + renderBlocks.aoLightValueScratchXYPP) - / 4.0F; + float aoMixedXYZPPP = (aoLightValue + renderBlocks.aoLightValueScratchXZPP + + renderBlocks.aoLightValueScratchXYPP + + renderBlocks.aoLightValueScratchXYZPPP) / 4.0F; + float aoMixedXYZPNP = (renderBlocks.aoLightValueScratchXYPN + renderBlocks.aoLightValueScratchXYZPNP + + aoLightValue + + renderBlocks.aoLightValueScratchXZPP) / 4.0F; + float aoMixedXYZPNN = (renderBlocks.aoLightValueScratchXYZPNN + renderBlocks.aoLightValueScratchXYPN + + renderBlocks.aoLightValueScratchXZPN + + aoLightValue) / 4.0F; + float aoMixedXYZPPN = (renderBlocks.aoLightValueScratchXZPN + aoLightValue + + renderBlocks.aoLightValueScratchXYZPPN + + renderBlocks.aoLightValueScratchXYPP) / 4.0F; aoTopLeft = (float) (aoMixedXYZPNP * (1.0D - renderBlocks.renderMinY) * renderBlocks.renderMaxZ + aoMixedXYZPNN * (1.0D - renderBlocks.renderMinY) * (1.0D - renderBlocks.renderMaxZ) @@ -667,12 +635,11 @@ public class LightingHelper { /** * Sets up lighting for the bottom face and returns the {@link LightingHelper}. * <p> - * This is a consolidated <code>method</code> that sets side shading - * with respect to the following attributes: + * This is a consolidated <code>method</code> that sets side shading with respect to the following attributes: * <p> * <ul> - * <li>{@link RenderBlocks#enableAO}</li> - * <li>{@link RenderBlocks#partialRenderBounds}</li> + * <li>{@link RenderBlocks#enableAO}</li> + * <li>{@link RenderBlocks#partialRenderBounds}</li> * </ul> * * @param block the block {@link Block} @@ -693,22 +660,22 @@ public class LightingHelper { float ratio = (float) (1.0F - renderBlocks.renderMinY); float aoLightValue = renderBlocks.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); - renderBlocks.aoBrightnessXYNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z); - renderBlocks.aoBrightnessYZNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z - 1); - renderBlocks.aoBrightnessYZNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z + 1); - renderBlocks.aoBrightnessXYPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z); - renderBlocks.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z - 1); - renderBlocks.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z + 1); - renderBlocks.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z - 1); - renderBlocks.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z + 1); + renderBlocks.aoBrightnessXYNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z); + renderBlocks.aoBrightnessYZNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z - 1); + renderBlocks.aoBrightnessYZNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z + 1); + renderBlocks.aoBrightnessXYPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z); + renderBlocks.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z - 1); + renderBlocks.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z + 1); + renderBlocks.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z - 1); + renderBlocks.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z + 1); renderBlocks.aoLightValueScratchXYNN = getMixedAo( renderBlocks.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(), renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(), @@ -763,26 +730,18 @@ public class LightingHelper { renderBlocks.aoBrightnessYZNP, mixedBrightness); - float aoMixedXYZPNP = (renderBlocks.aoLightValueScratchYZNP - + aoLightValue - + renderBlocks.aoLightValueScratchXYZPNP - + renderBlocks.aoLightValueScratchXYPN) - / 4.0F; - float aoMixedXYZPNN = (aoLightValue - + renderBlocks.aoLightValueScratchYZNN - + renderBlocks.aoLightValueScratchXYPN - + renderBlocks.aoLightValueScratchXYZPNN) - / 4.0F; - float aoMixedXYZNNN = (renderBlocks.aoLightValueScratchXYNN - + renderBlocks.aoLightValueScratchXYZNNN - + aoLightValue - + renderBlocks.aoLightValueScratchYZNN) - / 4.0F; - float aoMixedXYZNNP = (renderBlocks.aoLightValueScratchXYZNNP - + renderBlocks.aoLightValueScratchXYNN - + renderBlocks.aoLightValueScratchYZNP - + aoLightValue) - / 4.0F; + float aoMixedXYZPNP = (renderBlocks.aoLightValueScratchYZNP + aoLightValue + + renderBlocks.aoLightValueScratchXYZPNP + + renderBlocks.aoLightValueScratchXYPN) / 4.0F; + float aoMixedXYZPNN = (aoLightValue + renderBlocks.aoLightValueScratchYZNN + + renderBlocks.aoLightValueScratchXYPN + + renderBlocks.aoLightValueScratchXYZPNN) / 4.0F; + float aoMixedXYZNNN = (renderBlocks.aoLightValueScratchXYNN + renderBlocks.aoLightValueScratchXYZNNN + + aoLightValue + + renderBlocks.aoLightValueScratchYZNN) / 4.0F; + float aoMixedXYZNNP = (renderBlocks.aoLightValueScratchXYZNNP + renderBlocks.aoLightValueScratchXYNN + + renderBlocks.aoLightValueScratchYZNP + + aoLightValue) / 4.0F; aoTopLeft = (float) (aoMixedXYZNNP * renderBlocks.renderMaxZ * (1.0D - renderBlocks.renderMinX) + aoMixedXYZPNP * renderBlocks.renderMaxZ * renderBlocks.renderMinX @@ -845,12 +804,11 @@ public class LightingHelper { /** * Sets up lighting for the top face and returns the {@link LightingHelper}. * <p> - * This is a consolidated <code>method</code> that sets side shading - * with respect to the following attributes: + * This is a consolidated <code>method</code> that sets side shading with respect to the following attributes: * <p> * <ul> - * <li>{@link RenderBlocks#enableAO}</li> - * <li>{@link RenderBlocks#partialRenderBounds}</li> + * <li>{@link RenderBlocks#enableAO}</li> + * <li>{@link RenderBlocks#partialRenderBounds}</li> * </ul> * * @param block the block {@link Block} @@ -870,22 +828,22 @@ public class LightingHelper { float aoLightValue = renderBlocks.blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(); - renderBlocks.aoBrightnessXYNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z); - renderBlocks.aoBrightnessXYPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z); - renderBlocks.aoBrightnessYZPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z - 1); - renderBlocks.aoBrightnessYZPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z + 1); - renderBlocks.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z - 1); - renderBlocks.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z - 1); - renderBlocks.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z + 1); - renderBlocks.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z + 1); + renderBlocks.aoBrightnessXYNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z); + renderBlocks.aoBrightnessXYPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z); + renderBlocks.aoBrightnessYZPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z - 1); + renderBlocks.aoBrightnessYZPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z + 1); + renderBlocks.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z - 1); + renderBlocks.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z - 1); + renderBlocks.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z + 1); + renderBlocks.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z + 1); renderBlocks.aoLightValueScratchXYNP = getMixedAo( renderBlocks.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(), renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(), @@ -940,40 +898,32 @@ public class LightingHelper { renderBlocks.aoBrightnessYZPP, mixedBrightness); - float aoMixedXYZPPP = (renderBlocks.aoLightValueScratchYZPP - + aoLightValue - + renderBlocks.aoLightValueScratchXYZPPP - + renderBlocks.aoLightValueScratchXYPP) - / 4.0F; - float aoMixedXYZPPN = (aoLightValue - + renderBlocks.aoLightValueScratchYZPN - + renderBlocks.aoLightValueScratchXYPP - + renderBlocks.aoLightValueScratchXYZPPN) - / 4.0F; - float aoMixedXYZNPN = (renderBlocks.aoLightValueScratchXYNP - + renderBlocks.aoLightValueScratchXYZNPN - + aoLightValue - + renderBlocks.aoLightValueScratchYZPN) - / 4.0F; - float aoMixedXYZNPP = (renderBlocks.aoLightValueScratchXYZNPP - + renderBlocks.aoLightValueScratchXYNP - + renderBlocks.aoLightValueScratchYZPP - + aoLightValue) - / 4.0F; - - aoTopLeft /*SE*/ = (float) (aoMixedXYZNPP * renderBlocks.renderMaxZ * (1.0D - renderBlocks.renderMaxX) + float aoMixedXYZPPP = (renderBlocks.aoLightValueScratchYZPP + aoLightValue + + renderBlocks.aoLightValueScratchXYZPPP + + renderBlocks.aoLightValueScratchXYPP) / 4.0F; + float aoMixedXYZPPN = (aoLightValue + renderBlocks.aoLightValueScratchYZPN + + renderBlocks.aoLightValueScratchXYPP + + renderBlocks.aoLightValueScratchXYZPPN) / 4.0F; + float aoMixedXYZNPN = (renderBlocks.aoLightValueScratchXYNP + renderBlocks.aoLightValueScratchXYZNPN + + aoLightValue + + renderBlocks.aoLightValueScratchYZPN) / 4.0F; + float aoMixedXYZNPP = (renderBlocks.aoLightValueScratchXYZNPP + renderBlocks.aoLightValueScratchXYNP + + renderBlocks.aoLightValueScratchYZPP + + aoLightValue) / 4.0F; + + aoTopLeft /* SE */ = (float) (aoMixedXYZNPP * renderBlocks.renderMaxZ * (1.0D - renderBlocks.renderMaxX) + aoMixedXYZPPP * renderBlocks.renderMaxZ * renderBlocks.renderMaxX + aoMixedXYZPPN * (1.0D - renderBlocks.renderMaxZ) * renderBlocks.renderMaxX + aoMixedXYZNPN * (1.0D - renderBlocks.renderMaxZ) * (1.0D - renderBlocks.renderMaxX)); - aoBottomLeft /*NE*/ = (float) (aoMixedXYZNPP * renderBlocks.renderMinZ * (1.0D - renderBlocks.renderMaxX) + aoBottomLeft /* NE */ = (float) (aoMixedXYZNPP * renderBlocks.renderMinZ * (1.0D - renderBlocks.renderMaxX) + aoMixedXYZPPP * renderBlocks.renderMinZ * renderBlocks.renderMaxX + aoMixedXYZPPN * (1.0D - renderBlocks.renderMinZ) * renderBlocks.renderMaxX + aoMixedXYZNPN * (1.0D - renderBlocks.renderMinZ) * (1.0D - renderBlocks.renderMaxX)); - aoBottomRight /*NW*/ = (float) (aoMixedXYZNPP * renderBlocks.renderMinZ * (1.0D - renderBlocks.renderMinX) + aoBottomRight /* NW */ = (float) (aoMixedXYZNPP * renderBlocks.renderMinZ * (1.0D - renderBlocks.renderMinX) + aoMixedXYZPPP * renderBlocks.renderMinZ * renderBlocks.renderMinX + aoMixedXYZPPN * (1.0D - renderBlocks.renderMinZ) * renderBlocks.renderMinX + aoMixedXYZNPN * (1.0D - renderBlocks.renderMinZ) * (1.0D - renderBlocks.renderMinX)); - aoTopRight /*SW*/ = (float) (aoMixedXYZNPP * renderBlocks.renderMaxZ * (1.0D - renderBlocks.renderMinX) + aoTopRight /* SW */ = (float) (aoMixedXYZNPP * renderBlocks.renderMaxZ * (1.0D - renderBlocks.renderMinX) + aoMixedXYZPPP * renderBlocks.renderMaxZ * renderBlocks.renderMinX + aoMixedXYZPPN * (1.0D - renderBlocks.renderMaxZ) * renderBlocks.renderMinX + aoMixedXYZNPN * (1.0D - renderBlocks.renderMaxZ) * (1.0D - renderBlocks.renderMinX)); @@ -1022,12 +972,11 @@ public class LightingHelper { /** * Sets up lighting for the North face and returns the {@link LightingHelper}. * <p> - * This is a consolidated <code>method</code> that sets side shading - * with respect to the following attributes: + * This is a consolidated <code>method</code> that sets side shading with respect to the following attributes: * <p> * <ul> - * <li>{@link RenderBlocks#enableAO}</li> - * <li>{@link RenderBlocks#partialRenderBounds}</li> + * <li>{@link RenderBlocks#enableAO}</li> + * <li>{@link RenderBlocks#partialRenderBounds}</li> * </ul> * * @param block the block {@link Block} @@ -1048,22 +997,22 @@ public class LightingHelper { float ratio = (float) (1.0F - renderBlocks.renderMinZ); float aoLightValue = renderBlocks.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); - renderBlocks.aoBrightnessXZNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y, zOffset); - renderBlocks.aoBrightnessYZNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y - 1, zOffset); - renderBlocks.aoBrightnessYZPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y + 1, zOffset); - renderBlocks.aoBrightnessXZPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y, zOffset); - renderBlocks.aoBrightnessXYZNNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y - 1, zOffset); - renderBlocks.aoBrightnessXYZNPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y + 1, zOffset); - renderBlocks.aoBrightnessXYZPNN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y - 1, zOffset); - renderBlocks.aoBrightnessXYZPPN = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y + 1, zOffset); + renderBlocks.aoBrightnessXZNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y, zOffset); + renderBlocks.aoBrightnessYZNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y - 1, zOffset); + renderBlocks.aoBrightnessYZPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y + 1, zOffset); + renderBlocks.aoBrightnessXZPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y, zOffset); + renderBlocks.aoBrightnessXYZNNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y - 1, zOffset); + renderBlocks.aoBrightnessXYZNPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y + 1, zOffset); + renderBlocks.aoBrightnessXYZPNN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y - 1, zOffset); + renderBlocks.aoBrightnessXYZPPN = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y + 1, zOffset); renderBlocks.aoLightValueScratchXZNN = getMixedAo( renderBlocks.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(), renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(), @@ -1118,26 +1067,18 @@ public class LightingHelper { renderBlocks.aoBrightnessYZPN, mixedBrightness); - float aoMixedXYZPPN = (aoLightValue - + renderBlocks.aoLightValueScratchYZPN - + renderBlocks.aoLightValueScratchXZPN - + renderBlocks.aoLightValueScratchXYZPPN) - / 4.0F; - float aoMixedXYZPNN = (renderBlocks.aoLightValueScratchYZNN - + aoLightValue - + renderBlocks.aoLightValueScratchXYZPNN - + renderBlocks.aoLightValueScratchXZPN) - / 4.0F; - float aoMixedXYZNNN = (renderBlocks.aoLightValueScratchXYZNNN - + renderBlocks.aoLightValueScratchXZNN - + renderBlocks.aoLightValueScratchYZNN - + aoLightValue) - / 4.0F; - float aoMixedXYZNPN = (renderBlocks.aoLightValueScratchXZNN - + renderBlocks.aoLightValueScratchXYZNPN - + aoLightValue - + renderBlocks.aoLightValueScratchYZPN) - / 4.0F; + float aoMixedXYZPPN = (aoLightValue + renderBlocks.aoLightValueScratchYZPN + + renderBlocks.aoLightValueScratchXZPN + + renderBlocks.aoLightValueScratchXYZPPN) / 4.0F; + float aoMixedXYZPNN = (renderBlocks.aoLightValueScratchYZNN + aoLightValue + + renderBlocks.aoLightValueScratchXYZPNN + + renderBlocks.aoLightValueScratchXZPN) / 4.0F; + float aoMixedXYZNNN = (renderBlocks.aoLightValueScratchXYZNNN + renderBlocks.aoLightValueScratchXZNN + + renderBlocks.aoLightValueScratchYZNN + + aoLightValue) / 4.0F; + float aoMixedXYZNPN = (renderBlocks.aoLightValueScratchXZNN + renderBlocks.aoLightValueScratchXYZNPN + + aoLightValue + + renderBlocks.aoLightValueScratchYZPN) / 4.0F; aoTopLeft = (float) (aoMixedXYZNPN * renderBlocks.renderMaxY * (1.0D - renderBlocks.renderMinX) + aoMixedXYZPPN * renderBlocks.renderMaxY * renderBlocks.renderMinX @@ -1200,12 +1141,11 @@ public class LightingHelper { /** * Sets up lighting for the South face and returns the {@link LightingHelper}. * <p> - * This is a consolidated <code>method</code> that sets side shading - * with respect to the following attributes: + * This is a consolidated <code>method</code> that sets side shading with respect to the following attributes: * <p> * <ul> - * <li>{@link RenderBlocks#enableAO}</li> - * <li>{@link RenderBlocks#partialRenderBounds}</li> + * <li>{@link RenderBlocks#enableAO}</li> + * <li>{@link RenderBlocks#partialRenderBounds}</li> * </ul> * * @param block the block {@link Block} @@ -1225,22 +1165,22 @@ public class LightingHelper { float aoLightValue = renderBlocks.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); - renderBlocks.aoBrightnessXZNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y, zOffset); - renderBlocks.aoBrightnessXZPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y, zOffset); - renderBlocks.aoBrightnessYZNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y - 1, zOffset); - renderBlocks.aoBrightnessYZPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y + 1, zOffset); - renderBlocks.aoBrightnessXYZNNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y - 1, zOffset); - renderBlocks.aoBrightnessXYZNPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y + 1, zOffset); - renderBlocks.aoBrightnessXYZPNP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y - 1, zOffset); - renderBlocks.aoBrightnessXYZPPP = - block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y + 1, zOffset); + renderBlocks.aoBrightnessXZNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y, zOffset); + renderBlocks.aoBrightnessXZPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y, zOffset); + renderBlocks.aoBrightnessYZNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y - 1, zOffset); + renderBlocks.aoBrightnessYZPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y + 1, zOffset); + renderBlocks.aoBrightnessXYZNNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y - 1, zOffset); + renderBlocks.aoBrightnessXYZNPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y + 1, zOffset); + renderBlocks.aoBrightnessXYZPNP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y - 1, zOffset); + renderBlocks.aoBrightnessXYZPPP = block + .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y + 1, zOffset); renderBlocks.aoLightValueScratchXZNP = getMixedAo( renderBlocks.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(), renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(), @@ -1295,26 +1235,18 @@ public class LightingHelper { renderBlocks.aoBrightnessXYZPPP, mixedBrightness); - float aoMixedXYZNPP = (renderBlocks.aoLightValueScratchXZNP - + renderBlocks.aoLightValueScratchXYZNPP - + aoLightValue - + renderBlocks.aoLightValueScratchYZPP) - / 4.0F; - float aoMixedXYZNNP = (renderBlocks.aoLightValueScratchXYZNNP - + renderBlocks.aoLightValueScratchXZNP - + renderBlocks.aoLightValueScratchYZNP - + aoLightValue) - / 4.0F; - float aoMixedXYZPNP = (renderBlocks.aoLightValueScratchYZNP - + aoLightValue - + renderBlocks.aoLightValueScratchXYZPNP - + renderBlocks.aoLightValueScratchXZPP) - / 4.0F; - float aoMixedXYZPPP = (aoLightValue - + renderBlocks.aoLightValueScratchYZPP - + renderBlocks.aoLightValueScratchXZPP - + renderBlocks.aoLightValueScratchXYZPPP) - / 4.0F; + float aoMixedXYZNPP = (renderBlocks.aoLightValueScratchXZNP + renderBlocks.aoLightValueScratchXYZNPP + + aoLightValue + + renderBlocks.aoLightValueScratchYZPP) / 4.0F; + float aoMixedXYZNNP = (renderBlocks.aoLightValueScratchXYZNNP + renderBlocks.aoLightValueScratchXZNP + + renderBlocks.aoLightValueScratchYZNP + + aoLightValue) / 4.0F; + float aoMixedXYZPNP = (renderBlocks.aoLightValueScratchYZNP + aoLightValue + + renderBlocks.aoLightValueScratchXYZPNP + + renderBlocks.aoLightValueScratchXZPP) / 4.0F; + float aoMixedXYZPPP = (aoLightValue + renderBlocks.aoLightValueScratchYZPP + + renderBlocks.aoLightValueScratchXZPP + + renderBlocks.aoLightValueScratchXYZPPP) / 4.0F; aoTopLeft = (float) (aoMixedXYZNPP * renderBlocks.renderMaxY * (1.0D - renderBlocks.renderMinX) + aoMixedXYZPPP * renderBlocks.renderMaxY * renderBlocks.renderMinX 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 41335bb31a..cd26bbdf70 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 @@ -1,13 +1,5 @@ package com.github.technus.tectech.util; -import com.github.technus.tectech.TecTech; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -16,6 +8,7 @@ import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.function.Function; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Container; @@ -32,12 +25,24 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.storage.IPlayerFileData; import net.minecraft.world.storage.SaveHandler; import net.minecraftforge.fluids.FluidStack; + import org.apache.commons.lang3.StringUtils; +import com.github.technus.tectech.TecTech; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.GregTech_API; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; + /** * Created by Tec on 21.03.2017. */ public final class TT_Utility { + private TT_Utility() {} private static final StringBuilder STRING_BUILDER = new StringBuilder(); @@ -46,7 +51,8 @@ public final class TT_Utility { private static Formatter getFormatter() { STRING_BUILDER.setLength(0); return FORMATTER_MAP.computeIfAbsent( - Locale.getDefault(Locale.Category.FORMAT), locale -> new Formatter(STRING_BUILDER, locale)); + Locale.getDefault(Locale.Category.FORMAT), + locale -> new Formatter(STRING_BUILDER, locale)); } public static String formatNumberShortExp(double value) { @@ -98,10 +104,8 @@ public final class TT_Utility { return Double.parseDouble(str); } - private static final String SUPER_SCRIPT = - "\u207D\u207E*\u207A,\u207B./\u2070\u00B9\u00B2\u00B3\u2074\u2075\u2076\u2077\u2078\u2079:;<\u207C"; - private static final String SUB_SCRIPT = - "\u208D\u208E*\u208A,\u208B./\u2080\u2081\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089:;<\u208C"; + private static final String SUPER_SCRIPT = "\u207D\u207E*\u207A,\u207B./\u2070\u00B9\u00B2\u00B3\u2074\u2075\u2076\u2077\u2078\u2079:;<\u207C"; + private static final String SUB_SCRIPT = "\u208D\u208E*\u208A,\u208B./\u2080\u2081\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089:;<\u208C"; public static String toSubscript(String s) { STRING_BUILDER.setLength(0); @@ -200,12 +204,8 @@ public final class TT_Utility { return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; } - public static boolean isInputEqual( - boolean aDecreaseStacksizeBySuccess, - boolean aDontCheckStackSizes, - FluidStack[] requiredFluidInputs, - ItemStack[] requiredInputs, - FluidStack[] givenFluidInputs, + public static boolean isInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, + FluidStack[] requiredFluidInputs, ItemStack[] requiredInputs, FluidStack[] givenFluidInputs, ItemStack... givenInputs) { if (!GregTech_API.sPostloadFinished) { return false; @@ -293,9 +293,8 @@ public final class TT_Utility { if (tStack != null) { amt = tStack.stackSize; for (ItemStack aStack : givenInputs) { - if (GT_Utility.areUnificationsEqual(aStack, tStack, true) - || GT_Utility.areUnificationsEqual( - GT_OreDictUnificator.get(false, aStack), tStack, true)) { + if (GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility + .areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) { if (aDontCheckStackSizes) { aStack.stackSize -= amt; break; @@ -390,6 +389,7 @@ public final class TT_Utility { } public static class ItemStack_NoNBT implements Comparable<ItemStack_NoNBT> { + public final Item mItem; public final int mStackSize; public final int mMetaData; @@ -426,15 +426,11 @@ public final class TT_Utility { @Override public boolean equals(Object aStack) { - return aStack == this - || (aStack instanceof ItemStack_NoNBT - && ((mItem == ((ItemStack_NoNBT) aStack).mItem) - || ((ItemStack_NoNBT) aStack) - .mItem - .getUnlocalizedName() - .equals(this.mItem.getUnlocalizedName())) - && ((ItemStack_NoNBT) aStack).mStackSize == this.mStackSize - && ((ItemStack_NoNBT) aStack).mMetaData == this.mMetaData); + return aStack == this || (aStack instanceof ItemStack_NoNBT + && ((mItem == ((ItemStack_NoNBT) aStack).mItem) || ((ItemStack_NoNBT) aStack).mItem + .getUnlocalizedName().equals(this.mItem.getUnlocalizedName())) + && ((ItemStack_NoNBT) aStack).mStackSize == this.mStackSize + && ((ItemStack_NoNBT) aStack).mMetaData == this.mMetaData); } @Override @@ -444,8 +440,7 @@ public final class TT_Utility { @Override public String toString() { - return Integer.toString(hashCode()) - + ' ' + return Integer.toString(hashCode()) + ' ' + (mItem == null ? "null" : mItem.getUnlocalizedName()) + ' ' + mMetaData @@ -567,13 +562,13 @@ public final class TT_Utility { try { if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { if (uuid1 != null && uuid2 != null) { - IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer() - .worldServerForDimension(0) - .getSaveHandler() - .getSaveHandler(); + IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer().worldServerForDimension(0) + .getSaveHandler().getSaveHandler(); SaveHandler sh = (SaveHandler) playerNBTManagerObj; File dir = ObfuscationReflectionHelper.getPrivateValue( - SaveHandler.class, sh, new String[] {"playersDirectory", "field_75771_c"}); + SaveHandler.class, + sh, + new String[] { "playersDirectory", "field_75771_c" }); String id1 = uuid1.toString(); NBTTagCompound tagCompound = read(new File(dir, id1 + "." + extension)); if (tagCompound != null) { @@ -594,8 +589,7 @@ public final class TT_Utility { } } } - } catch (Exception ignored) { - } + } catch (Exception ignored) {} return new NBTTagCompound(); } @@ -603,25 +597,23 @@ public final class TT_Utility { try { if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { if (player != null) { - IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer() - .worldServerForDimension(0) - .getSaveHandler() - .getSaveHandler(); + IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer().worldServerForDimension(0) + .getSaveHandler().getSaveHandler(); SaveHandler sh = (SaveHandler) playerNBTManagerObj; File dir = ObfuscationReflectionHelper.getPrivateValue( - SaveHandler.class, sh, new String[] {"playersDirectory", "field_75771_c"}); + SaveHandler.class, + sh, + new String[] { "playersDirectory", "field_75771_c" }); String id1 = player.getUniqueID().toString(); write(new File(dir, id1 + "." + extension), data); write(new File(dir, id1 + "." + extension + "_bak"), data); - String id2 = UUID.nameUUIDFromBytes( - player.getCommandSenderName().getBytes(StandardCharsets.UTF_8)) + String id2 = UUID.nameUUIDFromBytes(player.getCommandSenderName().getBytes(StandardCharsets.UTF_8)) .toString(); write(new File(dir, id2 + "." + extension), data); write(new File(dir, id2 + "." + extension + "_bak"), data); } } - } catch (Exception ignored) { - } + } catch (Exception ignored) {} } private static NBTTagCompound read(File file) { diff --git a/src/main/java/com/github/technus/tectech/util/XSTR.java b/src/main/java/com/github/technus/tectech/util/XSTR.java index 0f1c5578d7..015ac826aa 100644 --- a/src/main/java/com/github/technus/tectech/util/XSTR.java +++ b/src/main/java/com/github/technus/tectech/util/XSTR.java @@ -1,37 +1,20 @@ package com.github.technus.tectech.util; /* - A subclass of java.util.random that implements the Xorshift random number - generator - <p> - - it is 30% faster than the generator from Java's library - it produces - random sequences of higher quality than java.util.Random - this class also - provides a clone() function - <p> - Usage: XSRandom rand = new XSRandom(); //Instantiation x = rand.nextInt(); - //pull a random number - <p> - To use the class in legacy code, you may also instantiate an XSRandom object - and assign it to a java.util.Random object: java.util.Random rand = new - XSRandom(); - <p> - for an explanation of the algorithm, see - http://demesos.blogspot.com/2011/09/pseudo-random-number-generators.html - - @author Wilfried Elmenreich University of Klagenfurt/Lakeside Labs -* http://www.elmenreich.tk -* <p> -* This code is released under the GNU Lesser General Public License Version 3 -* http://www.gnu.org/licenses/lgpl-3.0.txt -*/ + * A subclass of java.util.random that implements the Xorshift random number generator <p> - it is 30% faster than the + * generator from Java's library - it produces random sequences of higher quality than java.util.Random - this class + * also provides a clone() function <p> Usage: XSRandom rand = new XSRandom(); //Instantiation x = rand.nextInt(); + * //pull a random number <p> To use the class in legacy code, you may also instantiate an XSRandom object and assign it + * to a java.util.Random object: java.util.Random rand = new XSRandom(); <p> for an explanation of the algorithm, see + * http://demesos.blogspot.com/2011/09/pseudo-random-number-generators.html + * @author Wilfried Elmenreich University of Klagenfurt/Lakeside Labs http://www.elmenreich.tk <p> This code is released + * under the GNU Lesser General Public License Version 3 http://www.gnu.org/licenses/lgpl-3.0.txt + */ import java.util.Random; import java.util.concurrent.atomic.AtomicLong; /** - * XSTR - Xorshift ThermiteRandom - * Modified by Bogdan-G - * 03.06.2016 - * version 0.0.4 + * XSTR - Xorshift ThermiteRandom Modified by Bogdan-G 03.06.2016 version 0.0.4 */ public class XSTR extends Random { @@ -40,10 +23,11 @@ public class XSTR extends Random { private static final long GAMMA = 0x9e3779b97f4a7c15L; private static final int PROBE_INCREMENT = 0x9e3779b9; private static final long SEEDER_INCREMENT = 0xbb67ae8584caa73bL; - private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53) + private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53) private static final float FLOAT_UNIT = 0x1.0p-24f; // 1.0f / (1 << 24) private static final AtomicLong seedUniquifier = new AtomicLong(8682522807148012L); public static final XSTR XSTR_INSTANCE = new XSTR() { + @Override public synchronized void setSeed(long seed) { if (!Thread.currentThread().getStackTrace()[2].getClassName().equals(Random.class.getName())) { @@ -53,13 +37,11 @@ public class XSTR extends Random { }; /* - MODIFIED BY: Robotia - Modification: Implemented Random class seed generator - */ + * MODIFIED BY: Robotia Modification: Implemented Random class seed generator + */ /** - * Creates a new pseudo random number generator. The seed is initialized to - * the current time, as if by + * Creates a new pseudo random number generator. The seed is initialized to the current time, as if by * <code>setSeed(System.currentTimeMillis());</code>. */ public XSTR() { @@ -79,8 +61,8 @@ public class XSTR extends Random { } /** - * Creates a new pseudo random number generator, starting with the specified - * seed, using <code>setSeed(seed);</code>. + * Creates a new pseudo random number generator, starting with the specified seed, using + * <code>setSeed(seed);</code>. * * @param seed the initial seed */ @@ -108,9 +90,8 @@ public class XSTR extends Random { } /** - * Sets the seed for this pseudo random number generator. As described - * above, two instances of the same random class, starting with the same - * seed, produce the same results, if the same methods are called. + * Sets the seed for this pseudo random number generator. As described above, two instances of the same random + * class, starting with the same seed, produce the same results, if the same methods are called. * * @param seed the new seed */ @@ -128,9 +109,8 @@ public class XSTR extends Random { } /** - * Implementation of George Marsaglia's elegant Xorshift random generator - * 30% faster and better quality than the built-in java.util.random see also - * see http://www.javamex.com/tutorials/random_numbers/xorshift.shtml + * Implementation of George Marsaglia's elegant Xorshift random generator 30% faster and better quality than the + * built-in java.util.random see also see http://www.javamex.com/tutorials/random_numbers/xorshift.shtml * * @param nbits will shift nbits bits * @return next seed @@ -170,15 +150,14 @@ public class XSTR extends Random { } /** - * Returns a pseudorandom, uniformly distributed {@code int} value between 0 - * (inclusive) and the specified value (exclusive), drawn from this random - * number generator's sequence. The general contract of {@code nextInt} is - * that one {@code int} value in the specified range is pseudorandomly - * generated and returned. All {@code bound} possible {@code int} values are - * produced with (approximately) equal probability. The method - * {@code nextInt(int bound)} is implemented by class {@code Random} as if - * by: - * <pre> {@code + * Returns a pseudorandom, uniformly distributed {@code int} value between 0 (inclusive) and the specified value + * (exclusive), drawn from this random number generator's sequence. The general contract of {@code nextInt} is that + * one {@code int} value in the specified range is pseudorandomly generated and returned. All {@code bound} possible + * {@code int} values are produced with (approximately) equal probability. The method {@code nextInt(int bound)} is + * implemented by class {@code Random} as if by: + * + * <pre> + * {@code * public int nextInt(int bound) { * if (bound <= 0) * throw new IllegalArgumentException("bound must be positive"); @@ -192,35 +171,29 @@ public class XSTR extends Random { * val = bits % bound; * } while (bits - val + (bound-1) < 0); * return val; - * }}</pre> + * }} + * </pre> * - * <p>The hedge "approx - * imately" is used in the foregoing description only because the next - * method is only approximately an unbiased source of independently chosen - * bits. If it were a perfect source of randomly chosen bits, then the - * algorithm shown would choose {@code int} values from the stated range - * with perfect uniformity. * <p> - * The algorithm is slightly tricky. It rejects values that would result in - * an uneven distribution (due to the fact that 2^31 is not divisible by n). - * The probability of a value being rejected depends on n. The worst case is - * n=2^30+1, for which the probability of a reject is 1/2, and the expected - * number of iterations before the loop terminates is 2. + * The hedge "approx imately" is used in the foregoing description only because the next method is only + * approximately an unbiased source of independently chosen bits. If it were a perfect source of randomly chosen + * bits, then the algorithm shown would choose {@code int} values from the stated range with perfect uniformity. * <p> - * The algorithm treats the case where n is a power of two specially: it - * returns the correct number of high-order bits from the underlying - * pseudo-random number generator. In the absence of special treatment, the - * correct number of <i>low-order</i> bits would be returned. Linear - * congruential pseudo-random number generators such as the one implemented - * by this class are known to have short periods in the sequence of values - * of their low-order bits. Thus, this special case greatly increases the - * length of the sequence of values returned by successive calls to this - * method if n is a small power of two. + * The algorithm is slightly tricky. It rejects values that would result in an uneven distribution (due to the fact + * that 2^31 is not divisible by n). The probability of a value being rejected depends on n. The worst case is + * n=2^30+1, for which the probability of a reject is 1/2, and the expected number of iterations before the loop + * terminates is 2. + * <p> + * The algorithm treats the case where n is a power of two specially: it returns the correct number of high-order + * bits from the underlying pseudo-random number generator. In the absence of special treatment, the correct number + * of <i>low-order</i> bits would be returned. Linear congruential pseudo-random number generators such as the one + * implemented by this class are known to have short periods in the sequence of values of their low-order bits. + * Thus, this special case greatly increases the length of the sequence of values returned by successive calls to + * this method if n is a small power of two. * * @param bound the upper bound (exclusive). Must be positive. - * @return the next pseudorandom, uniformly distributed {@code int} value - * between zero (inclusive) and {@code bound} (exclusive) from this random - * number generator's sequence + * @return the next pseudorandom, uniformly distributed {@code int} value between zero (inclusive) and {@code bound} + * (exclusive) from this random number generator's sequence * @throws IllegalArgumentException if bound is not positive * @since 1.2 */ @@ -230,18 +203,10 @@ public class XSTR extends Random { // throw new RuntimeException("BadBound"); // } - /*int r = next(31); - int m = bound - 1; - if ((bound & m) == 0) // i.e., bound is a power of 2 - { - r = (int) ((bound * (long) r) >> 31); - } else { - for (int u = r; - u - (r = u % bound) + m < 0; - u = next(31)) - ; - } - return r;*/ + /* + * int r = next(31); int m = bound - 1; if ((bound & m) == 0) // i.e., bound is a power of 2 { r = (int) ((bound + * * (long) r) >> 31); } else { for (int u = r; u - (r = u % bound) + m < 0; u = next(31)) ; } return r; + */ // speedup, new nextInt ~+40% long last = seed ^ seed << 21; last ^= last >>> 35; @@ -269,10 +234,9 @@ public class XSTR extends Random { @Override public void nextBytes(byte[] bytes_arr) { - for (int iba = 0, lenba = bytes_arr.length; iba < lenba; ) { - for (int rndba = nextInt(), nba = Math.min(lenba - iba, Integer.SIZE / Byte.SIZE); - nba-- > 0; - rndba >>= Byte.SIZE) { + for (int iba = 0, lenba = bytes_arr.length; iba < lenba;) { + for (int rndba = nextInt(), nba = Math.min(lenba - iba, Integer.SIZE / Byte.SIZE); nba-- + > 0; rndba >>= Byte.SIZE) { bytes_arr[iba++] = (byte) rndba; } } |