Merge remote-tracking branch 'origin/neoforge-1.21' into neoforge-1.21

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.21	2024-07-19T12:18:34.2976416	Recipes
+// 1.21	2024-08-05T00:26:49.7353485	Recipes
 ff2b4eded29e6aee06a2b8a67ed2460d6b44574c data/deeperdarker/advancement/recipes/building_blocks/bloom_planks.json
 2b96f477889839f16134ded19ef45829d1ef94d3 data/deeperdarker/advancement/recipes/building_blocks/bloom_slab.json
 67da220cbe51e2cdd8ce24d17eacc2558e4ba816 data/deeperdarker/advancement/recipes/building_blocks/bloom_stairs.json
@@ -162,8 +162,9 @@ f9e982e607d61787866348fea287731c4db5909f data/deeperdarker/advancement/recipes/b
 e0b5fd7e2cda9ef7bd5a9ee556e5e6e1efda75ea data/deeperdarker/advancement/recipes/building_blocks/smooth_sculk_stone_stairs_from_smooth_sculk_stone_stonecutting.json
 d6997e0568569958883bc7c7ef83574866cb1a23 data/deeperdarker/advancement/recipes/building_blocks/smooth_sculk_stone_wall.json
 43ad17c280d6d9d063df84afa4555580286a4ae8 data/deeperdarker/advancement/recipes/building_blocks/smooth_sculk_stone_wall_from_smooth_sculk_stone_stonecutting.json
+6f4089e1259105ef8b87477b4ed88a7273d690e2 data/deeperdarker/advancement/recipes/building_blocks/soundproof_glass.json
 e6e5116b5225483eebb23e7d129ce2f5a3742c1b data/deeperdarker/advancement/recipes/building_blocks/stripped_echo_wood.json
-5e7617d00f7a0871908538c980141797eb0ecaa1 data/deeperdarker/advancement/recipes/combat/sonorous_staff.json
+a64804f0b5f94539f749b1cea301f7d571f98fb6 data/deeperdarker/advancement/recipes/combat/sonorous_staff.json
 e1eab5706f40aca2fa305742732f4f9666a74edb data/deeperdarker/advancement/recipes/combat/warden_boots_smithing.json
 e2e2ebd33afb9c0a6632f8435084b6d4f73eb865 data/deeperdarker/advancement/recipes/combat/warden_chestplate_smithing.json
 3e0861a0efde337d22e4b785bc83bccdc08848a7 data/deeperdarker/advancement/recipes/combat/warden_helmet_smithing.json
@@ -387,7 +388,7 @@ ebcc7c7ca35ad3815f4aaa62f879fa9c4c8245b5 data/deeperdarker/recipe/polished_sculk
 102d452b72463c72588d8d8ba9ecbbd352563d14 data/deeperdarker/recipe/redstone_from_smelting_gloomslate_redstone_ore.json
 54b11bef8229070caa4bc076e5785a88da9154f9 data/deeperdarker/recipe/redstone_from_smelting_sculk_stone_redstone_ore.json
 28e361dd8c612ec064dccccf2ff13b7c077c0235 data/deeperdarker/recipe/reinforced_echo_shard.json
-1234606e741684d5d1def7bc0fb4ad20fe5d9727 data/deeperdarker/recipe/sculk_grime.json
+310e3d96b81ef08fdd74e4071066ace1864ff9db data/deeperdarker/recipe/sculk_grime.json
 b0df87b2255559f14eef10dd47b37f388aa236ce data/deeperdarker/recipe/sculk_grime_bricks.json
 f7ca5ecd607248ea97d59291b26bc85b4202a69d data/deeperdarker/recipe/sculk_grime_brick_slab.json
 491d5f5e0dd96fa572930f312c5cbef401ca9146 data/deeperdarker/recipe/sculk_grime_brick_slab_from_sculk_grime_bricks_stonecutting.json
@@ -446,8 +447,9 @@ cf1bf7b201f811e64dc65744aa142c2e10fea833 data/deeperdarker/recipe/smooth_sculk_s
 6fd8e9b9437b010293a784073c15c9f7cbc3fbc1 data/deeperdarker/recipe/smooth_sculk_stone_stairs_from_smooth_sculk_stone_stonecutting.json
 2c3d23638bc2c9d8059ec41e6b422405e9b6ad75 data/deeperdarker/recipe/smooth_sculk_stone_wall.json
 86c0603ad443139c19fc532f33ab9a047ad7d1b6 data/deeperdarker/recipe/smooth_sculk_stone_wall_from_smooth_sculk_stone_stonecutting.json
-881d50b3b62e9c5d8b0f964491a45a3dc6d8dab2 data/deeperdarker/recipe/sonorous_staff.json
-bf8b2e18a104a75782d441f88d49e1420dc69f64 data/deeperdarker/recipe/soul_elytra.json
+45444ccddf1f6a7553ea159574f9608406d816d0 data/deeperdarker/recipe/sonorous_staff.json
+aea3bf9a942afe4b45459837b671352814563ff4 data/deeperdarker/recipe/soul_elytra.json
+003310a84d838ff034bb51b909f0b06caf3291c8 data/deeperdarker/recipe/soundproof_glass.json
 aa4d7caeb8bb0bdadb27f802e967c02ea26efea5 data/deeperdarker/recipe/stripped_echo_wood.json
 f8be1416b8ee77ccc9d27c35fff8622346cca986 data/deeperdarker/recipe/warden_axe_smithing.json
 599be8fb5a235281e0eb522d2449c338efc34b6d data/deeperdarker/recipe/warden_boots_smithing.json

src/generated/resources/data/deeperdarker/advancement/recipes/building_blocks/soundproof_glass.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_soul_dust": {
+      "conditions": {
+        "items": [
+          {
+            "items": "deeperdarker:soul_dust"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "deeperdarker:soundproof_glass"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_soul_dust"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "deeperdarker:soundproof_glass"
+    ]
+  }
+}

src/generated/resources/data/deeperdarker/advancement/recipes/combat/sonorous_staff.json

@@ -11,21 +11,21 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
-    "has_reinforced_echo_shard": {
+    "has_sculk_bone": {
       "conditions": {
         "items": [
           {
-            "items": "deeperdarker:reinforced_echo_shard"
+            "items": "deeperdarker:sculk_bone"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
-    "has_sculk_bone": {
+    "has_soul_crystal": {
       "conditions": {
         "items": [
           {
-            "items": "deeperdarker:sculk_bone"
+            "items": "deeperdarker:soul_crystal"
           }
         ]
       },
@@ -42,7 +42,7 @@
     [
       "has_the_recipe",
       "has_sculk_bone",
-      "has_reinforced_echo_shard",
+      "has_soul_crystal",
       "has_heart_of_the_deep"
     ]
   ],

src/generated/resources/data/deeperdarker/recipe/sculk_grime.json

@@ -2,13 +2,13 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "G": {
+    "#": {
       "item": "deeperdarker:grime_ball"
     }
   },
   "pattern": [
-    "GG",
-    "GG"
+    "##",
+    "##"
   ],
   "result": {
     "count": 1,

src/generated/resources/data/deeperdarker/recipe/sonorous_staff.json

@@ -5,22 +5,16 @@
     "B": {
       "item": "deeperdarker:sculk_bone"
     },
-    "G": {
-      "item": "minecraft:glowstone_dust"
+    "C": {
+      "item": "deeperdarker:soul_crystal"
     },
     "H": {
       "item": "deeperdarker:heart_of_the_deep"
-    },
-    "R": {
-      "item": "minecraft:redstone"
-    },
-    "S": {
-      "item": "deeperdarker:reinforced_echo_shard"
     }
   },
   "pattern": [
-    " RS",
-    " HG",
+    " CH",
+    " BC",
     "B  "
   ],
   "result": {

src/generated/resources/data/deeperdarker/recipe/soul_elytra.json

@@ -5,18 +5,18 @@
     "B": {
       "item": "deeperdarker:sculk_bone"
     },
+    "C": {
+      "item": "deeperdarker:soul_crystal"
+    },
     "D": {
       "item": "deeperdarker:soul_dust"
     },
     "E": {
       "item": "minecraft:elytra"
-    },
-    "S": {
-      "item": "deeperdarker:soul_crystal"
     }
   },
   "pattern": [
-    "BSB",
+    "BCB",
     "DED",
     "B B"
   ],

src/generated/resources/data/deeperdarker/recipe/soundproof_glass.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "G": {
+      "item": "minecraft:glass"
+    },
+    "S": {
+      "item": "deeperdarker:soul_dust"
+    }
+  },
+  "pattern": [
+    " S ",
+    "SGS",
+    " S "
+  ],
+  "result": {
+    "count": 2,
+    "id": "deeperdarker:soundproof_glass"
+  }
+}

src/main/java/com/kyanite/deeperdarker/datagen/data/DDRecipeProvider.java

@@ -108,26 +108,34 @@ private void addCraftingRecipes(RecipeOutput output) {
 
         chiseledBuilder(RecipeCategory.BUILDING_BLOCKS, DDBlocks.CHISELED_GLOOMSLATE.get(), Ingredient.of(DDBlocks.GLOOMSLATE_BRICK_SLAB.get())).unlockedBy("has_gloomslate_slab", has(DDBlocks.GLOOMSLATE_BRICK_SLAB.get())).save(output);
 
-        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, DDBlocks.SCULK_GRIME.get()).define('G', DDItems.GRIME_BALL.get()).pattern("GG").pattern("GG").unlockedBy("has_grime_ball", has(DDItems.GRIME_BALL.get())).save(output);
-        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, DDBlocks.SCULK_GRIME_BRICKS.get()).define('G', DDItems.GRIME_BRICK.get()).pattern("GG").pattern("GG").unlockedBy("has_grime_brick", has(DDItems.GRIME_BRICK.get())).save(output);
+        twoByTwoPacker(output, RecipeCategory.BUILDING_BLOCKS, DDBlocks.SCULK_GRIME, DDItems.GRIME_BALL);
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, DDBlocks.SCULK_GRIME_BRICKS.get())
+                .define('G', DDItems.GRIME_BRICK.get())
+                .pattern("GG").pattern("GG")
+                .unlockedBy("has_grime_brick", has(DDItems.GRIME_BRICK.get())).save(output);
         stairBuilder(DDBlocks.SCULK_GRIME_BRICK_STAIRS.get(), Ingredient.of(DDBlocks.SCULK_GRIME_BRICKS.get())).unlockedBy("has_sculk_grime_bricks", has(DDBlocks.SCULK_GRIME_BRICKS.get())).save(output);
         slab(output, RecipeCategory.BUILDING_BLOCKS, DDBlocks.SCULK_GRIME_BRICK_SLAB.get(), DDBlocks.SCULK_GRIME_BRICKS.get());
         wall(output, RecipeCategory.BUILDING_BLOCKS, DDBlocks.SCULK_GRIME_BRICK_WALL.get(), DDBlocks.SCULK_GRIME_BRICKS.get());
 
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, DDBlocks.SOUNDPROOF_GLASS, 2)
+                .define('S', DDItems.SOUL_DUST).define('G', Items.GLASS)
+                .pattern(" S ").pattern("SGS").pattern(" S ")
+                .unlockedBy(getHasName(DDItems.SOUL_DUST), has(DDItems.SOUL_DUST)).save(output);
+
         ShapedRecipeBuilder.shaped(RecipeCategory.TRANSPORTATION, DDItems.SOUL_ELYTRA.get())
-                .define('S', DDItems.SOUL_CRYSTAL.get()).define('D', DDItems.SOUL_DUST.get()).define('B', DDItems.SCULK_BONE.get()).define('E', Items.ELYTRA)
-                .pattern("BSB").pattern("DED").pattern("B B")
+                .define('B', DDItems.SCULK_BONE.get()).define('C', DDItems.SOUL_CRYSTAL.get()).define('D', DDItems.SOUL_DUST.get()).define('E', Items.ELYTRA)
+                .pattern("BCB").pattern("DED").pattern("B B")
                 .unlockedBy("has_elytra", has(Items.ELYTRA)).save(output);
         ShapedRecipeBuilder.shaped(RecipeCategory.MISC, DDItems.REINFORCED_ECHO_SHARD.get())
                 .define('P', Items.PHANTOM_MEMBRANE).define('C', DDItems.WARDEN_CARAPACE.get()).define('E', Items.ECHO_SHARD)
                 .pattern("PCP").pattern("CEC").pattern("PCP")
                 .unlockedBy(getHasName(DDItems.WARDEN_CARAPACE), has(DDItems.WARDEN_CARAPACE.get())).save(output);
         copySmithingTemplate(output, DDItems.WARDEN_UPGRADE_SMITHING_TEMPLATE.get(), Blocks.SCULK);
         ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, DDItems.SONOROUS_STAFF)
-                .define('B', DDItems.SCULK_BONE).define('H', DDItems.HEART_OF_THE_DEEP).define('R', Items.REDSTONE).define('S', DDItems.REINFORCED_ECHO_SHARD).define('G', Items.GLOWSTONE_DUST)
-                .pattern(" RS").pattern(" HG").pattern("B  ")
+                .define('B', DDItems.SCULK_BONE).define('C', DDItems.SOUL_CRYSTAL).define('H', DDItems.HEART_OF_THE_DEEP)
+                .pattern(" CH").pattern(" BC").pattern("B  ")
                 .unlockedBy(getHasName(DDItems.SCULK_BONE), has(DDItems.SCULK_BONE))
-                .unlockedBy(getHasName(DDItems.REINFORCED_ECHO_SHARD), has(DDItems.REINFORCED_ECHO_SHARD))
+                .unlockedBy(getHasName(DDItems.SOUL_CRYSTAL), has(DDItems.SOUL_CRYSTAL))
                 .unlockedBy(getHasName(DDItems.HEART_OF_THE_DEEP), has(DDItems.HEART_OF_THE_DEEP)).save(output);
     }