diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 0ae8a031f..d8783eed8 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -2963,7 +2963,7 @@ a50ae92f63a26e0baa28fc5ab0b04356c046df3f data/create/advancements/recipes/create ea8ec2e00c9d88b9a58202033c483efa068a15b5 data/create/advancements/recipes/create.palettes/oak_window_pane.json 7ac4e8386d77e36c0d921e31b3860eb8d0eb9f46 data/create/advancements/recipes/create.palettes/ochrum_pillar_from_ochrum_stonecutting.json 5c662131b9d73434a5ee6abda5b6f5b9819e194d data/create/advancements/recipes/create.palettes/ochrum_pillar_from_stone_types_ochrum_stonecutting.json -af9f67c301e0ac11174f79ef313b70ef5a0ac6ad data/create/advancements/recipes/create.palettes/ornate_iron_window.json +fc374d88e9f4ffeb54348a611dc470f148c572de data/create/advancements/recipes/create.palettes/ornate_iron_window.json 47aebe2078baf3b0c22f09934461f7376ebbea39 data/create/advancements/recipes/create.palettes/ornate_iron_window_pane.json 0b40d3c37e27d9d9297f050ad710af6c17821954 data/create/advancements/recipes/create.palettes/polished_cut_andesite_from_andesite_stonecutting.json eb1770f5e5f4384e84ae90e566d0d48a857b7748 data/create/advancements/recipes/create.palettes/polished_cut_andesite_from_stone_types_andesite_stonecutting.json @@ -4824,7 +4824,7 @@ cd9a78454bce20cf3557f5c44febae77ebd43e54 data/create/recipes/mixing/lava_from_co f06c8d1565a1f4d4914436b21e32d147de868d46 data/create/recipes/oak_window_pane.json 04a3c1b34a98d17cac734959e44f22ccb8be0fa5 data/create/recipes/ochrum_pillar_from_ochrum_stonecutting.json 6125d797561e861f1160c1d6d23c1036964bfb98 data/create/recipes/ochrum_pillar_from_stone_types_ochrum_stonecutting.json -850e67f6f890de9cb8e4c6865aa4ecb8a316c240 data/create/recipes/ornate_iron_window.json +3ef05e87a09a171e6d66e0dd003d6c308926f4bc data/create/recipes/ornate_iron_window.json 4ef1a7279f8deff6e2fd5fe027ec903694656bf9 data/create/recipes/ornate_iron_window_pane.json dcdde1728dbf3dcfdff215337d242a32c5aac921 data/create/recipes/oxidized_copper_shingle_slab.json 88a001be9a98b584a5b066826fd8d10aa2400e3e data/create/recipes/oxidized_copper_shingle_slab_from_oxidized_copper_shingles_stonecutting.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/ornate_iron_window.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/ornate_iron_window.json index 386c716aa..160377981 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.palettes/ornate_iron_window.json +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/ornate_iron_window.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "create:andesite_alloy" + "minecraft:iron_nugget" ] } ] diff --git a/src/generated/resources/data/create/recipes/ornate_iron_window.json b/src/generated/resources/data/create/recipes/ornate_iron_window.json index 1d1e23401..b074b5135 100644 --- a/src/generated/resources/data/create/recipes/ornate_iron_window.json +++ b/src/generated/resources/data/create/recipes/ornate_iron_window.json @@ -6,7 +6,7 @@ ], "key": { "#": { - "item": "create:andesite_alloy" + "item": "minecraft:iron_nugget" }, "X": { "tag": "forge:glass/colorless" diff --git a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java index 80446ffba..9de2f95e7 100644 --- a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java +++ b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java @@ -7,7 +7,6 @@ import static com.simibubi.create.foundation.data.WindowGen.framedGlassPane; import static com.simibubi.create.foundation.data.WindowGen.woodenWindowBlock; import static com.simibubi.create.foundation.data.WindowGen.woodenWindowPane; -import com.simibubi.create.AllItems; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.Create; import com.simibubi.create.content.AllSections; @@ -22,6 +21,7 @@ import com.tterrag.registrate.util.entry.BlockEntry; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.GlassBlock; import net.minecraft.world.level.block.state.properties.WoodType; @@ -74,7 +74,7 @@ public class AllPaletteBlocks { CRIMSON_WINDOW = woodenWindowBlock(WoodType.CRIMSON, Blocks.CRIMSON_PLANKS), WARPED_WINDOW = woodenWindowBlock(WoodType.WARPED, Blocks.WARPED_PLANKS), ORNATE_IRON_WINDOW = - customWindowBlock("ornate_iron_window", AllItems.ANDESITE_ALLOY, () -> AllSpriteShifts.ORNATE_IRON_WINDOW, + customWindowBlock("ornate_iron_window", () -> Items.IRON_NUGGET, () -> AllSpriteShifts.ORNATE_IRON_WINDOW, () -> RenderType::cutoutMipped, () -> MaterialColor.TERRACOTTA_LIGHT_GRAY); public static final BlockEntry OAK_WINDOW_PANE = diff --git a/src/main/resources/assets/create/models/block/hose_pulley/block.json b/src/main/resources/assets/create/models/block/hose_pulley/block.json index f0ebc820d..e7eaab188 100644 --- a/src/main/resources/assets/create/models/block/hose_pulley/block.json +++ b/src/main/resources/assets/create/models/block/hose_pulley/block.json @@ -4,6 +4,7 @@ "textures": { "3": "create:block/encased_pipe", "4": "create:block/copper_gearbox", + "7": "create:block/copper_underside", "8": "create:block/copper_plating", "particle": "create:block/copper_plating" }, @@ -15,7 +16,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { "east": {"uv": [2, 2, 14, 14], "texture": "#4"}, - "west": {"uv": [2, 2, 14, 14], "texture": "#4"}, + "west": {"uv": [2, 2, 14, 14], "texture": "#7"}, "down": {"uv": [2, 11, 14, 12], "rotation": 90, "texture": "#4"} } }, @@ -25,7 +26,7 @@ "to": [2, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "east": {"uv": [16, 0, 0, 16], "texture": "#3"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#7"}, "west": {"uv": [16, 0, 0, 16], "texture": "#3"} } }, @@ -48,10 +49,10 @@ "to": [16, 14, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [3, 2, 0, 14], "rotation": 180, "texture": "#8"}, + "north": {"uv": [3, 2, 0, 14], "rotation": 180, "texture": "#3"}, "east": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#4"}, - "south": {"uv": [14, 2, 15, 14], "texture": "#4"}, - "west": {"uv": [1, 2, 3, 14], "rotation": 180, "texture": "#8"} + "south": {"uv": [13, 2, 14, 14], "texture": "#4"}, + "west": {"uv": [1, 2, 3, 14], "rotation": 180, "texture": "#7"} } }, { @@ -60,10 +61,10 @@ "to": [16, 14, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [1, 2, 2, 14], "texture": "#4"}, + "north": {"uv": [2, 2, 3, 14], "texture": "#4"}, "east": {"uv": [2, 14, 0, 2], "rotation": 180, "texture": "#4"}, - "south": {"uv": [16, 2, 13, 14], "rotation": 180, "texture": "#8"}, - "west": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#4"} + "south": {"uv": [16, 2, 13, 14], "rotation": 180, "texture": "#3"}, + "west": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#7"} } }, { @@ -72,12 +73,12 @@ "to": [16, 2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [0, 14, 3, 16], "texture": "#8"}, + "north": {"uv": [0, 14, 3, 16], "texture": "#3"}, "east": {"uv": [0, 14, 16, 16], "texture": "#4"}, - "south": {"uv": [13, 14, 16, 16], "texture": "#8"}, - "west": {"uv": [5, 14, 11, 16], "texture": "#4"}, - "up": {"uv": [0, 15, 16, 14], "rotation": 90, "texture": "#4"}, - "down": {"uv": [16, 16, 13, 0], "rotation": 180, "texture": "#8"} + "south": {"uv": [13, 14, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#7"}, + "up": {"uv": [0, 14, 16, 13], "rotation": 90, "texture": "#4"}, + "down": {"uv": [16, 16, 13, 0], "rotation": 180, "texture": "#3"} } }, { @@ -86,12 +87,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { - "north": {"uv": [3, 2, 0, 0], "rotation": 180, "texture": "#8"}, + "north": {"uv": [3, 2, 0, 0], "rotation": 180, "texture": "#3"}, "east": {"uv": [16, 2, 0, 0], "rotation": 180, "texture": "#4"}, - "south": {"uv": [16, 2, 13, 0], "rotation": 180, "texture": "#8"}, + "south": {"uv": [16, 2, 13, 0], "rotation": 180, "texture": "#3"}, "west": {"uv": [4, 0, 11, 2], "texture": "#8"}, "up": {"uv": [16, 16, 13, 0], "rotation": 180, "texture": "#8"}, - "down": {"uv": [0, 16, 16, 14], "rotation": 270, "texture": "#4"} + "down": {"uv": [0, 3, 16, 2], "rotation": 270, "texture": "#4"} } }, { @@ -100,11 +101,11 @@ "to": [3, 2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [13, 14, 16, 16], "texture": "#8"}, - "east": {"uv": [5, 14, 11, 16], "texture": "#4"}, - "south": {"uv": [0, 14, 3, 16], "texture": "#8"}, - "up": {"uv": [0, 15, 16, 14], "rotation": 90, "texture": "#4"}, - "down": {"uv": [3, 16, 0, 0], "rotation": 180, "texture": "#8"} + "north": {"uv": [13, 14, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#7"}, + "south": {"uv": [0, 14, 3, 16], "texture": "#3"}, + "up": {"uv": [0, 15, 16, 14], "rotation": 90, "texture": "#7"}, + "down": {"uv": [3, 16, 0, 0], "rotation": 180, "texture": "#3"} } }, { @@ -113,8 +114,8 @@ "to": [3, 14, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [16, 2, 13, 14], "rotation": 180, "texture": "#8"}, - "east": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#4"}, + "north": {"uv": [16, 2, 13, 14], "rotation": 180, "texture": "#3"}, + "east": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#7"}, "south": {"uv": [13, 2, 15, 14], "texture": "#4"}, "up": {"uv": [2, 14, 0, 16], "rotation": 270, "texture": "#8"}, "down": {"uv": [2, 0, 0, 2], "rotation": 90, "texture": "#8"} @@ -126,11 +127,11 @@ "to": [3, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { - "north": {"uv": [16, 2, 13, 0], "rotation": 180, "texture": "#8"}, + "north": {"uv": [16, 2, 13, 0], "rotation": 180, "texture": "#3"}, "east": {"uv": [4, 0, 11, 2], "texture": "#8"}, - "south": {"uv": [3, 2, 0, 0], "rotation": 180, "texture": "#8"}, + "south": {"uv": [3, 2, 0, 0], "rotation": 180, "texture": "#3"}, "up": {"uv": [3, 16, 0, 0], "rotation": 180, "texture": "#8"}, - "down": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#4"} + "down": {"uv": [0, 13, 16, 14], "rotation": 270, "texture": "#7"} } }, { @@ -140,8 +141,8 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { "north": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#4"}, - "east": {"uv": [2, 14, 0, 2], "rotation": 180, "texture": "#3"}, - "south": {"uv": [0, 2, 3, 14], "rotation": 180, "texture": "#8"}, + "east": {"uv": [2, 14, 0, 2], "rotation": 180, "texture": "#7"}, + "south": {"uv": [3, 2, 0, 14], "rotation": 180, "texture": "#3"}, "up": {"uv": [0, 14, 2, 16], "rotation": 270, "texture": "#8"}, "down": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#8"} } @@ -154,10 +155,10 @@ "faces": { "north": {"uv": [3, 14, 13, 16], "texture": "#8"}, "east": {"uv": [0, 0, 0, 0], "texture": "#8"}, - "south": {"uv": [3, 14, 13, 16], "texture": "#8"}, + "south": {"uv": [3, 12, 13, 14], "texture": "#7"}, "west": {"uv": [0, 0, 0, 0], "texture": "#8"}, - "up": {"uv": [3, 13, 13, 15], "texture": "#8"}, - "down": {"uv": [3, 1, 13, 3], "texture": "#8"} + "up": {"uv": [3, 14, 13, 12], "texture": "#7"}, + "down": {"uv": [3, 1, 13, 3], "texture": "#3"} } }, { @@ -166,12 +167,12 @@ "to": [13, 2, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [13, 14, 3, 16], "texture": "#8"}, + "north": {"uv": [13, 12, 3, 14], "texture": "#7"}, "east": {"uv": [0, 0, 0, 0], "texture": "#8"}, "south": {"uv": [13, 14, 3, 16], "texture": "#8"}, "west": {"uv": [0, 0, 0, 0], "texture": "#8"}, - "up": {"uv": [3, 15, 13, 13], "texture": "#8"}, - "down": {"uv": [3, 15, 13, 13], "rotation": 180, "texture": "#8"} + "up": {"uv": [3, 12, 13, 14], "texture": "#7"}, + "down": {"uv": [3, 15, 13, 13], "rotation": 180, "texture": "#3"} } }, { @@ -180,10 +181,10 @@ "to": [13, 16, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, "faces": { - "north": {"uv": [13, 0, 3, 2], "texture": "#8"}, - "south": {"uv": [13, 0, 3, 2], "texture": "#8"}, + "north": {"uv": [13, 0, 3, 2], "texture": "#3"}, + "south": {"uv": [13, 0, 3, 2], "texture": "#3"}, "up": {"uv": [3, 1, 13, 15], "texture": "#8"}, - "down": {"uv": [3, 1, 13, 15], "texture": "#8"} + "down": {"uv": [3, 1, 13, 15], "texture": "#7"} } } ], diff --git a/src/main/resources/assets/create/models/block/hose_pulley/item.json b/src/main/resources/assets/create/models/block/hose_pulley/item.json index 285cf4aa9..428de4c1f 100644 --- a/src/main/resources/assets/create/models/block/hose_pulley/item.json +++ b/src/main/resources/assets/create/models/block/hose_pulley/item.json @@ -6,6 +6,7 @@ "4": "create:block/copper_gearbox", "5": "create:block/hose_pulley_rope", "6": "create:block/hose_pulley_magnet", + "7": "create:block/copper_underside", "8": "create:block/copper_plating", "particle": "create:block/copper_plating" }, @@ -16,7 +17,7 @@ "to": [14, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [2, 2, 14, 14], "texture": "#4"}, + "north": {"uv": [2, 2, 14, 14], "texture": "#7"}, "south": {"uv": [2, 2, 14, 14], "texture": "#4"}, "down": {"uv": [2, 11, 14, 12], "texture": "#4"} } @@ -28,7 +29,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { "north": {"uv": [16, 0, 0, 16], "texture": "#3"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#3"} + "south": {"uv": [16, 0, 0, 16], "texture": "#7"} } }, { @@ -50,10 +51,10 @@ "to": [16, 14, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [1, 2, 3, 14], "rotation": 180, "texture": "#8"}, - "east": {"uv": [3, 2, 0, 14], "rotation": 180, "texture": "#8"}, + "north": {"uv": [1, 2, 3, 14], "rotation": 180, "texture": "#7"}, + "east": {"uv": [3, 2, 0, 14], "rotation": 180, "texture": "#3"}, "south": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#4"}, - "west": {"uv": [14, 2, 15, 14], "texture": "#4"} + "west": {"uv": [13, 2, 14, 14], "texture": "#4"} } }, { @@ -62,10 +63,10 @@ "to": [2, 14, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#4"}, - "east": {"uv": [1, 2, 2, 14], "texture": "#4"}, + "north": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [2, 2, 3, 14], "texture": "#4"}, "south": {"uv": [2, 14, 0, 2], "rotation": 180, "texture": "#4"}, - "west": {"uv": [16, 2, 13, 14], "rotation": 180, "texture": "#8"} + "west": {"uv": [16, 2, 13, 14], "rotation": 180, "texture": "#3"} } }, { @@ -74,12 +75,12 @@ "to": [16, 2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [5, 14, 11, 16], "texture": "#4"}, - "east": {"uv": [0, 14, 3, 16], "texture": "#8"}, + "north": {"uv": [0, 14, 16, 16], "texture": "#7"}, + "east": {"uv": [0, 14, 3, 16], "texture": "#3"}, "south": {"uv": [0, 14, 16, 16], "texture": "#4"}, - "west": {"uv": [13, 14, 16, 16], "texture": "#8"}, - "up": {"uv": [0, 15, 16, 14], "rotation": 180, "texture": "#4"}, - "down": {"uv": [16, 16, 13, 0], "rotation": 90, "texture": "#8"} + "west": {"uv": [13, 14, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 14, 16, 13], "rotation": 180, "texture": "#4"}, + "down": {"uv": [16, 16, 13, 0], "rotation": 90, "texture": "#3"} } }, { @@ -89,11 +90,11 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { "north": {"uv": [4, 0, 11, 2], "texture": "#8"}, - "east": {"uv": [3, 2, 0, 0], "rotation": 180, "texture": "#8"}, + "east": {"uv": [3, 2, 0, 0], "rotation": 180, "texture": "#3"}, "south": {"uv": [16, 2, 0, 0], "rotation": 180, "texture": "#4"}, - "west": {"uv": [16, 2, 13, 0], "rotation": 180, "texture": "#8"}, + "west": {"uv": [16, 2, 13, 0], "rotation": 180, "texture": "#3"}, "up": {"uv": [16, 16, 13, 0], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 16, 16, 14], "rotation": 180, "texture": "#4"} + "down": {"uv": [0, 3, 16, 2], "rotation": 180, "texture": "#4"} } }, { @@ -102,11 +103,11 @@ "to": [16, 2, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "east": {"uv": [13, 14, 16, 16], "texture": "#8"}, - "south": {"uv": [5, 14, 11, 16], "texture": "#4"}, - "west": {"uv": [0, 14, 3, 16], "texture": "#8"}, - "up": {"uv": [0, 15, 16, 14], "rotation": 180, "texture": "#4"}, - "down": {"uv": [3, 16, 0, 0], "rotation": 90, "texture": "#8"} + "east": {"uv": [13, 14, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#7"}, + "west": {"uv": [0, 14, 3, 16], "texture": "#3"}, + "up": {"uv": [0, 15, 16, 14], "rotation": 180, "texture": "#7"}, + "down": {"uv": [3, 16, 0, 0], "rotation": 90, "texture": "#3"} } }, { @@ -115,8 +116,8 @@ "to": [16, 14, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "east": {"uv": [16, 2, 13, 14], "rotation": 180, "texture": "#8"}, - "south": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#4"}, + "east": {"uv": [16, 2, 13, 14], "rotation": 180, "texture": "#3"}, + "south": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#7"}, "west": {"uv": [13, 2, 15, 14], "texture": "#4"}, "up": {"uv": [2, 14, 0, 16], "texture": "#8"}, "down": {"uv": [2, 0, 0, 2], "texture": "#8"} @@ -128,11 +129,11 @@ "to": [16, 16, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { - "east": {"uv": [16, 2, 13, 0], "rotation": 180, "texture": "#8"}, + "east": {"uv": [16, 2, 13, 0], "rotation": 180, "texture": "#3"}, "south": {"uv": [4, 0, 11, 2], "texture": "#8"}, - "west": {"uv": [3, 2, 0, 0], "rotation": 180, "texture": "#8"}, + "west": {"uv": [3, 2, 0, 0], "rotation": 180, "texture": "#3"}, "up": {"uv": [3, 16, 0, 0], "rotation": 270, "texture": "#8"}, - "down": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#4"} + "down": {"uv": [0, 13, 16, 14], "rotation": 180, "texture": "#7"} } }, { @@ -142,8 +143,8 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { "east": {"uv": [16, 14, 14, 2], "rotation": 180, "texture": "#4"}, - "south": {"uv": [2, 14, 0, 2], "rotation": 180, "texture": "#3"}, - "west": {"uv": [0, 2, 3, 14], "rotation": 180, "texture": "#8"}, + "south": {"uv": [2, 14, 0, 2], "rotation": 180, "texture": "#7"}, + "west": {"uv": [3, 2, 0, 14], "rotation": 180, "texture": "#3"}, "up": {"uv": [0, 14, 2, 16], "texture": "#8"}, "down": {"uv": [0, 0, 2, 2], "texture": "#8"} } @@ -157,9 +158,9 @@ "north": {"uv": [0, 0, 0, 0], "texture": "#8"}, "east": {"uv": [3, 14, 13, 16], "texture": "#8"}, "south": {"uv": [0, 0, 0, 0], "texture": "#8"}, - "west": {"uv": [3, 14, 13, 16], "texture": "#8"}, - "up": {"uv": [3, 13, 13, 15], "rotation": 90, "texture": "#8"}, - "down": {"uv": [3, 1, 13, 3], "rotation": 270, "texture": "#8"} + "west": {"uv": [3, 12, 13, 14], "texture": "#7"}, + "up": {"uv": [3, 14, 13, 12], "rotation": 90, "texture": "#7"}, + "down": {"uv": [3, 1, 13, 3], "rotation": 270, "texture": "#3"} } }, { @@ -169,11 +170,11 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { "north": {"uv": [0, 0, 0, 0], "texture": "#8"}, - "east": {"uv": [13, 14, 3, 16], "texture": "#8"}, + "east": {"uv": [13, 12, 3, 14], "texture": "#7"}, "south": {"uv": [0, 0, 0, 0], "texture": "#8"}, "west": {"uv": [13, 14, 3, 16], "texture": "#8"}, - "up": {"uv": [3, 15, 13, 13], "rotation": 90, "texture": "#8"}, - "down": {"uv": [3, 15, 13, 13], "rotation": 90, "texture": "#8"} + "up": {"uv": [3, 12, 13, 14], "rotation": 90, "texture": "#7"}, + "down": {"uv": [3, 15, 13, 13], "rotation": 90, "texture": "#3"} } }, { @@ -182,10 +183,10 @@ "to": [15, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, "faces": { - "east": {"uv": [13, 0, 3, 2], "texture": "#8"}, - "west": {"uv": [13, 0, 3, 2], "texture": "#8"}, + "east": {"uv": [13, 0, 3, 2], "texture": "#3"}, + "west": {"uv": [13, 0, 3, 2], "texture": "#3"}, "up": {"uv": [3, 1, 13, 15], "rotation": 90, "texture": "#8"}, - "down": {"uv": [3, 1, 13, 15], "rotation": 270, "texture": "#8"} + "down": {"uv": [3, 1, 13, 15], "rotation": 270, "texture": "#7"} } }, { diff --git a/src/main/resources/assets/create/models/block/ladder.json b/src/main/resources/assets/create/models/block/ladder.json index 8944272ca..16a88bd37 100644 --- a/src/main/resources/assets/create/models/block/ladder.json +++ b/src/main/resources/assets/create/models/block/ladder.json @@ -10,22 +10,40 @@ "name": "ladder", "from": [2, 0, 14], "to": [14, 16, 16], + "shade": false, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [2, 0, 14, 16], "texture": "#1"}, "east": {"uv": [12, 0, 14, 16], "texture": "#0"}, "west": {"uv": [14, 0, 12, 16], "texture": "#0"} } }, + { + "name": "ladder", + "from": [2, 0, 14], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [2, 0, 14, 16], "texture": "#1"} + } + }, + { + "name": "ladder_backface", + "from": [2, 0, 16], + "to": [14, 16, 14], + "shade": false, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [14, 0, 12, 16], "texture": "#0"}, + "west": {"uv": [12, 0, 14, 16], "texture": "#0"} + } + }, { "name": "ladder_backface", "from": [2, 0, 16], "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "east": {"uv": [14, 0, 12, 16], "texture": "#0"}, - "south": {"uv": [14, 0, 2, 16], "texture": "#1"}, - "west": {"uv": [12, 0, 14, 16], "texture": "#0"} + "south": {"uv": [14, 0, 2, 16], "texture": "#1"} } }, { diff --git a/src/main/resources/assets/create/models/block/portable_fluid_interface/block.json b/src/main/resources/assets/create/models/block/portable_fluid_interface/block.json index 62c31c029..421f217dd 100644 --- a/src/main/resources/assets/create/models/block/portable_fluid_interface/block.json +++ b/src/main/resources/assets/create/models/block/portable_fluid_interface/block.json @@ -1,8 +1,109 @@ { - "parent": "create:block/portable_storage_interface/block", + "credit": "Made with Blockbench", "textures": { "0": "create:block/portable_fluid_interface", "1": "create:block/copper_casing", + "2": "create:block/copper_underside", "particle": "create:block/copper_casing" - } + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 10, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 10, 8, 16], "texture": "#0"}, + "south": {"uv": [0, 10, 8, 16], "texture": "#0"}, + "west": {"uv": [0, 10, 8, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [0, 12, 1.9], + "to": [2, 14.1, 14.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 10]}, + "faces": { + "north": {"uv": [14, 13, 16, 15], "texture": "#2"}, + "south": {"uv": [0, 13, 2, 15], "texture": "#2"}, + "west": {"uv": [1, 9, 7, 10], "texture": "#0"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#2"} + } + }, + { + "from": [14, 12, 2], + "to": [16, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 6]}, + "faces": { + "north": {"uv": [0, 13, 2, 15], "texture": "#2"}, + "east": {"uv": [1, 9, 7, 10], "texture": "#0"}, + "south": {"uv": [14, 13, 16, 15], "texture": "#2"}, + "up": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [2, 12, 0], + "to": [14, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 20, 8]}, + "faces": { + "north": {"uv": [1, 9, 7, 10], "texture": "#0"}, + "east": {"uv": [0, 13, 16, 15], "texture": "#2"}, + "south": {"uv": [1, 9, 7, 10], "texture": "#0"}, + "west": {"uv": [0, 13, 16, 15], "texture": "#2"}, + "up": {"uv": [2, 0, 14, 16], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 90], + "translation": [-0.5, 0, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-180, 0, 0], + "translation": [0, 22.25, 0] + }, + "fixed": { + "translation": [0, -1.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "block", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "Base", + "origin": [10, 20, 8], + "color": 0, + "children": [0, 1, 2, 3] + } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/portable_fluid_interface/block_middle.json b/src/main/resources/assets/create/models/block/portable_fluid_interface/block_middle.json index 0b3d3ab30..eaf9347ed 100644 --- a/src/main/resources/assets/create/models/block/portable_fluid_interface/block_middle.json +++ b/src/main/resources/assets/create/models/block/portable_fluid_interface/block_middle.json @@ -1,6 +1,66 @@ { - "parent": "create:block/portable_storage_interface/block_middle", + "credit": "Made with Blockbench", "textures": { - "0": "create:block/portable_fluid_interface" - } + "0": "create:block/portable_fluid_interface", + "particle": "create:block/copper_casing" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 18, 10]}, + "faces": { + "north": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, + "east": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, + "south": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, + "west": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, + "up": {"uv": [2, 6.5, 2.5, 7], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 90], + "translation": [-0.5, 0, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-180, 0, 0], + "translation": [0, 22.25, 0] + }, + "fixed": { + "translation": [0, -1.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "Middle", + "origin": [10, 22, 10], + "color": 0, + "children": [0] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/portable_fluid_interface/block_middle_powered.json b/src/main/resources/assets/create/models/block/portable_fluid_interface/block_middle_powered.json index c2a3789b4..1f14dde7a 100644 --- a/src/main/resources/assets/create/models/block/portable_fluid_interface/block_middle_powered.json +++ b/src/main/resources/assets/create/models/block/portable_fluid_interface/block_middle_powered.json @@ -1,6 +1,66 @@ { - "parent": "create:block/portable_storage_interface/block_middle_powered", + "credit": "Made with Blockbench", "textures": { - "0": "create:block/portable_fluid_interface" - } + "0": "create:block/portable_fluid_interface", + "particle": "create:block/copper_casing" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 18, 10]}, + "faces": { + "north": {"uv": [9, 3.5, 15, 8], "texture": "#0"}, + "east": {"uv": [9, 3.5, 15, 8], "texture": "#0"}, + "south": {"uv": [9, 3.5, 15, 8], "texture": "#0"}, + "west": {"uv": [9, 3.5, 15, 8], "texture": "#0"}, + "up": {"uv": [2, 6.5, 2.5, 7], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 90], + "translation": [-0.5, 0, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-180, 0, 0], + "translation": [0, 22.25, 0] + }, + "fixed": { + "translation": [0, -1.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "Middle", + "origin": [10, 22, 10], + "color": 0, + "children": [0] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/portable_fluid_interface/block_top.json b/src/main/resources/assets/create/models/block/portable_fluid_interface/block_top.json index ebd764857..3815c2846 100644 --- a/src/main/resources/assets/create/models/block/portable_fluid_interface/block_top.json +++ b/src/main/resources/assets/create/models/block/portable_fluid_interface/block_top.json @@ -1,6 +1,184 @@ { - "parent": "create:block/portable_storage_interface/block_top", + "credit": "Made with Blockbench", "textures": { - "0": "create:block/portable_fluid_interface" - } + "0": "create:block/portable_fluid_interface", + "particle": "create:block/copper_casing" + }, + "elements": [ + { + "from": [3, 7, 3], + "to": [13, 14.1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 15, 11]}, + "faces": { + "north": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"}, + "east": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"}, + "south": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"}, + "west": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"} + } + }, + { + "from": [1, 14, 1], + "to": [15, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, + "faces": { + "north": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, + "east": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, + "south": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, + "west": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, + "up": {"uv": [8.5, 8, 15.5, 15], "texture": "#0"}, + "down": {"uv": [8.5, 8, 15.5, 15], "texture": "#0"} + } + }, + { + "from": [4, 13.1, 13], + "to": [6, 15.1, 14], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 14, 13]}, + "faces": { + "east": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "south": {"uv": [10, 15, 11, 16], "texture": "#0"}, + "west": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [10, 13.1, 2], + "to": [12, 15.1, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 14, 3]}, + "faces": { + "north": {"uv": [10, 15, 11, 16], "texture": "#0"}, + "east": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "west": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [2, 13.1, 4], + "to": [3, 15.1, 6], + "rotation": {"angle": 45, "axis": "z", "origin": [3, 14, 8]}, + "faces": { + "north": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "south": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "west": {"uv": [10, 15, 11, 16], "texture": "#0"} + } + }, + { + "from": [13, 13.1, 10], + "to": [14, 15.1, 12], + "rotation": {"angle": -45, "axis": "z", "origin": [13, 14, 8]}, + "faces": { + "north": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "east": {"uv": [10, 15, 11, 16], "texture": "#0"}, + "south": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [10, 13.1, 13], + "to": [12, 15.1, 14], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 14, 13]}, + "faces": { + "east": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "south": {"uv": [13, 15, 14, 16], "texture": "#0"}, + "west": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [4, 13.1, 2], + "to": [6, 15.1, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 14, 3]}, + "faces": { + "north": {"uv": [13, 15, 14, 16], "texture": "#0"}, + "east": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "west": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [2, 13.1, 10], + "to": [3, 15.1, 12], + "rotation": {"angle": 45, "axis": "z", "origin": [3, 14, 8]}, + "faces": { + "north": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "south": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "west": {"uv": [13, 15, 14, 16], "texture": "#0"} + } + }, + { + "from": [13, 13.1, 4], + "to": [14, 15.1, 6], + "rotation": {"angle": -45, "axis": "z", "origin": [13, 14, 8]}, + "faces": { + "north": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "east": {"uv": [13, 15, 14, 16], "texture": "#0"}, + "south": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 90], + "translation": [-0.5, 0, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-180, 0, 0], + "translation": [0, 22.25, 0] + }, + "fixed": { + "translation": [0, -1.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "Middle", + "origin": [10, 22, 10], + "color": 0, + "children": [] + }, + { + "name": "block", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "Base", + "origin": [10, 20, 8], + "color": 0, + "children": [] + } + ] + }, + { + "name": "block_top", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "Top", + "origin": [10, 22, 10], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json b/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json index ffa83d0d0..19312bcc8 100644 --- a/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json +++ b/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json @@ -1,7 +1,244 @@ { - "parent": "create:block/portable_storage_interface/item", + "credit": "Made with Blockbench", "textures": { "0": "create:block/portable_fluid_interface", - "1": "create:block/copper_casing" - } + "1": "create:block/copper_casing", + "2": "create:block/copper_underside", + "particle": "create:block/copper_casing" + }, + "elements": [ + { + "from": [2, 7, 2], + "to": [14, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 18, 10]}, + "faces": { + "north": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, + "east": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, + "south": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, + "west": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, + "up": {"uv": [2, 6.5, 2.5, 7], "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 10, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 10, 8, 16], "texture": "#0"}, + "south": {"uv": [0, 10, 8, 16], "texture": "#0"}, + "west": {"uv": [0, 10, 8, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [0, 12, 1.9], + "to": [2, 14.1, 14.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 10]}, + "faces": { + "north": {"uv": [14, 13, 16, 15], "texture": "#2"}, + "south": {"uv": [0, 13, 2, 15], "texture": "#2"}, + "west": {"uv": [1, 9, 7, 10], "texture": "#0"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#2"} + } + }, + { + "from": [14, 12, 2], + "to": [16, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 6]}, + "faces": { + "north": {"uv": [0, 13, 2, 15], "texture": "#2"}, + "east": {"uv": [1, 9, 7, 10], "texture": "#0"}, + "south": {"uv": [14, 13, 16, 15], "texture": "#2"}, + "up": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [2, 12, 0], + "to": [14, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 20, 8]}, + "faces": { + "north": {"uv": [1, 9, 7, 10], "texture": "#0"}, + "east": {"uv": [0, 13, 16, 15], "texture": "#2"}, + "south": {"uv": [1, 9, 7, 10], "texture": "#0"}, + "west": {"uv": [0, 13, 16, 15], "texture": "#2"}, + "up": {"uv": [2, 0, 14, 16], "texture": "#2"} + } + }, + { + "from": [3, 10, 3], + "to": [13, 17.1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 18, 11]}, + "faces": { + "north": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"}, + "east": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"}, + "south": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"}, + "west": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"} + } + }, + { + "from": [1, 17, 1], + "to": [15, 19, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, + "faces": { + "north": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, + "east": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, + "south": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, + "west": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, + "up": {"uv": [8.5, 8, 15.5, 15], "texture": "#0"}, + "down": {"uv": [8.5, 8, 15.5, 15], "texture": "#0"} + } + }, + { + "from": [4, 16.1, 13], + "to": [6, 18.1, 14], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 17, 13]}, + "faces": { + "east": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "south": {"uv": [10, 15, 11, 16], "texture": "#0"}, + "west": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [10, 16.1, 2], + "to": [12, 18.1, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 17, 3]}, + "faces": { + "north": {"uv": [10, 15, 11, 16], "texture": "#0"}, + "east": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "west": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [2, 16.1, 4], + "to": [3, 18.1, 6], + "rotation": {"angle": 45, "axis": "z", "origin": [3, 17, 8]}, + "faces": { + "north": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "south": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "west": {"uv": [10, 15, 11, 16], "texture": "#0"} + } + }, + { + "from": [13, 16.1, 10], + "to": [14, 18.1, 12], + "rotation": {"angle": -45, "axis": "z", "origin": [13, 17, 8]}, + "faces": { + "north": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "east": {"uv": [10, 15, 11, 16], "texture": "#0"}, + "south": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [10, 16.1, 13], + "to": [12, 18.1, 14], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 17, 13]}, + "faces": { + "east": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "south": {"uv": [13, 15, 14, 16], "texture": "#0"}, + "west": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [4, 16.1, 2], + "to": [6, 18.1, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 17, 3]}, + "faces": { + "north": {"uv": [13, 15, 14, 16], "texture": "#0"}, + "east": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "west": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + }, + { + "from": [2, 16.1, 10], + "to": [3, 18.1, 12], + "rotation": {"angle": 45, "axis": "z", "origin": [3, 17, 8]}, + "faces": { + "north": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "south": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "west": {"uv": [13, 15, 14, 16], "texture": "#0"} + } + }, + { + "from": [13, 16.1, 4], + "to": [14, 18.1, 6], + "rotation": {"angle": -45, "axis": "z", "origin": [13, 17, 8]}, + "faces": { + "north": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"}, + "east": {"uv": [13, 15, 14, 16], "texture": "#0"}, + "south": {"uv": [6.5, 7.5, 7, 8], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 90], + "translation": [-0.5, 0, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [-180, 0, 0], + "translation": [0, 22.25, 0] + }, + "fixed": { + "translation": [0, -1.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "Middle", + "origin": [10, 22, 10], + "color": 0, + "children": [0] + }, + { + "name": "block", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "Base", + "origin": [10, 20, 8], + "color": 0, + "children": [1, 2, 3, 4] + } + ] + }, + { + "name": "block_top", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "Top", + "origin": [10, 22, 10], + "color": 0, + "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14] + } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/spout/block.json b/src/main/resources/assets/create/models/block/spout/block.json index 66ac7929e..26a3ce7e0 100644 --- a/src/main/resources/assets/create/models/block/spout/block.json +++ b/src/main/resources/assets/create/models/block/spout/block.json @@ -12,10 +12,10 @@ "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { - "north": {"uv": [1, 0, 7, 1], "texture": "#0"}, - "east": {"uv": [1, 0, 7, 1], "texture": "#0"}, - "south": {"uv": [1, 0, 7, 1], "texture": "#0"}, - "west": {"uv": [1, 0, 7, 1], "texture": "#0"}, + "north": {"uv": [1, 0, 7, 1], "texture": "#0", "cullface": "north"}, + "east": {"uv": [1, 0, 7, 1], "texture": "#0", "cullface": "east"}, + "south": {"uv": [1, 0, 7, 1], "texture": "#0", "cullface": "south"}, + "west": {"uv": [1, 0, 7, 1], "texture": "#0", "cullface": "west"}, "up": {"uv": [1, 9, 7, 15], "texture": "#0"} } }, @@ -25,12 +25,12 @@ "to": [15, 14, 15], "rotation": {"angle": 0, "axis": "y", "origin": [7, 6, -24]}, "faces": { - "north": {"uv": [0.5, 1, 7.5, 2], "texture": "#0"}, - "east": {"uv": [0.5, 1, 7.5, 2], "texture": "#0"}, - "south": {"uv": [0.5, 1, 7.5, 2], "texture": "#0"}, - "west": {"uv": [0.5, 1, 7.5, 2], "texture": "#0"}, + "north": {"uv": [0.5, 1, 7.5, 2], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.5, 1, 7.5, 2], "texture": "#0", "cullface": "east"}, + "south": {"uv": [0.5, 1, 7.5, 2], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0.5, 1, 7.5, 2], "texture": "#0", "cullface": "west"}, "up": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"}, - "down": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"} + "down": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0", "cullface": "down"} } }, { @@ -39,11 +39,11 @@ "to": [14, 2, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { - "north": {"uv": [1, 7, 7, 8], "texture": "#0"}, - "east": {"uv": [1, 7, 7, 8], "texture": "#0"}, - "south": {"uv": [1, 7, 7, 8], "texture": "#0"}, - "west": {"uv": [1, 7, 7, 8], "texture": "#0"}, - "down": {"uv": [9, 9, 15, 15], "texture": "#0"} + "north": {"uv": [1, 7, 7, 8], "texture": "#0", "cullface": "north"}, + "east": {"uv": [1, 7, 7, 8], "texture": "#0", "cullface": "east"}, + "south": {"uv": [1, 7, 7, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [1, 7, 7, 8], "texture": "#0", "cullface": "west"}, + "down": {"uv": [9, 9, 15, 15], "texture": "#0", "cullface": "down"} } }, { @@ -52,12 +52,12 @@ "to": [15, 4, 15], "rotation": {"angle": 0, "axis": "y", "origin": [7, -4, -24]}, "faces": { - "north": {"uv": [0.5, 6, 7.5, 7], "texture": "#0"}, - "east": {"uv": [1, 6, 7.5, 7], "texture": "#0"}, - "south": {"uv": [0.5, 6, 7.5, 7], "texture": "#0"}, - "west": {"uv": [0.5, 6, 7.5, 7], "texture": "#0"}, + "north": {"uv": [0.5, 6, 7.5, 7], "texture": "#0", "cullface": "north"}, + "east": {"uv": [1, 6, 7.5, 7], "texture": "#0", "cullface": "east"}, + "south": {"uv": [0.5, 6, 7.5, 7], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0.5, 6, 7.5, 7], "texture": "#0", "cullface": "west"}, "up": {"uv": [8.5, 8.5, 15.5, 15.5], "texture": "#0"}, - "down": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0"} + "down": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#0", "cullface": "down"} } }, { @@ -66,9 +66,9 @@ "to": [2, 12, 10], "faces": { "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "east": {"uv": [9, 0, 11, 4], "texture": "#0"}, + "east": {"uv": [9, 0, 11, 4], "texture": "#0", "cullface": "west"}, "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [9, 0, 11, 4], "texture": "#0"}, + "west": {"uv": [9, 0, 11, 4], "texture": "#0", "cullface": "west"}, "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, "down": {"uv": [0, 0, 0, 0], "texture": "#0"} } @@ -78,10 +78,10 @@ "from": [6, 4, 2], "to": [10, 12, 2], "faces": { - "north": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "north": {"uv": [9, 0, 11, 4], "texture": "#0", "cullface": "west"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0", "cullface": "west"}, + "south": {"uv": [9, 0, 11, 4], "texture": "#0", "cullface": "west"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0", "cullface": "west"}, "up": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"} } @@ -91,10 +91,10 @@ "from": [14, 4, 6], "to": [14, 12, 10], "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "east": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [9, 0, 11, 4], "texture": "#0"}, + "north": {"uv": [0, 0, 0, 0], "texture": "#0", "cullface": "west"}, + "east": {"uv": [9, 0, 11, 4], "texture": "#0", "cullface": "west"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#0", "cullface": "west"}, + "west": {"uv": [9, 0, 11, 4], "texture": "#0", "cullface": "west"}, "up": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, "down": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"} } @@ -104,10 +104,10 @@ "from": [6, 4, 14], "to": [10, 12, 14], "faces": { - "north": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "north": {"uv": [9, 0, 11, 4], "texture": "#0", "cullface": "west"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0", "cullface": "west"}, + "south": {"uv": [9, 0, 11, 4], "texture": "#0", "cullface": "west"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0", "cullface": "west"}, "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"}, "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} } @@ -117,9 +117,9 @@ "from": [1, 4, 1], "to": [2, 12, 6], "faces": { - "east": {"uv": [5, 2, 7.5, 6], "texture": "#0"}, - "south": {"uv": [7, 4.5, 7.5, 5], "texture": "#0"}, - "west": {"uv": [0.5, 2, 3, 6], "texture": "#0"} + "east": {"uv": [5, 2, 7.5, 6], "texture": "#0", "cullface": "west"}, + "south": {"uv": [7, 4.5, 7.5, 5], "texture": "#0", "cullface": "west"}, + "west": {"uv": [0.5, 2, 3, 6], "texture": "#0", "cullface": "west"} } }, { @@ -127,9 +127,9 @@ "from": [10, 4, 1], "to": [15, 12, 2], "faces": { - "north": {"uv": [0.5, 2, 3, 6], "texture": "#0"}, - "south": {"uv": [5, 2, 7.5, 6], "texture": "#0"}, - "west": {"uv": [7, 4.5, 7.5, 5], "texture": "#0"} + "north": {"uv": [0.5, 2, 3, 6], "texture": "#0", "cullface": "west"}, + "south": {"uv": [5, 2, 7.5, 6], "texture": "#0", "cullface": "west"}, + "west": {"uv": [7, 4.5, 7.5, 5], "texture": "#0", "cullface": "west"} } }, { @@ -137,9 +137,9 @@ "from": [14, 4, 10], "to": [15, 12, 15], "faces": { - "north": {"uv": [7, 4.5, 7.5, 5], "texture": "#0"}, - "east": {"uv": [0.5, 2, 3, 6], "texture": "#0"}, - "west": {"uv": [5, 2, 7.5, 6], "texture": "#0"} + "north": {"uv": [7, 4.5, 7.5, 5], "texture": "#0", "cullface": "west"}, + "east": {"uv": [0.5, 2, 3, 6], "texture": "#0", "cullface": "west"}, + "west": {"uv": [5, 2, 7.5, 6], "texture": "#0", "cullface": "west"} } }, { @@ -147,9 +147,9 @@ "from": [1, 4, 14], "to": [6, 12, 15], "faces": { - "north": {"uv": [5, 2, 7.5, 6], "texture": "#0"}, - "east": {"uv": [7, 4.5, 7.5, 5], "texture": "#0"}, - "south": {"uv": [0.5, 2, 3, 6], "texture": "#0"} + "north": {"uv": [5, 2, 7.5, 6], "texture": "#0", "cullface": "west"}, + "east": {"uv": [7, 4.5, 7.5, 5], "texture": "#0", "cullface": "west"}, + "south": {"uv": [0.5, 2, 3, 6], "texture": "#0", "cullface": "west"} } }, { @@ -157,9 +157,9 @@ "from": [1, 4, 10], "to": [2, 12, 15], "faces": { - "north": {"uv": [7, 3.5, 7.5, 4], "texture": "#0"}, - "east": {"uv": [0.5, 2, 3, 6], "texture": "#0"}, - "west": {"uv": [5, 2, 7.5, 6], "texture": "#0"} + "north": {"uv": [7, 3.5, 7.5, 4], "texture": "#0", "cullface": "west"}, + "east": {"uv": [0.5, 2, 3, 6], "texture": "#0", "cullface": "west"}, + "west": {"uv": [5, 2, 7.5, 6], "texture": "#0", "cullface": "west"} } }, { @@ -167,9 +167,9 @@ "from": [1, 4, 1], "to": [6, 12, 2], "faces": { - "north": {"uv": [5, 2, 7.5, 6], "texture": "#0"}, - "east": {"uv": [7, 3.5, 7.5, 4], "texture": "#0"}, - "south": {"uv": [0.5, 2, 3, 6], "texture": "#0"} + "north": {"uv": [5, 2, 7.5, 6], "texture": "#0", "cullface": "west"}, + "east": {"uv": [7, 3.5, 7.5, 4], "texture": "#0", "cullface": "west"}, + "south": {"uv": [0.5, 2, 3, 6], "texture": "#0", "cullface": "west"} } }, { @@ -177,9 +177,9 @@ "from": [14, 4, 1], "to": [15, 12, 6], "faces": { - "east": {"uv": [5, 2, 7.5, 6], "texture": "#0"}, - "south": {"uv": [7, 3.5, 7.5, 4], "texture": "#0"}, - "west": {"uv": [0.5, 2, 3, 6], "texture": "#0"} + "east": {"uv": [5, 2, 7.5, 6], "texture": "#0", "cullface": "west"}, + "south": {"uv": [7, 3.5, 7.5, 4], "texture": "#0", "cullface": "west"}, + "west": {"uv": [0.5, 2, 3, 6], "texture": "#0", "cullface": "west"} } }, { @@ -187,9 +187,9 @@ "from": [10, 4, 14], "to": [15, 12, 15], "faces": { - "north": {"uv": [0.5, 2, 3, 6], "texture": "#0"}, - "south": {"uv": [5, 2, 7.5, 6], "texture": "#0"}, - "west": {"uv": [7, 3.5, 7.5, 4], "texture": "#0"} + "north": {"uv": [0.5, 2, 3, 6], "texture": "#0", "cullface": "west"}, + "south": {"uv": [5, 2, 7.5, 6], "texture": "#0", "cullface": "west"}, + "west": {"uv": [7, 3.5, 7.5, 4], "texture": "#0", "cullface": "west"} } } ] diff --git a/src/main/resources/assets/create/models/block/spout/bottom.json b/src/main/resources/assets/create/models/block/spout/bottom.json index b8cc7a9e1..9e80c71d8 100644 --- a/src/main/resources/assets/create/models/block/spout/bottom.json +++ b/src/main/resources/assets/create/models/block/spout/bottom.json @@ -1,7 +1,9 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "0": "create:block/spout" + "0": "create:block/spout", + "particle": "create:block/copper_plating" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/spout/middle.json b/src/main/resources/assets/create/models/block/spout/middle.json index a0c3e53e7..8698882af 100644 --- a/src/main/resources/assets/create/models/block/spout/middle.json +++ b/src/main/resources/assets/create/models/block/spout/middle.json @@ -1,7 +1,9 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "0": "create:block/spout" + "0": "create:block/spout", + "particle": "create:block/copper_plating" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/spout/top.json b/src/main/resources/assets/create/models/block/spout/top.json index ccbd45888..10930fb8f 100644 --- a/src/main/resources/assets/create/models/block/spout/top.json +++ b/src/main/resources/assets/create/models/block/spout/top.json @@ -1,7 +1,9 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "0": "create:block/spout" + "0": "create:block/spout", + "particle": "create:block/copper_plating" }, "elements": [ { diff --git a/src/main/resources/assets/create/textures/block/copper/exposed_copper_roof_top.png b/src/main/resources/assets/create/textures/block/copper/exposed_copper_roof_top.png index e8d5adcdf..f87ea11be 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/exposed_copper_roof_top.png and b/src/main/resources/assets/create/textures/block/copper/exposed_copper_roof_top.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/exposed_copper_shingles.png b/src/main/resources/assets/create/textures/block/copper/exposed_copper_shingles.png index 129e9127f..fbd7dbd64 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/exposed_copper_shingles.png and b/src/main/resources/assets/create/textures/block/copper/exposed_copper_shingles.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/exposed_copper_tiles.png b/src/main/resources/assets/create/textures/block/copper/exposed_copper_tiles.png index 1c95b9a5b..c6253cbb3 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/exposed_copper_tiles.png and b/src/main/resources/assets/create/textures/block/copper/exposed_copper_tiles.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/oxidized_copper_roof_top.png b/src/main/resources/assets/create/textures/block/copper/oxidized_copper_roof_top.png index 59ff9f297..4abe43afb 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/oxidized_copper_roof_top.png and b/src/main/resources/assets/create/textures/block/copper/oxidized_copper_roof_top.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/oxidized_copper_shingles.png b/src/main/resources/assets/create/textures/block/copper/oxidized_copper_shingles.png index 4a7135372..b48d3162b 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/oxidized_copper_shingles.png and b/src/main/resources/assets/create/textures/block/copper/oxidized_copper_shingles.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/oxidized_copper_tiles.png b/src/main/resources/assets/create/textures/block/copper/oxidized_copper_tiles.png index 167bbcbd8..327db1ad9 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/oxidized_copper_tiles.png and b/src/main/resources/assets/create/textures/block/copper/oxidized_copper_tiles.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/weathered_copper_roof_top.png b/src/main/resources/assets/create/textures/block/copper/weathered_copper_roof_top.png index 6d651aaf7..44dbec965 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/weathered_copper_roof_top.png and b/src/main/resources/assets/create/textures/block/copper/weathered_copper_roof_top.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/weathered_copper_shingles.png b/src/main/resources/assets/create/textures/block/copper/weathered_copper_shingles.png index 4781959c4..4187bb06f 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/weathered_copper_shingles.png and b/src/main/resources/assets/create/textures/block/copper/weathered_copper_shingles.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/weathered_copper_tiles.png b/src/main/resources/assets/create/textures/block/copper/weathered_copper_tiles.png index 47a83c397..62f080371 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/weathered_copper_tiles.png and b/src/main/resources/assets/create/textures/block/copper/weathered_copper_tiles.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_casing.png b/src/main/resources/assets/create/textures/block/copper_casing.png index 13e6b5e0d..5776c11dc 100644 Binary files a/src/main/resources/assets/create/textures/block/copper_casing.png and b/src/main/resources/assets/create/textures/block/copper_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_casing_connected.png b/src/main/resources/assets/create/textures/block/copper_casing_connected.png index f7f3e1f75..c1728d349 100644 Binary files a/src/main/resources/assets/create/textures/block/copper_casing_connected.png and b/src/main/resources/assets/create/textures/block/copper_casing_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_gearbox.png b/src/main/resources/assets/create/textures/block/copper_gearbox.png index 8b19c317c..a6ed740ce 100644 Binary files a/src/main/resources/assets/create/textures/block/copper_gearbox.png and b/src/main/resources/assets/create/textures/block/copper_gearbox.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_plating.png b/src/main/resources/assets/create/textures/block/copper_plating.png index 866579825..c5393b28f 100644 Binary files a/src/main/resources/assets/create/textures/block/copper_plating.png and b/src/main/resources/assets/create/textures/block/copper_plating.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_underside.png b/src/main/resources/assets/create/textures/block/copper_underside.png new file mode 100644 index 000000000..97afded70 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/copper_underside.png differ diff --git a/src/main/resources/assets/create/textures/block/encased_pipe.png b/src/main/resources/assets/create/textures/block/encased_pipe.png index 10389aa1c..0664b699c 100644 Binary files a/src/main/resources/assets/create/textures/block/encased_pipe.png and b/src/main/resources/assets/create/textures/block/encased_pipe.png differ diff --git a/src/main/resources/assets/create/textures/block/fluid_tank_top.png b/src/main/resources/assets/create/textures/block/fluid_tank_top.png index 4cb3dd24d..53f1fb564 100644 Binary files a/src/main/resources/assets/create/textures/block/fluid_tank_top.png and b/src/main/resources/assets/create/textures/block/fluid_tank_top.png differ diff --git a/src/main/resources/assets/create/textures/block/fluid_tank_top_connected.png b/src/main/resources/assets/create/textures/block/fluid_tank_top_connected.png index addf1c531..35e709956 100644 Binary files a/src/main/resources/assets/create/textures/block/fluid_tank_top_connected.png and b/src/main/resources/assets/create/textures/block/fluid_tank_top_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/item_drain_side.png b/src/main/resources/assets/create/textures/block/item_drain_side.png index c190bd3fb..1426dfecf 100644 Binary files a/src/main/resources/assets/create/textures/block/item_drain_side.png and b/src/main/resources/assets/create/textures/block/item_drain_side.png differ diff --git a/src/main/resources/assets/create/textures/block/item_drain_top.png b/src/main/resources/assets/create/textures/block/item_drain_top.png index 42929d2d5..e76c4c0f0 100644 Binary files a/src/main/resources/assets/create/textures/block/item_drain_top.png and b/src/main/resources/assets/create/textures/block/item_drain_top.png differ diff --git a/src/main/resources/assets/create/textures/block/pipes.png b/src/main/resources/assets/create/textures/block/pipes.png index 853509763..310166490 100644 Binary files a/src/main/resources/assets/create/textures/block/pipes.png and b/src/main/resources/assets/create/textures/block/pipes.png differ diff --git a/src/main/resources/assets/create/textures/block/portable_fluid_interface.png b/src/main/resources/assets/create/textures/block/portable_fluid_interface.png index 5edb32cea..5e2bcf8d7 100644 Binary files a/src/main/resources/assets/create/textures/block/portable_fluid_interface.png and b/src/main/resources/assets/create/textures/block/portable_fluid_interface.png differ diff --git a/src/main/resources/assets/create/textures/block/pump.png b/src/main/resources/assets/create/textures/block/pump.png index 6f8fe6fca..6a36f2239 100644 Binary files a/src/main/resources/assets/create/textures/block/pump.png and b/src/main/resources/assets/create/textures/block/pump.png differ diff --git a/src/main/resources/assets/create/textures/block/spout.png b/src/main/resources/assets/create/textures/block/spout.png index 87ccad44d..fd7e89f89 100644 Binary files a/src/main/resources/assets/create/textures/block/spout.png and b/src/main/resources/assets/create/textures/block/spout.png differ diff --git a/src/main/resources/opt_in/Copper Legacy Pack.zip b/src/main/resources/opt_in/Copper Legacy Pack.zip index 0ceab8145..577a22eb0 100644 Binary files a/src/main/resources/opt_in/Copper Legacy Pack.zip and b/src/main/resources/opt_in/Copper Legacy Pack.zip differ