From 5cd8d8ce0c542f26cd85e22a39005a16e8f9d138 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 15 Jan 2025 01:40:36 +0900 Subject: [PATCH 1/7] Migrate to new way of specifying QFT catalyst (#1163) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- dependencies.gradle | 4 ++-- .../com/dreammaster/scripts/ScriptGregtechPlusPlus.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 964e90c3d..e64423b70 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.70:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.72:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -10,7 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.21:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.22:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index 68ff65dd7..88901771c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -9,6 +9,7 @@ import static gregtech.api.enums.Mods.RemoteIO; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST; import static gregtech.api.util.GTRecipeConstants.QFT_FOCUS_TIER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes; @@ -30,9 +31,9 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.material.MaterialsAlloy; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry; public class ScriptGregtechPlusPlus implements IScriptLoader { @@ -95,11 +96,11 @@ public void loadRecipes() { GTValues.RA.stdBuilder() .itemInputs( getModItem(EternalSingularity.ID, "combined_singularity", 1, 15, missing), - ItemList.EnergisedTesseract.get(1), - ItemUtils.getSimpleStack(GenericChem.TemporalHarmonyCatalyst, 0)) + ItemList.EnergisedTesseract.get(1)) .itemOutputs(GTOreDictUnificator.get("dustShirabon", 64), ItemList.Timepiece.get(1)) .fluidInputs(MaterialsUEVplus.PrimordialMatter.getFluid(1152)) .fluidOutputs(MaterialsUEVplus.Eternity.getMolten(9216), MaterialsUEVplus.Time.getMolten(18432)) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.TemporalHarmonyCatalyst)) .metadata(QFT_FOCUS_TIER, 4).duration(20 * SECONDS).eut(TierEU.RECIPE_UMV) .addTo(quantumForceTransformerRecipes); addForestryRecipes(); From 623800a1a3660a0427f45c28bb925140d4797c69 Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Wed, 15 Jan 2025 03:58:57 -0300 Subject: [PATCH 2/7] Add Chromatic Glass Crystal (#1149) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../com/dreammaster/gthandler/CustomItemList.java | 3 +++ .../dreammaster/gthandler/GT_Loader_Items.java | 3 +++ .../gthandler/recipes/ForgeHammerRecipes.java | 8 ++++++++ .../gthandler/recipes/MaceratorRecipes.java | 13 +++++++++++++ .../java/com/dreammaster/item/NHItemList.java | 3 +++ .../resources/assets/dreamcraft/lang/en_US.lang | 3 +++ .../textures/items/itemChromaticGem.png | Bin 0 -> 350 bytes .../textures/items/itemChromaticGemExquisite.png | Bin 0 -> 651 bytes .../textures/items/itemChromaticGemFlawless.png | Bin 0 -> 514 bytes 9 files changed, 33 insertions(+) create mode 100644 src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png create mode 100644 src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png create mode 100644 src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java index 64956252c..7d9bbb3ed 100644 --- a/src/main/java/com/dreammaster/gthandler/CustomItemList.java +++ b/src/main/java/com/dreammaster/gthandler/CustomItemList.java @@ -385,6 +385,9 @@ public enum CustomItemList implements IItemContainer { BioBall, PotassiumHydroxideDust, ChromaticLens, + ChromaticGem, + ChromaticGemFlawless, + ChromaticGemExquisite, RadoxPolymerLens, NanoCircuitOrigin, ChevronOrigin, diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java index 96ecf4e51..62c390dda 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java @@ -427,6 +427,9 @@ private void registerItems() { CustomItemList.PotassiumHydroxideDust.set(NHItemList.PotassiumHydroxideDust.getIS()); CustomItemList.RadoxPolymerLens.set(NHItemList.RadoxPolymerLens.getIS()); CustomItemList.ChromaticLens.set(NHItemList.ChromaticLens.getIS()); + CustomItemList.ChromaticGem.set(NHItemList.ChromaticGem.getIS()); + CustomItemList.ChromaticGemFlawless.set(NHItemList.ChromaticGemFlawless.getIS()); + CustomItemList.ChromaticGemExquisite.set(NHItemList.ChromaticGemExquisite.getIS()); CustomItemList.NanoCircuitOrigin.set(NHItemList.NanoCircuitOrigin.getIS()); CustomItemList.ChevronOrigin.set(NHItemList.ChevronOrigin.getIS()); CustomItemList.FramePartOrigin.set(NHItemList.FramePartOrigin.getIS()); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java index bc02614a7..ef07d229f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java @@ -30,6 +30,14 @@ public void run() { .itemOutputs(ItemList.GalliumArsenideCrystalSmallPart.get(4L)).duration(2 * SECONDS + 10 * TICKS).eut(4) .addTo(hammerRecipes); + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemExquisite.get(1)) + .itemOutputs(CustomItemList.ChromaticGemFlawless.get(2)).duration(2 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(hammerRecipes); + + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemFlawless.get(1)) + .itemOutputs(CustomItemList.ChromaticGem.get(2)).duration(2 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(hammerRecipes); + if (TinkerConstruct.isModLoaded()) { GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "Smeltery", 1L, 2)) .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 3L, 2)).duration(1 * SECONDS) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java index 403a43804..ffc412df5 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java @@ -28,6 +28,7 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.material.MaterialsElements; public class MaceratorRecipes implements Runnable { @@ -92,6 +93,18 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L)) .outputChances(10000, 2500, 2000, 1500).duration(10 * SECONDS).eut(8).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemExquisite.get(1)) + .itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(8)).duration(16 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(maceratorRecipes); + + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemFlawless.get(1)) + .itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(4)).duration(8 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(maceratorRecipes); + + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGem.get(1)) + .itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(2)).duration(4 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(maceratorRecipes); + if (OpenPrinters.isModLoaded()) { // Open Printers diff --git a/src/main/java/com/dreammaster/item/NHItemList.java b/src/main/java/com/dreammaster/item/NHItemList.java index bf95c2575..f868e6ad7 100644 --- a/src/main/java/com/dreammaster/item/NHItemList.java +++ b/src/main/java/com/dreammaster/item/NHItemList.java @@ -554,6 +554,9 @@ public enum NHItemList { CircuitMAX(new ModSimpleBaseItem("CircuitMAX", ModTabList.ModCircuitsTab)), RadoxPolymerLens(new ModSimpleBaseItem("RadoxPolymerLens", ModTabList.ModSpaceTab)), ChromaticLens(new ModSimpleBaseItem("ChromaticLens", ModTabList.ModSpaceTab)), + ChromaticGem(new ModSimpleBaseItem("ChromaticGem", ModTabList.ModSpaceTab)), + ChromaticGemFlawless(new ModSimpleBaseItem("ChromaticGemFlawless", ModTabList.ModSpaceTab)), + ChromaticGemExquisite(new ModSimpleBaseItem("ChromaticGemExquisite", ModTabList.ModSpaceTab)), NanoCircuitOrigin(new ModSimpleBaseItem("OriginNanoCircuit", ModTabList.ModSpaceTab)), GatePlateOrigin(new ModSimpleBaseItem("OriginGatePlate", ModTabList.ModSpaceTab)), ChevronOrigin(new ModSimpleBaseItem("OriginChevron", ModTabList.ModSpaceTab)), diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang index 662fd5daf..9edcc9452 100644 --- a/src/main/resources/assets/dreamcraft/lang/en_US.lang +++ b/src/main/resources/assets/dreamcraft/lang/en_US.lang @@ -611,6 +611,9 @@ item.CircuitUXV.name=Any UXV Circuit item.CircuitMAX.name=Any MAX Circuit item.RadoxPolymerLens.name=Radox Polymer Lens item.ChromaticLens.name=Chromatic Lens +item.ChromaticGem.name=Chromatic Crystal +item.ChromaticGemFlawless.name=Flawless Chromatic Crystal +item.ChromaticGemExquisite.name=Exquisite Chromatic Crystal item.Origin.tooltip=The first conquering item.Origin.version=(2.1.0.0) item.OriginNanoCircuit.name=Nano Circuit of Split Origin diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png new file mode 100644 index 0000000000000000000000000000000000000000..bc8bc46fb778245bd6656558382a2c33ff9dadc2 GIT binary patch literal 350 zcmV-k0iphhP)1vQ4x*3|aDl8a8QH)}kT-Kb^N`;3bza_|nA-wwpl>h($07*qoM6N<$g2~#M!vFvP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png new file mode 100644 index 0000000000000000000000000000000000000000..c2ad6560441741fec5a3d28a3b00527455be5b80 GIT binary patch literal 651 zcmV;60(AX}P)r#!?%OvbEb=L2#HUitwL zdayV)Xb;W>UBTCliBq^z2v&e4QPGV?JWz#}{8RT}738fbLi z2S9OH=ul+NyAw-|18t7@fT_N;+IEROWptg002ovPDHLkV1lp@I*R}R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png new file mode 100644 index 0000000000000000000000000000000000000000..bd3a6c978c55819e0f4d61ecba68defd9df16d29 GIT binary patch literal 514 zcmV+d0{#7oP)CWn+AvcAhk^R?R9YOr80g^cuJICmpY+`5cD zlLJ5nUCJ$sOQToG-?_=k+p;>%gc8`cjV>&h$_~0!oH0y80#H59b768Xlz5OJv%97= z;|yx@;$Zl0Ul5N8#7L57AJf#oeEe3=)Puh~0<#Dz~znGn1S*O|FPV;)ztW zf;&BdlpR#irQ(bckNts7GZ1pXl}n=yLw7ryjDuyXJ6xz*;! zPoL~&Eo$J4Wo@HrkhaD#jk7%cl%W^M0emf;VD@^3saG}bt=!fk1^_!-4URhdlv`O^ zu8VWhL3jn)Z3jP4B%jx4e0~4-EdVUoOWMO1ht$68F%pYm$vI>IB4xpoO=|Tw++Qt( z4k>bp>vM}5z@v(%KA3g Date: Wed, 15 Jan 2025 11:46:09 +0100 Subject: [PATCH 3/7] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index e64423b70..b933bd928 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.72:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.73:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") From d0e832e6d5df84a80b00c79a33058fe700b1ebbb Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Thu, 16 Jan 2025 01:26:11 -0300 Subject: [PATCH 4/7] Add Assembler Recipes to GTPP Bee Frames (#1165) --- .../scripts/ScriptGregtechPlusPlus.java | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index 88901771c..df82bd9b2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -7,6 +7,7 @@ import static gregtech.api.enums.Mods.IronTanks; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.RemoteIO; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST; @@ -30,6 +31,7 @@ import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; +import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.chemistry.GenericChem; @@ -108,6 +110,83 @@ public void loadRecipes() { @Optional.Method(modid = Mods.Names.FORESTRY) private void addForestryRecipes() { + + // Arborist Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.WoodSealed, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.WoodSealed, 4), + GTModHandler.getModItem(Minecraft.ID, "paper", 1, 0, missing), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameArborist)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Stabilization Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameStalilize)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Slowing Frame + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.TUMBAGA.getLongRod(4), + MaterialsAlloy.TUMBAGA.getRod(4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameSlow, 1, 0)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Decaying Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.WroughtIron, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameDecay)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); + + // Working Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(new ItemStack(FRItemRegistry.hiveFrameBusy)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Mutagenic Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Uranium235, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Plutonium241, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameMutagenic)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Accelerated Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Electrum, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameAccelerated)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), new ItemStack(FRItemRegistry.hiveFrameVoid)); RecipeManagers.carpenterManager.addRecipe( 60, From 1ef0549153e83b0621600ee34147e156ddb7d6d7 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 16 Jan 2025 13:08:26 +0100 Subject: [PATCH 5/7] update --- dependencies.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index b933bd928..5018f5d95 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,28 +1,28 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.73:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.75: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.6.1:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.3:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.22:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0: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.16.1-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0: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.8.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.2-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev") From b975609f516c47af20e968f692d7ff03f2302ab3 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Thu, 16 Jan 2025 17:47:19 +0100 Subject: [PATCH 6/7] Remove iridium plate recipe from double ingot (#1166) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../com/dreammaster/scripts/ScriptIndustrialCraft.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java index b79eeaddc..4499f5e72 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java @@ -979,14 +979,6 @@ public void loadRecipes() { "ingotIridium", null, null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - "craftingToolHardHammer", - null, - null, - GTOreDictUnificator.get(OrePrefixes.ingotDouble, Materials.Iridium, 1L), - null, - null); addShapedRecipe( createItemStack( From 6d576a6a70a093d0977a3945025111595a41316c Mon Sep 17 00:00:00 2001 From: SarcasticMax Date: Fri, 17 Jan 2025 15:47:10 +1100 Subject: [PATCH 7/7] Remove map recipe from crafting and recipe removal logic (#1168) --- .../java/com/dreammaster/recipes/RecipeRemover.java | 1 - .../java/com/dreammaster/scripts/ScriptMinecraft.java | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index e4913edc9..ed83cea00 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -1813,7 +1813,6 @@ public static void run() { removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "painting", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "flint_and_steel", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "dragon_egg", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "map", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "wooden_door", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "iron_door", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "skull", 1, 1, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index 6f6704c49..10a388510 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -4278,17 +4278,6 @@ private void craftingRecipes() { null, "craftingToolScrewdriver", null); - addShapedRecipe( - getModItem(Minecraft.ID, "map", 1, 0, missing), - "paperEmpty", - "paperEmpty", - "paperEmpty", - "paperEmpty", - getModItem(Minecraft.ID, "compass", 1, 0, missing), - "paperEmpty", - "paperEmpty", - "paperEmpty", - "paperEmpty"); addShapelessRecipe( getModItem(Minecraft.ID, "dye", 3, 15, missing), getModItem(Minecraft.ID, "bone", 1, 0, missing),