fix: update some tags

chimericdream · Sep 13, 2024 · a242e84 · a242e84
1 parent b558614
commit a242e84
Show file tree

Hide file tree

Showing 11 changed files with 157 additions and 26 deletions.
diff --git a/src/main/generated/data/minecraft/tags/block/mineable/axe.json b/src/main/generated/data/minecraft/tags/block/mineable/axe.json
@@ -4,6 +4,15 @@
     "minekea:storage/compressed/chorus_fruit",
     "minekea:storage/compressed/stick",
     "minekea:storage/compressed/sugar_cane",
+    "minekea:furniture/bookshelves/acacia",
+    "minekea:furniture/bookshelves/birch",
+    "minekea:furniture/bookshelves/cherry",
+    "minekea:furniture/bookshelves/crimson",
+    "minekea:furniture/bookshelves/dark_oak",
+    "minekea:furniture/bookshelves/jungle",
+    "minekea:furniture/bookshelves/mangrove",
+    "minekea:furniture/bookshelves/spruce",
+    "minekea:furniture/bookshelves/warped",
     "minekea:furniture/display_cases/acacia",
     "minekea:furniture/display_cases/birch",
     "minekea:furniture/display_cases/cherry",
@@ -23,6 +32,86 @@
     "minekea:furniture/display_cases/stripped/mangrove",
     "minekea:furniture/display_cases/stripped/oak",
     "minekea:furniture/display_cases/stripped/spruce",
-    "minekea:furniture/display_cases/stripped/warped"
+    "minekea:furniture/display_cases/stripped/warped",
+    "minekea:furniture/doors/bookshelves/acacia",
+    "minekea:furniture/doors/bookshelves/birch",
+    "minekea:furniture/doors/bookshelves/cherry",
+    "minekea:furniture/doors/bookshelves/crimson",
+    "minekea:furniture/doors/bookshelves/dark_oak",
+    "minekea:furniture/doors/bookshelves/jungle",
+    "minekea:furniture/doors/bookshelves/mangrove",
+    "minekea:furniture/doors/bookshelves/oak",
+    "minekea:furniture/doors/bookshelves/spruce",
+    "minekea:furniture/doors/bookshelves/warped",
+    "minekea:furniture/seating/chairs/acacia",
+    "minekea:furniture/seating/chairs/birch",
+    "minekea:furniture/seating/chairs/cherry",
+    "minekea:furniture/seating/chairs/crimson",
+    "minekea:furniture/seating/chairs/dark_oak",
+    "minekea:furniture/seating/chairs/jungle",
+    "minekea:furniture/seating/chairs/mangrove",
+    "minekea:furniture/seating/chairs/oak",
+    "minekea:furniture/seating/chairs/spruce",
+    "minekea:furniture/seating/chairs/warped",
+    "minekea:furniture/seating/stools/acacia",
+    "minekea:furniture/seating/stools/birch",
+    "minekea:furniture/seating/stools/cherry",
+    "minekea:furniture/seating/stools/crimson",
+    "minekea:furniture/seating/stools/dark_oak",
+    "minekea:furniture/seating/stools/jungle",
+    "minekea:furniture/seating/stools/mangrove",
+    "minekea:furniture/seating/stools/oak",
+    "minekea:furniture/seating/stools/spruce",
+    "minekea:furniture/seating/stools/warped",
+    "minekea:furniture/shelves/supported/acacia",
+    "minekea:furniture/shelves/supported/birch",
+    "minekea:furniture/shelves/supported/cherry",
+    "minekea:furniture/shelves/supported/crimson",
+    "minekea:furniture/shelves/supported/dark_oak",
+    "minekea:furniture/shelves/supported/jungle",
+    "minekea:furniture/shelves/supported/mangrove",
+    "minekea:furniture/shelves/supported/oak",
+    "minekea:furniture/shelves/supported/spruce",
+    "minekea:furniture/shelves/supported/warped",
+    "minekea:furniture/shelves/floating/acacia",
+    "minekea:furniture/shelves/floating/birch",
+    "minekea:furniture/shelves/floating/cherry",
+    "minekea:furniture/shelves/floating/crimson",
+    "minekea:furniture/shelves/floating/dark_oak",
+    "minekea:furniture/shelves/floating/jungle",
+    "minekea:furniture/shelves/floating/mangrove",
+    "minekea:furniture/shelves/floating/oak",
+    "minekea:furniture/shelves/floating/spruce",
+    "minekea:furniture/shelves/floating/warped",
+    "minekea:furniture/shutters/acacia",
+    "minekea:furniture/shutters/birch",
+    "minekea:furniture/shutters/cherry",
+    "minekea:furniture/shutters/crimson",
+    "minekea:furniture/shutters/dark_oak",
+    "minekea:furniture/shutters/jungle",
+    "minekea:furniture/shutters/mangrove",
+    "minekea:furniture/shutters/oak",
+    "minekea:furniture/shutters/spruce",
+    "minekea:furniture/shutters/warped",
+    "minekea:furniture/tables/acacia",
+    "minekea:furniture/tables/birch",
+    "minekea:furniture/tables/cherry",
+    "minekea:furniture/tables/crimson",
+    "minekea:furniture/tables/dark_oak",
+    "minekea:furniture/tables/jungle",
+    "minekea:furniture/tables/mangrove",
+    "minekea:furniture/tables/oak",
+    "minekea:furniture/tables/spruce",
+    "minekea:furniture/tables/warped",
+    "minekea:furniture/trapdoors/bookshelves/acacia",
+    "minekea:furniture/trapdoors/bookshelves/birch",
+    "minekea:furniture/trapdoors/bookshelves/cherry",
+    "minekea:furniture/trapdoors/bookshelves/crimson",
+    "minekea:furniture/trapdoors/bookshelves/dark_oak",
+    "minekea:furniture/trapdoors/bookshelves/jungle",
+    "minekea:furniture/trapdoors/bookshelves/mangrove",
+    "minekea:furniture/trapdoors/bookshelves/oak",
+    "minekea:furniture/trapdoors/bookshelves/spruce",
+    "minekea:furniture/trapdoors/bookshelves/warped"
   ]
 }
diff --git a/src/main/generated/data/minekea/tags/item/glass_jar_storable.json b/src/main/generated/data/minekea/tags/item/glass_jar_storable.json
@@ -1,23 +1,23 @@
 {
   "values": [
-    "minecraft:red_concrete_powder",
     "minecraft:cyan_dye",
+    "minecraft:red_concrete_powder",
     "minecraft:blaze_powder",
     "minecraft:redstone",
     "minecraft:yellow_concrete_powder",
-    "minecraft:wheat_seeds",
     "minecraft:brown_dye",
-    "minecraft:white_concrete_powder",
+    "minecraft:wheat_seeds",
     "minecraft:black_dye",
+    "minecraft:white_concrete_powder",
     "minecraft:blue_concrete_powder",
     "minecraft:magenta_dye",
     "minecraft:magenta_concrete_powder",
     "minecraft:brown_concrete_powder",
     "minecraft:red_sand",
     "minecraft:cyan_concrete_powder",
     "minecraft:beetroot",
-    "minecraft:carrot",
     "minecraft:nether_star",
+    "minecraft:carrot",
     "minecraft:gray_dye",
     "minecraft:light_blue_dye",
     "minecraft:ender_pearl",
@@ -33,31 +33,31 @@
     "minecraft:coal",
     "minecraft:melon_seeds",
     "minecraft:red_dye",
-    "minecraft:sugar",
-    "minecraft:pink_dye",
     "minecraft:totem_of_undying",
+    "minecraft:pink_dye",
+    "minecraft:sugar",
     "minecraft:purple_dye",
     "minecraft:wheat",
     "minecraft:amethyst_shard",
-    "minecraft:potato",
     "minecraft:paper",
+    "minecraft:potato",
     "minecraft:green_concrete_powder",
     "minecraft:lime_concrete_powder",
     "minecraft:melon_slice",
     "minecraft:bamboo",
-    "minecraft:gravel",
     "minecraft:phantom_membrane",
+    "minecraft:gravel",
     "minecraft:light_gray_concrete_powder",
-    "minecraft:light_blue_concrete_powder",
     "minecraft:egg",
+    "minecraft:light_blue_concrete_powder",
     "minecraft:green_dye",
     "minecraft:pink_concrete_powder",
     "minecraft:sugar_cane",
     "minecraft:purple_concrete_powder",
     "minecraft:dried_kelp",
     "minecraft:honeycomb",
-    "minecraft:light_gray_dye",
     "minecraft:black_concrete_powder",
+    "minecraft:light_gray_dye",
     "minecraft:stick",
     "minecraft:pumpkin_seeds",
     "minecraft:white_dye",

diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/bookshelves/GenericBookshelf.java b/src/main/java/com/chimericdream/minekea/block/furniture/bookshelves/GenericBookshelf.java
@@ -82,6 +82,7 @@ public void register() {
     @Override
     public void configureBlockTags(RegistryWrapper.WrapperLookup registryLookup, Function<TagKey<Block>, FabricTagProvider<Block>.FabricTagBuilder> getBuilder) {
         getBuilder.apply(BlockTags.ENCHANTMENT_POWER_PROVIDER).setReplace(false).add(this);
+        getBuilder.apply(BlockTags.AXE_MINEABLE).setReplace(false).add(this);
     }
 
     @Override

diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/doors/GenericBookshelfDoor.java b/src/main/java/com/chimericdream/minekea/block/furniture/doors/GenericBookshelfDoor.java
@@ -6,6 +6,7 @@
 import com.chimericdream.minekea.util.MinekeaTextures;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.block.AbstractBlock;
@@ -32,10 +33,13 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;
 
 import java.util.Optional;
+import java.util.function.Function;
 
 public class GenericBookshelfDoor extends DoorBlock implements MinekeaBlock {
     protected static final Model ITEM_MODEL = new Model(
@@ -106,6 +110,11 @@ public void register() {
         }
     }
 
+    @Override
+    public void configureBlockTags(RegistryWrapper.WrapperLookup registryLookup, Function<TagKey<Block>, FabricTagProvider<Block>.FabricTagBuilder> getBuilder) {
+        getBuilder.apply(BlockTags.AXE_MINEABLE).setReplace(false).add(this);
+    }
+
     private Block getBookshelf() {
         if (materialName == "Oak") {
             return Blocks.BOOKSHELF;

diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericChair.java b/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericChair.java
@@ -6,6 +6,7 @@
 import com.chimericdream.minekea.util.MinekeaTextures;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.block.AbstractBlock;
@@ -33,6 +34,8 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
@@ -53,6 +56,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
 public class GenericChair extends Block implements MinekeaBlock, Waterloggable {
     protected static final Model CHAIR_MODEL = new Model(
@@ -226,6 +230,11 @@ public void configureRecipes(RecipeExporter exporter) {
             .offerTo(exporter);
     }
 
+    @Override
+    public void configureBlockTags(RegistryWrapper.WrapperLookup registryLookup, Function<TagKey<Block>, FabricTagProvider<Block>.FabricTagBuilder> getBuilder) {
+        getBuilder.apply(BlockTags.AXE_MINEABLE).setReplace(false).add(this);
+    }
+
     @Override
     public void configureBlockLootTables(RegistryWrapper.WrapperLookup registryLookup, BlockLootTableGenerator generator) {
         generator.addDrop(this);

diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericStool.java b/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericStool.java
@@ -6,6 +6,7 @@
 import com.chimericdream.minekea.util.MinekeaTextures;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.block.AbstractBlock;
@@ -28,6 +29,8 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
@@ -46,6 +49,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 
 public class GenericStool extends Block implements MinekeaBlock, Waterloggable {
     protected static final Model STOOL_MODEL = new Model(
@@ -177,6 +181,11 @@ public void configureRecipes(RecipeExporter exporter) {
             .offerTo(exporter);
     }
 
+    @Override
+    public void configureBlockTags(RegistryWrapper.WrapperLookup registryLookup, Function<TagKey<Block>, FabricTagProvider<Block>.FabricTagBuilder> getBuilder) {
+        getBuilder.apply(BlockTags.AXE_MINEABLE).setReplace(false).add(this);
+    }
+
     @Override
     public void configureBlockLootTables(RegistryWrapper.WrapperLookup registryLookup, BlockLootTableGenerator generator) {
         generator.addDrop(this);

diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/shelves/GenericFloatingShelf.java b/src/main/java/com/chimericdream/minekea/block/furniture/shelves/GenericFloatingShelf.java
@@ -5,7 +5,6 @@
 import com.chimericdream.minekea.util.MinekeaTextures;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.block.Block;
@@ -22,15 +21,12 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.registry.tag.TagKey;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 
-import java.util.function.Function;
-
 public class GenericFloatingShelf extends GenericShelf {
     public GenericFloatingShelf(
         String materialName,
@@ -87,13 +83,6 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po
         };
     }
 
-    @Override
-    public void configureBlockTags(RegistryWrapper.WrapperLookup registryLookup, Function<TagKey<Block>, FabricTagProvider<Block>.FabricTagBuilder> getBuilder) {
-//        getBuilder.apply(MinecraftBlockTags.MINEABLE_AXE)
-//            .setReplace(false)
-//            .add(this);
-    }
-
     @Override
     public void configureRecipes(RecipeExporter exporter) {
         ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, this, 3)

diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/shelves/GenericShelf.java b/src/main/java/com/chimericdream/minekea/block/furniture/shelves/GenericShelf.java
@@ -37,6 +37,7 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
@@ -350,12 +351,9 @@ public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockSt
         }
     }
 
-
     @Override
     public void configureBlockTags(RegistryWrapper.WrapperLookup registryLookup, Function<TagKey<Block>, FabricTagProvider<Block>.FabricTagBuilder> getBuilder) {
-//        getBuilder.apply(MinecraftBlockTags.MINEABLE_AXE)
-//            .setReplace(false)
-//            .add(this);
+        getBuilder.apply(BlockTags.AXE_MINEABLE).setReplace(false).add(this);
     }
 
     @Override

diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/shutters/ShutterBlock.java b/src/main/java/com/chimericdream/minekea/block/furniture/shutters/ShutterBlock.java
@@ -5,6 +5,7 @@
 import com.chimericdream.minekea.util.MinekeaTextures;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
@@ -36,6 +37,8 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
@@ -56,6 +59,7 @@
 
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
 import static com.chimericdream.minekea.item.ItemGroups.FURNITURE_ITEM_GROUP_KEY;
 
@@ -414,6 +418,11 @@ public void configureRecipes(RecipeExporter exporter) {
             .offerTo(exporter);
     }
 
+    @Override
+    public void configureBlockTags(RegistryWrapper.WrapperLookup registryLookup, Function<TagKey<Block>, FabricTagProvider<Block>.FabricTagBuilder> getBuilder) {
+        getBuilder.apply(BlockTags.AXE_MINEABLE).setReplace(false).add(this);
+    }
+
     @Override
     public void configureBlockLootTables(RegistryWrapper.WrapperLookup registryLookup, BlockLootTableGenerator generator) {
         generator.addDrop(this);