From c76dcfb9bfccb2a623429d71217ccb5676e5c001 Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 5 Dec 2025 22:35:28 +0900 Subject: [PATCH 1/2] Fix DraconicEvolution mod OreDictionary --- README.md | 2 +- .../core/integration/deda/DEDAModule.java | 3 ++- .../deda/loaders/DEDAOreDictionaryLoader.java | 14 +++++----- .../gtexpert/core/mixins/GTEMixinLoader.java | 1 + .../draconicevolution/OreHandlerMixin.java | 27 +++++++++++++++++++ .../mixins.gtexpert.draconicevolution.json | 14 ++++++++++ 6 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/github/gtexpert/core/mixins/draconicevolution/OreHandlerMixin.java create mode 100644 src/main/resources/mixins.gtexpert.draconicevolution.json diff --git a/README.md b/README.md index 710eede6..093b0df7 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ - Primitive(ULV) Motor/Pump/ConveyorModule/Piston/RobotArm from [ULV-Covers](https://github.com/Cosmic-Chaos/ULV-Covers) under [LGPL-2.1](https://github.com/Cosmic-Chaos/ULV-Covers/blob/main/LICENSE.txt) License - DepLoader from [NewHorizonsCoreMod](https://github.com/GTNewHorizons/NewHorizonsCoreMod) under [LGPL-3.0](https://github.com/GTNewHorizons/NewHorizonsCoreMod/blob/master/LICENSE) License - Infinity some textures, Industrial Apiary some textures & codes from [NewHorizonsCoreMod](https://github.com/GTNewHorizons/NewHorizonsCoreMod) under [LGPL-3.0](https://github.com/GTNewHorizons/NewHorizonsCoreMod/blob/master/LICENSE) License -- I referenced MixinLoader from [Nomi-Labs](https://github.com/Nomi-CEu/Nomi-Labs) under [LGPL-3.0](https://github.com/Nomi-CEu/Nomi-Labs/blob/main/LICENSE) +- I referenced MixinLoader from [Nomi-Labs](https://github.com/Nomi-CEu/Nomi-Labs) under [LGPL-3.0](https://github.com/Nomi-CEu/Nomi-Labs/blob/main/LICENSE) License diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java index 9fee098c..34d62d0f 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java @@ -36,11 +36,12 @@ public void postInit(FMLPostInitializationEvent event) { @Override public void registerRecipesNormal(RegistryEvent.Register event) { DEDAMaterialInfoLoader.init(); - DEDAOreDictionaryLoader.init(); } @Override public void registerRecipesLowest(RegistryEvent.Register event) { + DEDAOreDictionaryLoader.init(); + // Draconic recipes DraconicFluidRecipe.init(); DraconicMaterialsRecipe.init(); diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java index f0af4d9d..70b1c0d0 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java @@ -8,15 +8,17 @@ public class DEDAOreDictionaryLoader { public static void init() { OreDictionary.registerOre("oreDraconium", - Mods.DraconicEvolution.getItem("draconium_ore")); + Mods.DraconicEvolution.getItem("draconium_ore", 1, 0)); OreDictionary.registerOre("oreNetherrackDraconium", - Mods.DraconicEvolution.getItem("resources", 1, 1)); + Mods.DraconicEvolution.getItem("draconium_ore", 1, 1)); OreDictionary.registerOre("oreEndstoneDraconium", - Mods.DraconicEvolution.getItem("resources", 1, 2)); + Mods.DraconicEvolution.getItem("draconium_ore", 1, 2)); - OreDictionary.registerOre("blockDraconium", - Mods.DraconicEvolution.getItem("draconium_block")); + OreDictionary.registerOre("nuggetAwakenedDraconium", + Mods.DraconicEvolution.getItem("nugget", 1, 1)); + OreDictionary.registerOre("ingotAwakenedDraconium", + Mods.DraconicEvolution.getItem("draconic_ingot", 1, 0)); OreDictionary.registerOre("blockAwakenedDraconium", - Mods.DraconicEvolution.getItem("draconic_block")); + Mods.DraconicEvolution.getItem("draconic_block", 1, 0)); } } diff --git a/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java index 03f008ba..f8de01c8 100644 --- a/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java +++ b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java @@ -19,6 +19,7 @@ public class GTEMixinLoader implements ILateMixinLoader { public static final Map modMixinsConfig = new ImmutableMap.Builder() + .put(Mods.Names.DRACONIC_EVOLUTION, true) .put(Mods.Names.DRACONIC_ADDITIONS, true) .put(Mods.Names.GREGTECH, true) .put(Mods.Names.GREGICALITY_MULTIBLOCKS, true) diff --git a/src/main/java/com/github/gtexpert/core/mixins/draconicevolution/OreHandlerMixin.java b/src/main/java/com/github/gtexpert/core/mixins/draconicevolution/OreHandlerMixin.java new file mode 100644 index 00000000..fe8561d8 --- /dev/null +++ b/src/main/java/com/github/gtexpert/core/mixins/draconicevolution/OreHandlerMixin.java @@ -0,0 +1,27 @@ +package com.github.gtexpert.core.mixins.draconicevolution; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import com.brandon3055.draconicevolution.OreHandler; + +@Mixin(value = OreHandler.class, remap = false) +public class OreHandlerMixin { + + /** + * Redirect OreDictionary.registerOre calls to prevent oreDraconium registration. + */ + @Redirect(method = "registerOres", + at = @At(value = "INVOKE", + target = "Lnet/minecraftforge/oredict/OreDictionary;registerOre(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)V")) + private static void gtexpert$redirectRegisterOre(String name, ItemStack ore) { + if (name.equals("oreDraconium")) { + return; + } + OreDictionary.registerOre(name, ore); + } +} diff --git a/src/main/resources/mixins.gtexpert.draconicevolution.json b/src/main/resources/mixins.gtexpert.draconicevolution.json new file mode 100644 index 00000000..cc06254c --- /dev/null +++ b/src/main/resources/mixins.gtexpert.draconicevolution.json @@ -0,0 +1,14 @@ +{ + "package": "com.github.gtexpert.core.mixins.draconicevolution", + "refmap": "mixins.gtexpert.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "OreHandlerMixin" + ], + "server": [ + ], + "client": [ + ] +} From 5512355d58ee03f2f014348eceadf2c507af2a14 Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 5 Dec 2025 22:37:02 +0900 Subject: [PATCH 2/2] fix --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ed89b28..8fc9dafa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.5.4 +- Fix DraconicEvolution mod OreDictionary [#341](https://github.com/GTModpackTeam/GTExpert-Core/pull/341) + +* * * + # 2.5.3 - Fix QuarkTechSuiteMixin [#340](https://github.com/GTModpackTeam/GTExpert-Core/pull/340) - Thanks to @MrKono for his support!!