From 06f6c817cc4b1252cabe171d3ae727fafb9e9ab1 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:40:18 +0100 Subject: [PATCH 1/2] Fix array out of bounds crash in DebugHandler (#1083) --- src/main/java/com/dreammaster/main/DebugHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/main/DebugHandler.java b/src/main/java/com/dreammaster/main/DebugHandler.java index 142a07463..7097527d0 100644 --- a/src/main/java/com/dreammaster/main/DebugHandler.java +++ b/src/main/java/com/dreammaster/main/DebugHandler.java @@ -13,7 +13,12 @@ public final class DebugHandler { public void onDrawDebug(RenderGameOverlayEvent.Text event) { if (Minecraft.getMinecraft().gameSettings.showDebugInfo) { if (MainRegistry.CoreConfig.ModDebugVersionDisplay_Enabled) { - event.left.add(1, String.format("%s %s", Refstrings.NAME, Refstrings.MODPACKPACK_VERSION)); + final String text = String.format("%s %s", Refstrings.NAME, Refstrings.MODPACKPACK_VERSION); + if (event.left.isEmpty()) { + event.left.add(text); + } else { + event.left.add(1, text); + } } } } From 9a5027c2b352aaf4e922c237186b61704e1ffb82 Mon Sep 17 00:00:00 2001 From: LazyFleshWasTaken <40587985+LazyFleshWasTaken@users.noreply.github.com> Date: Sun, 17 Nov 2024 15:37:11 -0800 Subject: [PATCH 2/2] 9x Oreberry maceration to remove tiny dust (#1086) --- .../gthandler/recipes/MaceratorRecipes.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java index 0dce15ccb..70770be01 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java @@ -181,25 +181,25 @@ public void run() { .duration(10 * SECONDS).eut(2).addTo(maceratorRecipes); // Oreberries - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 1L, 0)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1L)).outputChances(10000) - .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 9L, 0)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)).outputChances(10000) + .duration(15 * SECONDS).eut(18).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 1L, 1)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1L)).outputChances(10000) - .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 9L, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)).outputChances(10000) + .duration(15 * SECONDS).eut(18).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 1L, 2)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L)) - .outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 9L, 2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L)).outputChances(10000) + .duration(15 * SECONDS).eut(18).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 1L, 3)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L)).outputChances(10000) - .duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 9L, 3)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L)).outputChances(10000) + .duration(15 * SECONDS).eut(18).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 1L, 4)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminium, 1L)) - .outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 9L, 4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L)) + .outputChances(10000).duration(15 * SECONDS).eut(18).addTo(maceratorRecipes); }