mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-14 20:33:43 +01:00
Copper Re-polish, Part IV
- Integrated new assets by Dani
This commit is contained in:
simibubi
parent
8d84910fb9
commit
ba6f2400e7
56 changed files with 94 additions and 84 deletions
|
|
@ -4094,7 +4094,7 @@ e532a5c405e48b415e3fcd4f7c6183ea335cb915 data/create/recipes/crafting/kinetics/s
|
||||||
af5854ee2fa3be195ad9abcdeebe6ed7306b651c data/create/recipes/crafting/kinetics/stressometerfrom_conversion.json
|
af5854ee2fa3be195ad9abcdeebe6ed7306b651c data/create/recipes/crafting/kinetics/stressometerfrom_conversion.json
|
||||||
21f885a674603367b67e1e993c175638cbda9ea3 data/create/recipes/crafting/kinetics/super_glue.json
|
21f885a674603367b67e1e993c175638cbda9ea3 data/create/recipes/crafting/kinetics/super_glue.json
|
||||||
456d59d0fff2b042e1e886ebbe46b84fbd212c40 data/create/recipes/crafting/kinetics/track_signal.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
|
8494f5fcd85a740fa0f0384e3522d8cdd905ce49 data/create/recipes/crafting/kinetics/turntable.json
|
||||||
057c889b0a306f44b8835c896663154ccd9ff12f data/create/recipes/crafting/kinetics/vertical_gearboxfrom_conversion.json
|
057c889b0a306f44b8835c896663154ccd9ff12f data/create/recipes/crafting/kinetics/vertical_gearboxfrom_conversion.json
|
||||||
4fb009b86a51b2e259bd1f73848803f6276dd820 data/create/recipes/crafting/kinetics/water_wheel.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
|
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json
|
||||||
69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json
|
69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json
|
||||||
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json
|
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json
|
||||||
10c8a8bd33af3f173705dcd4418c2875349352fc data/minecraft/tags/blocks/mineable/axe.json
|
1472ec62e43355273f0699743ccdb65324c02475 data/minecraft/tags/blocks/mineable/axe.json
|
||||||
1309368a93ef80957973355b38794a6129f64e5d data/minecraft/tags/blocks/mineable/pickaxe.json
|
45d19c63a1ed100007befe447a624233524d265e data/minecraft/tags/blocks/mineable/pickaxe.json
|
||||||
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json
|
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json
|
||||||
e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json
|
e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json
|
||||||
a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json
|
a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"result": {
|
"result": {
|
||||||
"item": "create:track_station"
|
"item": "create:track_station",
|
||||||
|
"count": 2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -97,7 +97,6 @@
|
||||||
"create:rotation_speed_controller",
|
"create:rotation_speed_controller",
|
||||||
"create:mechanical_arm",
|
"create:mechanical_arm",
|
||||||
"create:railway_casing",
|
"create:railway_casing",
|
||||||
"create:track_station",
|
|
||||||
"create:content_observer",
|
"create:content_observer",
|
||||||
"create:stockpile_switch",
|
"create:stockpile_switch",
|
||||||
"create:creative_crate",
|
"create:creative_crate",
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,9 @@
|
||||||
"create:railway_casing",
|
"create:railway_casing",
|
||||||
"create:track_station",
|
"create:track_station",
|
||||||
"create:track_signal",
|
"create:track_signal",
|
||||||
|
"create:small_bogey",
|
||||||
|
"create:large_bogey",
|
||||||
|
"create:controls",
|
||||||
"create:item_vault",
|
"create:item_vault",
|
||||||
"create:andesite_funnel",
|
"create:andesite_funnel",
|
||||||
"create:andesite_belt_funnel",
|
"create:andesite_belt_funnel",
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ public class AllSpriteShifts {
|
||||||
|
|
||||||
public static final CTSpriteShiftEntry BRASS_TUNNEL_TOP = vertical("brass_tunnel_top"),
|
public static final CTSpriteShiftEntry BRASS_TUNNEL_TOP = vertical("brass_tunnel_top"),
|
||||||
FLUID_TANK = getCT(CTType.RECTANGLE, "fluid_tank"),
|
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");
|
CREATIVE_FLUID_TANK = getCT(CTType.CROSS, "creative_fluid_tank");
|
||||||
|
|
||||||
public static final Couple<CTSpriteShiftEntry> VAULT_TOP = vault("top"), VAULT_FRONT = vault("front"),
|
public static final Couple<CTSpriteShiftEntry> VAULT_TOP = vault("top"), VAULT_FRONT = vault("front"),
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ public class FluidTankModel extends CTModel {
|
||||||
protected static final ModelProperty<CullData> CULL_PROPERTY = new ModelProperty<>();
|
protected static final ModelProperty<CullData> CULL_PROPERTY = new ModelProperty<>();
|
||||||
|
|
||||||
public static FluidTankModel standard(BakedModel originalModel) {
|
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) {
|
public static FluidTankModel creative(BakedModel originalModel) {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"4": "create:block/fluid_tank_window_single",
|
"4": "create:block/fluid_tank_window_single",
|
||||||
"particle": "#1"
|
"particle": "#1"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"4": "create:block/fluid_tank_window_single",
|
"4": "create:block/fluid_tank_window_single",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"4": "create:block/fluid_tank_window_single",
|
"4": "create:block/fluid_tank_window_single",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"4": "create:block/fluid_tank_window_single",
|
"4": "create:block/fluid_tank_window_single",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"4": "create:block/fluid_tank_window_single",
|
"4": "create:block/fluid_tank_window_single",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "create:block/copper_casing",
|
"0": "create:block/fluid_tank_top",
|
||||||
"1": "create:block/fluid_tank",
|
"1": "create:block/fluid_tank",
|
||||||
"3": "create:block/fluid_tank_window",
|
"3": "create:block/fluid_tank_window",
|
||||||
"particle": "create:block/fluid_tank"
|
"particle": "create:block/fluid_tank"
|
||||||
|
|
|
||||||
|
|
@ -1,35 +1,37 @@
|
||||||
{
|
{
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "create:block/large_wheels",
|
"parent": "create:block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"3": "create:block/fluid_pipe",
|
"2": "create:block/pipes",
|
||||||
"4": "create:block/pump",
|
"4": "create:block/pump",
|
||||||
"particle": "create:block/fluid_pipe"
|
"particle": "create:block/pump"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
||||||
"name": "middle",
|
"name": "middle",
|
||||||
"from": [4, 4, 4],
|
"from": [4, 4, 4],
|
||||||
"to": [12, 12, 12],
|
"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": {
|
"faces": {
|
||||||
"north": {"uv": [0, 6, 4, 10], "texture": "#3"},
|
"north": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
|
||||||
"east": {"uv": [0, 6, 4, 10], "texture": "#3"},
|
"east": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
|
||||||
"south": {"uv": [0, 6, 4, 10], "texture": "#3"},
|
"south": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
|
||||||
"west": {"uv": [0, 6, 4, 10], "texture": "#3"}
|
"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",
|
"name": "back",
|
||||||
"from": [2, 0, 2],
|
"from": [2, 0, 2],
|
||||||
"to": [14, 5, 14],
|
"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": {
|
"faces": {
|
||||||
"north": {"uv": [11, 0, 13.5, 6], "rotation": 270, "texture": "#3"},
|
"north": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
|
||||||
"east": {"uv": [11, 0, 13.5, 6], "rotation": 270, "texture": "#3"},
|
"east": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
|
||||||
"south": {"uv": [11, 0, 13.5, 6], "rotation": 270, "texture": "#3"},
|
"south": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
|
||||||
"west": {"uv": [11, 0, 13.5, 6], "rotation": 270, "texture": "#3"},
|
"west": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
|
||||||
"up": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#3"},
|
"up": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#4"},
|
||||||
"down": {"uv": [0, 0, 12, 12], "texture": "#4"}
|
"down": {"uv": [0, 0, 12, 12], "texture": "#4"}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -37,48 +39,45 @@
|
||||||
"name": "front",
|
"name": "front",
|
||||||
"from": [3, 12, 3],
|
"from": [3, 12, 3],
|
||||||
"to": [13, 16, 13],
|
"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": {
|
"faces": {
|
||||||
"north": {"uv": [12, 4, 16, 14], "rotation": 90, "texture": "#4"},
|
"north": {"uv": [12, 4, 16, 14], "rotation": 90, "texture": "#4"},
|
||||||
"east": {"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"},
|
"south": {"uv": [12, 4, 16, 14], "rotation": 90, "texture": "#4"},
|
||||||
"west": {"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"},
|
"up": {"uv": [11, 11, 16, 16], "texture": "#2"},
|
||||||
"down": {"uv": [6, 0, 11, 5], "texture": "#3"}
|
"down": {"uv": [6, 11, 11, 16], "texture": "#2"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"display": {
|
"display": {
|
||||||
"thirdperson_righthand": {
|
"thirdperson_righthand": {
|
||||||
"rotation": [75, -149, 0],
|
"rotation": [75, 45, 0],
|
||||||
"translation": [0, 2.5, 0],
|
"translation": [0, 2.5, 0],
|
||||||
"scale": [0.375, 0.375, 0.375]
|
"scale": [0.375, 0.375, 0.375]
|
||||||
},
|
},
|
||||||
"thirdperson_lefthand": {
|
"thirdperson_lefthand": {
|
||||||
"rotation": [75, -149, 0],
|
"rotation": [75, 45, 0],
|
||||||
"translation": [0, 2.5, 0],
|
"translation": [0, 2.5, 0],
|
||||||
"scale": [0.375, 0.375, 0.375]
|
"scale": [0.375, 0.375, 0.375]
|
||||||
},
|
},
|
||||||
"firstperson_righthand": {
|
"firstperson_righthand": {
|
||||||
"rotation": [0, -55, 0],
|
"rotation": [0, 45, 0],
|
||||||
"scale": [0.4, 0.4, 0.4]
|
"scale": [0.4, 0.4, 0.4]
|
||||||
},
|
},
|
||||||
"firstperson_lefthand": {
|
"firstperson_lefthand": {
|
||||||
"rotation": [0, -55, 0],
|
"rotation": [0, 225, 0],
|
||||||
"scale": [0.4, 0.4, 0.4]
|
"scale": [0.4, 0.4, 0.4]
|
||||||
},
|
},
|
||||||
"ground": {
|
"ground": {
|
||||||
"translation": [0, 1, 1.25],
|
"translation": [0, 3, 0],
|
||||||
"scale": [0.25, 0.25, 0.25]
|
"scale": [0.25, 0.25, 0.25]
|
||||||
},
|
},
|
||||||
"gui": {
|
"gui": {
|
||||||
"rotation": [30, 45, 0],
|
"rotation": [30, 135, 0],
|
||||||
"translation": [2.5, -0.5, 0],
|
|
||||||
"scale": [0.625, 0.625, 0.625]
|
"scale": [0.625, 0.625, 0.625]
|
||||||
},
|
},
|
||||||
"fixed": {
|
"fixed": {
|
||||||
"rotation": [0, 180, 0],
|
|
||||||
"translation": [0, 1.75, -4.5],
|
|
||||||
"scale": [0.5, 0.5, 0.5]
|
"scale": [0.5, 0.5, 0.5]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -86,6 +85,7 @@
|
||||||
{
|
{
|
||||||
"name": "pump",
|
"name": "pump",
|
||||||
"origin": [8, 8, 8],
|
"origin": [8, 8, 8],
|
||||||
|
"color": 0,
|
||||||
"children": [0, 1, 2]
|
"children": [0, 1, 2]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"parent": "create:block/block",
|
"parent": "create:block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"3": "create:block/fluid_pipe",
|
"2": "create:block/pipes",
|
||||||
"4": "create:block/pump",
|
"4": "create:block/pump",
|
||||||
"5": "create:block/millstone",
|
"5": "create:block/millstone",
|
||||||
"particle": "create:block/fluid_pipe"
|
"particle": "create:block/pump"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
||||||
|
|
@ -150,10 +150,12 @@
|
||||||
"to": [12.5, 12.5, 12],
|
"to": [12.5, 12.5, 12],
|
||||||
"rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8.5, 8]},
|
"rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8.5, 8]},
|
||||||
"faces": {
|
"faces": {
|
||||||
"north": {"uv": [0, 8, 4, 12], "rotation": 90, "texture": "#3"},
|
"north": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"},
|
||||||
"south": {"uv": [0, 8, 4, 12], "rotation": 270, "texture": "#3"},
|
"east": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"},
|
||||||
"up": {"uv": [0, 8, 4, 12], "rotation": 270, "texture": "#3"},
|
"south": {"uv": [11.5, 15.5, 15.5, 11.5], "texture": "#2"},
|
||||||
"down": {"uv": [0, 8, 4, 12], "rotation": 270, "texture": "#3"}
|
"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],
|
"to": [16.5, 14.5, 14],
|
||||||
"rotation": {"angle": 0, "axis": "y", "origin": [8.5, 11.5, 8]},
|
"rotation": {"angle": 0, "axis": "y", "origin": [8.5, 11.5, 8]},
|
||||||
"faces": {
|
"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"},
|
"east": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#4"},
|
||||||
"south": {"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, 6, 6], "rotation": 90, "texture": "#3"},
|
"west": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#4"},
|
||||||
"up": {"uv": [11, 0, 13.5, 6], "rotation": 180, "texture": "#3"},
|
"up": {"uv": [13.5, 2, 16, 8], "rotation": 180, "texture": "#2"},
|
||||||
"down": {"uv": [11, 0, 13.5, 6], "rotation": 180, "texture": "#3"}
|
"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]},
|
"rotation": {"angle": 0, "axis": "y", "origin": [8.5, 10.5, 8]},
|
||||||
"faces": {
|
"faces": {
|
||||||
"north": {"uv": [12, 4, 16, 14], "rotation": 180, "texture": "#4"},
|
"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"},
|
"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"},
|
"up": {"uv": [12, 4, 16, 14], "texture": "#4"},
|
||||||
"down": {"uv": [12, 4, 16, 14], "texture": "#4"}
|
"down": {"uv": [12, 4, 16, 14], "texture": "#4"}
|
||||||
}
|
}
|
||||||
|
|
@ -220,16 +222,19 @@
|
||||||
{
|
{
|
||||||
"name": "arrow",
|
"name": "arrow",
|
||||||
"origin": [8, 8, 8],
|
"origin": [8, 8, 8],
|
||||||
|
"color": 0,
|
||||||
"children": [0, 1, 2, 3, 4]
|
"children": [0, 1, 2, 3, 4]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "cogwheel",
|
"name": "cogwheel",
|
||||||
"origin": [8, 8, 8],
|
"origin": [8, 8, 8],
|
||||||
|
"color": 0,
|
||||||
"children": [5, 6, 7, 8, 9]
|
"children": [5, 6, 7, 8, 9]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "pump",
|
"name": "pump",
|
||||||
"origin": [8, 8, 8],
|
"origin": [8, 8, 8],
|
||||||
|
"color": 0,
|
||||||
"children": [10, 11, 12]
|
"children": [10, 11, 12]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -3,7 +3,8 @@
|
||||||
"parent": "create:item/potato_cannon/item",
|
"parent": "create:item/potato_cannon/item",
|
||||||
"texture_size": [32, 32],
|
"texture_size": [32, 32],
|
||||||
"textures": {
|
"textures": {
|
||||||
"1": "create:item/potato_cannon"
|
"1": "create:item/potato_cannon",
|
||||||
|
"particle": "create:block/copper_casing"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
||||||
|
|
@ -65,10 +66,10 @@
|
||||||
],
|
],
|
||||||
"display": {
|
"display": {
|
||||||
"thirdperson_righthand": {
|
"thirdperson_righthand": {
|
||||||
"translation": [0, 1.75, 0]
|
"translation": [0, 2, 0]
|
||||||
},
|
},
|
||||||
"thirdperson_lefthand": {
|
"thirdperson_lefthand": {
|
||||||
"translation": [0, 1.75, 0]
|
"translation": [0, 2, 0]
|
||||||
},
|
},
|
||||||
"firstperson_righthand": {
|
"firstperson_righthand": {
|
||||||
"rotation": [5, 4, 5],
|
"rotation": [5, 4, 5],
|
||||||
|
|
@ -85,7 +86,7 @@
|
||||||
},
|
},
|
||||||
"gui": {
|
"gui": {
|
||||||
"rotation": [64, 47, -47],
|
"rotation": [64, 47, -47],
|
||||||
"translation": [0.5, 0, 0],
|
"translation": [0.25, -0.25, 0],
|
||||||
"scale": [0.86, 0.86, 0.86]
|
"scale": [0.86, 0.86, 0.86]
|
||||||
},
|
},
|
||||||
"head": {
|
"head": {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
|
"parent": "create:item/potato_cannon/item",
|
||||||
"texture_size": [32, 32],
|
"texture_size": [32, 32],
|
||||||
"textures": {
|
"textures": {
|
||||||
"1": "create:item/potato_cannon",
|
"1": "create:item/potato_cannon",
|
||||||
|
|
@ -57,9 +58,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"from": [7, 4, 14.5],
|
"from": [7, 5, 14.5],
|
||||||
"to": [9, 6, 15.5],
|
"to": [9, 7, 15.5],
|
||||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7.6, 11]},
|
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8.6, 11]},
|
||||||
"faces": {
|
"faces": {
|
||||||
"east": {"uv": [0.5, 10, 1, 11], "texture": "#1"},
|
"east": {"uv": [0.5, 10, 1, 11], "texture": "#1"},
|
||||||
"west": {"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],
|
"from": [6.5, 4.5, 8.5],
|
||||||
"to": [9.5, 6.5, 14.5],
|
"to": [9.5, 7.5, 14.5],
|
||||||
"rotation": {"angle": -45, "axis": "z", "origin": [8, 5, 11.5]},
|
"rotation": {"angle": -45, "axis": "z", "origin": [8, 6, 11.5]},
|
||||||
"faces": {
|
"faces": {
|
||||||
"north": {"uv": [3, 6, 4.5, 7.5], "rotation": 90, "texture": "#1"},
|
"north": {"uv": [3, 6, 4.5, 7.5], "rotation": 90, "texture": "#1"},
|
||||||
"east": {"uv": [6, 9.25, 3, 10.75], "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],
|
"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": {
|
"faces": {
|
||||||
"north": {"uv": [1.25, 8, 0.25, 11], "texture": "#1"},
|
"north": {"uv": [1.25, 8.5, 0.25, 11], "texture": "#1"},
|
||||||
"east": {"uv": [2, 8, 1, 11], "texture": "#1"},
|
"east": {"uv": [2, 8.5, 1, 11], "texture": "#1"},
|
||||||
"south": {"uv": [3, 8, 2, 11], "texture": "#1"},
|
"south": {"uv": [3, 8.5, 2, 11], "texture": "#1"},
|
||||||
"west": {"uv": [1, 8, 2, 11], "texture": "#1"},
|
"west": {"uv": [1, 8.5, 2, 11], "texture": "#1"},
|
||||||
"up": {"uv": [2, 7, 3, 8], "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"}
|
"down": {"uv": [1.5, 10.75, 2.5, 11], "rotation": 90, "texture": "#1"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"display": {
|
"display": {
|
||||||
"thirdperson_righthand": {
|
"thirdperson_righthand": {
|
||||||
"translation": [0, 1.75, 0]
|
"translation": [0, 2, 0]
|
||||||
},
|
},
|
||||||
"thirdperson_lefthand": {
|
"thirdperson_lefthand": {
|
||||||
"translation": [0, 1.75, 0]
|
"translation": [0, 2, 0]
|
||||||
},
|
},
|
||||||
"firstperson_righthand": {
|
"firstperson_righthand": {
|
||||||
"rotation": [5, 4, 5],
|
"rotation": [5, 4, 5],
|
||||||
|
|
@ -116,7 +117,7 @@
|
||||||
},
|
},
|
||||||
"gui": {
|
"gui": {
|
||||||
"rotation": [64, 47, -47],
|
"rotation": [64, 47, -47],
|
||||||
"translation": [0.5, 0, 0],
|
"translation": [0.25, -0.25, 0],
|
||||||
"scale": [0.86, 0.86, 0.86]
|
"scale": [0.86, 0.86, 0.86]
|
||||||
},
|
},
|
||||||
"head": {
|
"head": {
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 587 B After Width: | Height: | Size: 618 B |
Binary file not shown.
|
Before Width: | Height: | Size: 271 B After Width: | Height: | Size: 388 B |
Binary file not shown.
|
Before Width: | Height: | Size: 282 B After Width: | Height: | Size: 303 B |
Binary file not shown.
|
After Width: | Height: | Size: 266 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 458 B After Width: | Height: | Size: 443 B |
Binary file not shown.
|
Before Width: | Height: | Size: 482 B After Width: | Height: | Size: 522 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 269 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 295 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 296 B |
Binary file not shown.
|
Before Width: | Height: | Size: 222 B After Width: | Height: | Size: 329 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 298 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 286 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 288 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 291 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 292 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 301 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 306 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 307 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 299 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 256 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 300 B |
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 278 B |
Binary file not shown.
|
Before Width: | Height: | Size: 632 B After Width: | Height: | Size: 673 B |
Binary file not shown.
|
Before Width: | Height: | Size: 757 B After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
Loading…
Reference in a new issue