From 952efd857b33043ef1ef482b4651c1e9c36d220c Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 8 Nov 2024 00:49:53 +0100 Subject: [PATCH 01/17] update --- dependencies.gradle | 10 +++++----- settings.gradle | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1a65eb261..f2e9b4516 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,17 +1,17 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.56:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.58:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.5.18:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.5.19:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.6.34:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.23:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Mantle:0.4.1:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.24:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.12-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.2:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } @@ -21,7 +21,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.7:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false } - compileOnly("com.github.GTNewHorizons:amunra:0.7.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:amunra:0.7.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.16:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev") diff --git a/settings.gradle b/settings.gradle index 14cb8b7df..aa612ade0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.28' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29' } From 6ed3057c81dbbe70b29d8b00f45761f93b7fa5bf Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Fri, 8 Nov 2024 09:01:50 +0100 Subject: [PATCH 02/17] fix memory leak in RecipeRemover (#1056) Co-authored-by: Martin Robertz Co-authored-by: boubou19 --- .../dreammaster/recipes/RecipeRemover.java | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index 6a926e712..d2f6af417 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -111,32 +111,24 @@ public class RecipeRemover { - private static boolean bufferingRecipes = true; - - @SuppressWarnings("unchecked") - private static final ArrayList tList = (ArrayList) CraftingManager.getInstance().getRecipeList(); - - private static final HashMap>> bufferMap = new HashMap<>(); + private static HashMap>> bufferMap; private static void addToBuffer(HashSet outputs, Function whenToRemove) { for (GTUtility.ItemId output : outputs) { bufferMap.computeIfAbsent(output, o -> new ArrayList<>()).add(whenToRemove); } - if (!bufferingRecipes) stopBuffering(); } - private static void stopBuffering() { - int i = tList.size(); - tList.removeIf(r -> { + private static void flushBuffer() { + final ArrayList list = (ArrayList) CraftingManager.getInstance().getRecipeList(); + int i = list.size(); + list.removeIf(r -> { ItemStack rCopy = r.getRecipeOutput(); 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) { @@ -155,8 +147,7 @@ private static void stopBuffering() { } return false; }); - MainRegistry.Logger.info("Removed " + (i - tList.size()) + " recipes!"); - bufferMap.clear(); + MainRegistry.Logger.info("Removed " + (i - list.size()) + " recipes!"); } private static HashSet getItemsHashed(Object item, boolean includeWildcardVariants) { @@ -200,7 +191,7 @@ private static HashSet getItemsHashed(Object item, boolean inc * * @author kuba6000 */ - static void removeRecipeShapelessDelayed(Object aOutput, Object... aRecipe) { + private static void removeRecipeShapelessDelayed(Object aOutput, Object... aRecipe) { ArrayList aRecipeList = new ArrayList<>(Arrays.asList(aRecipe)); addToBuffer(getItemsHashed(aOutput, false), r -> { if (!(r instanceof ShapelessOreRecipe) && !(r instanceof ShapelessRecipes)) return false; @@ -252,7 +243,7 @@ static void removeRecipeShapelessDelayed(Object aOutput, Object... aRecipe) { * * @author kuba6000 */ - static void removeRecipeShapedDelayed(Object aOutput, Object[] row1, Object[] row2, Object[] row3) { + private static void removeRecipeShapedDelayed(Object aOutput, Object[] row1, Object[] row2, Object[] row3) { if (recipeWidthField == null) { try { recipeWidthField = ShapedOreRecipe.class.getDeclaredField("width"); @@ -316,7 +307,7 @@ static void removeRecipeShapedDelayed(Object aOutput, Object[] row1, Object[] ro * * @author kuba6000 */ - static void removeRecipeShapedDelayed(Object aOutput) { + private static void removeRecipeShapedDelayed(Object aOutput) { addToBuffer(getItemsHashed(aOutput, false), r -> r instanceof ShapedOreRecipe || r instanceof ShapedRecipes); } @@ -325,12 +316,12 @@ static void removeRecipeShapedDelayed(Object aOutput) { * * @author kuba6000 */ - static void removeRecipeByOutputDelayed(Object aOutput) { + private static void removeRecipeByOutputDelayed(Object aOutput) { addToBuffer(getItemsHashed(aOutput, false), r -> true); } public static void run() { - + bufferMap = new HashMap<>(); final long timeStart = System.currentTimeMillis(); // AUTOGENERATED FROM SCRIPTS @@ -3358,9 +3349,8 @@ public static void run() { new Object[0], new Object[0]); - stopBuffering(); - bufferingRecipes = false; - + flushBuffer(); + bufferMap = null; final long timeToLoad = System.currentTimeMillis() - timeStart; MainRegistry.Logger.info("Recipes removal took " + timeToLoad + " ms."); } From 3cdfa006f7425a13207fa985dcf6680162a8d0f8 Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:30:41 -0300 Subject: [PATCH 03/17] Added wiremill recipe for projectRed Red Alloy Wire (#1074) Co-authored-by: Martin Robertz --- .../java/com/dreammaster/scripts/ScriptProjectRed.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java index ef1055bfa..32b8582cf 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java +++ b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java @@ -38,6 +38,7 @@ import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.packagerRecipes; import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; +import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; @@ -3800,6 +3801,12 @@ private void recipes2() { com.dreammaster.item.ItemList.ElectrotineWire.getIS(1), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1)) .duration(5 * SECONDS).eut(8).addTo(unpackagerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 0, missing)) + .duration(SECONDS).eut(8).addTo(wiremillRecipes); } } From 0bfae0b0e9179ab72a337ab70721987ff475b195 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 8 Nov 2024 18:21:08 +0100 Subject: [PATCH 04/17] update --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f2e9b4516..c67caf551 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.58:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.59:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -13,7 +13,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.24:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.12-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") compileOnly("com.github.GTNewHorizons:Chisel:2.15.3-GTNH:dev") { transitive = false } From 8d2e5aca0139f6bc05264333717bc2da9b664c84 Mon Sep 17 00:00:00 2001 From: BlueHero233 <87818077+BlueHero233@users.noreply.github.com> Date: Sat, 9 Nov 2024 15:58:57 -0300 Subject: [PATCH 05/17] Icon rename (#1061) Co-authored-by: Martin Robertz --- .../com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java b/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java index 180a19ac6..c7b340af1 100644 --- a/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java +++ b/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java @@ -71,7 +71,7 @@ public void registerBlockIcons(IIconRegister aIconRegister) {} public IIcon getIcon(int aSide, int aMeta) { switch (aMeta) { case 0: - return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TURBINE_STEEL.getIcon(); case 1: return Textures.BlockIcons.MACHINE_CASING_PIPE_STEEL.getIcon(); case 2: From c1170c11aea78b1f0ae5741f69923c04da010108 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 9 Nov 2024 19:59:33 +0100 Subject: [PATCH 06/17] update --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c67caf551..3f49f3b3e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.59:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.61:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -9,7 +9,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:twilightforest:2.6.34:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.24:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.12-GTNH:dev") { transitive = false } From 40e4c19cec53052891a667483f131bd64b532ed3 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Sun, 10 Nov 2024 19:28:02 +0100 Subject: [PATCH 07/17] remove logfactory --- .../java/com/dreammaster/scripts/ScriptOpenComputers.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptOpenComputers.java b/src/main/java/com/dreammaster/scripts/ScriptOpenComputers.java index 329572ac8..6700f2925 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptOpenComputers.java +++ b/src/main/java/com/dreammaster/scripts/ScriptOpenComputers.java @@ -8,17 +8,12 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.enums.ItemList; import gregtech.api.enums.Mods; public class ScriptOpenComputers implements IScriptLoader { - private static final Log log = LogFactory.getLog(ScriptOpenComputers.class); - @Override public String getScriptName() { return "Open Computers"; From 51082b73723a025d1ec7225e47b6cb913a191e94 Mon Sep 17 00:00:00 2001 From: BlueHero233 <87818077+BlueHero233@users.noreply.github.com> Date: Sun, 10 Nov 2024 19:11:17 -0300 Subject: [PATCH 08/17] Add lepidopterology chest to Script (#1078) --- .../dreammaster/scripts/ScriptForestry.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptForestry.java b/src/main/java/com/dreammaster/scripts/ScriptForestry.java index 035d4470a..72e760b26 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptForestry.java +++ b/src/main/java/com/dreammaster/scripts/ScriptForestry.java @@ -2778,6 +2778,32 @@ private void recipes1() { GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'i', getModItem(Forestry.ID, "crate", 1, 0, missing)); + RecipeManagers.carpenterManager.addRecipe( + 60, + FluidRegistry.getFluidStack("seedoil", 1000), + getModItem(Minecraft.ID, "chest", 1, 0, missing), + getModItem(Forestry.ID, "lepidopterology", 1, 0, missing), + "abc", + "def", + "ghi", + 'a', + getModItem(Forestry.ID, "butterflyGE", 1, wildcard, missing), + 'b', + getModItem(Forestry.ID, "butterflyGE", 1, wildcard, missing), + 'c', + getModItem(Forestry.ID, "butterflyGE", 1, wildcard, missing), + 'd', + getModItem(Forestry.ID, "crate", 1, 0, missing), + 'e', + getModItem(Forestry.ID, "crate", 1, 0, missing), + 'f', + getModItem(Forestry.ID, "crate", 1, 0, missing), + 'g', + getModItem(Forestry.ID, "crate", 1, 0, missing), + 'h', + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), + 'i', + getModItem(Forestry.ID, "crate", 1, 0, missing)); RecipeManagers.carpenterManager.addRecipe( 60, FluidRegistry.getFluidStack("for.honey", 5000), From 5aa46b8a4ae568025134470048d0963746d39af8 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Mon, 11 Nov 2024 10:17:46 +0100 Subject: [PATCH 09/17] Improve the Name Remover machine (#1079) Co-authored-by: Martin Robertz Co-authored-by: Wilhelm Schuster --- .../gthandler/nameRemover/NameRemover.java | 69 +++++++++++++------ 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java b/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java index 3b2a82c12..a24724dcf 100644 --- a/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java +++ b/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java @@ -15,6 +15,7 @@ import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.CoverableTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.MTEBasicMachine; import gregtech.api.objects.GTRenderedTexture; @@ -58,18 +59,21 @@ public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { @Override public int checkRecipe() { if (getInputAt(0) == null) return 0; - ItemStack output = getInputAt(0).copy(); NBTTagCompound nbt = output.getTagCompound(); - boolean removeName = false, removeDye = false, removeDisassembly = false, removeColor = false, - removeRepair = false, removeSpray = false; - if (nbt != null) { - ItemStack circuit = getInputAt(1); int circuitSetting = 0; - if (circuit != null && circuit.getItem() instanceof ItemIntegratedCircuit) + ItemStack circuit = getInputAt(1); + if (circuit != null && circuit.getItem() instanceof ItemIntegratedCircuit) { circuitSetting = circuit.getItemDamage(); - + } + boolean removeName = false; + boolean removeDisassembly = false; + boolean removeColor = false; + boolean removeRepair = false; + boolean removeDye = false; + boolean removeSpray = false; + boolean removeCovers = false; switch (circuitSetting) { case 1: removeName = true; @@ -89,6 +93,8 @@ public int checkRecipe() { case 6: removeSpray = true; break; + case 24: + removeCovers = true; default: removeName = true; removeDisassembly = true; @@ -103,23 +109,35 @@ public int checkRecipe() { nbt.removeTag("display"); } } - if (removeDisassembly && nbt.hasKey("GT.CraftingComponents")) { - nbt.removeTag("GT.CraftingComponents"); - } - if (removeColor && nbt.hasKey("color")) { - nbt.removeTag("color"); - } - if (removeRepair && nbt.hasKey("RepairCost")) { - nbt.removeTag("RepairCost"); - } + if (removeDisassembly) removeTag(nbt, "GT.CraftingComponents"); + if (removeColor) removeTag(nbt, "color"); + if (removeRepair) removeTag(nbt, "RepairCost"); if (removeDye && nbt.hasKey("display")) { nbt.getCompoundTag("display").removeTag("color"); if (nbt.getCompoundTag("display").hasNoTags()) { nbt.removeTag("display"); } } - if (removeSpray && nbt.hasKey("mColor")) { - nbt.removeTag("mColor"); + if (removeSpray) removeTag(nbt, "mColor"); + removeTag(nbt, "mTargetStackSize"); // MTEBuffer + removeTag(nbt, "mOutputFluid"); // MTEDigitalTankBase + removeTag(nbt, "mVoidOverflow"); // MTEDigitalTankBase & MTEQuantumChest + removeTag(nbt, "mVoidFluidFull"); // MTEDigitalTankBase + removeTag(nbt, "mLockFluid"); // MTEDigitalTankBase + removeTag(nbt, "lockedFluidName"); // MTEDigitalTankBase + removeTag(nbt, "mAllowInputFromOutputSide"); // MTEDigitalTankBase + removeTag(nbt, "mItemsPerSide"); // MTEItemDistributor + removeTag(nbt, "radiusConfig"); // MTEMiner & MTEPump + removeTag(nbt, "mDisallowRetract"); // MTEPump + removeTag(nbt, "mStrongRedstone"); // BaseMetaTileEntity + if (removeCovers) { // BaseMetaTileEntity + removeTag(nbt, "mMuffler"); + removeTag(nbt, "mLockUpgrade"); + removeTag(nbt, "mCoverSides"); + removeTag(nbt, "gt.covers"); + for (String key : CoverableTileEntity.COVER_DATA_NBT_KEYS) { + removeTag(nbt, key); + } } if (nbt.hasNoTags()) { output.setTagCompound(null); @@ -135,10 +153,16 @@ public int checkRecipe() { return 0; } + private static void removeTag(NBTTagCompound nbt, String key) { + if (nbt.hasKey(key)) { + nbt.removeTag(key); + } + } + @Override public String[] getDescription() { List description = new ArrayList<>(); - description.add("Removes various NBT tags."); + description.add("Removes various NBT tags as well as covers."); description.add(" "); description.add(UNDERLINE + "First Slot" + RESET); description.add("The item you want to strip of NBT"); @@ -150,9 +174,12 @@ public String[] getDescription() { description.add(BOLD + "Circuit 4:" + RESET + " Remove Anvil repair tag"); description.add(BOLD + "Circuit 5:" + RESET + " Remove Dye from Leather armor"); description.add(BOLD + "Circuit 6:" + RESET + " Remove Spray color from GT items"); + description.add( + BOLD + "Circuit 24:" + + RESET + + " Remove everything including covers. Be careful you won't recover the covers!"); description.add(" "); - description.add(BOLD + "No Circuit:" + RESET + " Remove all of the above"); - + description.add(BOLD + "No Circuit:" + RESET + " Remove everything except covers"); return description.toArray(new String[0]); } From da72e1cb7c6eb7ff2afa8cd28ae8e8c7002545d3 Mon Sep 17 00:00:00 2001 From: Dream Master Date: Mon, 11 Nov 2024 10:30:18 +0100 Subject: [PATCH 10/17] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3f49f3b3e..197f28e52 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.61:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.62:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") From 0891aae4b84f78a079a783f4909a3ec8497cd291 Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Tue, 12 Nov 2024 07:24:58 -0300 Subject: [PATCH 11/17] Removed Ultra Dense ME conduit recipe (#1080) --- .../java/com/dreammaster/scripts/ScriptEnderIO.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 5ba57343d..ee1d95e40 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -122,16 +122,6 @@ public void loadRecipes() { .fluidInputs(Materials.EnergeticAlloy.getMolten(144L)).duration(10 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - // ME Ultra Dense Conduit - GTValues.RA.stdBuilder() - .itemInputs( - getModItem(EnderIO.ID, "itemMEConduit", 16, 1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), - circuit2) - .itemOutputs(getModItem(EnderIO.ID, "itemMEConduit", 4, 2)) - .fluidInputs(Materials.VibrantAlloy.getMolten(144L)).duration(10 * SECONDS).eut(960) - .addTo(assemblerRecipes); - ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( createItemStack( EnderIO.ID, From e5277553d45a168c8f4ffb8c740527f744988bf9 Mon Sep 17 00:00:00 2001 From: Dream Master Date: Tue, 12 Nov 2024 12:13:39 +0100 Subject: [PATCH 12/17] update --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 197f28e52..9eaba889f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,18 +1,18 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.62:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.65:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.5.19:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.5.20:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.24:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.12-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.13-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") From cc9287379539eb7bce92dc2a1728a3181ca9c487 Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:17:17 +0200 Subject: [PATCH 13/17] Add Cosmic Neutronium Block Solidifier Recipe (#1042) Co-authored-by: Martin Robertz --- .../gthandler/recipes/FluidSolidifierRecipes.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java index cd531b6f8..9e2336312 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java @@ -1,5 +1,6 @@ package com.dreammaster.gthandler.recipes; +import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; @@ -29,6 +30,8 @@ public class FluidSolidifierRecipes implements Runnable { @Override public void run() { + makeAvaritiaRecipes(); + // Sodium Dust GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) @@ -431,4 +434,14 @@ public void run() { .eut(TierEU.RECIPE_UIV).itemOutputs(ItemList.Hawking_Glass.get(1)).addTo(fluidSolidifierRecipes); } } + + private void makeAvaritiaRecipes() { + if (!Avaritia.isModLoaded()) { + return; + } + GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(Materials.CosmicNeutronium.getBlocks(1)) + .fluidInputs(Materials.CosmicNeutronium.getMolten(1296L)).duration(15 * SECONDS).eut(TierEU.RECIPE_ZPM) + .addTo(fluidSolidifierRecipes); + } } From 346cac8e0048b75111d099faeb6cb500a58935da Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:23:25 +0100 Subject: [PATCH 14/17] Delete GT++ Super chests (#1081) --- src/main/java/com/dreammaster/recipes/RecipeRemover.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index d2f6af417..8462213b2 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -1167,11 +1167,6 @@ public static void run() { removeRecipeByOutputDelayed(ItemList.Emitter_UHV.get(1L)); removeRecipeByOutputDelayed(ItemList.Sensor_UHV.get(1L)); removeRecipeByOutputDelayed(ItemList.Field_Generator_UHV.get(1L)); - removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_LV.get(1)); - removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_MV.get(1)); - removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_HV.get(1)); - removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_EV.get(1)); - removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_IV.get(1)); removeRecipeByOutputDelayed(GregtechItemList.Industrial_WireFactory.get(1)); removeRecipeByOutputDelayed(GregtechItemList.Boiler_Advanced_LV.get(1)); removeRecipeByOutputDelayed(new ItemStack(ModItems.itemBoilerChassis, 1, 0)); From 96cf06c0188e410a743ecc65565d6fe244a5f4c6 Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Sat, 16 Nov 2024 08:07:37 -0300 Subject: [PATCH 15/17] Added EU consumption to Air-Filter Tooltip (#1082) Co-authored-by: Martin Robertz --- .../multiAirFilter/GT_MetaTileEntity_AirFilterBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java index e5c42452c..0f4c99ff0 100644 --- a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java +++ b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java @@ -189,7 +189,8 @@ protected MultiblockTooltipBuilder createTooltip() { + "^mufflerTier)") .addInfo("every second").addInfo("- multiTierBonus for this controller is " + getBonusByTier()) .addInfo("- turbineEff is the efficiency of the Turbine in controller slot") - .addInfo("- Effective muffler tier is limited by energy input tier").addSeparator() + .addInfo("- Effective muffler tier is limited by energy input tier") + .addInfo("- Uses " + this.getRecipe().mEUt + " EU/t while working").addSeparator() .addInfo("Insert " + ItemList.AdsorptionFilter.getIS().getDisplayName() + " in an input bus") .addInfo(" to double pollution cleaning amount (30 uses per item)") .addInfo("Each maintenance issue reduces cleaning amount by 10%").beginStructureBlock(3, 4, 3, true) From 722b73e03ef8b49ca68558f22d6109e422a0b615 Mon Sep 17 00:00:00 2001 From: Ableytner <56540036+Ableytner@users.noreply.github.com> Date: Sat, 16 Nov 2024 15:14:10 +0100 Subject: [PATCH 16/17] Fix glass dupe using aurora (#1075) --- .../gthandler/GT_CraftingRecipeLoader.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index 161ff0b2d..004b57489 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -1710,14 +1710,30 @@ public void run() { } if (ZTones.isModLoaded()) { + // for recycling GTModHandler.addCraftingRecipe( GTModHandler.getModItem(ZTones.ID, "stoneTile", 8L, 0), - bits, + GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { " S ", "STS", " S ", 'S', new ItemStack(Blocks.stone_slab, 1), 'T', + new ItemStack(Blocks.stone, 1) }); + GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(ZTones.ID, "stoneTile", 8L, 0)); + // actual + GTModHandler.addCraftingRecipe( + GTModHandler.getModItem(ZTones.ID, "stoneTile", 8L, 0), + bits4, new Object[] { "SSS", "STS", "SSS", 'S', new ItemStack(Blocks.stone_slab, 1), 'T', new ItemStack(Blocks.stone, 1) }); + // for recycling GTModHandler.addCraftingRecipe( GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0), - bits, + GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { " G ", "GDG", " G ", 'G', new ItemStack(Blocks.glass, 1), 'D', + new ItemStack(Items.dye, 1, GTValues.W) }); + GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0)); + // actual + GTModHandler.addCraftingRecipe( + GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0), + bits4, new Object[] { "GGG", "GDG", "GGG", 'G', new ItemStack(Blocks.glass, 1), 'D', new ItemStack(Items.dye, 1, GTValues.W) }); GTModHandler.addCraftingRecipe( From ccd0a54badb93df64c64e1bb928853515080ec0e Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 16 Nov 2024 15:42:55 +0100 Subject: [PATCH 17/17] update --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 9eaba889f..372fe79c2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.65:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.68:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -12,7 +12,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.24:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.13-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.14-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")