Skip to content

Commit

Permalink
Improved Water Purifier texture/model
Browse files Browse the repository at this point in the history
  • Loading branch information
@Forstride
Forstride committed Jan 2, 2024
1 parent fa99f3d commit b4a4ab7
Show file tree
Hide file tree
Showing 17 changed files with 179 additions and 22 deletions.
4 changes: 2 additions & 2 deletions common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-02T09:16:41.4319405 Recipes
// 1.20.4 2024-01-02T11:28:21.5564694 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
Expand Down Expand Up @@ -68,7 +68,7 @@ e4a98b0325be4fb27194eb56a079871cdc8d4114 data/toughasnails/recipes/pumpkin_juice
2512026dc3a027f39db7e77e023a7017de386b9c data/toughasnails/recipes/sweet_berry_juice.json
e636bfd4fab8d516083454e872c8115f5c15cf27 data/toughasnails/recipes/temperature_gauge.json
b75d1caa0b1dcb9ae14dc02e47bba2a3c4b4a4dc data/toughasnails/recipes/thermometer.json
26985bc2361f55479fce0f342c9c2b7573237c7f data/toughasnails/recipes/water_purifier.json
b0bd031a8ff3aa063ccd97f5f915733a3c94935e 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
Expand Down
7 changes: 2 additions & 5 deletions common/src/generated/resources/data/toughasnails/recipes/water_purifier.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@
"G": {
"item": "minecraft:glass"
},
"S": {
"tag": "minecraft:sand"
},
"W": {
"tag": "minecraft:planks"
}
},
"pattern": [
"WSW",
"WGW",
"GCG",
"GGG"
"WWW"
],
"result": {
"item": "toughasnails:water_purifier"
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/toughasnails/init/ModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public static void registerRenderers()
public static void registerBlockColors(RegisterColorsEvent.Block event)
{
event.register((state, world, pos, tintIndex) -> 0x47DAFF, TANBlocks.RAIN_COLLECTOR);
event.register((state, world, pos, tintIndex) -> 0x3F76E4, TANBlocks.WATER_PURIFIER);
}

private static Block register(BiConsumer<ResourceLocation, Block> func, String name, Block block)
Expand Down
87 changes: 80 additions & 7 deletions common/src/main/resources/assets/toughasnails/models/block/water_purifier.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,82 @@
{
"parent": "minecraft:block/orientable_with_bottom",
"textures": {
"top": "toughasnails:block/water_purifier_top",
"front": "toughasnails:block/water_purifier_front",
"side": "toughasnails:block/water_purifier_side",
"bottom": "toughasnails:block/water_purifier_bottom"
}
"parent": "block/block",
"ambientocclusion": false,
"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",
"inside": "toughasnails:block/water_purifier_bottom"
},
"elements": [
{
"from": [0, 0, 0],
"to": [2, 16, 16],
"faces": {
"north": {"uv": [14, 0, 16, 16], "texture": "#front", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#side"},
"south": {"uv": [0, 0, 2, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 0, 2, 16], "texture": "#top", "cullface": "up"},
"down": {"uv": [0, 0, 2, 16], "texture": "#bottom"}
}
},
{
"from": [2, 0, 2],
"to": [14, 2, 14],
"faces": {
"north": {"uv": [2, 14, 14, 16], "texture": "#front", "cullface": "north"},
"east": {"uv": [2, 14, 14, 16], "texture": "#side", "cullface": "east"},
"south": {"uv": [2, 14, 14, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [2, 14, 14, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [2, 2, 14, 14], "texture": "#bottom", "cullface": "up"},
"down": {"uv": [2, 2, 14, 14], "texture": "#bottom"}
}
},
{
"from": [14, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#front", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"},
"south": {"uv": [14, 0, 16, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#side"},
"up": {"uv": [14, 0, 16, 16], "texture": "#top", "cullface": "up"},
"down": {"uv": [14, 0, 16, 16], "texture": "#bottom"}
}
},
{
"from": [2, 0, 0],
"to": [14, 16, 2],
"faces": {
"north": {"uv": [2, 0, 14, 16], "texture": "#front", "cullface": "north"},
"east": {"uv": [14, 0, 16, 16], "texture": "#side", "cullface": "east"},
"south": {"uv": [2, 0, 14, 16], "texture": "#side"},
"west": {"uv": [0, 0, 2, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [2, 0, 14, 2], "texture": "#top", "cullface": "up"},
"down": {"uv": [2, 14, 14, 16], "texture": "#bottom"}
}
},
{
"from": [2, 0, 14],
"to": [14, 16, 16],
"faces": {
"north": {"uv": [2, 0, 14, 16], "texture": "#front"},
"east": {"uv": [0, 0, 2, 16], "texture": "#side", "cullface": "east"},
"south": {"uv": [2, 0, 14, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [14, 0, 16, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [2, 14, 14, 16], "texture": "#top", "cullface": "up"},
"down": {"uv": [2, 0, 14, 2], "texture": "#bottom"}
}
},
{
"from": [2, 13, 2],
"to": [14, 16, 14],
"faces": {
"up": {"uv": [2, 2, 14, 14], "texture": "#top"},
"down": {"uv": [2, 2, 14, 14], "texture": "#top"}
}
}
]
}
100 changes: 93 additions & 7 deletions common/src/main/resources/assets/toughasnails/models/block/water_purifier_filtering.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,95 @@
{
"parent": "minecraft:block/orientable_with_bottom",
"textures": {
"top": "toughasnails:block/water_purifier_top_filtering",
"front": "toughasnails:block/water_purifier_front_filtering",
"side": "toughasnails:block/water_purifier_side_filtering",
"bottom": "toughasnails:block/water_purifier_bottom_filtering"
}
"parent": "block/block",
"ambientocclusion": false,
"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",
"inside": "toughasnails:block/water_purifier_bottom",
"water": "minecraft:block/water_still"
},
"elements": [
{
"from": [0, 0, 0],
"to": [2, 16, 16],
"faces": {
"north": {"uv": [14, 0, 16, 16], "texture": "#front", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#side"},
"south": {"uv": [0, 0, 2, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 0, 2, 16], "texture": "#top", "cullface": "up"},
"down": {"uv": [0, 0, 2, 16], "texture": "#bottom"}
}
},
{
"from": [2, 0, 2],
"to": [14, 2, 14],
"faces": {
"north": {"uv": [2, 14, 14, 16], "texture": "#front", "cullface": "north"},
"east": {"uv": [2, 14, 14, 16], "texture": "#side", "cullface": "east"},
"south": {"uv": [2, 14, 14, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [2, 14, 14, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [2, 2, 14, 14], "texture": "#bottom", "cullface": "up"},
"down": {"uv": [2, 2, 14, 14], "texture": "#bottom"}
}
},
{
"from": [14, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#front", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"},
"south": {"uv": [14, 0, 16, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#side"},
"up": {"uv": [14, 0, 16, 16], "texture": "#top", "cullface": "up"},
"down": {"uv": [14, 0, 16, 16], "texture": "#bottom"}
}
},
{
"from": [2, 0, 0],
"to": [14, 16, 2],
"faces": {
"north": {"uv": [2, 0, 14, 16], "texture": "#front", "cullface": "north"},
"east": {"uv": [14, 0, 16, 16], "texture": "#side", "cullface": "east"},
"south": {"uv": [2, 0, 14, 16], "texture": "#side"},
"west": {"uv": [0, 0, 2, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [2, 0, 14, 2], "texture": "#top", "cullface": "up"},
"down": {"uv": [2, 14, 14, 16], "texture": "#bottom"}
}
},
{
"from": [2, 0, 14],
"to": [14, 16, 16],
"faces": {
"north": {"uv": [2, 0, 14, 16], "texture": "#front"},
"east": {"uv": [0, 0, 2, 16], "texture": "#side", "cullface": "east"},
"south": {"uv": [2, 0, 14, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [14, 0, 16, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [2, 14, 14, 16], "texture": "#top", "cullface": "up"},
"down": {"uv": [2, 0, 14, 2], "texture": "#bottom"}
}
},
{
"from": [2, 13, 2],
"to": [14, 16, 14],
"faces": {
"up": {"uv": [2, 2, 14, 14], "texture": "#top"},
"down": {"uv": [2, 2, 14, 14], "texture": "#top"}
}
},
{
"from": [2, 2, 2],
"to": [14, 13, 14],
"faces": {
"north": {"uv": [2, 3, 14, 14], "texture": "#water", "tintindex": 0},
"east": {"uv": [2, 3, 14, 14], "texture": "#water", "tintindex": 0},
"south": {"uv": [2, 3, 14, 14], "texture": "#water", "tintindex": 0},
"west": {"uv": [2, 3, 14, 14], "texture": "#water", "tintindex": 0},
"up": {"uv": [2, 2, 14, 14], "texture": "#water", "tintindex": 0},
"down": {"uv": [2, 2, 14, 14], "texture": "#water", "tintindex": 0}
}
}
]
}
Binary file removed common/src/main/resources/assets/toughasnails/textures/block/mineral_wool_side.png
View file
Binary file not shown.
Binary file removed common/src/main/resources/assets/toughasnails/textures/block/mineral_wool_top.png
View file
Binary file not shown.
Binary file modified ...n/src/main/resources/assets/toughasnails/textures/block/rain_collector_side.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...src/main/resources/assets/toughasnails/textures/block/water_purifier_bottom.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...esources/assets/toughasnails/textures/block/water_purifier_bottom_filtering.png
View file
Binary file not shown.
Binary file modified .../src/main/resources/assets/toughasnails/textures/block/water_purifier_front.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...resources/assets/toughasnails/textures/block/water_purifier_front_filtering.png
View file
Binary file not shown.
Binary file modified ...n/src/main/resources/assets/toughasnails/textures/block/water_purifier_side.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed .../resources/assets/toughasnails/textures/block/water_purifier_side_filtering.png
View file
Binary file not shown.
Binary file modified ...on/src/main/resources/assets/toughasnails/textures/block/water_purifier_top.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...n/resources/assets/toughasnails/textures/block/water_purifier_top_filtering.png
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion forge/src/main/java/toughasnails/datagen/provider/TANRecipeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected void buildRecipes(RecipeOutput output)
// Blocks
ShapedRecipeBuilder.shaped(RecipeCategory.REDSTONE, TANBlocks.TEMPERATURE_GAUGE).define('G', Items.GLASS).define('Q', Items.QUARTZ).define('T', TANItems.THERMOMETER).define('B', Items.BRICK_SLAB).pattern("GGG").pattern("QTQ").pattern("BBB").unlockedBy("has_thermometer", has(TANItems.THERMOMETER)).save(output);
ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, TANBlocks.RAIN_COLLECTOR).define('S', Items.STRING).define('I', Items.IRON_INGOT).define('B', Items.BARREL).pattern("ISI").pattern("IBI").unlockedBy("has_barrel", has(Items.BARREL)).save(output);
ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, TANBlocks.WATER_PURIFIER).define('W', ItemTags.PLANKS).define('S', ItemTags.SAND).define('C', Items.CHARCOAL).define('G', Items.GLASS).pattern("WSW").pattern("GCG").pattern("GGG").unlockedBy("has_charcoal", has(Items.CHARCOAL)).save(output);
ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, TANBlocks.WATER_PURIFIER).define('W', ItemTags.PLANKS).define('C', Items.CHARCOAL).define('G', Items.GLASS).pattern("WGW").pattern("GCG").pattern("WWW").unlockedBy("has_charcoal", has(Items.CHARCOAL)).save(output);

// Armor
ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_BOOTS).define('X', ItemTags.LEAVES).pattern("X X").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output);
Expand Down

0 comments on commit b4a4ab7

Please sign in to comment.