Tweaked Water Purifier block properties

Glitchfiend · Jan 6, 2024 · 98167d7 · 98167d7
1 parent e6013a9
commit 98167d7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.20.4	2024-01-04T21:21:27.7372146	Recipes
+// 1.20.4	2024-01-06T06:40:04.398895	Recipes
 09252bd5a872203de304820e8d5c5493afe96cf4 data/toughasnails/advancements/recipes/combat/leaf_boots.json
 2da825265e95f5dfc0dd4026e0dafee70c17512c data/toughasnails/advancements/recipes/combat/leaf_chestplate.json
 6d96cd4baff66d426c9405852ceed3aa8a3cde8f data/toughasnails/advancements/recipes/combat/leaf_helmet.json

diff --git a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0
@@ -1,5 +1,5 @@
-// 1.20.4	2024-01-04T10:16:03.4641005	Tags for minecraft:block mod id toughasnails
-dfed6a08d97cca915d349d312f18532c01063afa data/minecraft/tags/blocks/mineable/axe.json
-2268290ab36d87a8ceacfe6fdbf187ed29a4dc80 data/minecraft/tags/blocks/mineable/pickaxe.json
+// 1.20.4	2024-01-06T06:37:23.910005	Tags for minecraft:block mod id toughasnails
+bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/blocks/mineable/axe.json
+0342cd45a4d6f790afda91090de45871d9b0ef63 data/minecraft/tags/blocks/mineable/pickaxe.json
 eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/blocks/cooling_blocks.json
 658fab0118eb1ac9896e1b9ab89f2d5ed055a967 data/toughasnails/tags/blocks/heating_blocks.json
diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
@@ -1,5 +1,6 @@
 {
   "values": [
-    "toughasnails:rain_collector"
+    "toughasnails:rain_collector",
+    "toughasnails:water_purifier"
   ]
 }
diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -1,7 +1,6 @@
 {
   "values": [
     "toughasnails:thermoregulator",
-    "toughasnails:temperature_gauge",
-    "toughasnails:water_purifier"
+    "toughasnails:temperature_gauge"
   ]
 }
diff --git a/common/src/main/java/toughasnails/init/ModBlocks.java b/common/src/main/java/toughasnails/init/ModBlocks.java
@@ -27,7 +27,7 @@ public static void registerBlocks(BiConsumer<ResourceLocation, Block> func)
         TANBlocks.THERMOREGULATOR = register(func, "thermoregulator", new ThermoregulatorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(3.5F).lightLevel(ThermoregulatorBlock.lightLevel(6))));
         TANBlocks.TEMPERATURE_GAUGE = register(func, "temperature_gauge", new TemperatureGaugeBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).requiresCorrectToolForDrops().strength(1.0F)));
         TANBlocks.RAIN_COLLECTOR = register(func, "rain_collector", new RainCollectorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.5F).sound(SoundType.WOOD).noOcclusion()));
-        TANBlocks.WATER_PURIFIER = register(func, "water_purifier", new WaterPurifierBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(3.0F, 6.0F).sound(SoundType.COPPER).noOcclusion()));
+        TANBlocks.WATER_PURIFIER = register(func, "water_purifier", new WaterPurifierBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).requiresCorrectToolForDrops().strength(2.5F).sound(SoundType.WOOD).noOcclusion()));
     }
 
     private static Block register(BiConsumer<ResourceLocation, Block> func, String name, Block block)

diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java b/forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java
@@ -28,8 +28,8 @@ public TANBlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Pr
     protected void addTags(HolderLookup.Provider provider)
     {
         // Vanilla tags
-        this.tag(BlockTags.MINEABLE_WITH_AXE).add(TANBlocks.RAIN_COLLECTOR);
-        this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(TANBlocks.THERMOREGULATOR, TANBlocks.TEMPERATURE_GAUGE, TANBlocks.WATER_PURIFIER);
+        this.tag(BlockTags.MINEABLE_WITH_AXE).add(TANBlocks.RAIN_COLLECTOR, TANBlocks.WATER_PURIFIER);
+        this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(TANBlocks.THERMOREGULATOR, TANBlocks.TEMPERATURE_GAUGE);
 
         // TAN tags
         this.tag(ModTags.Blocks.COOLING_BLOCKS).add(Blocks.SOUL_FIRE, Blocks.SOUL_CAMPFIRE, Blocks.SOUL_LANTERN, Blocks.PACKED_ICE, Blocks.BLUE_ICE, Blocks.POWDER_SNOW_CAULDRON);