Fix DraconicEvolution mod OreDictionary (#341)

Author: tier940

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!!

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

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<IRecipe> event) {
         DEDAMaterialInfoLoader.init();
-        DEDAOreDictionaryLoader.init();
     }
 
     @Override
     public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
+        DEDAOreDictionaryLoader.init();
+
         // Draconic recipes
         DraconicFluidRecipe.init();
         DraconicMaterialsRecipe.init();

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));
     }
 }

src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java

@@ -19,6 +19,7 @@
 public class GTEMixinLoader implements ILateMixinLoader {
 
     public static final Map<String, Boolean> modMixinsConfig = new ImmutableMap.Builder<String, Boolean>()
+            .put(Mods.Names.DRACONIC_EVOLUTION, true)
             .put(Mods.Names.DRACONIC_ADDITIONS, true)
             .put(Mods.Names.GREGTECH, true)
             .put(Mods.Names.GREGICALITY_MULTIBLOCKS, true)

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);
+    }
+}

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": [
+  ]
+}