From 01afb3595e358384ccfe24bf08b52fe997431530 Mon Sep 17 00:00:00 2001
From: Ethryan <3237986+Ethryan@users.noreply.github.com>
Date: Sat, 15 Jun 2024 17:03:51 +0200
Subject: [PATCH] Add support for the Raw Ore Item to Ore Destruction (#34)

* Add support for the Raw Ore Item to Ore Destruction

* Spotless...

* Fix for GT6
---
 dependencies.gradle                        |  4 +-
 src/main/java/tb/init/TBThaumonomicon.java | 54 +++++++++++++++++++++-
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 2771579..928972a 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-	compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.14:dev') {transitive=false}
+	compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.33:dev') {transitive=false}
 
 	compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
 	compile('com.github.GTNewHorizons:CodeChickenLib:1.2.1:dev')
 	compile('com.github.GTNewHorizons:DummyCore:2.0.3:dev')
-	runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.6.1-GTNH:dev")
+	runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.6.5-GTNH:dev")
 
 	runtimeOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev')
 	runtimeOnly('com.github.GTNewHorizons:CodeChickenCore:1.2.1:dev') // Required to allow dummycore to run in dev
diff --git a/src/main/java/tb/init/TBThaumonomicon.java b/src/main/java/tb/init/TBThaumonomicon.java
index 1692c42..42c1901 100644
--- a/src/main/java/tb/init/TBThaumonomicon.java
+++ b/src/main/java/tb/init/TBThaumonomicon.java
@@ -485,8 +485,12 @@ public static void setup() {
                 new ItemStack(ConfigItems.itemResource, 1, 14) });
 
         CrucibleRecipe[] shards = new CrucibleRecipe[6];
-        if (Loader.isModLoaded("gregtech")) {
+        if (Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi")) {
 
+            // Extend the size to support the new item inputs
+            shards = new CrucibleRecipe[12];
+
+            // Ore Blocks
             shards[0] = new CrucibleRecipe(
                 "TB.OreDestruction",
                 new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 0),
@@ -533,6 +537,54 @@ public static void setup() {
                 new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 544),
                 new AspectList().add(Aspect.MAGIC, 1)
                     .add(Aspect.ENTROPY, 5));
+
+            // Raw Ore Item
+            shards[6] = new CrucibleRecipe(
+                "TB.OreDestruction",
+                new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 0),
+                new ItemStack(GameRegistry.findItem("gregtech", "gt.metaitem.03"), 1, 5540),
+                new AspectList().add(Aspect.ENTROPY, 2)
+                    .add(Aspect.MAGIC, 1)
+                    .add(Aspect.AIR, 3));
+
+            shards[7] = new CrucibleRecipe(
+                "TB.OreDestruction",
+                new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 1),
+                new ItemStack(GameRegistry.findItem("gregtech", "gt.metaitem.03"), 1, 5541),
+                new AspectList().add(Aspect.ENTROPY, 2)
+                    .add(Aspect.MAGIC, 1)
+                    .add(Aspect.FIRE, 3));
+
+            shards[8] = new CrucibleRecipe(
+                "TB.OreDestruction",
+                new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 2),
+                new ItemStack(GameRegistry.findItem("gregtech", "gt.metaitem.03"), 1, 5543),
+                new AspectList().add(Aspect.ENTROPY, 2)
+                    .add(Aspect.MAGIC, 1)
+                    .add(Aspect.WATER, 3));
+
+            shards[9] = new CrucibleRecipe(
+                "TB.OreDestruction",
+                new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 3),
+                new ItemStack(GameRegistry.findItem("gregtech", "gt.metaitem.03"), 1, 5542),
+                new AspectList().add(Aspect.ENTROPY, 2)
+                    .add(Aspect.MAGIC, 1)
+                    .add(Aspect.EARTH, 3));
+
+            shards[10] = new CrucibleRecipe(
+                "TB.OreDestruction",
+                new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 4),
+                new ItemStack(GameRegistry.findItem("gregtech", "gt.metaitem.03"), 1, 5545),
+                new AspectList().add(Aspect.ENTROPY, 2)
+                    .add(Aspect.MAGIC, 1)
+                    .add(Aspect.ORDER, 3));
+
+            shards[11] = new CrucibleRecipe(
+                "TB.OreDestruction",
+                new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 5),
+                new ItemStack(GameRegistry.findItem("gregtech", "gt.metaitem.03"), 1, 5544),
+                new AspectList().add(Aspect.MAGIC, 1)
+                    .add(Aspect.ENTROPY, 5));
         } else {
 
             for (int i = 0; i < 6; ++i) shards[i] = new CrucibleRecipe(