Merge remote-tracking branch 'upstream/master' into crab

AViewFromTheTop · Oct 24, 2023 · b1aa0bf · b1aa0bf
2 parents 874aac2 + cf0d2f8
commit b1aa0bf
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 90 deletions.
diff --git a/...a/wilderwild/tags/blocks/baobab_logs.json → ...a/wilderwild/tags/blocks/baobab_logs.json b/...a/wilderwild/tags/blocks/baobab_logs.json → ...a/wilderwild/tags/blocks/baobab_logs.json
@@ -5,6 +5,9 @@
     "wilderwild:stripped_baobab_log",
     "wilderwild:baobab_wood",
     "wilderwild:stripped_baobab_wood",
-    "#wilderwild:hollowed_baobab_logs"
+    {
+      "id": "#wilderwild:hollowed_baobab_logs",
+      "required": false
+    }
   ]
-}
+}
diff --git a/...erwild/tags/blocks/basin_replaceable.json → ...erwild/tags/blocks/basin_replaceable.json b/...erwild/tags/blocks/basin_replaceable.json → ...erwild/tags/blocks/basin_replaceable.json
@@ -6,4 +6,4 @@
     "minecraft:podzol",
     "minecraft:moss_block"
   ]
-}
+}
diff --git a/src/main/generated/data/wilderwild/tags/blocks/blue_nematocyst_feature_placeable.json b/src/main/generated/data/wilderwild/tags/blocks/blue_nematocyst_feature_placeable.json
@@ -4,10 +4,7 @@
     "minecraft:clay",
     "minecraft:dripstone_block",
     "minecraft:calcite",
-    {
-      "id": "wilderwild:blue_pearlescent_mesoglea",
-      "required": false
-    },
+    "wilderwild:blue_pearlescent_mesoglea",
     {
       "id": "#minecraft:base_stone_overworld",
       "required": false

diff --git a/.../wilderwild/tags/blocks/cypress_logs.json → .../wilderwild/tags/blocks/cypress_logs.json b/.../wilderwild/tags/blocks/cypress_logs.json → .../wilderwild/tags/blocks/cypress_logs.json
@@ -5,6 +5,9 @@
     "wilderwild:stripped_cypress_log",
     "wilderwild:cypress_wood",
     "wilderwild:stripped_cypress_wood",
-    "#wilderwild:hollowed_cypress_logs"
+    {
+      "id": "#wilderwild:hollowed_cypress_logs",
+      "required": false
+    }
   ]
-}
+}
diff --git a/src/main/generated/data/wilderwild/tags/blocks/kills_termite.json b/src/main/generated/data/wilderwild/tags/blocks/kills_termite.json
@@ -48,22 +48,10 @@
     "minecraft:redstone_block",
     "minecraft:redstone_torch",
     "minecraft:redstone_wall_torch",
-    {
-      "id": "wilderwild:hollowed_crimson_stem",
-      "required": false
-    },
-    {
-      "id": "wilderwild:hollowed_warped_stem",
-      "required": false
-    },
-    {
-      "id": "wilderwild:stripped_hollowed_crimson_stem",
-      "required": false
-    },
-    {
-      "id": "wilderwild:stripped_hollowed_warped_stem",
-      "required": false
-    },
+    "wilderwild:hollowed_crimson_stem",
+    "wilderwild:hollowed_warped_stem",
+    "wilderwild:stripped_hollowed_crimson_stem",
+    "wilderwild:stripped_hollowed_warped_stem",
     {
       "id": "#minecraft:warped_stems",
       "required": false

diff --git a/...ata/wilderwild/tags/blocks/palm_logs.json → ...ata/wilderwild/tags/blocks/palm_logs.json b/...ata/wilderwild/tags/blocks/palm_logs.json → ...ata/wilderwild/tags/blocks/palm_logs.json
@@ -5,7 +5,9 @@
     "wilderwild:stripped_palm_log",
     "wilderwild:palm_wood",
     "wilderwild:stripped_palm_wood",
-    "wilderwild:palm_crown",
-    "#wilderwild:hollowed_palm_logs"
+    {
+      "id": "#wilderwild:hollowed_palm_logs",
+      "required": false
+    }
   ]
-}
+}
diff --git a/src/main/generated/data/wilderwild/tags/blocks/purple_nematocyst_feature_placeable.json b/src/main/generated/data/wilderwild/tags/blocks/purple_nematocyst_feature_placeable.json
@@ -4,10 +4,7 @@
     "minecraft:clay",
     "minecraft:dripstone_block",
     "minecraft:calcite",
-    {
-      "id": "wilderwild:purple_pearlescent_mesoglea",
-      "required": false
-    },
+    "wilderwild:purple_pearlescent_mesoglea",
     {
       "id": "#minecraft:base_stone_overworld",
       "required": false

diff --git a/...in/generated/data/wilderwild/tags/blocks/red_scorched_sand_feature_inner_replaceable.json b/...in/generated/data/wilderwild/tags/blocks/red_scorched_sand_feature_inner_replaceable.json
@@ -2,9 +2,6 @@
   "replace": false,
   "values": [
     "minecraft:red_sand",
-    {
-      "id": "wilderwild:red_scorched_sand",
-      "required": false
-    }
+    "wilderwild:scorched_red_sand"
   ]
 }
diff --git a/src/main/generated/data/wilderwild/tags/blocks/scorched_sand_feature_inner_replaceable.json b/src/main/generated/data/wilderwild/tags/blocks/scorched_sand_feature_inner_replaceable.json
@@ -2,9 +2,6 @@
   "replace": false,
   "values": [
     "minecraft:sand",
-    {
-      "id": "wilderwild:scorched_sand",
-      "required": false
-    }
+    "wilderwild:scorched_sand"
   ]
 }
diff --git a/src/main/generated/data/wilderwild/tags/blocks/termite_breakable.json b/src/main/generated/data/wilderwild/tags/blocks/termite_breakable.json
@@ -19,18 +19,9 @@
     "minecraft:stripped_oak_wood",
     "minecraft:stripped_spruce_wood",
     "minecraft:stripped_acacia_wood",
-    {
-      "id": "wilderwild:stripped_baobab_wood",
-      "required": false
-    },
-    {
-      "id": "wilderwild:stripped_cypress_wood",
-      "required": false
-    },
-    {
-      "id": "wilderwild:stripped_palm_wood",
-      "required": false
-    },
+    "wilderwild:stripped_baobab_wood",
+    "wilderwild:stripped_cypress_wood",
+    "wilderwild:stripped_palm_wood",
     {
       "id": "immersive_weathering:leaf_piles",
       "required": false

diff --git a/src/main/java/net/frozenblock/wilderwild/datagen/WWBlockTagProvider.java b/src/main/java/net/frozenblock/wilderwild/datagen/WWBlockTagProvider.java
@@ -234,14 +234,14 @@ private void generateFeatures() {
 			.add(Blocks.CLAY)
 			.add(Blocks.DRIPSTONE_BLOCK)
 			.add(Blocks.CALCITE)
-			.addOptional(WilderSharedConstants.id("blue_pearlescent_mesoglea"))
+			.add(RegisterBlocks.BLUE_PEARLESCENT_MESOGLEA)
 			.addOptionalTag(BlockTags.BASE_STONE_OVERWORLD);
 
 		this.getOrCreateTagBuilder(WilderBlockTags.PURPLE_NEMATOCYST_FEATURE_PLACEABLE)
 			.add(Blocks.CLAY)
 			.add(Blocks.DRIPSTONE_BLOCK)
 			.add(Blocks.CALCITE)
-			.addOptional(WilderSharedConstants.id("purple_pearlescent_mesoglea"))
+			.add(RegisterBlocks.PURPLE_PEARLESCENT_MESOGLEA)
 			.addOptionalTag(BlockTags.BASE_STONE_OVERWORLD);
 
 		this.getOrCreateTagBuilder(WilderBlockTags.SHELF_FUNGUS_FEATURE_PLACEABLE)
@@ -250,14 +250,14 @@ private void generateFeatures() {
 
 		this.getOrCreateTagBuilder(WilderBlockTags.SCORCHED_SAND_FEATURE_INNER_REPLACEABLE)
 			.add(Blocks.SAND)
-			.addOptional(WilderSharedConstants.id("scorched_sand"));
+			.add(RegisterBlocks.SCORCHED_SAND);
 
 		this.getOrCreateTagBuilder(WilderBlockTags.SCORCHED_SAND_FEATURE_REPLACEABLE)
 			.add(Blocks.SAND);
 
 		this.getOrCreateTagBuilder(WilderBlockTags.RED_SCORCHED_SAND_FEATURE_INNER_REPLACEABLE)
 			.add(Blocks.RED_SAND)
-			.addOptional(WilderSharedConstants.id("red_scorched_sand"));
+			.add(RegisterBlocks.SCORCHED_RED_SAND);
 
 		this.getOrCreateTagBuilder(WilderBlockTags.RED_SCORCHED_SAND_FEATURE_REPLACEABLE)
 			.add(Blocks.RED_SAND);
@@ -280,6 +280,33 @@ private void generateFeatures() {
 	}
 
 	private void generateTags() {
+		this.getOrCreateTagBuilder(WilderBlockTags.BAOBAB_LOGS)
+			.add(RegisterBlocks.BAOBAB_LOG)
+			.add(RegisterBlocks.STRIPPED_BAOBAB_LOG)
+			.add(RegisterBlocks.BAOBAB_WOOD)
+			.add(RegisterBlocks.STRIPPED_BAOBAB_WOOD)
+			.addOptionalTag(WilderBlockTags.HOLLOWED_BAOBAB_LOGS);
+
+		this.getOrCreateTagBuilder(WilderBlockTags.CYPRESS_LOGS)
+			.add(RegisterBlocks.CYPRESS_LOG)
+			.add(RegisterBlocks.STRIPPED_CYPRESS_LOG)
+			.add(RegisterBlocks.CYPRESS_WOOD)
+			.add(RegisterBlocks.STRIPPED_CYPRESS_WOOD)
+			.addOptionalTag(WilderBlockTags.HOLLOWED_CYPRESS_LOGS);
+
+		this.getOrCreateTagBuilder(WilderBlockTags.PALM_LOGS)
+			.add(RegisterBlocks.PALM_LOG)
+			.add(RegisterBlocks.STRIPPED_PALM_LOG)
+			.add(RegisterBlocks.PALM_WOOD)
+			.add(RegisterBlocks.STRIPPED_PALM_WOOD)
+			.addOptionalTag(WilderBlockTags.HOLLOWED_PALM_LOGS);
+
+		this.getOrCreateTagBuilder(WilderBlockTags.BASIN_REPLACEABLE)
+			.add(Blocks.GRASS_BLOCK)
+			.add(Blocks.COARSE_DIRT)
+			.add(Blocks.PODZOL)
+			.add(Blocks.MOSS_BLOCK);
+
 		this.getOrCreateTagBuilder(WilderBlockTags.STOPS_TUMBLEWEED)
 			.add(Blocks.MUD)
 			.add(Blocks.MUDDY_MANGROVE_ROOTS)
@@ -469,22 +496,10 @@ private void generateHollowedAndTermites() {
 			.add(Blocks.REDSTONE_BLOCK)
 			.add(Blocks.REDSTONE_TORCH)
 			.add(Blocks.REDSTONE_WALL_TORCH)
-			.addOptional(ResourceKey.create(
-				Registries.BLOCK,
-				WilderSharedConstants.id("hollowed_crimson_stem")
-			))
-			.addOptional(ResourceKey.create(
-				Registries.BLOCK,
-				WilderSharedConstants.id("hollowed_warped_stem")
-			))
-			.addOptional(ResourceKey.create(
-				Registries.BLOCK,
-				WilderSharedConstants.id("stripped_hollowed_crimson_stem")
-			))
-			.addOptional(ResourceKey.create(
-				Registries.BLOCK,
-				WilderSharedConstants.id("stripped_hollowed_warped_stem")
-			))
+			.add(RegisterBlocks.HOLLOWED_CRIMSON_STEM)
+			.add(RegisterBlocks.HOLLOWED_WARPED_STEM)
+			.add(RegisterBlocks.STRIPPED_HOLLOWED_CRIMSON_STEM)
+			.add(RegisterBlocks.STRIPPED_HOLLOWED_WARPED_STEM)
 			.addOptionalTag(BlockTags.WARPED_STEMS)
 			.addOptionalTag(BlockTags.CRIMSON_STEMS);
 
@@ -501,24 +516,9 @@ private void generateHollowedAndTermites() {
 			.add(Blocks.STRIPPED_OAK_WOOD)
 			.add(Blocks.STRIPPED_SPRUCE_WOOD)
 			.add(Blocks.STRIPPED_ACACIA_WOOD)
-			.addOptional(
-				ResourceKey.create(
-					Registries.BLOCK,
-					WilderSharedConstants.id("stripped_baobab_wood")
-				)
-			)
-			.addOptional(
-				ResourceKey.create(
-					Registries.BLOCK,
-					WilderSharedConstants.id("stripped_cypress_wood")
-				)
-			)
-			.addOptional(
-				ResourceKey.create(
-					Registries.BLOCK,
-					WilderSharedConstants.id("stripped_palm_wood")
-				)
-			)
+			.add(RegisterBlocks.STRIPPED_BAOBAB_WOOD)
+			.add(RegisterBlocks.STRIPPED_CYPRESS_WOOD)
+			.add(RegisterBlocks.STRIPPED_PALM_WOOD)
 			.addOptional(
 				ResourceKey.create(
 					Registries.BLOCK,

diff --git a/src/main/java/net/frozenblock/wilderwild/tag/WilderBlockTags.java b/src/main/java/net/frozenblock/wilderwild/tag/WilderBlockTags.java
@@ -34,13 +34,19 @@ public final class WilderBlockTags {
 	public static final TagKey<Block> SCULK_STAIR_REPLACEABLE = bind("sculk_stair_replaceable");
 	public static final TagKey<Block> SCULK_WALL_REPLACEABLE = bind("sculk_wall_replaceable");
 	public static final TagKey<Block> ANCIENT_HORN_NON_COLLIDE = bind("ancient_horn_vibration_non_collide");
+	public static final TagKey<Block> BAOBAB_LOGS = bind("baobab_logs");
+	public static final TagKey<Block> CYPRESS_LOGS = bind("cypress_logs");
+	public static final TagKey<Block> PALM_LOGS = bind("palm_logs");
 	public static final TagKey<Block> KILLS_TERMITE = bind("kills_termite");
 	public static final TagKey<Block> TERMITE_BREAKABLE = bind("termite_breakable");
 	public static final TagKey<Block> BLOCKS_TERMITE = bind("blocks_termite");
 	public static final TagKey<Block> FIREFLY_HIDEABLE_BLOCKS = bind("firefly_hideable_blocks");
 	public static final TagKey<Block> PACKED_MUD_REPLACEABLE = bind("packed_mud_replaceable");
 	public static final TagKey<Block> HOLLOWED_LOGS = bind("hollowed_logs");
 	public static final TagKey<Block> STRIPPED_HOLLOWED_LOGS = bind("stripped_hollowed_logs");
+	public static final TagKey<Block> HOLLOWED_BAOBAB_LOGS = bind("hollowed_baobab_logs");
+	public static final TagKey<Block> HOLLOWED_CYPRESS_LOGS = bind("hollowed_cypress_logs");
+	public static final TagKey<Block> HOLLOWED_PALM_LOGS = bind("hollowed_palm_logs");
 	public static final TagKey<Block> BUSH_MAY_PLACE_ON = bind("bush_may_place_on");
 	public static final TagKey<Block> SAND_POOL_REPLACEABLE = bind("sand_pool_replaceable");
 	public static final TagKey<Block> RIVER_POOL_REPLACEABLE = bind("river_pool_replaceable");
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ @@
         "minecraft:podzol",
         "minecraft:moss_block"
       ]
-    }
+    }