Changed Water Purifier model/texture/recipe again

Glitchfiend · Jan 2, 2024 · 4054054 · 4054054
1 parent 3fc8959
commit 4054054
Show file tree

Hide file tree

Showing 19 changed files with 118 additions and 171 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-02T15:28:15.4211521	Recipes
+// 1.20.4	2024-01-02T16:58:35.4468401	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
@@ -8,7 +8,7 @@ e8c549cdadb494e5854491524dbb6404aeb7f9a9 data/toughasnails/advancements/recipes/
 55e82e2e3092ccc58b5747ed2bafb449eccf091f data/toughasnails/advancements/recipes/combat/wool_helmet.json
 71aaf601361469d6104d38fb81aebd32861df055 data/toughasnails/advancements/recipes/combat/wool_leggings.json
 40c2eb94d0593910a7114f2695c5f3f129f7d035 data/toughasnails/advancements/recipes/decorations/rain_collector.json
-bb4f151b3d411b20ad496cfa2a95fd9aba7c1f78 data/toughasnails/advancements/recipes/decorations/water_purifier.json
+852c89cb611b30ccdcd1608dd261f33c5f600fb9 data/toughasnails/advancements/recipes/decorations/water_purifier.json
 5f76369328acf2e24354a8918957059d62c035bc data/toughasnails/advancements/recipes/food/apple_juice.json
 a566bf835d6a75c46dd173af19b9dd0f4fe7469c data/toughasnails/advancements/recipes/food/cactus_juice.json
 11df03224589ebc8052207a735ac13ff8c0c9192 data/toughasnails/advancements/recipes/food/charc_os.json
@@ -68,7 +68,7 @@ fb03395b2b66dc861d110435b0d5c63a351123cd data/toughasnails/recipes/rain_collecto
 2512026dc3a027f39db7e77e023a7017de386b9c data/toughasnails/recipes/sweet_berry_juice.json
 e636bfd4fab8d516083454e872c8115f5c15cf27 data/toughasnails/recipes/temperature_gauge.json
 b75d1caa0b1dcb9ae14dc02e47bba2a3c4b4a4dc data/toughasnails/recipes/thermometer.json
-db1c57e8de0ba741ce1687b038a33505cd4c3a73 data/toughasnails/recipes/water_purifier.json
+cbfb7c82bd9547a1a134e3814136fbdbcdd5dc79 data/toughasnails/recipes/water_purifier.json
 30229579a58927cae7011781b0936f7ca87888a4 data/toughasnails/recipes/wool_boots.json
 25ff54ef0230fd94b0f881f7866b571f4729d254 data/toughasnails/recipes/wool_chestplate.json
 0c83d0143c53a5071bda3e30a314be62876186f9 data/toughasnails/recipes/wool_helmet.json

diff --git a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0
@@ -1,4 +1,5 @@
-// 1.20.4	2024-01-01T08:38:05.3367638	Tags for minecraft:block mod id toughasnails
-bdcc25ec3d77d0540777147a5b124a1e15619160 data/minecraft/tags/blocks/mineable/pickaxe.json
+// 1.20.4	2024-01-02T16:58:35.4458416	Tags for minecraft:block mod id toughasnails
+dfed6a08d97cca915d349d312f18532c01063afa data/minecraft/tags/blocks/mineable/axe.json
+204b99a448ab27dca7519b0ea2c4e0a422b1f12a data/minecraft/tags/blocks/mineable/pickaxe.json
 eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/blocks/cooling_blocks.json
 d4134d307e68e7865444c0d1d1ab81babc6a27ff 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
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "toughasnails:rain_collector"
+  ]
+}
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:temperature_gauge",
-    "toughasnails:rain_collector",
     "toughasnails:water_purifier"
   ]
 }
diff --git a/...enerated/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json b/...enerated/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json
@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_charcoal": {
+    "has_copper_ingot": {
       "conditions": {
         "items": [
           {
             "items": [
-              "minecraft:charcoal"
+              "minecraft:copper_ingot"
             ]
           }
         ]
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_charcoal"
+      "has_copper_ingot"
     ]
   ],
   "rewards": {

diff --git a/common/src/generated/resources/data/toughasnails/recipes/water_purifier.json b/common/src/generated/resources/data/toughasnails/recipes/water_purifier.json
@@ -8,14 +8,14 @@
     "G": {
       "item": "minecraft:glass"
     },
-    "W": {
-      "tag": "minecraft:planks"
+    "I": {
+      "item": "minecraft:copper_ingot"
     }
   },
   "pattern": [
-    "WCW",
-    "G G",
-    "WWW"
+    "III",
+    "GCG",
+    "III"
   ],
   "result": {
     "item": "toughasnails:water_purifier"

diff --git a/common/src/main/java/toughasnails/block/WaterPurifierBlock.java b/common/src/main/java/toughasnails/block/WaterPurifierBlock.java
@@ -39,7 +39,7 @@
 public class WaterPurifierBlock extends BaseEntityBlock
 {
     public static final MapCodec<WaterPurifierBlock> CODEC = simpleCodec(WaterPurifierBlock::new);
-    private static final Map<Direction, VoxelShape> SHAPES = Maps.newEnumMap(ImmutableMap.of(Direction.NORTH, Block.box(0.0D, 0.0D, 2.0D, 16.0D, 16.0D, 16.0D), Direction.SOUTH, Block.box(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, 14.0D), Direction.EAST, Block.box(0.0D, 0.0D, 0.0D, 14.0D, 16.0D, 16.0D), Direction.WEST, Block.box(2.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D)));
+    protected static final VoxelShape SHAPE = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 16.0D, 13.0D);
     public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING;
     public static final BooleanProperty PURIFYING = BooleanProperty.create("filtering");
 
@@ -58,7 +58,7 @@ protected MapCodec<? extends BaseEntityBlock> codec()
     @Override
     public VoxelShape getShape(BlockState state, BlockGetter reader, BlockPos pos, CollisionContext selectionContext)
     {
-        return SHAPES.get(state.getValue(FACING));
+        return SHAPE;
     }
 
     @Override

diff --git a/common/src/main/java/toughasnails/init/ModBlocks.java b/common/src/main/java/toughasnails/init/ModBlocks.java
@@ -9,7 +9,9 @@
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.minecraft.world.level.material.MapColor;
 import toughasnails.api.TANAPI;
 import toughasnails.api.block.TANBlocks;
@@ -27,8 +29,8 @@ public class ModBlocks
     public static void registerBlocks(BiConsumer<ResourceLocation, Block> func)
     {
         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.STONE).requiresCorrectToolForDrops().strength(2.0F).noOcclusion()));
-        TANBlocks.WATER_PURIFIER = register(func, "water_purifier", new WaterPurifierBlock(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(3.5F).noOcclusion()));
+        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()));
     }
 
     public static void registerRenderers()

diff --git a/common/src/main/resources/assets/toughasnails/models/block/water_purifier.json b/common/src/main/resources/assets/toughasnails/models/block/water_purifier.json
@@ -4,94 +4,66 @@
 	"textures": {
 		"particle": "toughasnails:block/water_purifier_side",
 		"top": "toughasnails:block/water_purifier_top",
-		"bottom": "toughasnails:block/water_purifier_bottom",
 		"side": "toughasnails:block/water_purifier_side",
-		"front": "toughasnails:block/water_purifier_front",
 		"nozzle": "toughasnails:block/water_purifier_nozzle"
 	},
 	"elements": [
 		{
-			"from": [0, 0, 2],
-			"to": [2, 16, 16],
+			"from": [3, 0, 3],
+			"to": [13, 5, 13],
 			"faces": {
-				"north": {"uv": [14, 0, 16, 16], "texture": "#front"},
-				"east": {"uv": [0, 0, 14, 16], "texture": "#side"},
-				"south": {"uv": [0, 0, 2, 16], "texture": "#front"},
-				"west": {"uv": [0, 0, 14, 16], "texture": "#side"},
-				"up": {"uv": [0, 0, 2, 14], "texture": "#top"},
-				"down": {"uv": [0, 0, 2, 14], "texture": "#bottom"}
+				"north": {"uv": [3, 11, 13, 16], "texture": "#side"},
+				"east": {"uv": [3, 11, 13, 16], "texture": "#side"},
+				"south": {"uv": [3, 11, 13, 16], "texture": "#side"},
+				"west": {"uv": [3, 11, 13, 16], "texture": "#side"},
+				"up": {"uv": [3, 3, 13, 13], "texture": "#top"},
+				"down": {"uv": [3, 3, 13, 13], "texture": "#top"}
 			}
 		},
 		{
-			"from": [2, 0, 4],
-			"to": [14, 2, 14],
+			"from": [3, 5, 3],
+			"to": [13, 15, 13],
 			"faces": {
-				"up": {"uv": [2, 2, 14, 12], "texture": "#bottom"},
-				"down": {"uv": [2, 2, 14, 12], "texture": "#bottom"}
+				"north": {"uv": [3, 1, 13, 11], "texture": "#side"},
+				"east": {"uv": [3, 1, 13, 11], "texture": "#side"},
+				"south": {"uv": [3, 1, 13, 11], "texture": "#side"},
+				"west": {"uv": [3, 1, 13, 11], "texture": "#side"}
 			}
 		},
 		{
-			"from": [14, 0, 2],
-			"to": [16, 16, 16],
+			"from": [3, 15, 3],
+			"to": [13, 16, 13],
 			"faces": {
-				"north": {"uv": [0, 0, 2, 16], "texture": "#front"},
-				"east": {"uv": [0, 0, 14, 16], "texture": "#side"},
-				"south": {"uv": [14, 0, 16, 16], "texture": "#front"},
-				"west": {"uv": [0, 0, 14, 16], "texture": "#side"},
-				"up": {"uv": [14, 0, 16, 14], "texture": "#top"},
-				"down": {"uv": [14, 0, 16, 14], "texture": "#bottom"}
+				"north": {"uv": [3, 0, 13, 1], "texture": "#side"},
+				"east": {"uv": [3, 0, 13, 1], "texture": "#side"},
+				"south": {"uv": [3, 0, 13, 1], "texture": "#side"},
+				"west": {"uv": [3, 0, 13, 1], "texture": "#side"},
+				"up": {"uv": [3, 3, 13, 13], "texture": "#top"},
+				"down": {"uv": [3, 3, 13, 13], "texture": "#top"}
 			}
 		},
 		{
-			"from": [2, 0, 2],
-			"to": [14, 16, 4],
+			"from": [7, 1, 1],
+			"to": [9, 4, 3],
 			"faces": {
-				"north": {"uv": [2, 0, 14, 16], "texture": "#front"},
-				"south": {"uv": [2, 0, 14, 16], "texture": "#front"},
-				"up": {"uv": [2, 0, 14, 2], "texture": "#top"},
-				"down": {"uv": [2, 12, 14, 14], "texture": "#bottom"}
+				"north": {"uv": [0, 4, 2, 7], "texture": "#nozzle"},
+				"east": {"uv": [0, 4, 2, 7], "texture": "#nozzle"},
+				"south": {"uv": [0, 4, 2, 7], "texture": "#nozzle"},
+				"west": {"uv": [0, 4, 2, 7], "texture": "#nozzle"},
+				"up": {"uv": [0, 7, 2, 9], "texture": "#nozzle"},
+				"down": {"uv": [0, 7, 2, 9], "texture": "#nozzle"}
 			}
 		},
 		{
-			"from": [2, 0, 14],
-			"to": [14, 16, 16],
+			"from": [7, 4, 0],
+			"to": [9, 5, 3],
 			"faces": {
-				"north": {"uv": [2, 0, 14, 16], "texture": "#front"},
-				"south": {"uv": [2, 0, 14, 16], "texture": "#front"},
-				"up": {"uv": [2, 12, 14, 14], "texture": "#top"},
-				"down": {"uv": [2, 0, 14, 2], "texture": "#bottom"}
-			}
-		},
-		{
-			"from": [2, 13, 4],
-			"to": [14, 14, 14],
-			"faces": {
-				"up": {"uv": [2, 2, 14, 12], "texture": "#top"},
-				"down": {"uv": [2, 2, 14, 12], "texture": "#top"}
-			}
-		},
-		{
-			"from": [7, 3, 0],
-			"to": [9, 9, 2],
-			"faces": {
-				"north": {"uv": [0, 3, 2, 9], "texture": "#nozzle"},
-				"east": {"uv": [0, 3, 2, 9], "texture": "#nozzle"},
-				"south": {"uv": [0, 3, 2, 9], "texture": "#nozzle"},
-				"west": {"uv": [0, 3, 2, 9], "texture": "#nozzle"},
-				"up": {"uv": [0, 9, 2, 11], "texture": "#nozzle"},
-				"down": {"uv": [0, 9, 2, 11], "texture": "#nozzle"}
-			}
-		},
-		{
-			"from": [6, 9, 0],
-			"to": [10, 10, 2],
-			"faces": {
-				"north": {"uv": [0, 2, 4, 3], "texture": "#nozzle"},
-				"east": {"uv": [2, 2, 4, 3], "texture": "#nozzle"},
-				"south": {"uv": [0, 2, 4, 3], "texture": "#nozzle"},
-				"west": {"uv": [0, 2, 2, 3], "texture": "#nozzle"},
-				"up": {"uv": [0, 0, 4, 2], "texture": "#nozzle"},
-				"down": {"uv": [0, 0, 4, 2], "texture": "#nozzle"}
+				"north": {"uv": [0, 3, 2, 4], "texture": "#nozzle"},
+				"east": {"uv": [2, 0, 5, 1], "texture": "#nozzle"},
+				"south": {"uv": [0, 3, 2, 4], "texture": "#nozzle"},
+				"west": {"uv": [2, 0, 5, 1], "texture": "#nozzle"},
+				"up": {"uv": [0, 0, 2, 3], "texture": "#nozzle"},
+				"down": {"uv": [0, 0, 2, 3], "texture": "#nozzle"}
 			}
 		}
 	]