Merge remote-tracking branch 'origin/mc1.18/0.5.1' into mc1.19/0.5.1

build.gradle

@@ -107,39 +107,44 @@ minecraft {
 
 repositories {
     maven {
-        // Location of the maven that hosts JEI files (and TiC)
+        // location of the maven for Registrate and Flywheel
-        name 'Progwml6 maven'
+        name = 'tterrag maven'
-        url 'https://dvs1.progwml6.com/files/maven'
+        url = 'https://maven.tterrag.com'
+    }
+    maven {
+        // location of the maven that hosts JEI files since January 2023
+        // location of the maven for Vazkii's mods
+        name = "Jared's maven"
+        url = "https://maven.blamejared.com/"
     }
     /*maven {
-        // Location of a maven mirror for JEI files, as a fallback
+        // location of a maven mirror for JEI files, as a fallback
-        name 'ModMaven'
+        name = "ModMaven"
-        url 'https://modmaven.k-4u.nl'
+        url = "https://modmaven.dev"
     }*/
     maven {
-        // Location of the maven for vazkii's mods
+        // location of the maven for Dynamic Trees
-        name 'blamejared'
+        url = 'https://harleyoconnor.com/maven'
-        url 'https://maven.blamejared.com'
     }
     maven {
-        // Location of the maven for mixed mappings, Registrate, and Flywheel
+        // location of the maven for Curios API
-        name 'tterrag maven'
+        url = "https://maven.theillusivec4.top/"
-        url 'https://maven.tterrag.com'
     }
     maven {
-        url 'https://www.cursemaven.com'
+        // location of maven for CC: Tweaked
+        name = "squiddev"
+        url = "https://squiddev.cc/maven/"
+        content {
+            includeGroup "org.squiddev"
+        }
+    }
+
+    maven {
+        url = 'https://www.cursemaven.com'
         content {
             includeGroup "curse.maven"
         }
     }
-    maven {
-        //location of the maven for dynamic trees
-        url 'https://harleyoconnor.com/maven'
-    }
-    maven {
-        //location of the maven for curios api
-        url = "https://maven.theillusivec4.top/"
-    }
     maven {
         name = "Modrinth"
         url = "https://api.modrinth.com/maven"
@@ -147,17 +152,10 @@ repositories {
             includeGroup "maven.modrinth"
         }
     }
+
     flatDir {
         dirs 'libs'
     }
-    maven {
-        // Location of maven for CC: Tweaked
-        name = "squiddev"
-        url = "https://squiddev.cc/maven/"
-        content {
-            includeGroup "org.squiddev"
-        }
-    }
 }
 
 dependencies {

gradle.properties

@@ -11,7 +11,7 @@ minecraft_version = 1.19.2
 forge_version = 43.2.4
 
 # build dependency versions
-forgegradle_version = 5.1.53
+forgegradle_version = 5.1.74
 mixingradle_version = 0.7-SNAPSHOT
 mixin_version = 0.8.5
 librarian_version = 1.+

src/generated/resources/assets/create/blockstates/experience_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "create:block/experience_block"
+    }
+  }
+}

src/generated/resources/assets/create/lang/en_ud.json

@@ -221,6 +221,7 @@
   "block.create.encased_chain_drive": "ǝʌıɹᗡ uıɐɥƆ pǝsɐɔuƎ",
   "block.create.encased_fan": "uɐℲ pǝsɐɔuƎ",
   "block.create.encased_fluid_pipe": "ǝdıԀ pınןℲ pǝsɐɔuƎ",
+  "block.create.experience_block": "ǝɔuǝıɹǝdxƎ ɟo ʞɔoןᗺ",
   "block.create.exposed_copper_shingle_slab": "qɐןS ǝןbuıɥS ɹǝddoƆ pǝsodxƎ",
   "block.create.exposed_copper_shingle_stairs": "sɹıɐʇS ǝןbuıɥS ɹǝddoƆ pǝsodxƎ",
   "block.create.exposed_copper_shingles": "sǝןbuıɥS ɹǝddoƆ pǝsodxƎ",
@@ -623,19 +624,19 @@
   "item.create.crafter_slot_cover": "ɹǝʌoƆ ʇoןS ɹǝʇɟɐɹƆ",
   "item.create.crafting_blueprint": "ʇuıɹdǝnןᗺ buıʇɟɐɹƆ",
   "item.create.creative_blaze_cake": "ǝʞɐƆ ǝzɐןᗺ ǝʌıʇɐǝɹƆ",
-  "item.create.crushed_aluminum_ore": "ǝɹO ɯnuıɯnןⱯ pǝɥsnɹƆ",
+  "item.create.crushed_raw_aluminum": "ɯnuıɯnןⱯ ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_copper_ore": "ǝɹO ɹǝddoƆ pǝɥsnɹƆ",
+  "item.create.crushed_raw_copper": "ɹǝddoƆ ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_gold_ore": "ǝɹO pןo⅁ pǝɥsnɹƆ",
+  "item.create.crushed_raw_gold": "pןo⅁ ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_iron_ore": "ǝɹO uoɹI pǝɥsnɹƆ",
+  "item.create.crushed_raw_iron": "uoɹI ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_lead_ore": "ǝɹO pɐǝꞀ pǝɥsnɹƆ",
+  "item.create.crushed_raw_lead": "pɐǝꞀ ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_nickel_ore": "ǝɹO ןǝʞɔıN pǝɥsnɹƆ",
+  "item.create.crushed_raw_nickel": "ןǝʞɔıN ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_osmium_ore": "ǝɹO ɯnıɯsO pǝɥsnɹƆ",
+  "item.create.crushed_raw_osmium": "ɯnıɯsO ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_platinum_ore": "ǝɹO ɯnuıʇɐןԀ pǝɥsnɹƆ",
+  "item.create.crushed_raw_platinum": "ɯnuıʇɐןԀ ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_quicksilver_ore": "ǝɹO ɹǝʌןısʞɔınὉ pǝɥsnɹƆ",
+  "item.create.crushed_raw_quicksilver": "ɹǝʌןısʞɔınὉ ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_silver_ore": "ǝɹO ɹǝʌןıS pǝɥsnɹƆ",
+  "item.create.crushed_raw_silver": "ɹǝʌןıS ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_tin_ore": "ǝɹO uı⟘ pǝɥsnɹƆ",
+  "item.create.crushed_raw_tin": "uı⟘ ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_uranium_ore": "ǝɹO ɯnıuɐɹ∩ pǝɥsnɹƆ",
+  "item.create.crushed_raw_uranium": "ɯnıuɐɹ∩ ʍɐᴚ pǝɥsnɹƆ",
-  "item.create.crushed_zinc_ore": "ǝɹO ɔuıZ pǝɥsnɹƆ",
+  "item.create.crushed_raw_zinc": "ɔuıZ ʍɐᴚ pǝɥsnɹƆ",
   "item.create.dough": "ɥbnoᗡ",
   "item.create.electron_tube": "ǝqn⟘ uoɹʇɔǝןƎ",
   "item.create.empty_blaze_burner": "ɹǝuɹnᗺ ǝzɐןᗺ ʎʇdɯƎ",

src/generated/resources/assets/create/lang/en_us.json

@@ -224,6 +224,7 @@
 	"block.create.encased_chain_drive": "Encased Chain Drive",
 	"block.create.encased_fan": "Encased Fan",
 	"block.create.encased_fluid_pipe": "Encased Fluid Pipe",
+	"block.create.experience_block": "Block of Experience",
 	"block.create.exposed_copper_shingle_slab": "Exposed Copper Shingle Slab",
 	"block.create.exposed_copper_shingle_stairs": "Exposed Copper Shingle Stairs",
 	"block.create.exposed_copper_shingles": "Exposed Copper Shingles",
@@ -630,19 +631,19 @@
 	"item.create.crafter_slot_cover": "Crafter Slot Cover",
 	"item.create.crafting_blueprint": "Crafting Blueprint",
 	"item.create.creative_blaze_cake": "Creative Blaze Cake",
-	"item.create.crushed_aluminum_ore": "Crushed Aluminum Ore",
+	"item.create.crushed_raw_aluminum": "Crushed Raw Aluminum",
-	"item.create.crushed_copper_ore": "Crushed Copper Ore",
+	"item.create.crushed_raw_copper": "Crushed Raw Copper",
-	"item.create.crushed_gold_ore": "Crushed Gold Ore",
+	"item.create.crushed_raw_gold": "Crushed Raw Gold",
-	"item.create.crushed_iron_ore": "Crushed Iron Ore",
+	"item.create.crushed_raw_iron": "Crushed Raw Iron",
-	"item.create.crushed_lead_ore": "Crushed Lead Ore",
+	"item.create.crushed_raw_lead": "Crushed Raw Lead",
-	"item.create.crushed_nickel_ore": "Crushed Nickel Ore",
+	"item.create.crushed_raw_nickel": "Crushed Raw Nickel",
-	"item.create.crushed_osmium_ore": "Crushed Osmium Ore",
+	"item.create.crushed_raw_osmium": "Crushed Raw Osmium",
-	"item.create.crushed_platinum_ore": "Crushed Platinum Ore",
+	"item.create.crushed_raw_platinum": "Crushed Raw Platinum",
-	"item.create.crushed_quicksilver_ore": "Crushed Quicksilver Ore",
+	"item.create.crushed_raw_quicksilver": "Crushed Raw Quicksilver",
-	"item.create.crushed_silver_ore": "Crushed Silver Ore",
+	"item.create.crushed_raw_silver": "Crushed Raw Silver",
-	"item.create.crushed_tin_ore": "Crushed Tin Ore",
+	"item.create.crushed_raw_tin": "Crushed Raw Tin",
-	"item.create.crushed_uranium_ore": "Crushed Uranium Ore",
+	"item.create.crushed_raw_uranium": "Crushed Raw Uranium",
-	"item.create.crushed_zinc_ore": "Crushed Zinc Ore",
+	"item.create.crushed_raw_zinc": "Crushed Raw Zinc",
 	"item.create.dough": "Dough",
 	"item.create.electron_tube": "Electron Tube",
 	"item.create.empty_blaze_burner": "Empty Blaze Burner",
@@ -1209,7 +1210,7 @@
 	"create.schematic.mirror.leftRight": "Left-Right",
 	"create.schematic.tool.deploy": "Position",
 	"create.schematic.tool.move": "Move XZ",
-	"create.schematic.tool.movey": "Move Y",
+	"create.schematic.tool.move_y": "Move Y",
 	"create.schematic.tool.rotate": "Rotate",
 	"create.schematic.tool.print": "Print",
 	"create.schematic.tool.flip": "Mirror",
@@ -1221,10 +1222,10 @@
 	"create.schematic.tool.move.description.1": "Point at the Schematic and [CTRL]-Scroll to push it.",
 	"create.schematic.tool.move.description.2": "",
 	"create.schematic.tool.move.description.3": "",
-	"create.schematic.tool.movey.description.0": "Shifts the Schematic Vertically.",
+	"create.schematic.tool.move_y.description.0": "Shifts the Schematic Vertically.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-Scroll to move it up/down.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-Scroll to move it up/down.",
-	"create.schematic.tool.movey.description.2": "",
+	"create.schematic.tool.move_y.description.2": "",
-	"create.schematic.tool.movey.description.3": "",
+	"create.schematic.tool.move_y.description.3": "",
 	"create.schematic.tool.rotate.description.0": "Rotates the Schematic around its center.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-Scroll to rotate by 90 Degrees.",
 	"create.schematic.tool.rotate.description.2": "",
@@ -2120,12 +2121,12 @@
 	"item.create.copper_diving_boots.tooltip": "COPPER DIVING BOOTS",
 	"item.create.copper_diving_boots.tooltip.summary": "A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.",
 	"item.create.copper_diving_boots.tooltip.condition1": "When Worn",
-	"item.create.copper_diving_boots.tooltip.behaviour1": "Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
+	"item.create.copper_diving_boots.tooltip.behaviour1": "Wielder _descends_ more _quickly_ in liquids. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
 
 	"item.create.netherite_diving_boots.tooltip": "NETHERITE DIVING BOOTS",
 	"item.create.netherite_diving_boots.tooltip.summary": "A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor, including Oceans made of Lava.",
 	"item.create.netherite_diving_boots.tooltip.condition1": "When Worn",
-	"item.create.netherite_diving_boots.tooltip.behaviour1": "Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
+	"item.create.netherite_diving_boots.tooltip.behaviour1": "Wielder _descends_ more _quickly_ in liquids. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
 
 	"item.create.crafting_blueprint.tooltip": "CRAFTING BLUEPRINT",
 	"item.create.crafting_blueprint.tooltip.summary": "_Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.",
@@ -2702,7 +2703,7 @@
 	"create.ponder.mechanical_arm.header": "Setting up Mechanical Arms",
 	"create.ponder.mechanical_arm.text_1": "Mechanical Arms have to be assigned their in- and outputs before they are placed",
 	"create.ponder.mechanical_arm.text_2": "Right-Click inventories while holding the Arm to assign them as Targets",
-	"create.ponder.mechanical_arm.text_3": "Right-Click again to toggle between Input (Blue) and Output (Orange)",
+	"create.ponder.mechanical_arm.text_3": "Right-Click again to toggle between Input (Blue) and Output (Yellow)",
 	"create.ponder.mechanical_arm.text_4": "Left-Click components to remove their Selection",
 	"create.ponder.mechanical_arm.text_5": "Once placed, the Mechanical Arm will target the blocks selected previously",
 	"create.ponder.mechanical_arm.text_6": "They can have any amount of in- and outputs within their range",

src/generated/resources/assets/create/models/item/crushed_nickel_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_nickel_ore"
-  }
-}

src/generated/resources/assets/create/models/item/crushed_osmium_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_osmium_ore"
-  }
-}

src/generated/resources/assets/create/models/item/crushed_platinum_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_platinum_ore"
-  }
-}

src/generated/resources/assets/create/models/item/crushed_quicksilver_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_quicksilver_ore"
-  }
-}

src/generated/resources/assets/create/models/item/crushed_raw_aluminum.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_aluminum_ore"
+    "layer0": "create:item/crushed_raw_aluminum"
   }
 }

src/generated/resources/assets/create/models/item/crushed_raw_copper.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_copper_ore"
+    "layer0": "create:item/crushed_raw_copper"
   }
 }

src/generated/resources/assets/create/models/item/crushed_raw_gold.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_lead_ore"
+    "layer0": "create:item/crushed_raw_gold"
   }
 }

src/generated/resources/assets/create/models/item/crushed_raw_iron.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_gold_ore"
+    "layer0": "create:item/crushed_raw_iron"
   }
 }

src/generated/resources/assets/create/models/item/crushed_raw_lead.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_iron_ore"
+    "layer0": "create:item/crushed_raw_lead"
   }
 }

src/generated/resources/assets/create/models/item/crushed_raw_nickel.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_nickel"
+  }
+}

src/generated/resources/assets/create/models/item/crushed_raw_osmium.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_osmium"
+  }
+}

src/generated/resources/assets/create/models/item/crushed_raw_platinum.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_platinum"
+  }
+}

src/generated/resources/assets/create/models/item/crushed_raw_quicksilver.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_quicksilver"
+  }
+}

src/generated/resources/assets/create/models/item/crushed_raw_silver.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_silver"
+  }
+}

src/generated/resources/assets/create/models/item/crushed_raw_tin.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_tin_ore"
+    "layer0": "create:item/crushed_raw_tin"
   }
 }

src/generated/resources/assets/create/models/item/crushed_raw_uranium.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_uranium"
+  }
+}

src/generated/resources/assets/create/models/item/crushed_raw_zinc.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_zinc"
+  }
+}

src/generated/resources/assets/create/models/item/crushed_silver_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_silver_ore"
-  }
-}

src/generated/resources/assets/create/models/item/crushed_uranium_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_uranium_ore"
-  }
-}

src/generated/resources/assets/create/models/item/crushed_zinc_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_zinc_ore"
-  }
-}

src/generated/resources/assets/create/models/item/experience_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "create:block/experience_block"
+}

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_aluminum_ore"
+              "create:crushed_raw_aluminum"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_nickel_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_nickel_ore"
+              "create:crushed_raw_nickel"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_osmium_ore"
+              "create:crushed_raw_osmium"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_silver_ore"
+              "create:crushed_raw_silver"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_tin_ore"
+              "create:crushed_raw_tin"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_uranium_ore"
+              "create:crushed_raw_uranium"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_uranium_ore"
+              "create:crushed_raw_uranium"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_nickel_ore"
+              "create:crushed_raw_nickel"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_silver_ore"
+              "create:crushed_raw_silver"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_tin_ore"
+              "create:crushed_raw_tin"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_aluminum_ore"
+              "create:crushed_raw_aluminum"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_nickel_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_nickel_ore"
+              "create:crushed_raw_nickel"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_osmium_ore"
+              "create:crushed_raw_osmium"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_silver_ore"
+              "create:crushed_raw_silver"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_tin_ore"
+              "create:crushed_raw_tin"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_uranium_ore"
+              "create:crushed_raw_uranium"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_uranium_ore"
+              "create:crushed_raw_uranium"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_nickel_ore"
+              "create:crushed_raw_nickel"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_silver_ore"
+              "create:crushed_raw_silver"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_tin_ore"
+              "create:crushed_raw_tin"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_zinc_ore"
+              "create:crushed_raw_zinc"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/experience_nugget_from_block.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "create:crafting/materials/experience_nugget_from_block"
+    ]
+  },
+  "criteria": {
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "create:experience_nugget"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "create:crafting/materials/experience_nugget_from_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_zinc_ore"
+              "create:crushed_raw_zinc"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/materials/experience_block.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "create:crafting/materials/experience_block"
+    ]
+  },
+  "criteria": {
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "create:experience_nugget"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "create:crafting/materials/experience_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_copper_ore"
+              "create:crushed_raw_copper"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/misc/blasting/gold_ingot_from_crushed.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_gold_ore"
+              "create:crushed_raw_gold"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/misc/blasting/iron_ingot_from_crushed.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_iron_ore"
+              "create:crushed_raw_iron"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_copper_ore"
+              "create:crushed_raw_copper"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/misc/smelting/gold_ingot_from_crushed.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_gold_ore"
+              "create:crushed_raw_gold"
             ]
           }
         ]

src/generated/resources/data/create/advancements/recipes/misc/smelting/iron_ingot_from_crushed.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_iron_ore"
+              "create:crushed_raw_iron"
             ]
           }
         ]

src/generated/resources/data/create/loot_tables/blocks/experience_block.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:experience_block"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json

@@ -3,7 +3,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_copper_ore"
+    "item": "create:crushed_raw_copper"
   },
   "result": "minecraft:copper_ingot"
 }

src/generated/resources/data/create/recipes/blasting/gold_ingot_from_crushed.json

@@ -3,7 +3,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_gold_ore"
+    "item": "create:crushed_raw_gold"
   },
   "result": "minecraft:gold_ingot"
 }

src/generated/resources/data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_aluminum_ore"
+    "item": "create:crushed_raw_aluminum"
   },
   "result": "immersiveengineering:ingot_aluminum"
 }

src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "immersiveengineering:ingot_lead"
 }

src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_mekanism.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "mekanism:ingot_lead"
 }

src/generated/resources/data/create/recipes/blasting/ingot_nickel_compat_immersiveengineering.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_nickel_ore"
+    "item": "create:crushed_raw_nickel"
   },
   "result": "immersiveengineering:ingot_nickel"
 }

src/generated/resources/data/create/recipes/blasting/ingot_osmium_compat_mekanism.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_osmium_ore"
+    "item": "create:crushed_raw_osmium"
   },
   "result": "mekanism:ingot_osmium"
 }

src/generated/resources/data/create/recipes/blasting/ingot_silver_compat_immersiveengineering.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_silver_ore"
+    "item": "create:crushed_raw_silver"
   },
   "result": "immersiveengineering:ingot_silver"
 }

src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_mekanism.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_tin_ore"
+    "item": "create:crushed_raw_tin"
   },
   "result": "mekanism:ingot_tin"
 }

src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_uranium_ore"
+    "item": "create:crushed_raw_uranium"
   },
   "result": "immersiveengineering:ingot_uranium"
 }

src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_mekanism.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_uranium_ore"
+    "item": "create:crushed_raw_uranium"
   },
   "result": "mekanism:ingot_uranium"
 }

src/generated/resources/data/create/recipes/blasting/iron_ingot_from_crushed.json

@@ -3,7 +3,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_iron_ore"
+    "item": "create:crushed_raw_iron"
   },
   "result": "minecraft:iron_ingot"
 }

src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "thermal:lead_ingot"
 }

src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_nickel_ore"
+    "item": "create:crushed_raw_nickel"
   },
   "result": "thermal:nickel_ingot"
 }

src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_silver_ore"
+    "item": "create:crushed_raw_silver"
   },
   "result": "thermal:silver_ingot"
 }

src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json

@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_tin_ore"
+    "item": "create:crushed_raw_tin"
   },
   "result": "thermal:tin_ingot"
 }

src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_crushed.json

@@ -3,7 +3,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_zinc_ore"
+    "item": "create:crushed_raw_zinc"
   },
   "result": "create:zinc_ingot"
 }

src/generated/resources/data/create/recipes/crafting/materials/experience_block.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "CCC",
+    "CCC",
+    "CCC"
+  ],
+  "key": {
+    "C": {
+      "item": "create:experience_nugget"
+    }
+  },
+  "result": {
+    "item": "create:experience_block"
+  }
+}

src/generated/resources/data/create/recipes/crafting/materials/experience_nugget_from_block.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "create:experience_block"
+    }
+  ],
+  "result": {
+    "item": "create:experience_nugget",
+    "count": 9
+  }
+}

src/generated/resources/data/create/recipes/crushing/aluminum_ore.json

@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_aluminum_ore"
+      "item": "create:crushed_raw_aluminum"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_aluminum_ore"
+      "item": "create:crushed_raw_aluminum"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/asurine.json

@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.3,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.3,

src/generated/resources/data/create/recipes/crushing/asurine_recycling.json

@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.3,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.3,

src/generated/resources/data/create/recipes/crushing/copper_ore.json

@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 5,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/crimsite.json

@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.4,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.4,

src/generated/resources/data/create/recipes/crushing/crimsite_recycling.json

@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.4,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.4,

src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json

@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 7,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json

@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 2,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json

@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 2,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json

@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 2,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/gold_ore.json

@@ -8,11 +8,11 @@
   "processingTime": 250,
   "results": [
     {
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/iron_ore.json

@@ -8,11 +8,11 @@
   "processingTime": 250,
   "results": [
     {
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/lead_ore.json

@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/nickel_ore.json

@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_nickel_ore"
+      "item": "create:crushed_raw_nickel"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_nickel_ore"
+      "item": "create:crushed_raw_nickel"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/ochrum.json

@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.2,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.2,

src/generated/resources/data/create/recipes/crushing/ochrum_recycling.json

@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.2,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.2,

src/generated/resources/data/create/recipes/crushing/osmium_ore.json

@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_osmium_ore"
+      "item": "create:crushed_raw_osmium"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_osmium_ore"
+      "item": "create:crushed_raw_osmium"
     },
     {
       "chance": 0.75,

src/generated/resources/data/create/recipes/crushing/platinum_ore.json

@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_platinum_ore"
+      "item": "create:crushed_raw_platinum"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_platinum_ore"
+      "item": "create:crushed_raw_platinum"
     },
     {
       "chance": 0.75,