From be448e26da99aa3b107be12b97a6f50c3310837f Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 14 Nov 2018 14:03:28 +0100
Subject: [PATCH] un-oredict all ancient items because then mod compat isn't
 completely broken constantly

---
 .../java/de/ellpeck/naturesaura/NaturesAura.java  |  2 --
 .../de/ellpeck/naturesaura/items/OreDict.java     | 15 ---------------
 .../assets/naturesaura/recipes/ancient_stick.json |  3 +--
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 src/main/java/de/ellpeck/naturesaura/items/OreDict.java

diff --git a/src/main/java/de/ellpeck/naturesaura/NaturesAura.java b/src/main/java/de/ellpeck/naturesaura/NaturesAura.java
index f0f233a9..16046997 100644
--- a/src/main/java/de/ellpeck/naturesaura/NaturesAura.java
+++ b/src/main/java/de/ellpeck/naturesaura/NaturesAura.java
@@ -12,7 +12,6 @@ import de.ellpeck.naturesaura.compat.Compat;
 import de.ellpeck.naturesaura.events.CommonEvents;
 import de.ellpeck.naturesaura.events.TerrainGenEvents;
 import de.ellpeck.naturesaura.items.ModItems;
-import de.ellpeck.naturesaura.items.OreDict;
 import de.ellpeck.naturesaura.packet.PacketHandler;
 import de.ellpeck.naturesaura.proxy.IProxy;
 import de.ellpeck.naturesaura.recipes.ModRecipes;
@@ -78,7 +77,6 @@ public final class NaturesAura {
         ModConfig.initOrReload();
         ModRecipes.init();
         ModRegistry.init(event);
-        OreDict.init();
         DrainSpotEffects.init();
 
         proxy.init(event);
diff --git a/src/main/java/de/ellpeck/naturesaura/items/OreDict.java b/src/main/java/de/ellpeck/naturesaura/items/OreDict.java
deleted file mode 100644
index 7a8a76d5..00000000
--- a/src/main/java/de/ellpeck/naturesaura/items/OreDict.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.ellpeck.naturesaura.items;
-
-import de.ellpeck.naturesaura.blocks.ModBlocks;
-import net.minecraftforge.oredict.OreDictionary;
-
-public final class OreDict {
-
-    public static void init() {
-        OreDictionary.registerOre("logWood", ModBlocks.ANCIENT_LOG);
-        OreDictionary.registerOre("plankWood", ModBlocks.ANCIENT_PLANKS);
-        OreDictionary.registerOre("stickWood", ModItems.ANCIENT_STICK);
-        OreDictionary.registerOre("treeLeaves", ModBlocks.ANCIENT_LEAVES);
-    }
-
-}
diff --git a/src/main/resources/assets/naturesaura/recipes/ancient_stick.json b/src/main/resources/assets/naturesaura/recipes/ancient_stick.json
index e88855b4..1ac4da65 100644
--- a/src/main/resources/assets/naturesaura/recipes/ancient_stick.json
+++ b/src/main/resources/assets/naturesaura/recipes/ancient_stick.json
@@ -1,7 +1,6 @@
 {
     "type": "forge:ore_shaped",
     "pattern": [
-        "W",
         "W",
         "W"
     ],
@@ -12,6 +11,6 @@
     },
     "result": {
         "item": "naturesaura:ancient_stick",
-        "count": 3
+        "count": 2
     }
 }
\ No newline at end of file