Ore processor complete and recipe structure clean-up

KhanhPham05 · Aug 26, 2022 · d053358 · d053358
1 parent eb90c9c
commit d053358
Show file tree

Hide file tree

Showing 135 changed files with 833 additions and 1,007 deletions.
diff --git a/.gradle/7.3/checksums/checksums.lock b/.gradle/7.3/checksums/checksums.lock
diff --git a/.gradle/7.3/checksums/sha1-checksums.bin b/.gradle/7.3/checksums/sha1-checksums.bin
diff --git a/.gradle/7.3/executionHistory/executionHistory.bin b/.gradle/7.3/executionHistory/executionHistory.bin
diff --git a/.gradle/7.3/executionHistory/executionHistory.lock b/.gradle/7.3/executionHistory/executionHistory.lock
diff --git a/.gradle/7.3/fileHashes/fileHashes.bin b/.gradle/7.3/fileHashes/fileHashes.bin
diff --git a/.gradle/7.3/fileHashes/fileHashes.lock b/.gradle/7.3/fileHashes/fileHashes.lock
diff --git a/.gradle/7.3/fileHashes/resourceHashesCache.bin b/.gradle/7.3/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
diff --git a/src/generated/resources/assets/tothemoon/lang/en_us.json b/src/generated/resources/assets/tothemoon/lang/en_us.json
@@ -238,6 +238,7 @@
   "jei.tothemoon.alloy_smelter_category": "Alloy Smelting",
   "jei.tothemoon.high_heat_smelting": "High Heat Smelting",
   "jei.tothemoon.metal_press_category": "Metal Pressing",
+  "jei.tothemoon.ore_processing": "Ore Processing",
   "jei.tothemoon.recipe_consume_mold": "Consume Mold",
   "jei.tothemoon.workbench_crafting": "Workbench Crafting",
   "message.tothemoon.nbf_form_fail": "Can not form Nether Brick Furnace",

diff --git a/src/generated/resources/data/forge/tags/blocks/sheetmetals.json b/src/generated/resources/data/forge/tags/blocks/sheetmetals.json
@@ -1,9 +1,9 @@
 {
   "replace": false,
   "values": [
-    "#forge:sheetmetals/steel",
+    "#forge:sheetmetals/gold",
     "#forge:sheetmetals/iron",
-    "#forge:sheetmetals/copper",
-    "#forge:sheetmetals/gold"
+    "#forge:sheetmetals/steel",
+    "#forge:sheetmetals/copper"
   ]
 }
diff --git a/src/generated/resources/data/forge/tags/items/dusts.json b/src/generated/resources/data/forge/tags/items/dusts.json
@@ -1,14 +1,14 @@
 {
   "replace": false,
   "values": [
-    "#forge:dusts/redstone_steel_metal",
-    "#forge:dusts/redstone_metal",
     "#forge:dusts/uranium",
     "#forge:dusts/steel",
-    "#forge:dusts/gold",
     "#forge:dusts/coal",
-    "#forge:dusts/iron",
     "#forge:dusts/copper",
+    "#forge:dusts/redstone_metal",
+    "#forge:dusts/iron",
+    "#forge:dusts/gold",
+    "#forge:dusts/redstone_steel_metal",
     "#forge:dusts/heated_coal"
   ]
 }
diff --git a/src/generated/resources/data/forge/tags/items/gears.json b/src/generated/resources/data/forge/tags/items/gears.json
@@ -3,9 +3,9 @@
   "values": [
     "#forge:gears/copper",
     "#forge:gears/iron",
-    "#forge:gears/redstone_metal",
-    "#forge:gears/gold",
+    "#forge:gears/steel",
     "#forge:gears/redstone_steel",
-    "#forge:gears/steel"
+    "#forge:gears/gold",
+    "#forge:gears/redstone_metal"
   ]
 }
diff --git a/src/generated/resources/data/forge/tags/items/ores/uranium.json b/src/generated/resources/data/forge/tags/items/ores/uranium.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "tothemoon:deepslate_uranium_ore"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/rods.json b/src/generated/resources/data/forge/tags/items/rods.json
@@ -1,12 +1,12 @@
 {
   "replace": false,
   "values": [
+    "#forge:rods/gold",
     "#forge:rods/steel",
-    "#forge:rods/redstone_metal",
-    "#forge:rods/copper",
     "#forge:rods/iron",
-    "#forge:rods/redstone_steel",
     "#forge:rods/uranium",
-    "#forge:rods/gold"
+    "#forge:rods/redstone_steel",
+    "#forge:rods/redstone_metal",
+    "#forge:rods/copper"
   ]
 }
diff --git a/src/generated/resources/data/forge/tags/items/sheetmetals.json b/src/generated/resources/data/forge/tags/items/sheetmetals.json
@@ -1,9 +1,9 @@
 {
   "replace": false,
   "values": [
-    "#forge:sheetmetals/steel",
     "#forge:sheetmetals/copper",
     "#forge:sheetmetals/gold",
-    "#forge:sheetmetals/iron"
+    "#forge:sheetmetals/iron",
+    "#forge:sheetmetals/steel"
   ]
 }
diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json
@@ -1,11 +1,11 @@
 {
   "replace": false,
   "values": [
-    "#forge:storage_blocks/steel",
-    "#forge:storage_blocks/redstone_steel",
-    "#forge:storage_blocks/purified_quartz",
+    "#forge:storage_blocks/uranium",
     "#forge:storage_blocks/raw_uranium",
+    "#forge:storage_blocks/steel",
     "#forge:storage_blocks/redstone_metal",
-    "#forge:storage_blocks/uranium"
+    "#forge:storage_blocks/redstone_steel",
+    "#forge:storage_blocks/purified_quartz"
   ]
 }
diff --git a/src/generated/resources/data/tothemoon/advancements/alloying/redstone_metal.json b/src/generated/resources/data/tothemoon/advancements/alloying/redstone_metal.json
@@ -0,0 +1,4 @@
+{
+  "criteria": {},
+  "requirements": []
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/alloying/steel_ingot.json b/src/generated/resources/data/tothemoon/advancements/alloying/steel_ingot.json
@@ -0,0 +1,4 @@
+{
+  "criteria": {},
+  "requirements": []
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/coal_dust.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/coal_dust.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/copper_from_ore.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/copper_from_ore.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/copper_from_raw.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/copper_from_raw.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/gold_from_ore.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/gold_from_ore.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/gold_from_raw.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/gold_from_raw.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/iron_from_ore.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/iron_from_ore.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/iron_from_raw.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/iron_from_raw.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/lapis_lazuli.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/lapis_lazuli.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/netherite_scrap.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/netherite_scrap.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/quartz.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/quartz.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/tothemoon/advancements/ore_processing/redstone.json b/src/generated/resources/data/tothemoon/advancements/ore_processing/redstone.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "auto_trigger": {
+      "trigger": "minecraft:tick",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "auto_trigger"
+    ]
+  ]
+}
diff --git a/...s/recipes/misc/blasting/copper_ingot.json → ...recipes/misc/blasting/gold_from_dust.json b/...s/recipes/misc/blasting/copper_ingot.json → ...recipes/misc/blasting/gold_from_dust.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "tothemoon:blasting/copper_ingot"
+      "tothemoon:blasting/gold_from_dust"
     ]
   },
   "criteria": {
@@ -13,7 +13,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "tothemoon:blasting/copper_ingot"
+        "recipe": "tothemoon:blasting/gold_from_dust"
       }
     }
   },

diff --git a/...nts/recipes/misc/blasting/gold_ingot.json → ...recipes/misc/blasting/iron_from_dust.json b/...nts/recipes/misc/blasting/gold_ingot.json → ...recipes/misc/blasting/iron_from_dust.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "tothemoon:blasting/gold_ingot"
+      "tothemoon:blasting/iron_from_dust"
     ]
   },
   "criteria": {
@@ -13,7 +13,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "tothemoon:blasting/gold_ingot"
+        "recipe": "tothemoon:blasting/iron_from_dust"
       }
     }
   },

diff --git a/src/generated/resources/data/tothemoon/advancements/recipes/misc/smelting/copper_ingot.json b/src/generated/resources/data/tothemoon/advancements/recipes/misc/smelting/copper_ingot.json
diff --git a/...nts/recipes/misc/blasting/iron_ingot.json → ...recipes/misc/smelting/gold_from_dust.json b/...nts/recipes/misc/blasting/iron_ingot.json → ...recipes/misc/smelting/gold_from_dust.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "tothemoon:blasting/iron_ingot"
+      "tothemoon:smelting/gold_from_dust"
     ]
   },
   "criteria": {
@@ -13,7 +13,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "tothemoon:blasting/iron_ingot"
+        "recipe": "tothemoon:smelting/gold_from_dust"
       }
     }
   },

diff --git a/src/generated/resources/data/tothemoon/advancements/recipes/misc/smelting/gold_ingot.json b/src/generated/resources/data/tothemoon/advancements/recipes/misc/smelting/gold_ingot.json