From 6a9ab970fd71d359138efd0da4306b627f8d755b Mon Sep 17 00:00:00 2001 From: MCTBL <30978504+MCTBL@users.noreply.github.com> Date: Thu, 7 Dec 2023 02:39:46 +0800 Subject: [PATCH 01/13] change essentia cells index (#771) --- .../scripts/ScriptThaumicEnergistics.java | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java index 3637ae48e..7f559a0a3 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java @@ -80,7 +80,7 @@ public void loadRecipes() { // ItemStacks for in/out ItemStack SingularityDrive = getModItem(EternalSingularity.ID, "eternal_singularity", 1); // Creative Essentia Cell - ItemStack CEC = getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10); + ItemStack CEC = getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 4); ThaumcraftApi.addInfusionCraftingRecipe( "thaumicenergistics.TESTORAGE", @@ -1907,7 +1907,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Fiberglass_Advanced.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) .fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom().duration(10 * SECONDS).eut(1920) .addTo(circuitAssemblerRecipes); @@ -1918,7 +1918,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Fiberglass_Advanced.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) .fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom().duration(10 * SECONDS).eut(1920) .addTo(circuitAssemblerRecipes); @@ -1929,7 +1929,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Fiberglass_Advanced.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom().duration(10 * SECONDS) .eut(1920).addTo(circuitAssemblerRecipes); // 1024k Essentia Storage Component @@ -1941,7 +1941,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Multifiberglass_Elite.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) .fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom().duration(10 * SECONDS).eut(7680) .addTo(circuitAssemblerRecipes); @@ -1952,7 +1952,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Multifiberglass_Elite.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) .fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom().duration(10 * SECONDS).eut(7680) .addTo(circuitAssemblerRecipes); @@ -1963,7 +1963,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Multifiberglass_Elite.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom().duration(10 * SECONDS) .eut(7680).addTo(circuitAssemblerRecipes); // 4096k Essentia Storage Component @@ -1975,7 +1975,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Wetware_Extreme.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) .fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom().duration(10 * SECONDS).eut(30720) .addTo(circuitAssemblerRecipes); @@ -1986,7 +1986,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Wetware_Extreme.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) .fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom().duration(10 * SECONDS).eut(30720) .addTo(circuitAssemblerRecipes); @@ -1997,7 +1997,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Wetware_Extreme.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom().duration(10 * SECONDS) .eut(30720).addTo(circuitAssemblerRecipes); // 16384k Essentia Storage Component @@ -2009,7 +2009,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Bio_Ultra.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)) .fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom().duration(10 * SECONDS).eut(500000) .addTo(circuitAssemblerRecipes); @@ -2020,7 +2020,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Bio_Ultra.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)) .fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom().duration(10 * SECONDS).eut(500000) .addTo(circuitAssemblerRecipes); @@ -2031,7 +2031,7 @@ public void loadRecipes() { CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), ItemList.Circuit_Board_Bio_Ultra.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)) .fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom().duration(10 * SECONDS) .eut(500000).addTo(circuitAssemblerRecipes); @@ -2063,10 +2063,10 @@ public void loadRecipes() { TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)); + TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "part.base", 1, 6, missing)); TCHelper.removeCrucibleRecipe( @@ -2734,7 +2734,7 @@ public void loadRecipes() { getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), new AspectList().add(Aspect.getAspect("ordo"), 50).add(Aspect.getAspect("ignis"), 50) .add(Aspect.getAspect("aqua"), 50), "abc", @@ -2762,10 +2762,10 @@ public void loadRecipes() { "thaumicenergistics.TESTORAGE", new ResearchPage( TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing)))); + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), new AspectList().add(Aspect.getAspect("ordo"), 60).add(Aspect.getAspect("ignis"), 60) .add(Aspect.getAspect("aqua"), 60), "abc", @@ -2774,29 +2774,29 @@ public void loadRecipes() { 'a', "circuitElite", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), 'c', "circuitElite", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), 'g', "circuitElite", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), 'i', "circuitElite"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)))); + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), new AspectList().add(Aspect.getAspect("ordo"), 70).add(Aspect.getAspect("ignis"), 70) .add(Aspect.getAspect("aqua"), 70), "abc", @@ -2805,29 +2805,29 @@ public void loadRecipes() { 'a', "circuitMaster", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), 'c', "circuitMaster", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), 'g', "circuitMaster", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), 'i', "circuitMaster"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)))); + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing), new AspectList().add(Aspect.getAspect("ordo"), 80).add(Aspect.getAspect("ignis"), 80) .add(Aspect.getAspect("aqua"), 80), "abc", @@ -2836,26 +2836,26 @@ public void loadRecipes() { 'a', "circuitSuperconductor", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), 'c', "circuitSuperconductor", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), 'g', "circuitSuperconductor", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), 'i', "circuitSuperconductor"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)))); + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), @@ -3040,7 +3040,7 @@ public void loadRecipes() { getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 3, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 4, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 5, missing), new AspectList().add(Aspect.getAspect("ordo"), 55).add(Aspect.getAspect("terra"), 55) .add(Aspect.getAspect("aqua"), 55), "abc", @@ -3055,7 +3055,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), 'f', "plateInfusedEarth", 'g', @@ -3066,19 +3066,19 @@ public void loadRecipes() { "plateThaumium"); ThaumcraftApi.addShapelessArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 4, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 5, missing), new AspectList().add(Aspect.getAspect("ordo"), 45).add(Aspect.getAspect("terra"), 45) .add(Aspect.getAspect("aqua"), 45), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 4, missing)); + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 4, missing)))); + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 5, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 5, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 6, missing), new AspectList().add(Aspect.getAspect("ordo"), 65).add(Aspect.getAspect("terra"), 65) .add(Aspect.getAspect("aqua"), 65), "abc", @@ -3093,7 +3093,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), 'f', "plateInfusedEarth", 'g', @@ -3104,19 +3104,19 @@ public void loadRecipes() { "plateThaumium"); ThaumcraftApi.addShapelessArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 5, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 6, missing), new AspectList().add(Aspect.getAspect("ordo"), 55).add(Aspect.getAspect("terra"), 55) .add(Aspect.getAspect("aqua"), 55), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)); + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 5, missing)))); + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 6, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 6, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 7, missing), new AspectList().add(Aspect.getAspect("ordo"), 75).add(Aspect.getAspect("terra"), 75) .add(Aspect.getAspect("aqua"), 75), "abc", @@ -3131,7 +3131,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), 'f', "plateInfusedEarth", 'g', @@ -3142,19 +3142,19 @@ public void loadRecipes() { "plateThaumium"); ThaumcraftApi.addShapelessArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 6, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 7, missing), new AspectList().add(Aspect.getAspect("ordo"), 65).add(Aspect.getAspect("terra"), 65) .add(Aspect.getAspect("aqua"), 65), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)); + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 6, missing)))); + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 7, missing)))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 7, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 8, missing), new AspectList().add(Aspect.getAspect("ordo"), 85).add(Aspect.getAspect("terra"), 85) .add(Aspect.getAspect("aqua"), 85), "abc", @@ -3169,7 +3169,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing), 'f', "plateInfusedEarth", 'g', @@ -3180,20 +3180,20 @@ public void loadRecipes() { "plateThaumium"); ThaumcraftApi.addShapelessArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 7, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 8, missing), new AspectList().add(Aspect.getAspect("ordo"), 75).add(Aspect.getAspect("terra"), 75) .add(Aspect.getAspect("aqua"), 75), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)); + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 7, missing)))); + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 8, missing)))); // Fluid Quantum Drive ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 8, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 9, missing), "---------", "----a----", "---bdb---", @@ -3210,12 +3210,12 @@ public void loadRecipes() { 'c', "circuitInfinite", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing), 'e', getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing)); // ME Digital Singularity ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 9, missing), + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10, missing), "----a----", "---aba---", "--ecdce--", @@ -3232,7 +3232,7 @@ public void loadRecipes() { 'c', getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 1, 0, missing), 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing), 'e', "blockInfinity", 'f', From 3e7c477965e3362c528eda0a49652d29cb38b2ce Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 7 Dec 2023 14:27:02 +0100 Subject: [PATCH 02/13] redusce coolant to prevent positive EU output (#773) --- .../dreammaster/gthandler/recipes/ChemicalBathRecipes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java index 29c6bd84d..db48eac91 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalBathRecipes.java @@ -63,8 +63,8 @@ public void run() { // Cooling Hot Netherrack Bricks GT_Values.RA.stdBuilder().itemInputs(CustomItemList.HotNetherrackBrick.get(1L)) .itemOutputs(CustomItemList.InfernalBrick.get(1L)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 1000)).duration(10 * SECONDS) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2coolant"), 250)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 250)).duration(10 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(chemicalBathRecipes); // Cooling Hot Kanthal MV GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Kanthal, 1L)) From 4942fdbe1f83907d81aaac0a3edb825cf1545cc4 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 7 Dec 2023 23:20:41 +0100 Subject: [PATCH 03/13] Fixrec (#774) * Remove all recipes * Fix + apply on all removals --------- Co-authored-by: kuba6000 --- .../dreammaster/forestry/ForestryHelper.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/dreammaster/forestry/ForestryHelper.java b/src/main/java/com/dreammaster/forestry/ForestryHelper.java index 7a93475ca..ccf530cc3 100644 --- a/src/main/java/com/dreammaster/forestry/ForestryHelper.java +++ b/src/main/java/com/dreammaster/forestry/ForestryHelper.java @@ -1,5 +1,7 @@ package com.dreammaster.forestry; +import java.util.stream.Collectors; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -9,31 +11,29 @@ public class ForestryHelper { public static void removeCarpenterRecipe(ItemStack output) { - RecipeManagers.carpenterManager.removeRecipe( - RecipeManagers.carpenterManager.recipes().stream().filter( - r -> GT_Utility.areStacksEqual(r.getCraftingGridRecipe().getRecipeOutput(), output, true)) - .findFirst().orElse(null)); + RecipeManagers.carpenterManager.recipes().stream() + .filter(r -> GT_Utility.areStacksEqual(r.getCraftingGridRecipe().getRecipeOutput(), output, true)) + .collect(Collectors.toList()).forEach(r -> RecipeManagers.carpenterManager.removeRecipe(r)); } public static void removeCentrifugeRecipe(ItemStack input) { - RecipeManagers.centrifugeManager.removeRecipe( - RecipeManagers.centrifugeManager.recipes().stream() - .filter(r -> GT_Utility.areStacksEqual(r.getInput(), input, true)).findFirst().orElse(null)); + RecipeManagers.centrifugeManager.recipes().stream() + .filter(r -> GT_Utility.areStacksEqual(r.getInput(), input, true)).collect(Collectors.toList()) + .forEach(r -> RecipeManagers.centrifugeManager.removeRecipe(r)); } public static void removeSqueezerRecipe(FluidStack output, ItemStack... inputs) { - RecipeManagers.squeezerManager.removeRecipe(RecipeManagers.squeezerManager.recipes().stream().filter(r -> { + RecipeManagers.squeezerManager.recipes().stream().filter(r -> { if (!GT_Utility.areFluidsEqual(r.getFluidOutput(), output, true)) return false; for (int i = 0, inputsLength = inputs.length; i < inputsLength; i++) if (!GT_Utility.areStacksEqual(r.getResources()[i], inputs[i], true)) return false; return true; - }).findFirst().orElse(null)); + }).collect(Collectors.toList()).forEach(r -> RecipeManagers.squeezerManager.removeRecipe(r)); } public static void removeFabricatorRecipe(ItemStack output) { - RecipeManagers.fabricatorManager.removeRecipe( - RecipeManagers.fabricatorManager.recipes().stream() - .filter(r -> GT_Utility.areStacksEqual(r.getRecipeOutput(), output, true)).findFirst() - .orElse(null)); + RecipeManagers.fabricatorManager.recipes().stream() + .filter(r -> GT_Utility.areStacksEqual(r.getRecipeOutput(), output, true)).collect(Collectors.toList()) + .forEach(r -> RecipeManagers.fabricatorManager.removeRecipe(r)); } } From af35c27fb24b7fd7479739562fcc4c0fc4cbe67b Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 9 Dec 2023 17:30:00 +0100 Subject: [PATCH 04/13] update version + deps --- dependencies.gradle | 6 +++--- src/main/java/com/dreammaster/lib/Refstrings.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1ef666ae9..4b89015b1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.98:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.104:dev") api("com.github.GTNewHorizons:Yamcl:0.5.86:dev") api("com.github.GTNewHorizons:Baubles:1.0.3:dev") @@ -9,14 +9,14 @@ dependencies { compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.7:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TecTech:5.3.20:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TecTech:5.3.22:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:bartworks:0.8.20:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly("curse.maven:witchery-69673:2234410") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.39:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.44:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false } diff --git a/src/main/java/com/dreammaster/lib/Refstrings.java b/src/main/java/com/dreammaster/lib/Refstrings.java index 4181db72a..93db29067 100644 --- a/src/main/java/com/dreammaster/lib/Refstrings.java +++ b/src/main/java/com/dreammaster/lib/Refstrings.java @@ -7,7 +7,7 @@ public final class Refstrings { public static final String MODID = Mods.Names.NEW_HORIZONS_CORE_MOD; public static final String NAME = "GT: New Horizons"; public static final String VERSION = BuildVersion.VERSION; - public static final String MODPACKPACK_VERSION = "2.4.2"; + public static final String MODPACKPACK_VERSION = "2.5.0"; public static final String CLIENTSIDE = "com.dreammaster.main.ClientProxy"; public static final String SERVERSIDE = "com.dreammaster.main.CommonProxy"; public static final String COLLECTIONID = "GTNewHorizons"; From 6fe4a801f6a91ab9da866089b8367dbcd7d9198d Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 9 Dec 2023 17:39:17 +0100 Subject: [PATCH 05/13] update dep --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4b89015b1..eb6bdcdc7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.104:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev") api("com.github.GTNewHorizons:Yamcl:0.5.86:dev") api("com.github.GTNewHorizons:Baubles:1.0.3:dev") From 927466d3b689b71cc71155f8eb89e76e553496fb Mon Sep 17 00:00:00 2001 From: ghostflyby Date: Mon, 11 Dec 2023 03:15:12 +0800 Subject: [PATCH 06/13] Recipe remove NPE (#775) * Fix occasional NPE * Remove null items * Use log instead of stdout Co-authored-by: Raven Szewczyk * log StackTrace in warn --------- Co-authored-by: Raven Szewczyk --- .../java/com/dreammaster/recipes/RecipeRemover.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index 9c9827cca..bbdaf590b 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -53,7 +53,16 @@ private static void stopBuffering() { int i = tList.size(); tList.removeIf(r -> { ItemStack rCopy = r.getRecipeOutput(); - if (rCopy == null) return false; // ???????????????????? + if (rCopy == null) { + return false; + } + if (rCopy.getItem() == null) { + MainRegistry.Logger.warn("Someone is adding recipes with null items!"); + for (StackTraceElement element : Thread.currentThread().getStackTrace()) { + MainRegistry.Logger.warn(element.toString()); + } + return true; + } if (rCopy.stackTagCompound != null) { rCopy = rCopy.copy(); rCopy.stackTagCompound = null; From 76d46c0c95ae776834cd96be6ab00c0c71a52c23 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 11 Dec 2023 11:45:35 +0100 Subject: [PATCH 07/13] updatebs+deps --- build.gradle | 8 +++++--- dependencies.gradle | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 8507c7dfb..50c3291c8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1701530445 +//version: 1702141377 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -54,7 +54,7 @@ plugins { id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26' } print("You might want to check out './gradlew :faq' if your build fails.\n") @@ -613,7 +613,7 @@ repositories { } maven { name = "ic2" - url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/") + url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/") content { includeGroup "net.industrial-craft" } @@ -672,6 +672,8 @@ configurations.all { substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + + substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets') } } diff --git a/dependencies.gradle b/dependencies.gradle index eb6bdcdc7..4b60d7c6f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -9,14 +9,14 @@ dependencies { compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.7:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TecTech:5.3.22:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TecTech:5.3.23:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:bartworks:0.8.20:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly("curse.maven:witchery-69673:2234410") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.44:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.45:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false } From 598309d06e0e9a9ea0777b02477b5567b79d4fbc Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:04:53 +0100 Subject: [PATCH 08/13] Handle Unbreakable TCon Tool achievement via code (#776) --- .../amazingtrophies/AchievementHandler.java | 13 +++++++++++++ .../java/com/dreammaster/main/MainRegistry.java | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java index ab62c3d68..2c66f0b3d 100644 --- a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java +++ b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java @@ -16,10 +16,12 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import cpw.mods.fml.relauncher.Side; import fox.spiteful.avaritia.items.LudicrousItems; +import tconstruct.library.tools.ToolCore; public class AchievementHandler { @@ -32,6 +34,7 @@ public class AchievementHandler { public static StatBase eternityBeaconAchievement; private static StatBase allEffects; private static StatBase hearts; + private static StatBase unbreakableTool; private static int numberPotions = 0; public static void init() { @@ -41,6 +44,7 @@ public static void init() { eternityBeaconAchievement = StatList.func_151177_a("eternity_beacon"); allEffects = StatList.func_151177_a("all_effects"); hearts = StatList.func_151177_a("100_hearts"); + unbreakableTool = StatList.func_151177_a("unbreakable_tconstruct_tool"); for (Potion potion : Potion.potionTypes) { if (potion != null && !potion.isInstant()) { @@ -124,6 +128,15 @@ public void onLivingHurt(LivingAttackEvent event) { } + @SubscribeEvent + public void onItemPickup(ItemPickupEvent event) { + ItemStack stack = event.pickedUp.getEntityItem(); + if (stack.getItem() instanceof ToolCore && stack.hasTagCompound() + && stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Unbreaking") >= 10) { + event.player.triggerAchievement(unbreakableTool); + } + } + private static boolean hasArmor(ItemStack[] armor, Item helmet, Item chestplate, Item leggins, Item boots) { ItemStack equippedHelmet = armor[3]; ItemStack equippedChestplate = armor[2]; diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java index 2fc567c93..424c64771 100644 --- a/src/main/java/com/dreammaster/main/MainRegistry.java +++ b/src/main/java/com/dreammaster/main/MainRegistry.java @@ -486,7 +486,10 @@ public void CompleteLoad(FMLLoadCompleteEvent event) { BW_RadHatchMaterial.runRadHatchAdder(); } if (Thaumcraft.isModLoaded()) TCLoader.checkRecipeProblems(); - if (Loader.isModLoaded("amazingtrophies") && BloodMagic.isModLoaded() && Avaritia.isModLoaded()) { + if (Loader.isModLoaded("amazingtrophies") && BloodMagic.isModLoaded() + && Avaritia.isModLoaded() + && SGCraft.isModLoaded() + && TinkerConstruct.isModLoaded()) { AchievementHandler.init(); AchievementHandler handler = new AchievementHandler(); MinecraftForge.EVENT_BUS.register(handler); From 24c2204193f8ba279982a79f85675a707b10f2af Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 12 Dec 2023 11:26:46 +0100 Subject: [PATCH 09/13] update deps --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4b60d7c6f..aa2bbfd83 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,15 +8,15 @@ dependencies { compileOnly("com.github.GTNewHorizons:Avaritia:1.46:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.7:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.8:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TecTech:5.3.23:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:bartworks:0.8.20:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:bartworks:0.8.21:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly("curse.maven:witchery-69673:2234410") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.45:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.46:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false } From 45cd2b0dd253cceab41e6e7ae0cc3258c65e4b4b Mon Sep 17 00:00:00 2001 From: 54M44R <26176694+54M44R@users.noreply.github.com> Date: Thu, 14 Dec 2023 05:38:58 -0500 Subject: [PATCH 10/13] Recipe Conflict + Recipe Fix (#780) * Update ScriptBiblioCraft.java Replaces the OpenComputers ButtonGroup for the TypeWriter with the Keyboard * Fix LogisticsPipes recipe conflict Replaces all LogisticsPipes blocks to use Integrated Circuit 24 instead of 18 in order to solve a recipe conflict between Crafting Logistics Pipes & Logistics Crafting Table --- .../scripts/ScriptBiblioCraft.java | 2 +- .../scripts/ScriptLogisticPipes.java | 90 +++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptBiblioCraft.java b/src/main/java/com/dreammaster/scripts/ScriptBiblioCraft.java index e76fab793..44305d967 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptBiblioCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptBiblioCraft.java @@ -756,7 +756,7 @@ public void loadRecipes() { addShapedRecipe( TypeWriterB[i], "plateRubber", - getModItem(OpenComputers.ID, "item", 1, 20), + getModItem(OpenComputers.ID, "keyboard", 1), "plateRubber", "ringIron", color16[i], diff --git a/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java b/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java index 0484cfc95..92ce0da4f 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java +++ b/src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java @@ -780,7 +780,7 @@ private void recipes1() { getModItem(IndustrialCraft2.ID, "itemPartCircuit", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -791,7 +791,7 @@ private void recipes1() { ItemList.Circuit_Basic.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -802,7 +802,7 @@ private void recipes1() { ItemList.Circuit_Microprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -813,7 +813,7 @@ private void recipes1() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 5, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -824,7 +824,7 @@ private void recipes1() { getModItem(IndustrialCraft2.ID, "itemPartCircuit", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -835,7 +835,7 @@ private void recipes1() { ItemList.Circuit_Basic.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -846,7 +846,7 @@ private void recipes1() { ItemList.Circuit_Microprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -857,7 +857,7 @@ private void recipes1() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 5, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -868,7 +868,7 @@ private void recipes1() { getModItem(IndustrialCraft2.ID, "itemPartCircuit", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 576)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -879,7 +879,7 @@ private void recipes1() { ItemList.Circuit_Basic.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 576)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -890,7 +890,7 @@ private void recipes1() { ItemList.Circuit_Microprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 576)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -901,7 +901,7 @@ private void recipes1() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 5, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 576)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -912,7 +912,7 @@ private void recipes1() { getModItem(IndustrialCraft2.ID, "itemPartCircuit", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 576)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -923,7 +923,7 @@ private void recipes1() { ItemList.Circuit_Basic.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 576)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -934,7 +934,7 @@ private void recipes1() { ItemList.Circuit_Microprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 576)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -945,7 +945,7 @@ private void recipes1() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 5, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 576)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -956,7 +956,7 @@ private void recipes1() { getModItem(IndustrialCraft2.ID, "itemPartCircuit", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 288)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -967,7 +967,7 @@ private void recipes1() { ItemList.Circuit_Basic.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 288)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -978,7 +978,7 @@ private void recipes1() { ItemList.Circuit_Microprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 288)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -989,7 +989,7 @@ private void recipes1() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 5, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 288)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -1000,7 +1000,7 @@ private void recipes1() { getModItem(IndustrialCraft2.ID, "itemPartCircuit", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 288)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -1011,7 +1011,7 @@ private void recipes1() { ItemList.Circuit_Basic.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 288)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -1022,7 +1022,7 @@ private void recipes1() { ItemList.Circuit_Microprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 288)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -1033,7 +1033,7 @@ private void recipes1() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 5, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 4L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 8L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 1, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 288)).duration(40 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -2875,7 +2875,7 @@ private void recipes2() { getModItem(LogisticsPipes.ID, "item.PipeItemsRequestLogistics", 1, 0, missing), getModItem(IronChests.ID, "BlockIronChest", 1, 3, missing), getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 2, 0, missing), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "item.PipeBlockRequestTable", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -2888,7 +2888,7 @@ private void recipes2() { getModItem(LogisticsPipes.ID, "item.PipeItemsRequestLogistics", 1, 0, missing), getModItem(IronChests.ID, "BlockIronChest", 1, 3, missing), ItemList.Circuit_Good.get(2L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "item.PipeBlockRequestTable", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -2901,7 +2901,7 @@ private void recipes2() { getModItem(LogisticsPipes.ID, "item.PipeItemsRequestLogistics", 1, 0, missing), getModItem(IronChests.ID, "BlockIronChest", 1, 3, missing), ItemList.Circuit_Integrated_Good.get(2L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "item.PipeBlockRequestTable", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -2914,7 +2914,7 @@ private void recipes2() { getModItem(LogisticsPipes.ID, "item.PipeItemsRequestLogistics", 1, 0, missing), getModItem(IronChests.ID, "BlockIronChest", 1, 3, missing), ItemList.Circuit_Processor.get(2L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "item.PipeBlockRequestTable", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -2927,7 +2927,7 @@ private void recipes2() { getModItem(LogisticsPipes.ID, "item.PipeItemsRequestLogistics", 1, 0, missing), getModItem(IronChests.ID, "BlockIronChest", 1, 3, missing), getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 6, missing), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "item.PipeBlockRequestTable", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3215,7 +3215,7 @@ private void recipes2() { getModItem(IndustrialCraft2.ID, "itemPartCircuitAdv", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 2, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3227,7 +3227,7 @@ private void recipes2() { ItemList.Circuit_Computer.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 2, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3239,7 +3239,7 @@ private void recipes2() { ItemList.Circuit_Nanoprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 2, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3251,7 +3251,7 @@ private void recipes2() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 7, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 4L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 2, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3265,7 +3265,7 @@ private void recipes2() { getModItem(IndustrialCraft2.ID, "itemPartCircuitAdv", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 3, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(45 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3279,7 +3279,7 @@ private void recipes2() { ItemList.Circuit_Computer.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 3, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(45 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3293,7 +3293,7 @@ private void recipes2() { ItemList.Circuit_Nanoprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 3, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(45 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3307,7 +3307,7 @@ private void recipes2() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 7, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 3, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(45 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3321,7 +3321,7 @@ private void recipes2() { getModItem(IndustrialCraft2.ID, "itemPartCircuitAdv", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 3, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(45 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3335,7 +3335,7 @@ private void recipes2() { ItemList.Circuit_Computer.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 3, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(45 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3349,7 +3349,7 @@ private void recipes2() { ItemList.Circuit_Nanoprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 3, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(45 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3363,7 +3363,7 @@ private void recipes2() { getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 7, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedSteel, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 3, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(45 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3381,7 +3381,7 @@ private void recipes2() { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 8L), getModItem(IndustrialCraft2.ID, "itemPartCircuitAdv", 2, 0, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Copper, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 5, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3393,7 +3393,7 @@ private void recipes2() { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 8L), ItemList.Circuit_Computer.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Copper, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 5, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3405,7 +3405,7 @@ private void recipes2() { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 8L), ItemList.Circuit_Nanoprocessor.get(2L), GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Copper, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 5, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3417,7 +3417,7 @@ private void recipes2() { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 8L), getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 2, 7, missing), GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Copper, 4L), - GT_Utility.getIntegratedCircuit(18)) + GT_Utility.getIntegratedCircuit(24)) .itemOutputs(getModItem(LogisticsPipes.ID, "logisticsSolidBlock", 1, 5, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 576)).duration(80 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); From 5bb5cfdc18eeb1f34d663ccf3fe44e0a92e9edd7 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 14 Dec 2023 11:46:52 +0100 Subject: [PATCH 11/13] update deps --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index aa2bbfd83..2bcb80852 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -16,7 +16,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly("curse.maven:witchery-69673:2234410") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.46:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.48:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false } From 4694f4a3eec0c05772b59f81761ff1ff8deb570f Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:38:57 +0100 Subject: [PATCH 12/13] add advanced radiation proof plate space assembler recipe (#777) Co-authored-by: Martin Robertz --- .../recipes/SpaceAssemblerRecipes.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java index f51702422..98d78af90 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java @@ -149,6 +149,26 @@ public void run() { null); } + if (GoodGenerator.isModLoaded()) { + // Advanced Radiation Proof Plate + IG_RecipeAdder.addSpaceAssemblerRecipe( + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lanthanum, 32L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 16L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 16L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 64L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 16L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 16L) }, + new FluidStack[] { new FluidStack(solderIndalloy, (32 * 144)), + Materials.Lead.getMolten(64 * 144L) }, + GT_ModHandler.getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 4L, 0), + 1, + 50 * 20, + (int) TierEU.ZPM, + null, + null); + } + // Alternate Energy Cluster Recipe IG_RecipeAdder.addSpaceAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Bio_Ultra.get(1), From 860de4f649c0c03d659125f252b8fa63c1720a47 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 18 Dec 2023 12:42:29 +0100 Subject: [PATCH 13/13] update deps --- dependencies.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 2bcb80852..2855fbf20 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,22 +1,22 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.108:dev") api("com.github.GTNewHorizons:Yamcl:0.5.86:dev") api("com.github.GTNewHorizons:Baubles:1.0.3:dev") compileOnly("com.github.GTNewHorizons:Avaritia:1.46:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.8:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.9:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TecTech:5.3.23:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:bartworks:0.8.21:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:bartworks:0.8.22:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly("curse.maven:witchery-69673:2234410") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.48:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.54:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false }