From 16cf30ec761b43865d051d9ae74ad047004a35bf Mon Sep 17 00:00:00 2001 From: Xanthian Date: Sun, 11 Feb 2024 17:01:46 +0000 Subject: [PATCH] 1.20.1 4.2.7 Fixed missing bow tag Sorted duplication in all torch tags --- gradle.properties | 2 +- .../tags/items/piglin_repellents.json | 3 ++- .../vsas/tags/blocks/redstone_torches.json | 18 ++++-------------- .../data/vsas/tags/blocks/soul_torches.json | 12 +----------- .../data/vsas/tags/blocks/torches.json | 12 +----------- .../vsas/tags/blocks/wall_soul_torches.json | 12 +++++++----- .../generated/data/vsas/tags/items/bows.json | 15 +++++++++++++++ .../data/vsas/tags/items/redstone_torches.json | 18 ++++-------------- .../data/vsas/tags/items/soul_torches.json | 12 +----------- .../data/vsas/tags/items/torches.json | 12 +----------- .../vsas/tags/items/wall_soul_torches.json | 15 +++++++++++++++ .../net/xanthian/vsas/ClientInitialise.java | 11 +++++++++++ .../xanthian/vsas/blocks/RedstoneTorches.java | 3 ++- .../net/xanthian/vsas/blocks/SoulTorches.java | 3 ++- .../java/net/xanthian/vsas/blocks/Torches.java | 3 ++- .../vsas/datagen/BlockTagGenerator.java | 14 ++++---------- .../vsas/datagen/ItemTagGenerator.java | 11 ++++++++++- .../vsas/datagen/LangFileGenerator.java | 1 + .../vsas/datagen/LootTableGenerator.java | 9 +++++++++ 19 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 src/main/generated/data/vsas/tags/items/bows.json create mode 100644 src/main/generated/data/vsas/tags/items/wall_soul_torches.json diff --git a/gradle.properties b/gradle.properties index 4fc406e..31f2d64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ loader_version=0.15.6 #Fabric api fabric_version=0.91.0+1.20.1 # Mod Properties -mod_version=4.2.6 +mod_version=4.2.7 maven_group=xanthian archives_base_name=vsas diff --git a/src/main/generated/data/minecraft/tags/items/piglin_repellents.json b/src/main/generated/data/minecraft/tags/items/piglin_repellents.json index 0b7696f..d136609 100644 --- a/src/main/generated/data/minecraft/tags/items/piglin_repellents.json +++ b/src/main/generated/data/minecraft/tags/items/piglin_repellents.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#vsas:soul_campfires", - "#vsas:soul_torches" + "#vsas:soul_torches", + "#vsas:wall_soul_torches" ] } \ No newline at end of file diff --git a/src/main/generated/data/vsas/tags/blocks/redstone_torches.json b/src/main/generated/data/vsas/tags/blocks/redstone_torches.json index 0d0676e..62254c9 100644 --- a/src/main/generated/data/vsas/tags/blocks/redstone_torches.json +++ b/src/main/generated/data/vsas/tags/blocks/redstone_torches.json @@ -1,25 +1,15 @@ { "replace": false, "values": [ - "vsas:torches/wall_spruce_redstone_torch", - "vsas:torches/wall_acacia_redstone_torch", - "vsas:torches/bamboo_redstone_torch", - "vsas:torches/wall_crimson_redstone_torch", - "vsas:torches/warped_redstone_torch", - "vsas:torches/wall_mangrove_redstone_torch", - "vsas:torches/crimson_redstone_torch", - "vsas:torches/cherry_redstone_torch", "vsas:torches/dark_oak_redstone_torch", - "vsas:torches/wall_birch_redstone_torch", + "vsas:torches/bamboo_redstone_torch", "vsas:torches/birch_redstone_torch", "vsas:torches/jungle_redstone_torch", - "vsas:torches/wall_cherry_redstone_torch", - "vsas:torches/wall_warped_redstone_torch", "vsas:torches/acacia_redstone_torch", - "vsas:torches/wall_bamboo_redstone_torch", "vsas:torches/spruce_redstone_torch", - "vsas:torches/wall_dark_oak_redstone_torch", "vsas:torches/mangrove_redstone_torch", - "vsas:torches/wall_jungle_redstone_torch" + "vsas:torches/warped_redstone_torch", + "vsas:torches/crimson_redstone_torch", + "vsas:torches/cherry_redstone_torch" ] } \ No newline at end of file diff --git a/src/main/generated/data/vsas/tags/blocks/soul_torches.json b/src/main/generated/data/vsas/tags/blocks/soul_torches.json index cbb07b3..500a517 100644 --- a/src/main/generated/data/vsas/tags/blocks/soul_torches.json +++ b/src/main/generated/data/vsas/tags/blocks/soul_torches.json @@ -1,21 +1,11 @@ { "replace": false, "values": [ - "vsas:torches/wall_warped_soul_torch", - "vsas:torches/wall_spruce_soul_torch", - "vsas:torches/wall_acacia_soul_torch", - "vsas:torches/wall_mangrove_soul_torch", + "vsas:torches/birch_soul_torch", "vsas:torches/spruce_soul_torch", "vsas:torches/warped_soul_torch", - "vsas:torches/wall_cherry_soul_torch", "vsas:torches/crimson_soul_torch", - "vsas:torches/wall_dark_oak_soul_torch", - "vsas:torches/wall_bamboo_soul_torch", - "vsas:torches/wall_crimson_soul_torch", - "vsas:torches/wall_jungle_soul_torch", - "vsas:torches/birch_soul_torch", "vsas:torches/jungle_soul_torch", - "vsas:torches/wall_birch_soul_torch", "vsas:torches/bamboo_soul_torch", "vsas:torches/dark_oak_soul_torch", "vsas:torches/acacia_soul_torch", diff --git a/src/main/generated/data/vsas/tags/blocks/torches.json b/src/main/generated/data/vsas/tags/blocks/torches.json index c8b61e4..70e30d3 100644 --- a/src/main/generated/data/vsas/tags/blocks/torches.json +++ b/src/main/generated/data/vsas/tags/blocks/torches.json @@ -1,25 +1,15 @@ { "replace": false, "values": [ - "vsas:torches/wall_cherry_torch", + "vsas:torches/birch_torch", "vsas:torches/mangrove_torch", "vsas:torches/cherry_torch", "vsas:torches/crimson_torch", "vsas:torches/acacia_torch", - "vsas:torches/wall_crimson_torch", - "vsas:torches/wall_jungle_torch", - "vsas:torches/wall_acacia_torch", - "vsas:torches/wall_mangrove_torch", - "vsas:torches/birch_torch", - "vsas:torches/wall_dark_oak_torch", - "vsas:torches/wall_spruce_torch", - "vsas:torches/wall_warped_torch", "vsas:torches/warped_torch", - "vsas:torches/wall_birch_torch", "vsas:torches/dark_oak_torch", "vsas:torches/jungle_torch", "vsas:torches/bamboo_torch", - "vsas:torches/wall_bamboo_torch", "vsas:torches/spruce_torch" ] } \ No newline at end of file diff --git a/src/main/generated/data/vsas/tags/blocks/wall_soul_torches.json b/src/main/generated/data/vsas/tags/blocks/wall_soul_torches.json index 683cdf4..1e2ef05 100644 --- a/src/main/generated/data/vsas/tags/blocks/wall_soul_torches.json +++ b/src/main/generated/data/vsas/tags/blocks/wall_soul_torches.json @@ -1,13 +1,15 @@ { "replace": false, "values": [ + "vsas:torches/wall_warped_soul_torch", + "vsas:torches/wall_spruce_soul_torch", "vsas:torches/wall_acacia_soul_torch", + "vsas:torches/wall_mangrove_soul_torch", + "vsas:torches/wall_cherry_soul_torch", + "vsas:torches/wall_dark_oak_soul_torch", "vsas:torches/wall_birch_soul_torch", + "vsas:torches/wall_bamboo_soul_torch", "vsas:torches/wall_crimson_soul_torch", - "vsas:torches/wall_dark_oak_soul_torch", - "vsas:torches/wall_jungle_soul_torch", - "vsas:torches/wall_mangrove_soul_torch", - "vsas:torches/wall_spruce_soul_torch", - "vsas:torches/wall_warped_soul_torch" + "vsas:torches/wall_jungle_soul_torch" ] } \ No newline at end of file diff --git a/src/main/generated/data/vsas/tags/items/bows.json b/src/main/generated/data/vsas/tags/items/bows.json new file mode 100644 index 0000000..08e0d4f --- /dev/null +++ b/src/main/generated/data/vsas/tags/items/bows.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "vsas:bows/warped_bow", + "vsas:bows/cherry_bow", + "vsas:bows/bamboo_bow", + "vsas:bows/jungle_bow", + "vsas:bows/birch_bow", + "vsas:bows/mangrove_bow", + "vsas:bows/acacia_bow", + "vsas:bows/crimson_bow", + "vsas:bows/oak_bow", + "vsas:bows/dark_oak_bow" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/vsas/tags/items/redstone_torches.json b/src/main/generated/data/vsas/tags/items/redstone_torches.json index fc857f9..62254c9 100644 --- a/src/main/generated/data/vsas/tags/items/redstone_torches.json +++ b/src/main/generated/data/vsas/tags/items/redstone_torches.json @@ -1,25 +1,15 @@ { "replace": false, "values": [ - "vsas:torches/spruce_redstone_torch", - "vsas:torches/acacia_redstone_torch", - "vsas:torches/bamboo_redstone_torch", - "vsas:torches/crimson_redstone_torch", - "vsas:torches/warped_redstone_torch", - "vsas:torches/mangrove_redstone_torch", - "vsas:torches/crimson_redstone_torch", - "vsas:torches/cherry_redstone_torch", "vsas:torches/dark_oak_redstone_torch", - "vsas:torches/birch_redstone_torch", + "vsas:torches/bamboo_redstone_torch", "vsas:torches/birch_redstone_torch", "vsas:torches/jungle_redstone_torch", - "vsas:torches/cherry_redstone_torch", - "vsas:torches/warped_redstone_torch", "vsas:torches/acacia_redstone_torch", - "vsas:torches/bamboo_redstone_torch", "vsas:torches/spruce_redstone_torch", - "vsas:torches/dark_oak_redstone_torch", "vsas:torches/mangrove_redstone_torch", - "vsas:torches/jungle_redstone_torch" + "vsas:torches/warped_redstone_torch", + "vsas:torches/crimson_redstone_torch", + "vsas:torches/cherry_redstone_torch" ] } \ No newline at end of file diff --git a/src/main/generated/data/vsas/tags/items/soul_torches.json b/src/main/generated/data/vsas/tags/items/soul_torches.json index 69ae309..500a517 100644 --- a/src/main/generated/data/vsas/tags/items/soul_torches.json +++ b/src/main/generated/data/vsas/tags/items/soul_torches.json @@ -1,21 +1,11 @@ { "replace": false, "values": [ - "vsas:torches/warped_soul_torch", - "vsas:torches/spruce_soul_torch", - "vsas:torches/acacia_soul_torch", - "vsas:torches/mangrove_soul_torch", + "vsas:torches/birch_soul_torch", "vsas:torches/spruce_soul_torch", "vsas:torches/warped_soul_torch", - "vsas:torches/cherry_soul_torch", - "vsas:torches/crimson_soul_torch", - "vsas:torches/dark_oak_soul_torch", - "vsas:torches/bamboo_soul_torch", "vsas:torches/crimson_soul_torch", "vsas:torches/jungle_soul_torch", - "vsas:torches/birch_soul_torch", - "vsas:torches/jungle_soul_torch", - "vsas:torches/birch_soul_torch", "vsas:torches/bamboo_soul_torch", "vsas:torches/dark_oak_soul_torch", "vsas:torches/acacia_soul_torch", diff --git a/src/main/generated/data/vsas/tags/items/torches.json b/src/main/generated/data/vsas/tags/items/torches.json index 8430f26..70e30d3 100644 --- a/src/main/generated/data/vsas/tags/items/torches.json +++ b/src/main/generated/data/vsas/tags/items/torches.json @@ -1,25 +1,15 @@ { "replace": false, "values": [ - "vsas:torches/cherry_torch", + "vsas:torches/birch_torch", "vsas:torches/mangrove_torch", "vsas:torches/cherry_torch", "vsas:torches/crimson_torch", "vsas:torches/acacia_torch", - "vsas:torches/crimson_torch", - "vsas:torches/jungle_torch", - "vsas:torches/acacia_torch", - "vsas:torches/mangrove_torch", - "vsas:torches/birch_torch", - "vsas:torches/dark_oak_torch", - "vsas:torches/spruce_torch", - "vsas:torches/warped_torch", "vsas:torches/warped_torch", - "vsas:torches/birch_torch", "vsas:torches/dark_oak_torch", "vsas:torches/jungle_torch", "vsas:torches/bamboo_torch", - "vsas:torches/bamboo_torch", "vsas:torches/spruce_torch" ] } \ No newline at end of file diff --git a/src/main/generated/data/vsas/tags/items/wall_soul_torches.json b/src/main/generated/data/vsas/tags/items/wall_soul_torches.json new file mode 100644 index 0000000..017424e --- /dev/null +++ b/src/main/generated/data/vsas/tags/items/wall_soul_torches.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "vsas:torches/warped_soul_torch", + "vsas:torches/spruce_soul_torch", + "vsas:torches/acacia_soul_torch", + "vsas:torches/mangrove_soul_torch", + "vsas:torches/cherry_soul_torch", + "vsas:torches/dark_oak_soul_torch", + "vsas:torches/birch_soul_torch", + "vsas:torches/bamboo_soul_torch", + "vsas:torches/crimson_soul_torch", + "vsas:torches/jungle_soul_torch" + ] +} \ No newline at end of file diff --git a/src/main/java/net/xanthian/vsas/ClientInitialise.java b/src/main/java/net/xanthian/vsas/ClientInitialise.java index 53e08a3..be73e75 100644 --- a/src/main/java/net/xanthian/vsas/ClientInitialise.java +++ b/src/main/java/net/xanthian/vsas/ClientInitialise.java @@ -96,5 +96,16 @@ public void onInitializeClient() { for (Block torch : Torches.MOD_TORCHES.values()) { BlockRenderLayerMap.INSTANCE.putBlock(torch, RenderLayer.getCutout()); } + for (Block redstonetorch : RedstoneTorches.MOD_REDSTONE_WALL_TORCHES.values()) { + BlockRenderLayerMap.INSTANCE.putBlock(redstonetorch, RenderLayer.getCutout()); + } + + for (Block soultorch : SoulTorches.MOD_SOUL_WALL_TORCHES.values()) { + BlockRenderLayerMap.INSTANCE.putBlock(soultorch, RenderLayer.getCutout()); + } + + for (Block torch : Torches.MOD_WALL_TORCHES.values()) { + BlockRenderLayerMap.INSTANCE.putBlock(torch, RenderLayer.getCutout()); + } } } diff --git a/src/main/java/net/xanthian/vsas/blocks/RedstoneTorches.java b/src/main/java/net/xanthian/vsas/blocks/RedstoneTorches.java index a8dac9d..e9f094f 100644 --- a/src/main/java/net/xanthian/vsas/blocks/RedstoneTorches.java +++ b/src/main/java/net/xanthian/vsas/blocks/RedstoneTorches.java @@ -37,6 +37,7 @@ public class RedstoneTorches { public static final Block WARPED_REDSTONE_TORCH = new VariantRedstoneTorchBlock(); public static final Block WALL_WARPED_REDSTONE_TORCH = new VariantWallRedstoneTorchBlock(); public static Map MOD_REDSTONE_TORCHES = Maps.newHashMap(); + public static Map MOD_REDSTONE_WALL_TORCHES = Maps.newHashMap(); public static void registerRedstoneTorchBlocks() { initTorchBlock("torches/acacia_redstone_torch", ACACIA_REDSTONE_TORCH, "torches/wall_acacia_redstone_torch", WALL_ACACIA_REDSTONE_TORCH); @@ -55,7 +56,7 @@ private static void initTorchBlock(String torchName, Block torch, String wallTor Identifier identifier = new Identifier(Initialise.MOD_ID, torchName); Identifier identifier2 = new Identifier(Initialise.MOD_ID, wallTorchName); MOD_REDSTONE_TORCHES.put(identifier, torch); - MOD_REDSTONE_TORCHES.put(identifier2, wallTorch); + MOD_REDSTONE_WALL_TORCHES.put(identifier2, wallTorch); Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, torchName), torch); Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, wallTorchName), wallTorch); Registry.register(Registries.ITEM, new Identifier(Initialise.MOD_ID, torchName), new VerticallyAttachableBlockItem(torch, wallTorch, new FabricItemSettings(), Direction.DOWN)); diff --git a/src/main/java/net/xanthian/vsas/blocks/SoulTorches.java b/src/main/java/net/xanthian/vsas/blocks/SoulTorches.java index 0e61bec..4b4ea32 100644 --- a/src/main/java/net/xanthian/vsas/blocks/SoulTorches.java +++ b/src/main/java/net/xanthian/vsas/blocks/SoulTorches.java @@ -37,6 +37,7 @@ public class SoulTorches { public static final Block WARPED_SOUL_TORCH = new VariantSoulTorchBlock(); public static final Block WALL_WARPED_SOUL_TORCH = new VariantWallSoulTorchBlock(); public static Map MOD_SOUL_TORCHES = Maps.newHashMap(); + public static Map MOD_SOUL_WALL_TORCHES = Maps.newHashMap(); public static void registerSoulTorchBlocks() { initTorchBlock("torches/acacia_soul_torch", ACACIA_SOUL_TORCH, "torches/wall_acacia_soul_torch", WALL_ACACIA_SOUL_TORCH); @@ -55,7 +56,7 @@ private static void initTorchBlock(String torchName, Block torch, String wallTor Identifier identifier = new Identifier(Initialise.MOD_ID, torchName); Identifier identifier2 = new Identifier(Initialise.MOD_ID, wallTorchName); MOD_SOUL_TORCHES.put(identifier, torch); - MOD_SOUL_TORCHES.put(identifier2, wallTorch); + MOD_SOUL_WALL_TORCHES.put(identifier2, wallTorch); Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, torchName), torch); Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, wallTorchName), wallTorch); Registry.register(Registries.ITEM, new Identifier(Initialise.MOD_ID, torchName), new VerticallyAttachableBlockItem(torch, wallTorch, new FabricItemSettings(), Direction.DOWN)); diff --git a/src/main/java/net/xanthian/vsas/blocks/Torches.java b/src/main/java/net/xanthian/vsas/blocks/Torches.java index 00776c1..d6d3c20 100644 --- a/src/main/java/net/xanthian/vsas/blocks/Torches.java +++ b/src/main/java/net/xanthian/vsas/blocks/Torches.java @@ -17,6 +17,7 @@ public class Torches { public static Map MOD_TORCHES = Maps.newHashMap(); + public static Map MOD_WALL_TORCHES = Maps.newHashMap(); public static final Block ACACIA_TORCH = new VariantTorchBlock(); public static final Block WALL_ACACIA_TORCH = new VariantWallTorchBlock(); public static final Block BAMBOO_TORCH = new VariantTorchBlock(); @@ -55,7 +56,7 @@ private static void initTorchBlock(String torchName, Block torch, String wallTor Identifier identifier = new Identifier(Initialise.MOD_ID, torchName); Identifier identifier2 = new Identifier(Initialise.MOD_ID, wallTorchName); MOD_TORCHES.put(identifier, torch); - MOD_TORCHES.put(identifier2, wallTorch); + MOD_WALL_TORCHES.put(identifier2, wallTorch); Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, torchName), torch); Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, wallTorchName), wallTorch); Registry.register(Registries.ITEM, new Identifier(Initialise.MOD_ID, torchName), new VerticallyAttachableBlockItem(torch, wallTorch, new FabricItemSettings(), Direction.DOWN)); diff --git a/src/main/java/net/xanthian/vsas/datagen/BlockTagGenerator.java b/src/main/java/net/xanthian/vsas/datagen/BlockTagGenerator.java index 7fa7356..1683e88 100644 --- a/src/main/java/net/xanthian/vsas/datagen/BlockTagGenerator.java +++ b/src/main/java/net/xanthian/vsas/datagen/BlockTagGenerator.java @@ -81,22 +81,16 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { getOrCreateTagBuilder(SOUL_TORCHES) .add(block); } + for (Block block : SoulTorches.MOD_SOUL_WALL_TORCHES.values()) { + getOrCreateTagBuilder(WALL_SOUL_TORCHES) + .add(block); + } for (Block block : Torches.MOD_TORCHES.values()) { getOrCreateTagBuilder(TORCHES) .add(block); } - getOrCreateTagBuilder(WALL_SOUL_TORCHES) - .add(SoulTorches.WALL_ACACIA_SOUL_TORCH) - .add(SoulTorches.WALL_BIRCH_SOUL_TORCH) - .add(SoulTorches.WALL_CRIMSON_SOUL_TORCH) - .add(SoulTorches.WALL_DARK_OAK_SOUL_TORCH) - .add(SoulTorches.WALL_JUNGLE_SOUL_TORCH) - .add(SoulTorches.WALL_MANGROVE_SOUL_TORCH) - .add(SoulTorches.WALL_SPRUCE_SOUL_TORCH) - .add(SoulTorches.WALL_WARPED_SOUL_TORCH); - getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) .addTag(LADDERS) .addTag(CAMPFIRES) diff --git a/src/main/java/net/xanthian/vsas/datagen/ItemTagGenerator.java b/src/main/java/net/xanthian/vsas/datagen/ItemTagGenerator.java index 6919635..ef4a13d 100644 --- a/src/main/java/net/xanthian/vsas/datagen/ItemTagGenerator.java +++ b/src/main/java/net/xanthian/vsas/datagen/ItemTagGenerator.java @@ -21,6 +21,7 @@ public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { private static final TagKey ARROWS = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "arrows")); + private static final TagKey BOWS = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "bows")); private static final TagKey WOODEN_AXES = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "wooden_axes")); private static final TagKey STONE_AXES = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "stone_axes")); private static final TagKey IRON_AXES = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "iron_axes")); @@ -48,6 +49,7 @@ public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { private static final TagKey NETHERITE_SHOVELS = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "netherite_shovels")); private static final TagKey SOUL_CAMPFIRES = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "soul_campfires")); private static final TagKey SOUL_TORCHES = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "soul_torches")); + private static final TagKey WALL_SOUL_TORCHES = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "wall_soul_torches")); private static final TagKey STONE_SWORDS = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "stone_swords")); private static final TagKey NETHERITE_SWORDS = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "netherite_swords")); private static final TagKey TORCHES = TagKey.of(Registries.ITEM.getKey(), new Identifier(MOD_ID, "torches")); @@ -130,6 +132,10 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { getOrCreateTagBuilder(SOUL_TORCHES) .add(block.asItem()); } + for (Block block : SoulTorches.MOD_SOUL_WALL_TORCHES.values()) { + getOrCreateTagBuilder(WALL_SOUL_TORCHES) + .add(block.asItem()); + } for (Block block : Torches.MOD_TORCHES.values()) { getOrCreateTagBuilder(TORCHES) @@ -157,6 +163,8 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { } for (Item item : Bows.MOD_BOWS.values()) { + getOrCreateTagBuilder(BOWS) + .add(item); getOrCreateTagBuilder(C_BOWS) .add(item); getOrCreateTagBuilder(ARCHER_AFHA) @@ -547,7 +555,8 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { getOrCreateTagBuilder(ItemTags.PIGLIN_REPELLENTS) .addTag(SOUL_CAMPFIRES) - .addTag(SOUL_TORCHES); + .addTag(SOUL_TORCHES) + .addTag(WALL_SOUL_TORCHES); getOrCreateTagBuilder(C_JOB_SITE) diff --git a/src/main/java/net/xanthian/vsas/datagen/LangFileGenerator.java b/src/main/java/net/xanthian/vsas/datagen/LangFileGenerator.java index 60d90ee..7c29ecc 100644 --- a/src/main/java/net/xanthian/vsas/datagen/LangFileGenerator.java +++ b/src/main/java/net/xanthian/vsas/datagen/LangFileGenerator.java @@ -103,6 +103,7 @@ public void generateTranslations(TranslationBuilder translationBuilder) { translationBuilder.add(block, generateBlockDisplayName("torches/", block)); } + for (Block block : Torches.MOD_TORCHES.values()) { translationBuilder.add(block, generateBlockDisplayName("torches/", block)); } diff --git a/src/main/java/net/xanthian/vsas/datagen/LootTableGenerator.java b/src/main/java/net/xanthian/vsas/datagen/LootTableGenerator.java index f24be3a..7cbfb49 100644 --- a/src/main/java/net/xanthian/vsas/datagen/LootTableGenerator.java +++ b/src/main/java/net/xanthian/vsas/datagen/LootTableGenerator.java @@ -53,6 +53,9 @@ public void generate() { for (Block redstonetorch : RedstoneTorches.MOD_REDSTONE_TORCHES.values()) { addDrop(redstonetorch); } + for (Block redstonetorch : RedstoneTorches.MOD_REDSTONE_WALL_TORCHES.values()) { + addDrop(redstonetorch); + } for (Block campfires : SoulCampfires.MOD_SOUL_CAMPFIRES.values()) { addDrop(campfires, (Block block) -> VanillaBlockLootTableGenerator.dropsWithSilkTouch(block, this.addSurvivesExplosionCondition(block, ItemEntry.builder(Items.SOUL_SOIL).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)))))); @@ -61,9 +64,15 @@ public void generate() { for (Block soultorch : SoulTorches.MOD_SOUL_TORCHES.values()) { addDrop(soultorch); } + for (Block soultorch : SoulTorches.MOD_SOUL_WALL_TORCHES.values()) { + addDrop(soultorch); + } for (Block torch : Torches.MOD_TORCHES.values()) { addDrop(torch); } + for (Block torch : Torches.MOD_WALL_TORCHES.values()) { + addDrop(torch); + } } } \ No newline at end of file