From 2cdfbeb599253ff306b3655a999ba6afcc116a43 Mon Sep 17 00:00:00 2001 From: adam riondy Date: Wed, 4 Jan 2023 03:11:57 +0100 Subject: add craft for uxv energy hatch and dynamo --- .../dreamcraft/DreamCraftRecipeLoader.java | 75 +++++++++++++++++++++- 1 file changed, 73 insertions(+), 2 deletions(-) (limited to 'src') 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 a42fddbfd6..d0650163c6 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 @@ -3383,6 +3383,73 @@ public class DreamCraftRecipeLoader { 1000, 128_000_000); + // UXV Dynamo/energy hatch + TT_recipeAdder.addResearchableAssemblylineRecipe( + getItemContainer("Hatch_Energy_UMV").get(1L), + 384000, + 256, + 800000, + 32, + new Object[] { + getItemContainer("Hull_UMV").get(4L), + 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); + + TT_recipeAdder.addResearchableAssemblylineRecipe( + getItemContainer("Hatch_Dynamo_UMV").get(1L), + 384000, + 256, + 800000, + 32, + new Object[] { + getItemContainer("Hull_UMV").get(4L), + 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); + // UHV Circuit Wetwaremainframe TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Circuit_Wetwaresupercomputer.get(1L), @@ -5740,7 +5807,8 @@ public class DreamCraftRecipeLoader { 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_UMV").get(1L), + getItemContainer("Hatch_Energy_UXV").get(1L) }; ItemStack[] dynamo_hatches = { @@ -5756,7 +5824,8 @@ public class DreamCraftRecipeLoader { 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_UMV").get(1L), + getItemContainer("Hatch_Dynamo_UXV").get(1L) }; Object[] circuits_tier_plus_two = { @@ -5790,6 +5859,7 @@ public class DreamCraftRecipeLoader { 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[] wireless_dynamos = { @@ -5806,6 +5876,7 @@ public class DreamCraftRecipeLoader { 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 ------------------------ -- cgit From eb54cc0fb6e4330d73f6de42585b151602bea535 Mon Sep 17 00:00:00 2001 From: adam riondy Date: Wed, 4 Jan 2023 03:16:15 +0100 Subject: spotlessApply --- .../dreamcraft/DreamCraftRecipeLoader.java | 76 +++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'src') 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 d0650163c6..c6378dc8ad 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 @@ -3391,27 +3391,27 @@ public class DreamCraftRecipeLoader { 800000, 32, new Object[] { - getItemContainer("Hull_UMV").get(4L), - 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) + getItemContainer("Hull_UMV").get(4L), + 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) + Materials.SuperCoolant.getFluid(64_000L), + new FluidStack(solderUEV, 80 * 144), + Materials.UUMatter.getFluid(64000L) }, getItemContainer("Hatch_Energy_UXV").get(1L), 1000, @@ -3424,27 +3424,27 @@ public class DreamCraftRecipeLoader { 800000, 32, new Object[] { - getItemContainer("Hull_UMV").get(4L), - 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) + getItemContainer("Hull_UMV").get(4L), + 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) + Materials.SuperCoolant.getFluid(64_000L), + new FluidStack(solderUEV, 80 * 144), + Materials.UUMatter.getFluid(64000L) }, getItemContainer("Hatch_Dynamo_UXV").get(1L), 1000, -- cgit From ad36dfb729c8347960e90445cc6639f9482eb84b Mon Sep 17 00:00:00 2001 From: adam riondy Date: Wed, 4 Jan 2023 03:32:22 +0100 Subject: now wireless work too --- .../tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') 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 c6378dc8ad..ee0b90a523 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 @@ -5843,6 +5843,8 @@ public class DreamCraftRecipeLoader { 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[] wireless_hatches = { -- cgit