From 7e153794ad1f79afa0014b82593060ffedc54a61 Mon Sep 17 00:00:00 2001 From: Sampsa <69092953+S4mpsa@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:24:47 +0300 Subject: Retier Laser Hatch amperage, add Laser Mirror, add customizable amperage to Laser Hatches (#2859) * Remove laser recipes based on tiers * Add 4M and 16M Laser Hatches * Add Laser Mirror * Add Laser Mirror recipe * Refactor mirror * Add customizable amperage to laser source hatches * Hide lasers from NEI, add customizable amperage to target hatches * Fix missing connection branch * Address review --- .../system/material/BW_NonMeta_MaterialItems.java | 6 + .../technus/tectech/loader/recipe/Assembler.java | 528 +-------------- .../loader/recipe/ResearchStationAssemblyLine.java | 133 +++- .../tectech/loader/thing/MachineLoader.java | 743 +++++++++++++-------- .../technus/tectech/thing/CustomItemList.java | 15 + .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 9 +- .../GT_MetaTileEntity_Hatch_DynamoTunnel.java | 74 +- .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 9 +- .../GT_MetaTileEntity_Hatch_EnergyTunnel.java | 61 +- .../pipe/GT_MetaTileEntity_Pipe_EnergyMirror.java | 224 +++++++ 10 files changed, 980 insertions(+), 822 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EnergyMirror.java (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_NonMeta_MaterialItems.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_NonMeta_MaterialItems.java index db53437858..62c688f2ab 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_NonMeta_MaterialItems.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_NonMeta_MaterialItems.java @@ -54,6 +54,12 @@ public enum BW_NonMeta_MaterialItems implements IItemContainer { return this; } + @Override + public IItemContainer hidden() { + codechicken.nei.api.API.hideItem(get(1L)); + return this; + } + @Override public Item getItem() { if (this.mHasNotBeenSet) diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java index 35dea3f0ed..d0c34f50cd 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java @@ -1206,20 +1206,8 @@ public class Assembler implements Runnable { } - // Laser Dynamo IV-UXV 1024/t + // Laser Dynamo LuV-UXV 1024/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel2_IV.get(1)) - .duration(1 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), @@ -1319,32 +1307,8 @@ public class Assembler implements Runnable { } - // Laser Dynamo IV-UXV 4096/t + // Laser Dynamo ZPM-UXV 4096/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel3_IV.get(1)) - .duration(3 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel3_LuV.get(1)) - .duration(3 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), @@ -1432,44 +1396,8 @@ public class Assembler implements Runnable { } - // Laser Dynamo IV-UXV 16384/t + // Laser Dynamo UV-UXV 16384/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel4_IV.get(1)) - .duration(6 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel4_LuV.get(1)) - .duration(6 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel4_ZPM.get(1)) - .duration(6 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_UV.get(1), @@ -1545,56 +1473,8 @@ public class Assembler implements Runnable { } - // Laser Dynamo IV-UXV 65536/t + // Laser Dynamo UHV-UXV 65536/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel5_IV.get(1)) - .duration(13 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel5_LuV.get(1)) - .duration(13 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel5_ZPM.get(1)) - .duration(13 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel5_UV.get(1)) - .duration(13 * MINUTES + 20 * SECONDS) - .eut(500000) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MAX.get(1), @@ -1658,68 +1538,8 @@ public class Assembler implements Runnable { } - // Laser Dynamo IV-UXV 262144/t + // Laser Dynamo UEV-UXV 262144/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel6_IV.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel6_LuV.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel6_ZPM.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel6_UV.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(500000) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel6_UHV.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(2000000) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( getItemContainer("Hull_UEV").get(1), @@ -1771,80 +1591,8 @@ public class Assembler implements Runnable { } - // Laser Dynamo IV-UXV 1048576/t + // Laser Dynamo UIV-UXV 1048576/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel7_IV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel7_LuV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel7_ZPM.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel7_UV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(500000) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel7_UHV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(2000000) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_dynamoTunnel7_UEV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(8000000) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( getItemContainer("Hull_UIV").get(1), @@ -2000,20 +1748,8 @@ public class Assembler implements Runnable { } - // Laser Target IV-UXV 1024/t + // Laser Target LuV-UXV 1024/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel2_IV.get(1)) - .duration(1 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), @@ -2113,32 +1849,8 @@ public class Assembler implements Runnable { } - // Laser Target IV-UXV 4096/t + // Laser Target ZPM-UXV 4096/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel3_IV.get(1)) - .duration(3 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel3_LuV.get(1)) - .duration(3 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), @@ -2226,44 +1938,8 @@ public class Assembler implements Runnable { } - // Laser Target IV-UXV 16384/t + // Laser Target UV-UXV 16384/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel4_IV.get(1)) - .duration(6 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel4_LuV.get(1)) - .duration(6 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel4_ZPM.get(1)) - .duration(6 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_UV.get(1), @@ -2339,56 +2015,8 @@ public class Assembler implements Runnable { } - // Laser Target IV-UXV 65536/t + // Laser Target UHV-UXV 65536/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel5_IV.get(1)) - .duration(13 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel5_LuV.get(1)) - .duration(13 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel5_ZPM.get(1)) - .duration(13 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel5_UV.get(1)) - .duration(13 * MINUTES + 20 * SECONDS) - .eut(500000) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MAX.get(1), @@ -2452,68 +2080,8 @@ public class Assembler implements Runnable { } - // Laser Target IV-UXV 262144/t + // Laser Target UEV-UXV 262144/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel6_IV.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel6_LuV.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel6_ZPM.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel6_UV.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(500000) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel6_UHV.get(1)) - .duration(26 * MINUTES + 40 * SECONDS) - .eut(2000000) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( getItemContainer("Hull_UEV").get(1), @@ -2565,80 +2133,8 @@ public class Assembler implements Runnable { } - // Laser Target IV-UXV 1048576/t + // Laser Target UIV-UXV 1048576/t { - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel7_IV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel7_LuV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel7_ZPM.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel7_UV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(500000) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel7_UHV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(2000000) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - 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)) - .itemOutputs(CustomItemList.eM_energyTunnel7_UEV.get(1)) - .duration(53 * MINUTES + 20 * SECONDS) - .eut(8000000) - .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( getItemContainer("Hull_UIV").get(1), diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 515d68e409..20a3a662c2 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -560,6 +560,21 @@ public class ResearchStationAssemblyLine implements Runnable { 300 * 20, 8_000_000); + // Laser Vacuum Mirror + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.LASERpipe.get(1L), + 20_000, + 16, + 40_000, + 2, + new Object[] { CustomItemList.eM_Power.get(1L), CustomItemList.LASERpipe.get(4L), + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDenseChromaticGlass", 1), + ItemList.Circuit_Chip_QPIC.get(2L), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L } }, + new FluidStack[] { Materials.Grade4PurifiedWater.getFluid(4000L) }, + CustomItemList.LASERpipeSmart.get(1L), + 10 * 20, + (int) TierEU.RECIPE_UHV); + // Transcendent Plasma Mixer - TPM. TT_recipeAdder.addResearchableAssemblylineRecipe( CustomItemList.eM_energyTunnel7_UV.get(1), @@ -3025,7 +3040,8 @@ public class ResearchStationAssemblyLine implements Runnable { ItemStack[] laserTargets_UXV = { CustomItemList.eM_energyTunnel1_UXV.get(1), CustomItemList.eM_energyTunnel2_UXV.get(1), CustomItemList.eM_energyTunnel3_UXV.get(1), CustomItemList.eM_energyTunnel4_UXV.get(1), CustomItemList.eM_energyTunnel5_UXV.get(1), - CustomItemList.eM_energyTunnel6_UXV.get(1), CustomItemList.eM_energyTunnel7_UXV.get(1) }; + CustomItemList.eM_energyTunnel6_UXV.get(1), CustomItemList.eM_energyTunnel7_UXV.get(1), + CustomItemList.eM_energyTunnel8_UXV.get(1), CustomItemList.eM_energyTunnel9_UXV.get(1) }; 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), @@ -3087,7 +3103,8 @@ public class ResearchStationAssemblyLine implements Runnable { ItemStack[] wirelessLasers = { CustomItemList.eM_energyWirelessTunnel1_UXV.get(1), CustomItemList.eM_energyWirelessTunnel2_UXV.get(1), CustomItemList.eM_energyWirelessTunnel3_UXV.get(1), CustomItemList.eM_energyWirelessTunnel4_UXV.get(1), CustomItemList.eM_energyWirelessTunnel5_UXV.get(1), - CustomItemList.eM_energyWirelessTunnel6_UXV.get(1), CustomItemList.eM_energyWirelessTunnel7_UXV.get(1) }; + CustomItemList.eM_energyWirelessTunnel6_UXV.get(1), CustomItemList.eM_energyWirelessTunnel7_UXV.get(1), + CustomItemList.eM_energyWirelessTunnel8_UXV.get(1), CustomItemList.eM_energyWirelessTunnel9_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), @@ -3219,6 +3236,118 @@ public class ResearchStationAssemblyLine implements Runnable { recipeEuPerTick); } + // ------------------------ 4MA+ Lasers ------------------------ + + // 4M UMV Target + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.eM_energyTunnel7_UMV.get(1), + totalComputation * 48, + compPerSecond * 48, + researchEuPerTick * 3, + researchAmperage * 16, + new Object[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UMV.get(64), + ItemList.Emitter_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Quantium, 32) }, + new FluidStack[] { new FluidStack(solderUEV, 1_296 * 64 * 4) }, + CustomItemList.eM_energyTunnel8_UMV.get(1), + 53 * MINUTES + 20 * SECONDS, + (int) TierEU.RECIPE_UMV); + + // 4M UXV Target + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.eM_energyTunnel7_UXV.get(1), + totalComputation * 64, + compPerSecond * 64, + researchEuPerTick * 4, + researchAmperage * 16, + new Object[] { getItemContainer("Hull_UXV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UXV.get(64), + ItemList.Sensor_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.BlackPlutonium, 32) }, + new FluidStack[] { new FluidStack(solderUEV, 1_296 * 64 * 4) }, + CustomItemList.eM_energyTunnel8_UXV.get(1), + 106 * MINUTES + 40 * SECONDS, + (int) TierEU.RECIPE_UXV); + + // 16M UXV Target + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.eM_energyTunnel8_UXV.get(1), + totalComputation * 64, + compPerSecond * 64, + researchEuPerTick * 4, + researchAmperage * 16, + new Object[] { getItemContainer("Hull_UXV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UXV.get(64), + ItemList.Sensor_UXV.get(64), ItemList.Sensor_UXV.get(64), ItemList.Sensor_UXV.get(64), + ItemList.Electric_Pump_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), + ItemList.Electric_Pump_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.BlackPlutonium, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 1_296 * 128 * 4) }, + CustomItemList.eM_energyTunnel9_UXV.get(1), + 213 * MINUTES + 20 * SECONDS, + (int) TierEU.RECIPE_UXV); + + // 4M UMV Source + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.eM_dynamoTunnel7_UMV.get(1), + totalComputation * 48, + compPerSecond * 48, + researchEuPerTick * 3, + researchAmperage * 16, + new Object[] { getItemContainer("Hull_UMV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UMV.get(64), + ItemList.Sensor_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Quantium, 32) }, + new FluidStack[] { new FluidStack(solderUEV, 1_296 * 64 * 4) }, + CustomItemList.eM_dynamoTunnel8_UMV.get(1), + 53 * MINUTES + 20 * SECONDS, + (int) TierEU.RECIPE_UMV); + + // 4M UXV Source + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.eM_dynamoTunnel7_UXV.get(1), + totalComputation * 64, + compPerSecond * 64, + researchEuPerTick * 4, + researchAmperage * 16, + new Object[] { getItemContainer("Hull_UXV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UXV.get(64), + ItemList.Sensor_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.BlackPlutonium, 32) }, + new FluidStack[] { new FluidStack(solderUEV, 1_296 * 64 * 4) }, + CustomItemList.eM_dynamoTunnel8_UXV.get(1), + 106 * MINUTES + 40 * SECONDS, + (int) TierEU.RECIPE_UXV); + + // 16M UXV Source + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.eM_dynamoTunnel8_UXV.get(1), + totalComputation * 64, + compPerSecond * 64, + researchEuPerTick * 4, + researchAmperage * 16, + new Object[] { getItemContainer("Hull_UXV").get(1), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UXV.get(64), + ItemList.Emitter_UXV.get(64), ItemList.Emitter_UXV.get(64), ItemList.Emitter_UXV.get(64), + ItemList.Electric_Pump_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), + ItemList.Electric_Pump_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.BlackPlutonium, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 1_296 * 128 * 4) }, + CustomItemList.eM_dynamoTunnel9_UXV.get(1), + 213 * MINUTES + 20 * SECONDS, + (int) TierEU.RECIPE_UXV); + // ------------------------ Wireless EU dynamos ------------------------ for (int i = 0; i < wirelessHatches.length; i++) { 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 ecbe748705..4f64213d4e 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,7 @@ import static com.github.technus.tectech.thing.CustomItemList.DATApipe; import static com.github.technus.tectech.thing.CustomItemList.DATApipeBlock; import static com.github.technus.tectech.thing.CustomItemList.LASERpipe; import static com.github.technus.tectech.thing.CustomItemList.LASERpipeBlock; +import static com.github.technus.tectech.thing.CustomItemList.LASERpipeSmart; import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_IV; import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_LuV; import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UEV; @@ -159,7 +160,10 @@ import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_U import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UV; import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel8_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel8_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel9001; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel9_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_EV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_IV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_LuV; @@ -253,7 +257,10 @@ import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_U import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel8_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel8_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel9001; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel9_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_EV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_IV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_LuV; @@ -294,6 +301,8 @@ import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessT import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel5_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel6_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel7_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel8_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel9_UXV; import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeData; import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeMaintenance; import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeUncertainty; @@ -345,6 +354,7 @@ import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pi import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_PipeBlock_Energy; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Energy; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EnergyMirror; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_BuckConverter; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugPollutor; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugPowerGenerator; @@ -352,6 +362,8 @@ import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_ import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_OwnerDetector; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_TeslaCoil; +import gregtech.api.enums.MetaTileEntityIDs; + /** * Created by danie_000 on 16.11.2016. */ @@ -778,6 +790,20 @@ public class MachineLoader implements Runnable { "UXV 1,048,576A Wireless Energy Hatch", 13, 1048576).getStackForm(1L)); + eM_energyWirelessTunnel8_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + MetaTileEntityIDs.WIRELESS_LASER_UXV8.ID, + "hatch.energywirelesstunnel8.tier.13", + "UXV 4,194,304A Wireless Energy Hatch", + 13, + 4194304).getStackForm(1L)); + eM_energyWirelessTunnel9_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + MetaTileEntityIDs.WIRELESS_LASER_UXV9.ID, + "hatch.energywirelesstunnel9.tier.13", + "UXV 16,777,216A Wireless Energy Hatch", + 13, + 16777216).getStackForm(1L)); // =================================================================================================== // Multi AMP Laser INPUTS // =================================================================================================== @@ -789,48 +815,60 @@ public class MachineLoader implements Runnable { "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 1,024A/t Laser Target Hatch", - 5, - 1024).getStackForm(1L)); - eM_energyTunnel3_IV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15150, - "hatch.energytunnel3.tier.05", - "IV 4,096A/t Laser Target Hatch", - 5, - 4096).getStackForm(1L)); - eM_energyTunnel4_IV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15160, - "hatch.energytunnel4.tier.05", - "IV 16,384A/t Laser Target Hatch", - 5, - 16384).getStackForm(1L)); - eM_energyTunnel5_IV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15170, - "hatch.energytunnel5.tier.05", - "IV 65,536A/t Laser Target Hatch", - 5, - 65536).getStackForm(1L)); - eM_energyTunnel6_IV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15180, - "hatch.energytunnel6.tier.05", - "IV 262,144A/t Laser Target Hatch", - 5, - 262144).getStackForm(1L)); - eM_energyTunnel7_IV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15190, - "hatch.energytunnel7.tier.05", - "IV 1,048,576A/t Laser Target Hatch", - 5, - 1048576).getStackForm(1L)); + eM_energyTunnel2_IV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15140, + "hatch.energytunnel2.tier.05", + "IV 1,024A/t Laser Target Hatch", + 5, + 1024).getStackForm(1L)) + .hidden(); + eM_energyTunnel3_IV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15150, + "hatch.energytunnel3.tier.05", + "IV 4,096A/t Laser Target Hatch", + 5, + 4096).getStackForm(1L)) + .hidden(); + eM_energyTunnel4_IV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15160, + "hatch.energytunnel4.tier.05", + "IV 16,384A/t Laser Target Hatch", + 5, + 16384).getStackForm(1L)) + .hidden(); + eM_energyTunnel5_IV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15170, + "hatch.energytunnel5.tier.05", + "IV 65,536A/t Laser Target Hatch", + 5, + 65536).getStackForm(1L)) + .hidden(); + eM_energyTunnel6_IV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15180, + "hatch.energytunnel6.tier.05", + "IV 262,144A/t Laser Target Hatch", + 5, + 262144).getStackForm(1L)) + .hidden(); + eM_energyTunnel7_IV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15190, + "hatch.energytunnel7.tier.05", + "IV 1,048,576A/t Laser Target Hatch", + 5, + 1048576).getStackForm(1L)) + .hidden(); eM_energyTunnel1_LuV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( @@ -846,41 +884,51 @@ public class MachineLoader implements Runnable { "LuV 1,024A/t Laser Target Hatch", 6, 1024).getStackForm(1L)); - eM_energyTunnel3_LuV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15151, - "hatch.energytunnel3.tier.06", - "LuV 4,096A/t Laser Target Hatch", - 6, - 4096).getStackForm(1L)); - eM_energyTunnel4_LuV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15161, - "hatch.energytunnel4.tier.06", - "LuV 16,384A/t Laser Target Hatch", - 6, - 16384).getStackForm(1L)); - eM_energyTunnel5_LuV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15171, - "hatch.energytunnel5.tier.06", - "LuV 65,536A/t Laser Target Hatch", - 6, - 65536).getStackForm(1L)); - eM_energyTunnel6_LuV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15181, - "hatch.energytunnel6.tier.06", - "LuV 262,144A/t Laser Target Hatch", - 6, - 262144).getStackForm(1L)); - eM_energyTunnel7_LuV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15191, - "hatch.energytunnel7.tier.06", - "LuV 1,048,576A/t Laser Target Hatch", - 6, - 1048576).getStackForm(1L)); + eM_energyTunnel3_LuV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15151, + "hatch.energytunnel3.tier.06", + "LuV 4,096A/t Laser Target Hatch", + 6, + 4096).getStackForm(1L)) + .hidden(); + eM_energyTunnel4_LuV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15161, + "hatch.energytunnel4.tier.06", + "LuV 16,384A/t Laser Target Hatch", + 6, + 16384).getStackForm(1L)) + .hidden(); + eM_energyTunnel5_LuV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15171, + "hatch.energytunnel5.tier.06", + "LuV 65,536A/t Laser Target Hatch", + 6, + 65536).getStackForm(1L)) + .hidden(); + eM_energyTunnel6_LuV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15181, + "hatch.energytunnel6.tier.06", + "LuV 262,144A/t Laser Target Hatch", + 6, + 262144).getStackForm(1L)) + .hidden(); + eM_energyTunnel7_LuV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15191, + "hatch.energytunnel7.tier.06", + "LuV 1,048,576A/t Laser Target Hatch", + 6, + 1048576).getStackForm(1L)) + .hidden(); eM_energyTunnel1_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( @@ -903,34 +951,42 @@ public class MachineLoader implements Runnable { "ZPM 4,096A/t Laser Target Hatch", 7, 4096).getStackForm(1L)); - eM_energyTunnel4_ZPM.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15162, - "hatch.energytunnel4.tier.07", - "ZPM 16,384A/t Laser Target Hatch", - 7, - 16384).getStackForm(1L)); - eM_energyTunnel5_ZPM.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15172, - "hatch.energytunnel5.tier.07", - "ZPM 65,536A/t Laser Target Hatch", - 7, - 65536).getStackForm(1L)); - eM_energyTunnel6_ZPM.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15182, - "hatch.energytunnel6.tier.07", - "ZPM 262,144A/t Laser Target Hatch", - 7, - 262144).getStackForm(1L)); - eM_energyTunnel7_ZPM.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15192, - "hatch.energytunnel7.tier.07", - "ZPM 1,048,576A/t Laser Target Hatch", - 7, - 1048576).getStackForm(1L)); + eM_energyTunnel4_ZPM + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15162, + "hatch.energytunnel4.tier.07", + "ZPM 16,384A/t Laser Target Hatch", + 7, + 16384).getStackForm(1L)) + .hidden(); + eM_energyTunnel5_ZPM + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15172, + "hatch.energytunnel5.tier.07", + "ZPM 65,536A/t Laser Target Hatch", + 7, + 65536).getStackForm(1L)) + .hidden(); + eM_energyTunnel6_ZPM + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15182, + "hatch.energytunnel6.tier.07", + "ZPM 262,144A/t Laser Target Hatch", + 7, + 262144).getStackForm(1L)) + .hidden(); + eM_energyTunnel7_ZPM + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15192, + "hatch.energytunnel7.tier.07", + "ZPM 1,048,576A/t Laser Target Hatch", + 7, + 1048576).getStackForm(1L)) + .hidden(); eM_energyTunnel1_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( @@ -960,27 +1016,33 @@ public class MachineLoader implements Runnable { "UV 16,384A/t Laser Target Hatch", 8, 16384).getStackForm(1L)); - eM_energyTunnel5_UV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15173, - "hatch.energytunnel5.tier.08", - "UV 65,536A/t Laser Target Hatch", - 8, - 65536).getStackForm(1L)); - eM_energyTunnel6_UV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15183, - "hatch.energytunnel6.tier.08", - "UV 262,144A/t Laser Target Hatch", - 8, - 262144).getStackForm(1L)); - eM_energyTunnel7_UV.set( - new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15193, - "hatch.energytunnel7.tier.08", - "UV 1,048,576A/t Laser Target Hatch", - 8, - 1048576).getStackForm(1L)); + eM_energyTunnel5_UV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15173, + "hatch.energytunnel5.tier.08", + "UV 65,536A/t Laser Target Hatch", + 8, + 65536).getStackForm(1L)) + .hidden(); + eM_energyTunnel6_UV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15183, + "hatch.energytunnel6.tier.08", + "UV 262,144A/t Laser Target Hatch", + 8, + 262144).getStackForm(1L)) + .hidden(); + eM_energyTunnel7_UV + .set( + new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15193, + "hatch.energytunnel7.tier.08", + "UV 1,048,576A/t Laser Target Hatch", + 8, + 1048576).getStackForm(1L)) + .hidden(); eM_energyTunnel1_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( @@ -1017,20