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 d8b35b80c..06bb407c1 100644 Binary files a/src/main/resources/assets/create/textures/block/cam_linkage.png and b/src/main/resources/assets/create/textures/block/cam_linkage.png differ 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 973482f5a..987177909 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/copper_roof_top.png and b/src/main/resources/assets/create/textures/block/copper/copper_roof_top.png differ 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 eee537276..bbf045d5d 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/copper_shingles.png and b/src/main/resources/assets/create/textures/block/copper/copper_shingles.png differ diff --git a/src/main/resources/assets/create/textures/block/copper/copper_tiles.png b/src/main/resources/assets/create/textures/block/copper/copper_tiles.png index 24e88d4be..f55a693b9 100644 Binary files a/src/main/resources/assets/create/textures/block/copper/copper_tiles.png and b/src/main/resources/assets/create/textures/block/copper/copper_tiles.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 new file mode 100644 index 000000000..4cb3dd24d Binary files /dev/null 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 new file mode 100644 index 000000000..addf1c531 Binary files /dev/null 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/pipes.png b/src/main/resources/assets/create/textures/block/pipes.png index 96b22cc61..853509763 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/pump.png b/src/main/resources/assets/create/textures/block/pump.png index e5f760b74..6f8fe6fca 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/valve_handle/valve_handle_black.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_black.png index 689d719e3..05436d1c7 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_black.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_black.png differ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_blue.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_blue.png index 4590e364b..825ecd91c 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_blue.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_blue.png differ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_brown.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_brown.png index 7d4628663..b649c5345 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_brown.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_brown.png differ 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 a9d31a1c0..26352aa9d 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_copper.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_copper.png differ 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 6dd59637d..1765e535d 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_cyan.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_cyan.png differ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_gray.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_gray.png index 573329b1f..d7d8ceb5d 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_gray.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_gray.png differ 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 bb0527b25..36faf4fce 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_green.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_green.png differ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_light_blue.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_light_blue.png index 7576c28cc..964a706f1 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_light_blue.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_light_blue.png differ 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 eb54bcec9..da5195be3 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_light_gray.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_light_gray.png differ 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 5d5b2ccf7..0b4438360 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_lime.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_lime.png differ 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 3e4df9935..3bdf02ce4 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_magenta.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_magenta.png differ 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 d4187d15e..4af23b08d 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_orange.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_orange.png differ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_pink.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_pink.png index f35d01667..76eec71f6 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_pink.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_pink.png differ 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 029045145..bda42a492 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_purple.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_purple.png differ 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 a6397742f..33f88ac10 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_red.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_red.png differ 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 c393085e2..1c2a8c51a 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_white.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_white.png differ diff --git a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_yellow.png b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_yellow.png index d854af744..1cd161c20 100644 Binary files a/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_yellow.png and b/src/main/resources/assets/create/textures/block/valve_handle/valve_handle_yellow.png differ 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 b485a77ff..d5d74ddce 100644 Binary files a/src/main/resources/assets/create/textures/item/potato_cannon.png and b/src/main/resources/assets/create/textures/item/potato_cannon.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 7789163a6..0ceab8145 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