From ba6f2400e79ff02defc2142f10f4bf4e95de5620 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 27 May 2022 17:03:56 +0200 Subject: [PATCH] Copper Re-polish, Part IV - Integrated new assets by Dani --- src/generated/resources/.cache/cache | 6 +- .../crafting/kinetics/track_station.json | 3 +- .../minecraft/tags/blocks/mineable/axe.json | 1 - .../tags/blocks/mineable/pickaxe.json | 3 + .../com/simibubi/create/AllSpriteShifts.java | 1 + .../fluids/tank/FluidTankModel.java | 2 +- .../models/block/fluid_tank/block_bottom.json | 2 +- .../block/fluid_tank/block_bottom_window.json | 2 +- .../fluid_tank/block_bottom_window_ne.json | 2 +- .../fluid_tank/block_bottom_window_nw.json | 2 +- .../fluid_tank/block_bottom_window_se.json | 2 +- .../fluid_tank/block_bottom_window_sw.json | 2 +- .../models/block/fluid_tank/block_single.json | 2 +- .../block/fluid_tank/block_single_window.json | 2 +- .../fluid_tank/block_single_window_ne.json | 2 +- .../fluid_tank/block_single_window_nw.json | 2 +- .../fluid_tank/block_single_window_se.json | 2 +- .../fluid_tank/block_single_window_sw.json | 2 +- .../models/block/fluid_tank/block_top.json | 2 +- .../block/fluid_tank/block_top_window.json | 2 +- .../block/fluid_tank/block_top_window_ne.json | 2 +- .../block/fluid_tank/block_top_window_nw.json | 2 +- .../block/fluid_tank/block_top_window_se.json | 2 +- .../block/fluid_tank/block_top_window_sw.json | 2 +- .../models/block/mechanical_pump/block.json | 52 +++++++++--------- .../models/block/mechanical_pump/item.json | 31 ++++++----- .../models/item/potato_cannon/base.bbmodel | 1 - .../create/models/item/potato_cannon/cog.json | 9 +-- .../models/item/potato_cannon/item.json | 33 +++++------ .../create/textures/block/cam_linkage.png | Bin 1454 -> 1438 bytes .../textures/block/copper/copper_roof_top.png | Bin 587 -> 618 bytes .../textures/block/copper/copper_shingles.png | Bin 271 -> 388 bytes .../textures/block/copper/copper_tiles.png | Bin 282 -> 303 bytes .../create/textures/block/fluid_tank_top.png | Bin 0 -> 266 bytes .../block/fluid_tank_top_connected.png | Bin 0 -> 1213 bytes .../assets/create/textures/block/pipes.png | Bin 458 -> 443 bytes .../assets/create/textures/block/pump.png | Bin 482 -> 522 bytes .../block/valve_handle/valve_handle_black.png | Bin 211 -> 269 bytes .../block/valve_handle/valve_handle_blue.png | Bin 211 -> 295 bytes .../block/valve_handle/valve_handle_brown.png | Bin 211 -> 296 bytes .../valve_handle/valve_handle_copper.png | Bin 222 -> 329 bytes .../block/valve_handle/valve_handle_cyan.png | Bin 211 -> 298 bytes .../block/valve_handle/valve_handle_gray.png | Bin 211 -> 286 bytes .../block/valve_handle/valve_handle_green.png | Bin 211 -> 288 bytes .../valve_handle/valve_handle_light_blue.png | Bin 211 -> 291 bytes .../valve_handle/valve_handle_light_gray.png | Bin 211 -> 292 bytes .../block/valve_handle/valve_handle_lime.png | Bin 211 -> 301 bytes .../valve_handle/valve_handle_magenta.png | Bin 211 -> 306 bytes .../valve_handle/valve_handle_orange.png | Bin 211 -> 307 bytes .../block/valve_handle/valve_handle_pink.png | Bin 211 -> 299 bytes .../valve_handle/valve_handle_purple.png | Bin 211 -> 256 bytes .../block/valve_handle/valve_handle_red.png | Bin 211 -> 300 bytes .../block/valve_handle/valve_handle_white.png | Bin 211 -> 278 bytes .../valve_handle/valve_handle_yellow.png | Bin 632 -> 673 bytes .../create/textures/item/potato_cannon.png | Bin 757 -> 1955 bytes .../resources/opt_in/Copper Legacy Pack.zip | Bin 6804 -> 7004 bytes 56 files changed, 94 insertions(+), 84 deletions(-) delete mode 100644 src/main/resources/assets/create/models/item/potato_cannon/base.bbmodel create mode 100644 src/main/resources/assets/create/textures/block/fluid_tank_top.png create mode 100644 src/main/resources/assets/create/textures/block/fluid_tank_top_connected.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index f2c21c6e8..5fe449130 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -4094,7 +4094,7 @@ e532a5c405e48b415e3fcd4f7c6183ea335cb915 data/create/recipes/crafting/kinetics/s af5854ee2fa3be195ad9abcdeebe6ed7306b651c data/create/recipes/crafting/kinetics/stressometerfrom_conversion.json 21f885a674603367b67e1e993c175638cbda9ea3 data/create/recipes/crafting/kinetics/super_glue.json 456d59d0fff2b042e1e886ebbe46b84fbd212c40 data/create/recipes/crafting/kinetics/track_signal.json -901a57eb0b488d046fc6d9dbd0b44785dc1a6062 data/create/recipes/crafting/kinetics/track_station.json +3c8fd3b5fe4d264cfe405c8d222b451769c816d5 data/create/recipes/crafting/kinetics/track_station.json 8494f5fcd85a740fa0f0384e3522d8cdd905ce49 data/create/recipes/crafting/kinetics/turntable.json 057c889b0a306f44b8835c896663154ccd9ff12f data/create/recipes/crafting/kinetics/vertical_gearboxfrom_conversion.json 4fb009b86a51b2e259bd1f73848803f6276dd820 data/create/recipes/crafting/kinetics/water_wheel.json @@ -5358,8 +5358,8 @@ ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/br 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json -10c8a8bd33af3f173705dcd4418c2875349352fc data/minecraft/tags/blocks/mineable/axe.json -1309368a93ef80957973355b38794a6129f64e5d data/minecraft/tags/blocks/mineable/pickaxe.json +1472ec62e43355273f0699743ccdb65324c02475 data/minecraft/tags/blocks/mineable/axe.json +45d19c63a1ed100007befe447a624233524d265e data/minecraft/tags/blocks/mineable/pickaxe.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/track_station.json b/src/generated/resources/data/create/recipes/crafting/kinetics/track_station.json index ba2ff79a8..aef634226 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/track_station.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/track_station.json @@ -9,6 +9,7 @@ } ], "result": { - "item": "create:track_station" + "item": "create:track_station", + "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index bcb820c7a..69017d17a 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -97,7 +97,6 @@ "create:rotation_speed_controller", "create:mechanical_arm", "create:railway_casing", - "create:track_station", "create:content_observer", "create:stockpile_switch", "create:creative_crate", diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 048af292c..810a62004 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -113,6 +113,9 @@ "create:railway_casing", "create:track_station", "create:track_signal", + "create:small_bogey", + "create:large_bogey", + "create:controls", "create:item_vault", "create:andesite_funnel", "create:andesite_belt_funnel", diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index 653fa9426..071e09d87 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -52,6 +52,7 @@ public class AllSpriteShifts { public static final CTSpriteShiftEntry BRASS_TUNNEL_TOP = vertical("brass_tunnel_top"), FLUID_TANK = getCT(CTType.RECTANGLE, "fluid_tank"), + FLUID_TANK_TOP = getCT(CTType.RECTANGLE, "fluid_tank_top"), CREATIVE_FLUID_TANK = getCT(CTType.CROSS, "creative_fluid_tank"); public static final Couple VAULT_TOP = vault("top"), VAULT_FRONT = vault("front"), diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java index 5796a7e59..f47dbc8da 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java @@ -27,7 +27,7 @@ public class FluidTankModel extends CTModel { protected static final ModelProperty CULL_PROPERTY = new ModelProperty<>(); public static FluidTankModel standard(BakedModel originalModel) { - return new FluidTankModel(originalModel, AllSpriteShifts.FLUID_TANK, AllSpriteShifts.COPPER_CASING); + return new FluidTankModel(originalModel, AllSpriteShifts.FLUID_TANK, AllSpriteShifts.FLUID_TANK_TOP); } public static FluidTankModel creative(BakedModel originalModel) { diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom.json index b7ca78d34..5cd7e552c 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "particle": "create:block/fluid_tank" }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window.json index bb8bc0859..2f5dd7e48 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_ne.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_ne.json index b8292e6a9..c912a89f3 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_ne.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_ne.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_nw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_nw.json index eba200f6d..c1c4cae8b 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_nw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_nw.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_se.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_se.json index 818121858..63909f530 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_se.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_se.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_sw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_sw.json index 1ad709653..2d70983f8 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_sw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_sw.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single.json index fff031667..c15cf1bbb 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "particle": "create:block/fluid_tank" }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window.json index 3b21d585d..515f6c871 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "4": "create:block/fluid_tank_window_single", "particle": "#1" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_ne.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_ne.json index 796adf27f..b951812ab 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_ne.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_ne.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "4": "create:block/fluid_tank_window_single", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_nw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_nw.json index 555cbf4ac..fb2415381 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_nw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_nw.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "4": "create:block/fluid_tank_window_single", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_se.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_se.json index 8987474f8..aa34bb9c4 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_se.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_se.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "4": "create:block/fluid_tank_window_single", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_sw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_sw.json index 84fc2e862..8e4f5f7c9 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_sw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_sw.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "4": "create:block/fluid_tank_window_single", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top.json index c82bca162..7189a6cd9 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "particle": "create:block/fluid_tank" }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window.json index 9c1e436a8..15e98f11a 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_ne.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_ne.json index ea6698cc5..e9a0734b2 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_ne.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_ne.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_nw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_nw.json index aac6384ff..51e41ddd1 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_nw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_nw.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_se.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_se.json index bfa61d2f8..041d9b4be 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_se.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_se.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_sw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_sw.json index 7e7d07038..5f0cabf9a 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_sw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_sw.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/copper_casing", + "0": "create:block/fluid_tank_top", "1": "create:block/fluid_tank", "3": "create:block/fluid_tank_window", "particle": "create:block/fluid_tank" diff --git a/src/main/resources/assets/create/models/block/mechanical_pump/block.json b/src/main/resources/assets/create/models/block/mechanical_pump/block.json index 859edf294..df7988ce9 100644 --- a/src/main/resources/assets/create/models/block/mechanical_pump/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_pump/block.json @@ -1,35 +1,37 @@ { "credit": "Made with Blockbench", - "parent": "create:block/large_wheels", + "parent": "create:block/block", "textures": { - "3": "create:block/fluid_pipe", + "2": "create:block/pipes", "4": "create:block/pump", - "particle": "create:block/fluid_pipe" + "particle": "create:block/pump" }, "elements": [ { "name": "middle", "from": [4, 4, 4], "to": [12, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, + "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, "faces": { - "north": {"uv": [0, 6, 4, 10], "texture": "#3"}, - "east": {"uv": [0, 6, 4, 10], "texture": "#3"}, - "south": {"uv": [0, 6, 4, 10], "texture": "#3"}, - "west": {"uv": [0, 6, 4, 10], "texture": "#3"} + "north": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, + "east": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, + "south": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, + "west": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, + "down": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"} } }, { "name": "back", "from": [2, 0, 2], "to": [14, 5, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 20]}, + "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, "faces": { - "north": {"uv": [11, 0, 13.5, 6], "rotation": 270, "texture": "#3"}, - "east": {"uv": [11, 0, 13.5, 6], "rotation": 270, "texture": "#3"}, - "south": {"uv": [11, 0, 13.5, 6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [11, 0, 13.5, 6], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#3"}, + "north": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, + "east": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, + "south": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, + "west": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, + "up": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#4"}, "down": {"uv": [0, 0, 12, 12], "texture": "#4"} } }, @@ -37,48 +39,45 @@ "name": "front", "from": [3, 12, 3], "to": [13, 16, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]}, + "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, "faces": { "north": {"uv": [12, 4, 16, 14], "rotation": 90, "texture": "#4"}, "east": {"uv": [12, 4, 16, 14], "rotation": 90, "texture": "#4"}, "south": {"uv": [12, 4, 16, 14], "rotation": 90, "texture": "#4"}, "west": {"uv": [12, 4, 16, 14], "rotation": 90, "texture": "#4"}, - "up": {"uv": [6, 0, 11, 5], "texture": "#3"}, - "down": {"uv": [6, 0, 11, 5], "texture": "#3"} + "up": {"uv": [11, 11, 16, 16], "texture": "#2"}, + "down": {"uv": [6, 11, 11, 16], "texture": "#2"} } } ], "display": { "thirdperson_righthand": { - "rotation": [75, -149, 0], + "rotation": [75, 45, 0], "translation": [0, 2.5, 0], "scale": [0.375, 0.375, 0.375] }, "thirdperson_lefthand": { - "rotation": [75, -149, 0], + "rotation": [75, 45, 0], "translation": [0, 2.5, 0], "scale": [0.375, 0.375, 0.375] }, "firstperson_righthand": { - "rotation": [0, -55, 0], + "rotation": [0, 45, 0], "scale": [0.4, 0.4, 0.4] }, "firstperson_lefthand": { - "rotation": [0, -55, 0], + "rotation": [0, 225, 0], "scale": [0.4, 0.4, 0.4] }, "ground": { - "translation": [0, 1, 1.25], + "translation": [0, 3, 0], "scale": [0.25, 0.25, 0.25] }, "gui": { - "rotation": [30, 45, 0], - "translation": [2.5, -0.5, 0], + "rotation": [30, 135, 0], "scale": [0.625, 0.625, 0.625] }, "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 1.75, -4.5], "scale": [0.5, 0.5, 0.5] } }, @@ -86,6 +85,7 @@ { "name": "pump", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2] } ] diff --git a/src/main/resources/assets/create/models/block/mechanical_pump/item.json b/src/main/resources/assets/create/models/block/mechanical_pump/item.json index a91c59241..c2dd84152 100644 --- a/src/main/resources/assets/create/models/block/mechanical_pump/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "3": "create:block/fluid_pipe", + "2": "create:block/pipes", "4": "create:block/pump", "5": "create:block/millstone", - "particle": "create:block/fluid_pipe" + "particle": "create:block/pump" }, "elements": [ { @@ -150,10 +150,12 @@ "to": [12.5, 12.5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8.5, 8]}, "faces": { - "north": {"uv": [0, 8, 4, 12], "rotation": 90, "texture": "#3"}, - "south": {"uv": [0, 8, 4, 12], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 8, 4, 12], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 8, 4, 12], "rotation": 270, "texture": "#3"} + "north": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"}, + "east": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"}, + "south": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"}, + "west": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"}, + "up": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"}, + "down": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"} } }, { @@ -162,12 +164,12 @@ "to": [16.5, 14.5, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 11.5, 8]}, "faces": { - "north": {"uv": [11, 0, 13.5, 6], "texture": "#3"}, + "north": {"uv": [13.5, 2, 16, 8], "texture": "#2"}, "east": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#4"}, - "south": {"uv": [11, 0, 13.5, 6], "rotation": 180, "texture": "#3"}, - "west": {"uv": [0, 0, 6, 6], "rotation": 90, "texture": "#3"}, - "up": {"uv": [11, 0, 13.5, 6], "rotation": 180, "texture": "#3"}, - "down": {"uv": [11, 0, 13.5, 6], "rotation": 180, "texture": "#3"} + "south": {"uv": [13.5, 2, 16, 8], "rotation": 180, "texture": "#2"}, + "west": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#4"}, + "up": {"uv": [13.5, 2, 16, 8], "rotation": 180, "texture": "#2"}, + "down": {"uv": [13.5, 2, 16, 8], "rotation": 180, "texture": "#2"} } }, { @@ -177,9 +179,9 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 10.5, 8]}, "faces": { "north": {"uv": [12, 4, 16, 14], "rotation": 180, "texture": "#4"}, - "east": {"uv": [6, 0, 11, 5], "rotation": 270, "texture": "#3"}, + "east": {"uv": [6, 11, 11, 16], "rotation": 270, "texture": "#2"}, "south": {"uv": [12, 4, 16, 14], "texture": "#4"}, - "west": {"uv": [6, 0, 11, 5], "rotation": 270, "texture": "#3"}, + "west": {"uv": [11, 11, 16, 16], "rotation": 270, "texture": "#2"}, "up": {"uv": [12, 4, 16, 14], "texture": "#4"}, "down": {"uv": [12, 4, 16, 14], "texture": "#4"} } @@ -220,16 +222,19 @@ { "name": "arrow", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4] }, { "name": "cogwheel", "origin": [8, 8, 8], + "color": 0, "children": [5, 6, 7, 8, 9] }, { "name": "pump", "origin": [8, 8, 8], + "color": 0, "children": [10, 11, 12] } ] diff --git a/src/main/resources/assets/create/models/item/potato_cannon/base.bbmodel b/src/main/resources/assets/create/models/item/potato_cannon/base.bbmodel deleted file mode 100644 index ac8d214b3..000000000 --- a/src/main/resources/assets/create/models/item/potato_cannon/base.bbmodel +++ /dev/null @@ -1 +0,0 @@ -{"meta":{"format_version":"3.6","creation_time":1624660393,"model_format":"java_block","box_uv":false},"name":"item","parent":"create:item/potato_cannon/item","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"resolution":{"width":16,"height":16},"elements":[{"name":"cube","rescale":false,"from":[7,7,-2.5],"to":[9,10,6.5],"autouv":0,"color":0,"locked":false,"origin":[7,7.6,11],"faces":{"north":{"uv":[7.5,1,9.5,4],"texture":0},"east":{"uv":[0.5,6,3.5,15],"rotation":90,"texture":0},"south":{"uv":[7.5,1,9.5,4],"texture":0},"west":{"uv":[0.5,6,3.5,15],"rotation":270,"texture":0},"up":{"uv":[1,6,3,15],"texture":0},"down":{"uv":[1,6,3,15],"rotation":180,"texture":0}},"uuid":"5e678c6f-f4df-6c89-5094-cf6f159d76f1"},{"name":"cube","rescale":false,"from":[7,7,9.5],"to":[9,10,10.5],"autouv":0,"color":3,"locked":false,"origin":[8,7.6,11],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0.5,6,3.5,7],"rotation":90,"texture":0},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0.5,6,3.5,7],"rotation":270,"texture":0},"up":{"uv":[1,6,3,7],"texture":0},"down":{"uv":[1,6,3,7],"rotation":180,"texture":0}},"uuid":"26a67f2c-179c-2879-8433-8e3568b818d3"},{"name":"cube","rescale":false,"from":[6,7,10.5],"to":[10,11,16.5],"autouv":0,"color":5,"locked":false,"origin":[8,9.6,11],"faces":{"north":{"uv":[7,7,15,15],"rotation":270,"texture":1},"east":{"uv":[4,4,12,16],"rotation":270,"texture":2},"south":{"uv":[7,7,15,15],"rotation":270,"texture":1},"west":{"uv":[4,4,12,16],"rotation":90,"texture":2},"up":{"uv":[4,4,12,16],"rotation":180,"texture":2},"down":{"uv":[4,4,12,16],"texture":2}},"uuid":"4c11c0a3-218a-f5f1-5ef1-42e94ee9aacd"},{"name":"cube","rescale":false,"from":[7,4,11.5],"to":[9,6,15.5],"autouv":0,"color":7,"locked":false,"origin":[8,7.6,11],"faces":{"north":{"uv":[13,13,15,15],"texture":0},"east":{"uv":[1,6,3,10],"rotation":90,"texture":0},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[1,6,3,10],"rotation":270,"texture":0},"up":{"uv":[1,6,3,10],"texture":0},"down":{"uv":[1,6,3,10],"rotation":180,"texture":0}},"uuid":"ea1494fd-ebef-b708-b9a4-92593f90d620"},{"name":"cube","rescale":false,"from":[6.5,3.5,9.5],"to":[9.5,6.5,14.5],"autouv":0,"color":0,"locked":false,"rotation":[0,0,-45],"origin":[8,5,11.5],"faces":{"north":{"uv":[12.5,12.5,15.5,15.5],"texture":0},"east":{"uv":[0.5,6,3.5,11],"rotation":90,"texture":0},"south":{"uv":[12.5,12.5,15.5,15.5],"texture":0},"west":{"uv":[0.5,6,3.5,11],"rotation":270,"texture":0},"up":{"uv":[0.5,6,3.5,11],"texture":0},"down":{"uv":[0.5,6,3.5,11],"rotation":180,"texture":0}},"uuid":"c9ee0469-c584-6987-c27a-d6591c119e4a"},{"name":"cube","rescale":false,"from":[7,4,15.5],"to":[9,10,17.5],"autouv":0,"color":7,"locked":false,"origin":[8,7.6,11],"faces":{"north":{"uv":[3,7,1,13],"rotation":180,"texture":0},"east":{"uv":[1,9,3,15],"texture":0},"south":{"uv":[3,7,1,13],"rotation":180,"texture":0},"west":{"uv":[3,9,1,15],"texture":0},"up":{"uv":[1,7,3,9],"rotation":180,"texture":0},"down":{"uv":[1,7,3,9],"texture":0}},"uuid":"7116c2c4-a219-6979-364f-792a4eec68c2"},{"name":"Cog","rescale":false,"from":[5.5,8,6.5],"to":[10.5,9,9.5],"autouv":0,"color":4,"locked":false,"rotation":[0,0,45],"origin":[8,8.5,8.5],"faces":{"north":{"uv":[6,15,11,16],"texture":3},"east":{"uv":[7,13,8,16],"rotation":270,"texture":3},"south":{"uv":[6,14,11,15],"texture":3},"west":{"uv":[9,13,10,16],"rotation":90,"texture":3},"up":{"uv":[6,13,11,16],"rotation":180,"texture":3},"down":{"uv":[6,13,11,16],"texture":3}},"uuid":"9c6e556e-3af0-8367-5c8c-2eda35106e6a"},{"name":"Cog","rescale":false,"from":[5.5,8,6.5],"to":[10.5,9,9.5],"autouv":0,"color":7,"locked":false,"rotation":[0,0,-45],"origin":[8,8.5,8.5],"faces":{"north":{"uv":[6,15,11,16],"texture":3},"east":{"uv":[7,13,8,16],"rotation":270,"texture":3},"south":{"uv":[6,14,11,15],"texture":3},"west":{"uv":[9,13,10,16],"rotation":90,"texture":3},"up":{"uv":[6,13,11,16],"rotation":180,"texture":3},"down":{"uv":[6,13,11,16],"texture":3}},"uuid":"b79ea326-3102-0b62-7b79-2a938ad44e69"},{"name":"Cog","rescale":false,"from":[7.5,6,6.5],"to":[8.5,11,9.5],"autouv":0,"color":6,"locked":false,"origin":[8,8.5,8.5],"faces":{"north":{"uv":[6,15,11,16],"rotation":270,"texture":3},"east":{"uv":[6,13,11,16],"rotation":270,"texture":3},"south":{"uv":[6,14,11,15],"rotation":90,"texture":3},"west":{"uv":[6,13,11,16],"rotation":90,"texture":3},"up":{"uv":[8,13,9,16],"rotation":180,"texture":3},"down":{"uv":[6,13,7,16],"texture":3}},"uuid":"aec1402d-fc45-fc7e-0144-520a7ceddb0d"},{"name":"Cog","rescale":false,"from":[5.5,8,6.5],"to":[10.5,9,9.5],"autouv":0,"color":0,"locked":false,"origin":[8,11,3.5],"faces":{"north":{"uv":[6,15,11,16],"texture":3},"east":{"uv":[6,13,7,16],"rotation":270,"texture":3},"south":{"uv":[6,14,11,15],"texture":3},"west":{"uv":[8,13,9,16],"rotation":90,"texture":3},"up":{"uv":[6,13,11,16],"rotation":180,"texture":3},"down":{"uv":[6,13,11,16],"texture":3}},"uuid":"6cd0eeca-26e6-bf33-2ad3-5d0185d8f13e"}],"outliner":["5e678c6f-f4df-6c89-5094-cf6f159d76f1","26a67f2c-179c-2879-8433-8e3568b818d3","4c11c0a3-218a-f5f1-5ef1-42e94ee9aacd","ea1494fd-ebef-b708-b9a4-92593f90d620","c9ee0469-c584-6987-c27a-d6591c119e4a","7116c2c4-a219-6979-364f-792a4eec68c2",{"name":"cog","origin":[8,8,8],"uuid":"0fed5b4f-08c1-81df-64e3-c2a1410f906c","export":true,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":[{"name":"accelerator","origin":[8,8,8],"uuid":"f3e38ac1-88e9-9ad4-6331-f44b7424a494","export":true,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":["9c6e556e-3af0-8367-5c8c-2eda35106e6a","b79ea326-3102-0b62-7b79-2a938ad44e69","aec1402d-fc45-fc7e-0144-520a7ceddb0d","6cd0eeca-26e6-bf33-2ad3-5d0185d8f13e"]}]}],"textures":[{"path":"C:\\Users\\simon\\Desktop\\Modding\\Forgespace 1.16\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\fluid_pipe.png","name":"fluid_pipe.png","folder":"block","namespace":"create","id":"2","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"b1f94f74-864a-5d8e-db7c-abf1e7f25c9a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFlklEQVRYR61XXWhcRRg9d5PNbna7d7ObbNI2SWMttgY1Koi0mrZiS8GgYAo+lKAPRUoF/0CkfSh5KH3wB4RS8akIKkGk9Qd/KgQVNX0o6kNJlfoX2jTbZJPsbppsNsnNJrly5va7mb3ZNElxXmbv3NmZM993zvnmGsf3PW7nFwywhX226qXJuDwvFAp4oGEdIvGAGoqGQ6ovq3aes9fGVJ/LWhifBqKVi2v1jc6gs/sHZyOtGQTQEA0gUGGgIuwsFAgAlgXM5i31zPHc2Awuj+Sxs6VabRyvT6h34zMT7nLRoIns9VGM56cUiJbtW9Uz537+Ve/yALYkgriSn8OFiSlnwwq/6mdnC6rfboawOVyOi8lJBWDz1ia14I/9yaLTPNbUgPanWnDl734FQBqjkV2Yw7Evuo1Lp161t+6ogZUfhrn7lKEiQAAfXssiHK5EwO+HGTExkXNOZhUKyOen8dymOHoGJnDgkSYV8s7T573RVM8nX2xTp2aT1PRfTKkDEsD5tw/azVsiGDTSuK+9axHAx0MTiIRDyN6YwIP3NmNsPIerA0nEq0zk8lNoqzLRm14bAAGhA/jpaIfdtDGApH8YrS98YxhH9u6xW+oC+DQzrU7f1FAPy5pFlRnBtGWhP3ldATiwwXQjwJy+8u65khE4/nwr5jOW4gEb+ZIcGHMj8OVL7XZdzI9c9Ab2vtZtGId3tdp77k7gg39HUROPIVARQCwaURGwZi1YluUCIAee3NGoSLUSgJGsA6A2XgzgzKF2uz4IpGoz2H/sZwfAw3URfJbJFaUgNZrG0PCom4JD9yTQ05tZNQkVf6ylALo62uy6SDmGakbw7IkLTgq2xSrwSWoMfn+5UgBTIQSkEgqFOZeEbfcnXBmKBCk/aSJDhr4UCd9/5gm7utKPofWDOPzWbw6Ah+408ddIHj0Zh/kEwsaN2R6tDIFKoQp2NprKiLgB86ybEY1Il58uw/SkY0Tv7W+zYz4bo/VpvHzy18UIlGSUNjhYmEcyO7UmAKWM6MTT++w6zCFTM4mjp39xOLDS5vr7hngIcZ8TIVqtNev8fWbeQLDMVj1Nh3NKWTF9JxT0YT6awpGPfjcMIuLkRI1jw2y0YN29dAAkkbcWuKG+KT2moaPr3BLf5zymPOKbx4KZQufZP50U8MVyhejN774vudBaoqbPfX33LtuED/lEBm+cvbQYAYZLTibVTPz7djcr9T+mPDpfhkIsjXe+/mPRilnxaBpsNBGmYbkS+n8CMqhLlmKePr4pptamlRIEpckCcqsNmUKmzxcqx8LUHFjapVE5bBv9ZUVjnMfG+4YLQCJAm2U5pYutFgCNTL9P6GQWlURiwSKSczw5bjkA+KZmfVCZCt1r6J+bN5uxGRw88+2KEWAx8ypDihHXlnX1IkWesUQrGW6rDatbkLgaw88bENtKALz/F/v1pk1uSxwnOImwAsDbTkNjTJ2eKNn6+rKrAsAIMrwksHdzqRGsGVxXf88o85BLAKyVhKUA6JvJgbg5AQkYibKbAp6ABOQEFpXVklBPgaiIh5A1+FvSKyBYMUVlioQMISfxsinl9HYBCNHkVk22e1NEcOnUDChTNwIb7oqpEBGAKIFmRKbqOvZqnPwRCesckhPKfK8XyHgRAMm/zlSC4AbsRdNezeshljXkHihGpP9H1nIjoKtAJ4oAEbT6JUS/dMp7YTnToAPg+volhvNdH2B9br4jWiQjXT5ePXNxIavOcGU4HpbTSdm8PlPkAzoJ9XucbCySks1kcx2YV++yweWr46o2CAnlCsfeJaF8GelWWuquJ5bKXrdrb/71D1QSmM2bAlGIsmL945SThXDyoSonlQ9V/eQisVJzpNiwSlIBpYqRIuGtyqm+mZRWr6w4zg3093q5jaxzSvFyMvwPaYjs9h/DqboAAAAASUVORK5CYII="},{"path":"C:\\Users\\simon\\Desktop\\Modding\\Forgespace 1.16\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\andesite_casing_very_short.png","name":"andesite_casing_very_short.png","folder":"block","namespace":"create","id":"4","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"85220030-0179-1a36-8ed9-8a2cd4d94045","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB0ElEQVQ4T91TPUscQRh+Zj9vct7tnglRiBauH4WXFHYWNvkBadIEDlIJQUipKP6QdLGzFqwEWxtJEERNQsAEBBsTLt6a253d2V1HZnTOVe8X+Dbzvs/MPLP7PO9LlldXhO/5yIsChTDAohCylpELAYsQ/O9ewHEoTNNQOOc5nlAXnbADMv9hXigUAGMMlFJd3lnlno7yGdJ63xJxxMCzDIblIksj2JYNIQTiNEW9WgVLYhiGjSzj6gHGUtCKg7pXA3kEv1AWsZ9698XTQutVuTAeTCBmKRzHUhxFcQnOGWoD9Z6VEpe20aoHk1zCMk0cfTsEWVxZFE8bz7C78UldrlYcRAnva2UZnGstYX/vy3Uf+A0ff75uYnTYx9/zLs7aXQQjg6g4FhKeI2JcYdPBc7TDWOWzbz/efgGt1HCys45Bz8W/MEXYTRQBdW2wNEO7EyusOT6E07NQ5T0CrcGP7bUHBEIUIMTsEYy98HoPTL5+h875TStLEe8TjA75sCyBPCe4iBL1aplAavDz+yFUKwfBFA62Pt8RzrVNpFmhMJnLkLXOZ94s4Nfv42uCl81XykYd9cbNNCa3AyT39Bk5iTKUjbqRdMOUJ63fBJYxSXIFRuc4bJLxudoAAAAASUVORK5CYII="},{"path":"C:\\Users\\simon\\Desktop\\Modding\\Forgespace 1.16\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\andesite_casing_short.png","name":"andesite_casing_short.png","folder":"block","namespace":"create","id":"5","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"5f28a2dc-5511-6bd0-cc23-537b005e1fff","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB7UlEQVQ4T61TvYvUUBD/veTtS97Fze6qHNeIuH7hx9oJdnaCjYLlgVis2Gh34OH/oZ121lcIItjaiCDIraco3oLYCCLmVpOXz30yL8maXfY6p5nMTOY3834zw+4/2NTdThd5UaDQFlS4B7JJcq3BGcPvPxMIIWHblvGnaY4V6SDYC8CGd4baeAEopSClrM05TbFamv+w9ZvrOgoV0iyDxR1kSYgWb0FrjShJ4HseVBzBslrIstQUUCqBdAX8Thvsvz5hWe+LrdfPrLXh4Hj/BCKVQAhuMIpiijRVaB/wZ0SSn0iTXgc2m4LbNt7vjEoSCeD11iOT7LnCTCTJiqVk1s4LV29jPP5cApw+O8Do2cNZgu+5SPMccZLPgbgOh+AckzDGmStD7I6/gG1sbuhDvcP4+PIJjqyV84/idC4xy6YG0JPC+H8GEQbX7uHd2zdlB91eF5Pt5yZIVanSYvUmIsWPXb5VckAdSLeNr6+e4uTRVQg+26t9OdjZ/WGeMEciPeFgx4FXbWJYbR7ZtFQkjDGjv30PsHrxOoJf1SrTFGoAM4kFkGYrFCMA4uDThxHMKvf7p7D94vG+LTst28RotPRN+tKNu+UUCOD8uYFZpFr8XnWN8b8DMtOp/qFLJJlxQEa9ss1LW3aBTR/l/QWX8QNstMA25AAAAABJRU5ErkJggg=="},{"path":"C:\\Users\\simon\\Desktop\\Modding\\Forgespace 1.16\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\andesite_bricks.png","name":"andesite_bricks.png","folder":"block","namespace":"create","id":"particle","particle":true,"visible":true,"mode":"bitmap","saved":true,"uuid":"0a732870-6ee2-5b2b-13e2-0eadb56af61a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACqElEQVQ4TzVTuUqzQRQ94xbjlsQkKCoqGg2E2AiBWEafwEKwsRA7KwvBwnewsRHEB5BUgiBYKYYohERcQIka4y7u+67zcw78Ax/zMXPvPeeee8Ykk0n79/eH5+dneDwebGxsoKGhAbe3t2hvb8fR0RG4Hh4eUFlZqd3n8+H9/R3MM/F43DLw4uIC1dXVeHp6QllZmZK4/v/z3Ov1Cuj+/h4vLy/Y29uDmZqasgwsKChQclFRkVBKSkp0ZozBz8+PEKuqqvD6+orCwkJ8fHzg8/MTpr+/39bX14tBaWmpaH19fen/+/tbyRUVFfj9/dXncDhUnCwYY6anp202m1XfbIGU6+rqRPH09FTB1CGXyyEWi+m+paUFmUxGAGZiYsLe3NyociQSEeXm5mbt19fXOD8/x8HBAfb399Hd3Q2Xy4W2tja1u76+DjM+Pm7Pzs7Q0dEh1ZlAVPZK+nd3dyp0cnKCsbEx5PN5gR0eHoql6evrs1SXwewxEAiALb29vcHtdksPakBGj4+Pos0C1KqpqQlmfn5eIq6srChhZ2dHegSDQfkilUphbW0Nvb29Up93iUQCTqdTOpjZ2Vnb2dkpmul0GsfHx4hGoxpnOBzWSCcnJ9HT0yMD1dbWCj2ZTEpYMzMzY0mJY6QwW1tbGB0d1SVRdnd3cXl5ieHhYSwvL4sldeIZPzM0NGRpCiJSOO6cL/Wg4ixCAAYXFxeDE2Nr1MxaCzM3NycGfr9f/XKtrq5KzMbGRnmCiSzOIoy9urrSm+FYzcLCgqVNW1tbVXFpaQmbm5vqv6amRv6nLxhD99EPZLG9vY2BgQGYxcVFS8cxmSgUk313dXUhFArJRGyFr5P3nD29wWIjIyMwg4ODlo+C4vCQo6LaFJRalJeXa2ci42g6sqM29MU/xiWmDH0vZeMAAAAASUVORK5CYII="}],"display":{"thirdperson_righthand":{"rotation":[0,90,0],"translation":[0,3.25,0]},"thirdperson_lefthand":{"translation":[0,3.75,0]},"firstperson_righthand":{"rotation":[-4.5,100.25,10],"translation":[1,4,1]},"firstperson_lefthand":{"rotation":[17.25,267,10],"translation":[1,4,1]},"ground":{"rotation":[-90,0,0],"translation":[0,-2.3,0],"scale":[0.76914,0.76914,0.76914]},"gui":{"rotation":[28,-163,43],"translation":[0.5,0,0],"scale":[1.09453,1.09453,1.09453]},"head":{"translation":[0,8,0],"scale":[1.4,1.4,1.4]},"fixed":{"rotation":[0,160.5,0],"translation":[0.5,0.5,0]}}} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/potato_cannon/cog.json b/src/main/resources/assets/create/models/item/potato_cannon/cog.json index 7a630b442..023fd8b88 100644 --- a/src/main/resources/assets/create/models/item/potato_cannon/cog.json +++ b/src/main/resources/assets/create/models/item/potato_cannon/cog.json @@ -3,7 +3,8 @@ "parent": "create:item/potato_cannon/item", "texture_size": [32, 32], "textures": { - "1": "create:item/potato_cannon" + "1": "create:item/potato_cannon", + "particle": "create:block/copper_casing" }, "elements": [ { @@ -65,10 +66,10 @@ ], "display": { "thirdperson_righthand": { - "translation": [0, 1.75, 0] + "translation": [0, 2, 0] }, "thirdperson_lefthand": { - "translation": [0, 1.75, 0] + "translation": [0, 2, 0] }, "firstperson_righthand": { "rotation": [5, 4, 5], @@ -85,7 +86,7 @@ }, "gui": { "rotation": [64, 47, -47], - "translation": [0.5, 0, 0], + "translation": [0.25, -0.25, 0], "scale": [0.86, 0.86, 0.86] }, "head": { diff --git a/src/main/resources/assets/create/models/item/potato_cannon/item.json b/src/main/resources/assets/create/models/item/potato_cannon/item.json index ece021b34..3052946f4 100644 --- a/src/main/resources/assets/create/models/item/potato_cannon/item.json +++ b/src/main/resources/assets/create/models/item/potato_cannon/item.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench", + "parent": "create:item/potato_cannon/item", "texture_size": [32, 32], "textures": { "1": "create:item/potato_cannon", @@ -57,9 +58,9 @@ } }, { - "from": [7, 4, 14.5], - "to": [9, 6, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.6, 11]}, + "from": [7, 5, 14.5], + "to": [9, 7, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.6, 11]}, "faces": { "east": {"uv": [0.5, 10, 1, 11], "texture": "#1"}, "west": {"uv": [0.5, 10, 1, 11], "texture": "#1"}, @@ -68,9 +69,9 @@ } }, { - "from": [6.5, 3.5, 8.5], - "to": [9.5, 6.5, 14.5], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 5, 11.5]}, + "from": [6.5, 4.5, 8.5], + "to": [9.5, 7.5, 14.5], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 6, 11.5]}, "faces": { "north": {"uv": [3, 6, 4.5, 7.5], "rotation": 90, "texture": "#1"}, "east": {"uv": [6, 9.25, 3, 10.75], "texture": "#1"}, @@ -81,25 +82,25 @@ } }, { - "from": [7, 4, 15.5], + "from": [7, 5, 15.5], "to": [9, 10, 17.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7.6, 11]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.6, 11]}, "faces": { - "north": {"uv": [1.25, 8, 0.25, 11], "texture": "#1"}, - "east": {"uv": [2, 8, 1, 11], "texture": "#1"}, - "south": {"uv": [3, 8, 2, 11], "texture": "#1"}, - "west": {"uv": [1, 8, 2, 11], "texture": "#1"}, - "up": {"uv": [2, 7, 3, 8], "texture": "#1"}, + "north": {"uv": [1.25, 8.5, 0.25, 11], "texture": "#1"}, + "east": {"uv": [2, 8.5, 1, 11], "texture": "#1"}, + "south": {"uv": [3, 8.5, 2, 11], "texture": "#1"}, + "west": {"uv": [1, 8.5, 2, 11], "texture": "#1"}, + "up": {"uv": [2, 7.5, 3, 8.5], "texture": "#1"}, "down": {"uv": [1.5, 10.75, 2.5, 11], "rotation": 90, "texture": "#1"} } } ], "display": { "thirdperson_righthand": { - "translation": [0, 1.75, 0] + "translation": [0, 2, 0] }, "thirdperson_lefthand": { - "translation": [0, 1.75, 0] + "translation": [0, 2, 0] }, "firstperson_righthand": { "rotation": [5, 4, 5], @@ -116,7 +117,7 @@ }, "gui": { "rotation": [64, 47, -47], - "translation": [0.5, 0, 0], + "translation": [0.25, -0.25, 0], "scale": [0.86, 0.86, 0.86] }, "head": { diff --git a/src/main/resources/assets/create/textures/block/cam_linkage.png b/src/main/resources/assets/create/textures/block/cam_linkage.png index d8b35b80c22f742a8ddd4ae747729136e01fbfd1..06bb407c1bee99fdd500840fe41fe6033fe7a125 100644 GIT binary patch delta 1018 zcmVvFbDB(aghLX;3Mz%hc~PlS zT14g#hG1b1gJqZ^xdfA)XPImM+n%sZAdpqRio_kgTx?K~~ zG^NA4T~nDC_WoITXWl-S%K)%lYfxNS4Jj+e#KeS#*8_*W;VaEyg@9XE7wp_r zg4rvVX>Q)9S*}ytvZ%K9nM}r{7^t@P$Ju)<2m!gN1bQLMH{bqAwb|k8&$B=suz0X3 zFUqHn%-(;op`_tah2x~5nDWJ}$*3-!OvQZp>FH@Z5{VKHKhKjVdz?Du6drfHzyGh8 zI~eRysZ>Ie04K2OzA@lpGU*&16a#L<35Q=G8a<7sX*_=X4*=2VX#jS1S_}qzst24+ zEjUOq_wZK3Qmk$@)GTl<0$9Ix(bfwuD)quKtj~X&U;ZZM3IX|a7;hH10hmvxl+s(< zviM=dQ^ED73w>rz@~Rg?z|C5ml%a9EvI2n7(`Z}&0gy5@(VmUoK=45j-aO(;B>``| z`WpJ#3^V7?Q+-s!Y8y0noNDOD|HRLM0v6{}=!LAf0)1xA`EA}OSFXbi9|3>-{eWt- z#b199%N|RebPVEMtY5omyVfnvrv&d@iyq+_O|U;En5vsxe}@Ccr6=e90c#-$y7`#<%fj{0fwO}HVi9}KPkvT o=-GIjaS+m(gs@bO0W~ZB2OnT4TB0v=TL1t607*qoM6N<$g7Fvk;s5{u delta 1035 zcmV+m1oZo!3$6>WvjKkq24YJ`L;#8aiU5k^+UFzy000SaNLh0L04^f{04^f|c%?sf z00007bV*G`2jvA26gCGQ^Y;V*000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dak zSAh-}000AqNklp-ut|dptt@|RY7bksW!XiXnx<#-cH5NR zi;55P$L9KnvlD*+tW|0h7MCJBB``j&Au8ZkLrLKHCo`Nn`6a6>E9CSvg~g?9%ieCA zjE`%y+vufljAGx7!6^Y;24~A|d&Ba^PShrd;oY z1VFdj<*UyZ_%Q#zOC*#4fYmfcNf4(U>sjyukP*_}w6nrmKo?4QV z3iI3DyT5-&wngC9#rb}AGRe&OGt^h_Q!iGjJhdn{HYFz&HnIZQ$s~F{!c?VnqS1Z4e7V8?{dVJV)|;EJ z+;@Au4N9d_#6!SNtm;TP;0&B-^c~{y18ADY^XGs60T7QL0APK+L9e$VD`0=rf~^vB zHgDAAj8|b!L;w$e`l7Gr-9axu-FZ>yi2;|aH#42zSFqcko_FP6P!)qZ|1xHP> zafzxbbKpiLLCVm$U0U2~#TrfPe*jX3=8k8h({u44bJZN;NL>OSeQ*T*&;-**k5YbC z!D@dR)Yt89sKS5cw?G05b1C$E#ytXkde;7}-X~kE!gU3KzyEncx!&OMzeOR^mRp)C zTs(6px`nxv=gh?;2ra`=6tJgbmF(nTQhLt&my)O1DG9u2ZQX=ca5r|bFx)pCo%Ow~ zP5sF^bAA^1Q6^x||G|e}v<%^X5QGn=qZ5B^wpa~KQ2!)VTu6+7%ZZGOkqxptd{PFM zVbf}nO1|y+(@C}4{`80Z|1p${;+* z8a0bbdARGnJN67iW^5Q%Aig)ZV&TKXtb@!ibJ%~c0c9%qh_p diff --git a/src/main/resources/assets/create/textures/block/copper/copper_roof_top.png b/src/main/resources/assets/create/textures/block/copper/copper_roof_top.png index 973482f5ad8b03696078152f6f4e09c8e3cc534b..987177909600fdae9089441dad315336f27e3920 100644 GIT binary patch delta 205 zcmV;;05bo}1nLBk7zqdh0001xk!UutHj)8Syipv*A;HOj3ND;{t|2dg zRh)%^fkED0>Fb*>aM3qcU)_20O+#J)t2h$_1H-GEFSxa|xJ7ulMR?v^eYJ1@BZvyD z;!IGv!>1U;sgQ{w= zKw3dk&^d-gwsh9bJV1__=4qD1wuJ3pd<4=sJiS)~IbZr_8avKt3@Wxt11ezopr0Jpq8NB{r; diff --git a/src/main/resources/assets/create/textures/block/copper/copper_shingles.png b/src/main/resources/assets/create/textures/block/copper/copper_shingles.png index eee5372765262c54fc831fdb7b0b1e459e42804b..bbf045d5dd872e48c504387befc6ed3090056cd9 100644 GIT binary patch delta 373 zcmV-*0gC>Q0)zvQ7=H)?0001xk!Usm000DMK}|sb0I`mI`%#ks00BEmL_t(2k$q9I zZo)7WJW!AfwuFP9PzEGMGUhv&nfe?3F}|X6H|W^S0#gMkA(pyyIBHy}!qeTocXo0& zI=;SyHsbe)Rmaa3fXr2{kcMk4%EsaS0)V!%aneSyDzs6oN`DHSVpRb^RnzE)Rb56u zXlK&4s-^&_5Jx{0+8I6_{XmtM5l^cbvZJc$Sc^#{9}o=wmKJCprzP?<&cz%Q&&TO# zXSA3Td;ws&se0G(`aX2|27o?vZ-+AuXX>N}YxcujssaUnDOSZ;s>O~4Z`a!JHV*09k z_{HFFMTHjAU%KS^H`YX>AMUYYgVTqnVY#U|?nB3v8F3#vG#Kr7+mvaF?}_pQTepwq TuQX_T00000NkvXXu0mjfiA}C! delta 255 zcmV}_RQ_+AMItsvcdftmAI(U%$sflgQ!AxzHI;jgP zMIu86+_+LiQxLrOLVhKx%Z<%bhu9{W-a#YU8VYg5__RjZd58Udw|uMufyK+5Rwaaj-BjFznrO>%xHt mSjCx$aW}H~Xc;`vBpv{R)DvON9fjfm0000!m3;u+$c)?Dc#OROtD^+E+J8d|-2f>ZaVer_#+?9Y z&D@5V&9_+qT)o?MjN7Zo00i2*LprOgLjZP^xop8CnQQ>uhM3K~f@RA9+jxxK-N;M1MG8=`!qdeuMB=h;uOZ(d0}*H5x8lWpO+HK4xQc8H`{G;{uxZm4TZa`# zHvZJy^YY}jls`8Us&{O<_*l-!MWM|0)#nve_1h*~nfQLC`&6fI^OYV+ep<~j-9cDz z{mkr3EYrNoPUq{qbmCJhomDz#x!6@*ss5ruqc?}vT6|}1?@|y+NO#fzx`Dyd)z4*} HQ$iB}TjXSs literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..addf1c5319c64ad0717c183c8285b0e32f139d31 GIT binary patch literal 1213 zcmV;u1Va0XP)Px(cS%G+RCt{2o4rmOK@^1#)*^Y`V2q1R8VXQE6A39&LPV1$O%#bIND<{7qLg`u z^yyO~@c?u{LF6V9ASj3uSfK?>W3QAVDa>_d@80>@AIA~QX>9M#H+yD0duQfqcjoh} zm%mX`N67$>x~;PK)OC~$5CFj2k1ud>7-MJi1S^Ye%&#tF3SRdv$KMZ5``CEDj*G(> zN1wjJg&)QPgi&k!snakX06?xxRo>)30D!|U-^K;D_RoO*Gjv+BnM$q(zW@Ns-BzZ& zD?e@N{0G3OR{-ER8DMRxgKoPiR+98n?4DfZju+uwG)bQO4*+0gv5l?$GpsFjkldu` zwwvNGPEPw+Tk2r<*P)T15;&bJj}r^;=F2JisaJoI(d`-234v`cX6Fud0tMc!`ApJ zyrc#}s)}B`2v5INMm-;xzM+Ebx#=G#U zc{M1h^E&_6>f}xSwL#DZn-(RKc|Mg%;^*q%ZT>ScfHz9I-$?3e%f?IQRZ}#tOO3C> zyZFzIfHWRzdsv-TbmF`Ξ6)y-UomE;vnXRd}8MfGQ*<{S?Xe&&)q;TZ7wpTRrN1 zZBkj@H?DOp8)i|%6Yyt zCG)gySA&#};j6zgyv~1S8l+(>HJspBY@A_(tg?`8?Q!hsa|fD^R(fy@vi>=c|L%COLE;37v)XMN2DD9cOo z`2c>>=K}=urpCMQs(GIe@c96r5AgW_E}su@Tx9utKm}gs-{%9=LR>x{pn(CO56H;I zm&pgHx|jI?9Zwq`pARU&oBWG0plCk8mH%(^0sI~-nhz+#t7a$?mu-9*UhDu`xh4J7 zxSyv_dghL#<4N40PA-kF!b|?gBY+O}_Re#|hE`p@y>s!xI-UnaX&&dJhbJ@Y;&uKr z4@v?+cdm&a2iNG{UVxs(OZq9gbARW4m2u@ICH)i-&P{@s{09K=d}9eKz01*Kt`2(h z?lG==m*WQ|i}KT!>OTO0oz0W+$>rOpzt!FXfaGS>%g4zeQ{Kk&6(jv4>Tju>PDOb- zuk%0i;puwm$K~&Wf-2AZ`}YO>`vN2R_XYg>0{(pgEAQVIugA$x=jQtU0;CjEu@$ z(#-)pNIH4hf%_aVpwLrLLvjF5Yw~=HJ;~{F4?rmAT2;w7q1b42e^oN0GJ?Vx9PpW1 zOE?-p?_A-?8xWGvwTO=7a|27_%G(ISh^s&V%*1pfcZ`S?robWjho5S%lgC$?TC3UJ z8RtqLfLLV|lRHeKssR|M0railU{-^26H~JRm?iDYqKi_ZQUJ7c0U7}Gl^VU)0NNFh z9{m7Rt0Ail^M4~WHAXCpScEP$pCzS7Um@97sj(d1^t`6zxHacUQjfX|>J6@(BlX5; R49oxk002ovPDHLkV1n_Gk>3CS delta 332 zcmV-S0ki(Q1Ih!CF%1M~K}|sb0I`n?{9y%=E?R#832;bRa{vGi!2kdb!2!6DYwZ94 z0S8G$K~y+TrIEps#2^SnX$|10oBaRZP7~wQR%OQ=woin-f~FNgLf+JlFOtm(l-GAa zygmR3V6ox^RvrknHQ)g(O{TUqd7inNu>Id;0FOC51Iwr%u6TTIm7Ghl8(^A2Wd;Qo zdJum{qWCd@-ceK)ClDr;p;IC{08?l}!MQ^ITmc0H*TB1Ch46&0z{lhdFTM232Y;qo zQvkJ=+*$+sMr24ZD@bc}8Y)hppW^CSfinqkgsYod-*?-YNt#uXZ6i?A2Vj>#omG|B z5kMV)_UHyMt14#2nN_CqYefKK1*;_ct{ya@Ysn_c!O<4X3epcPaXsIZ07vD>9oDR;=IZa?bhgJ@?$3 z3E#b307N3B+didYs~E0HLbrX&&eMCSrUroa>{SNfV1I8BM1K<`fV0CM0Kp^%!1qMD zK`@E&J%Nv4Yqy%lr}45@ibM#2;hGFO=L|aM{7KU_@jXE#LJs!#7KscXwcmV1D@c4k z>hs~tRAJD*HYF_FCeA6cB8_*f-**}-l2Gzig^9K-KFn8x$l>Q~7;ad#H~Bfj^#8GxT_ WX`_-Uh0mP;0000=luWYTrO8S-LH(9 zk&}kb;l-H*u(z{4w)zf{+s+f42WynK7O)(TVossFwIGh=cz>cE#PvJ?q5!{->HxHR zF73-ZxV#HBPwJD&6R|L8T$%jU9e%bR-dw%#^^1rf&7O!ACE*(^EoNx@(^SzKFUrM8;Wr{h)H<(o% zM9av?g@kX=sec*R!w~?6HGEfC%qeKgdEaC?PsDadG_K64ErM8%7wS>8l!&7M8UDQ&qbR`naZ@BFPo|}10IJQ$P#vJJ+b;$!b3n@+h=eYt zbl=FqzlT0@{oc>l?~$f<`he5@%DA+mantCaWn}*fpE2Q2+eS^s(7OX%Z}eIDG}8KN idFJmNq+0tW0XzeS)tx**Cx;~f00001t~l8|W@!`0oc)%2*QQ7tG-B>_!@pD{ZU-2CtCb!aLY`DbElK3n6C^M8V3+Dxii98w7V@En?y(Za_N= ze>2Qy=JS{#)7eTvlS&y#!^xWFvvLLiSS}_6714ZKcY0qC#~ zc|75M+`x(xkl4InCg2Qmt6{cVpA!gv2Kc#T-qv&2wq5i=5WM}r2sW9%?<-1Q=Ly5G eHsG&c&;u9PQxU3pw_hm$0000&Z8Y)6UPk%q}4z;a560=kyGQlsOiKY0eyMjuiV60ihmpjs#?xI_-H2iZGNa|bHUkYdZUl#~>!?Uo7&K`c3cG7=QX{Dee; zZVO&#&-k0Cabx=RdE^F}YC0_&fUal)5UT=!$?Us93ClDJ*MCOk8kuTFA6kuMWnSLFuqWvI z9-Do}@^?d$`6St)cIrcbQ8u(a>v@B%OxVi%%lTr5<2aXd7={o3Z>TH;L2$IJ>w2On fsttJaA2w%gI0SRC!VrZr|^O~lla;JOsgt{gw1)H&~gN*POn{DK)Ap4~_Ta=biU978y+ zC*LSeJ3sF-yM%;21mq^{`=Cx2&rCX-_1#gHm>x?r9d!x3jiZ spMS~g;Fg)Oa3dqLguzY=g9+RWi;R_-^!BVi0yLJv)78&qol`;+06(EZO#lD@ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_copper.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_copper.png index a9d31a1c086433295b21d32cc80668513131232b..26352aa9d0d5043b70ba9999db10eae1b61e8a61 100644 GIT binary patch delta 314 zcmV-A0mc5_0m%Z87=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks0096=L_t(IjqQ># zPQx$&MPF1CL}-eFI#g^$j9tsZl7)qt6L5+ifm3h-hD=?^0g%{G=OQs6hR6}5b%mTN z3@EOhw9E|r#j^eV{Pk_`?&`9_l2n@GU=P5IQfUBgrVkzsiGSJ{g@U{&kxDZa@TNJDYi-o=c;>=7d~02Gqk?666=m;PC85 z8j$1T>Eal|aXmT0(zyEmYhE56p4b1LZV8uRFmk`Pe*a%S9i#UT=l=iis8s&m$u;cU z8Oy?d%n^nEzDsR*^uJsIC>mE(n83jN>;eN@5hFu{wT7}?;FT{xgBd(s{an^LB{Ts5 DV)aY2 diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_cyan.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_cyan.png index 6dd59637da4ba5ace0911b5f421445a3539af009..1765e535df98edb9221197c4797a5e29eb19eec0 100644 GIT binary patch delta 283 zcmV+$0p$ME0jdI!7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks007}hL_t(IjqQ;= z3c^4Xgl9D@{-uaEfY=QmMyk)1Bti;GJgP@&Op5Pw#cHedRqjv zbOZ6}fVMeDeDgqOw?;t9^H)G3?r59yl%PbEE2C2dkPHABAijBpD+LlMY8^BZRP}WS zY&ZrRO+eQRqN9sW6gD2H38W~B13&Z8Y)6UPk%q}4z;a560=kyGQlsOiKYIxg*!8Q;H+@TgbvuV6SjG9DD%PDHLkV1ksWc(nik delta 195 zcmbQobeVC2L_G^L0|Ud`yN`l^6id3JuOkD)#(wTUiL5}rdVo)eE07NIaCEn|i1c;y zak4QqwMfaYw6JxIP0J69OY;khb#V1^_X~cti@6Y}l(8hpFPOpM*^M+H$IH{jF@)oK z@{QuO^YbpVOGrrgmCnsMJ%b@-jzuAx-li;34;z+s%c{zs_C#_!C}o%Fo@ViUJ8Nt8 s`Io#7ZkZViH!?Cy80@q#n83}j$XJ<4Z_nx@Kw}v^UHx3vIVCg!0MqzCfB*mh diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_green.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_green.png index bb0527b25a34daf4f6e4770a8c340732e7c0612e..36faf4fce9ffa0e5de9585d12f0745a8e9e05bab 100644 GIT binary patch delta 273 zcmV+s0q*|O0iXhq7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks007rXL_t(IjqQ*< zZo)tiM&JI#$Vje|8qp!;6e#E6I9!6xCqQX(kKiUvT!Fmu&(2aETZ5j_m4vQ03=rqRdC2Q-w-7>6J#H}M&oj`kFX%Uo{0jBKVagcF z$wx;F3PG|?Q_W;xz_fusHTcu*fZjhXQ50S4G)>2E1NLY4b=O?2*P*Ja2R`uRe{cpu X6jHR9{+h)A015yANkvXXu0mjf!c2W7 delta 195 zcmZ3$beVC2L_G^L0|Ud`yN`l^6id3JuOkD)#(wTUiL5}rdVo)eE07NIaCEn|i1c;y zak7z3a8;P-Dx2=6(B&rI>>*#{A(!VaU+Qtqyz3HBDPu{HUoeBivm0qZj+dv4V+hCf zX+M^X1Lp^Ji1>51C4w4+j8Y4*@7u2Eg}fIiQ2kjfQPesDB(%$#^lvu&q{Oq4Mr* z6JXdD``sU|HwWMp9eNFJ1{5mC_2%^}+DKE|^##aOLMmIuQe~7Xd)%PQ(>s{Vri@&N z^Ij5fceTMI2(5UEnt|>P?iy5a!ZA)-#ozT8rfJsaAPBDhU(@~1tK+zv|FWxA(XJm1dR tT7CW{uY+4=#=?z^%n}AWEes}bGb}PzX42cU`Uuci22WQ%mvv4FO#tl;MV$Zu diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_light_gray.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_light_gray.png index eb54bcec93cb8dafcbd6e24fdf7c9fe4570d42ac..da5195be3891fdf3b12e5d0d329ff61a037f7438 100644 GIT binary patch delta 277 zcmV+w0qXwK0i*(u7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks007%bL_t(IjqQ=k zYQr!PMNhz$Eig%-vu%3XU<-NLeI{Vx@6xNOxWIY=lNLcP>{G zW6Y5shzMDh0g$Ti(+2^-7&DLP^iS#T?5(S*Yi({dGkFpYRLWQqa|{sD};9x@A@6PkSP{9h9=mbWgK*zMZwT s`us~?2e-_Og&P@}B@A|27);=1SY)isq_=1F5umXQp00i_>zopr04x(k9smFU diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_lime.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_lime.png index 5d5b2ccf78069cbebb01bc6be7f69b6b7be4cf94..0b4438360cee289012a284a1004ed10846b19856 100644 GIT binary patch delta 286 zcmV+(0pb4B0j&a%7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks0087kL_t(IjqQ;= zZo)tig+Er-x34YUdVK8;EItj}P}nvs)Cw3Yr{Dk{e095nA{B~sf7P5#muRg|bsWdP?(e95h@$A| kdFObNBxw}5^A{iZ2Aq~u%bdqhmjD0&07*qoM6N<$f)MbeVC2L_G^L0|Ud`yN`l^6id3JuOkD)#(wTUiL5}rdVo)eE0Fg0baAn>4)gQ$ zbhb}eP`deCe$ukM1;=yy4`kQx%uHFER#>)@7|v2Y_JvxLD;3xf&V42z7Fne_Io2HC;j>FVdQ&MBb@0Mu(md;kCd diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_magenta.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_magenta.png index 3e4df99350b85a5ac370e2ca38c2a9ffbb3497cd..3bdf02ce4df90aa1e84cc222009ec1487682be6e 100644 GIT binary patch delta 291 zcmV+;0o?x60kQ&+7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks008MpL_t(IjqQ=m zYQjJig+FPSNTv}~C@rW@(na2+d!et>m7Bgn9w19!!F8cOv=w7Yk{O(Vpo`*IV*+;9 zMZewLd+yNC_F`kUjg>r{MD4i%ky4{IEnSaMlv&;=mWiem& z`~-D=-NCTmXD}SFPS-qrzOk{U^`OzfRMr&-&=vmq3398+SNdppznCF}aPK&dPyT;T p<06Wpt>+!;NgR@-)!?7Mzz#Z*T^Gw#*K_~?002ovPDHLkV1nUXhD`tf delta 195 zcmdnQbeVC2L_G^L0|Ud`yN`l^6id3JuOkD)#(wTUiL5}rdVo)eE07NGaCWt`3iI>y za<*F^+V-@1>-NZ=yQS-{<}W{&xnN)X@~1tK+zv|FWxA(XJm1dR tT7CW{uY+4=#=?z^%n}AWEes}bGb}PzX42cU`Uuci22WQ%mvv4FO#oM8MsolF diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_orange.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_orange.png index d4187d15e05425d903e56f328b729023279540ad..4af23b08d3f5a6b72a2db72c8f6e1b94a01266e1 100644 GIT binary patch delta 292 zcmV+<0o(r50kZ;-7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks008PqL_t(IjqQ=W zP69y`g+G?vRT3D`ERfJy*_c3Y!-G)sP&~ypCO(En8>p-dxMs}^6OdhYv2tL4NTj3i zl=q(V<=mOdbUfH`phRw{HZK6EUkdLMS z%P61S0~}%T`MkjEcL4}qKS~=M1;i@F>vxG&YJ!fijOj|W%&q`P4>c^50nCQs4_L}x|?YL9B=TY6VR*7aP(;7y8G*V-!J^X q0o*^#3d`ZJw;hY3zn$=}bI=dU`&XeSKTEj)0000&Z8Y)6UPk%q}4z;a560=kyGQlsOiKY`KBvW{g0RXl)1i**};OX^wKntrZw10gUlNXRFf^dfY;5G`) zZ_)0p1^6!CtCaB~1VE*mPJ`Y6lNXE^;h#axsHC#%3Xn`erkc8Iln2C_dO`$OaM<>L*q(NNH{i}Ka1{cIZ&xx7$pO^>0000%X>=ZU0red!rVirC+#{|x8hjG#`7!h*aDR@mIV0)GdMiEkp|>=dAc}; za9mHmQJi*u-eq_}C}h*ylqKq6!?JE!Rr%ANNNxwE>@wZcES_&? uZLL24lGnj4Gh^XKMrH|vofZZYxEU51D>LcsS$za(EQ6=3pUXO@geCxV^GLk_ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_purple.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_purple.png index 02904514526335ac1d333c13d74c26b3820c8cbf..bda42a492214bca4d8364ad906fc12f7f095930c 100644 GIT binary patch delta 240 zcmV7HXAJYx(Aub$xO~&ZghQ%&+4OrI6E~Co^Rf4;H!3#GjSYG^SZ9z q{$KHKR8=*E;j2AO)2s&k`2`;22wDM!r+mBs0000KV;oh|Ha*2Gs+#B8eMx=ByD;FRLWQqa|{sD};9x@A@6PkSP{9h9=mbWgK*zMZwT s`us~?2e-_Og&P@}B@A|27);=1SY)isq_=1F5umXQp00i_>zopr0IW4bPXGV_ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_red.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_red.png index a6397742ff2be2cb75166711748fa3bf064466a4..33f88ac1043bec3e1546b5b3846714bf588089ee 100644 GIT binary patch delta 285 zcmV+&0pkAC0jvU$7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks0084jL_t(IjqQ;; zZo)tmMbCU<0g@vnsi2`uLqSi&s#ru;Kz89xq)HPc8a6;_p$x*(cxFstFfhha(xu30 zp5}e-yLuzurn8DG@-p!JAOT2Koio0Ui?0tsgg!T>(qn=mFMr{+?|AIXo5t@V#Isid z(z8AYCIb%$Hid>Fb|AY2Oi)Y)wF3x^qcf@GRJ$XPmw~(l5I|@)8n0S6=yVYC>l=)F zl2PK=TFq*2F-~Dj6}7fL;38l=_2EvWy85|;opbEmZSwu;g(OLuca~-M*8_UF`D_*E j!+B+`?V9=L&lYh6@0wLa-yd%<00000NkvXXu0mjfdkucL delta 195 zcmZ3(beVC2L_G^L0|Ud`yN`l^6id3JuOkD)#(wTUiL5}rdVo)eE07NIaCEn|i1c;y zak5EPH{b7MS)gUP(b9a0sl{|->snpwE(2?g@FNmHrHmy(e!&b5&u*jvIbNPFjv*Y^ zlW!EKou7A^T|z>_uXJwC=@|?ub1Vwk^fqOQdf2e6TUJ&6v?r3=K`FaT_cV*=+gV$y s&%fk#aLdeCxRH@r!eFO`!31uGMaIfZdV5wM0UFET>FVdQ&MBb@0IAPE3;+NC diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_white.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_white.png index c393085e23cab18bb1b7be720311640a58dd3762..1c2a8c51aa1097fae1ae692f8d623f0a0ff9b8b3 100644 GIT binary patch delta 262 zcmV+h0r~#Z0hR)g7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks007NNL_t(IjqQ;= z3c^4TMxPLZV`r@V=|Vai8|z#|utMZVH1YI9AaX z2eyNT2H7PgyQHPzY`(yC-QpZY(cAx9YA?btygAOZo;Z#_2K@O2?pkkD(nCwL&_YBLN>ikS)v{`EbEq4l|Su?I`)D z0zpkL-#~qZFi>zw*{*h|sRe5vZfz74$Y<|LSs{QY1c$wby{?$w%M(KQBgS#u`2VtC m_Oot0Mp2YI*M9Yn-cdI}VM~*VmIV+100007O6cf4++U`8eX|ouHpreSV&G`+3a%=RT{t)UfiT;G!7+yl|h$wPB$^ zrHmy(e!&b5&u*lFI7!~_F1+8iBz^^Qd^}woLn`8uJ$QY6dASo35;y`m!$gcg3@)zL zPL|y}8e9^xBu-uG>NWF`aZp;P*>^}`rO4zhS2nP)v9)#et(qw;aiAgnI~!XOBZEt* V(2;2S5J#ZF44$rjF6*2UngGVnPp$v} diff --git a/src/main/resources/assets/create/textures/item/potato_cannon.png b/src/main/resources/assets/create/textures/item/potato_cannon.png index b485a77ff07155e1bb8dc5b59084722e842f9ead..d5d74ddce49b36e5d46ecf17c3ce36f4fe7ab2f2 100644 GIT binary patch delta 1952 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 Kp6$9Y$cq5i%Lo7f delta 678 zcmca(HpO(pIbkja5YWqN4VJWHmR-lhz_4!OL;uOTd?Jd%3=G`Dj105pNH8!kwq`mz z2Y5O=D-;yvr)B1(GB8xk*&M)F#^@#PS5X2qLN~xC#P#QymUrt5-mc4kI63*jq@+{z z;V0|Dj^_s*%M08T@4qq5Z%&}|>;R`$cgGethkM_?&jxB_O!9Vj;g{IOaC34F`+CmY zkIO~VfX+ypEXd+JK<>D}k-m91+eyyJ=Y+%<^(Q;<%TC@QpbK;i&twtdqnka2CNVPF zPrf4@0VGXDl7Qq4k!&V=hKUm-Cd-OOh}tt?3D(J7qPZH#GH{;)eXGZy0*VJ9Pypg% z%#$7Yl_p!T@J;p?(*PPgc_W(yAF_%HHn57zHoqL&x%`v^yYJ;>NVqr%5qJPkuU{%agu~8Qy(u-P?b-N&$&Y~n00^