From 6511cbcd7b96881ddd48001e62ba53ca07d1f4c0 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue, 7 Jul 2020 16:03:49 +0200 Subject: [PATCH] Belt casing overhaul - Sideways and Vertical belts can now be reinforced with casing - Belts can now be reinforced with andesite casing - Reinforcing belts no longer consumes the casing block - Reworked reinforced belt models - Fixed flipped diagonal belt casing once again - Fixed belts breaking instantly when punched in survival mode --- src/generated/resources/.cache/cache | 4 +- .../assets/create/blockstates/belt.json | 96 ++++++------ .../create/blockstates/radial_chassis.json | 72 ++++----- .../java/com/simibubi/create/AllBlocks.java | 31 ++-- .../com/simibubi/create/AllSpriteShifts.java | 1 + .../contraptions/relays/belt/BeltBlock.java | 65 +++------ .../relays/belt/BeltGenerator.java | 12 +- .../contraptions/relays/belt/BeltModel.java | 74 ++++++++++ .../contraptions/relays/belt/BeltShapes.java | 2 + .../relays/belt/BeltTileEntity.java | 44 ++++++ .../block/belt_casing/diagonal_end.json | 110 ++++++++------ .../block/belt_casing/diagonal_middle.json | 62 ++------ .../block/belt_casing/diagonal_pulley.json | 55 ++++--- .../block/belt_casing/diagonal_start.json | 138 ++++++++++-------- .../block/belt_casing/horizontal_end.json | 80 +++++----- .../block/belt_casing/horizontal_middle.json | 17 +-- .../block/belt_casing/horizontal_pulley.json | 67 +++------ .../block/belt_casing/horizontal_start.json | 88 ++++++----- .../block/belt_casing/sideways_end.json | 124 +++++++++++++++- .../block/belt_casing/sideways_middle.json | 31 +++- .../block/belt_casing/sideways_pulley.json | 111 +++++++++++++- .../block/belt_casing/sideways_start.json | 124 +++++++++++++++- .../block/belt_casing/vertical_end.json | 5 - .../block/belt_casing/vertical_middle.json | 5 - .../block/belt_casing/vertical_pulley.json | 5 - .../block/belt_casing/vertical_start.json | 5 - .../textures/block/andesite_casing_belt.png | Bin 0 -> 1483 bytes .../assets/create/textures/block/axis_top.png | Bin 318 -> 215 bytes .../textures/block/brass_casing_belt.png | Bin 0 -> 1164 bytes 29 files changed, 916 insertions(+), 512 deletions(-) create mode 100644 src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java delete mode 100644 src/main/resources/assets/create/models/block/belt_casing/vertical_end.json delete mode 100644 src/main/resources/assets/create/models/block/belt_casing/vertical_middle.json delete mode 100644 src/main/resources/assets/create/models/block/belt_casing/vertical_pulley.json delete mode 100644 src/main/resources/assets/create/models/block/belt_casing/vertical_start.json create mode 100644 src/main/resources/assets/create/textures/block/andesite_casing_belt.png create mode 100644 src/main/resources/assets/create/textures/block/brass_casing_belt.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 4650a1bad..b89ffae8f 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -16,7 +16,7 @@ a579c40c43dc2174afb66f42d00d0c4a0efaaeee assets\create\blockstates\andesite_bric 82bd82270aff7d51e9239680ef4dd7b5c899ceb0 assets\create\blockstates\andesite_cobblestone_wall.json 398922758a6219544e5b85c91c9cf8a543b437e5 assets\create\blockstates\andesite_pillar.json f9fa6aa530eb0891a74eadfbebc663172a57147a assets\create\blockstates\basin.json -0051a90014873a4967d74a2be92675ff1826d94a assets\create\blockstates\belt.json +39dc813be2049a42475f93d12f9f2e356139cf1b assets\create\blockstates\belt.json 9bbc9a2dc2428175ae0cadf7537ed6815e3e241d assets\create\blockstates\belt_funnel.json 40d10934934ea142d71fc6ce598b1455c3ad47b4 assets\create\blockstates\belt_observer.json 4325605fbdea60d5f54286c309c825bebcd74b95 assets\create\blockstates\belt_tunnel.json @@ -282,7 +282,7 @@ b7829c2ef2c47188713f8cab21b2c9bc7f9c5b79 assets\create\blockstates\portable_stor e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets\create\blockstates\powered_toggle_latch.json 3a739f9d4276828d83f2d2750bf3227c87bcd438 assets\create\blockstates\pulley_magnet.json 469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets\create\blockstates\pulse_repeater.json -4439fc83a8c7370ab44b211a3fd48abde20a4728 assets\create\blockstates\radial_chassis.json +6fa36883e76e9e403bb429c8f86b8c0d3bba0cff assets\create\blockstates\radial_chassis.json 5e03eb759050c365f9f452ef0659f19a80e1e2f8 assets\create\blockstates\reality_funnel.json 8929677f2cc5354aa19ef182af69f9f0b41eb242 assets\create\blockstates\redstone_contact.json c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets\create\blockstates\redstone_link.json diff --git a/src/generated/resources/assets/create/blockstates/belt.json b/src/generated/resources/assets/create/blockstates/belt.json index 98e422395..2c9de12cc 100644 --- a/src/generated/resources/assets/create/blockstates/belt.json +++ b/src/generated/resources/assets/create/blockstates/belt.json @@ -131,7 +131,7 @@ "model": "create:block/belt/upward_start" }, "casing=true,facing=south,part=start,slope=upward": { - "model": "create:block/belt_casing/diagonal_end", + "model": "create:block/belt_casing/diagonal_start", "y": 180 }, "casing=false,facing=west,part=start,slope=upward": { @@ -139,7 +139,7 @@ "y": 90 }, "casing=true,facing=west,part=start,slope=upward": { - "model": "create:block/belt_casing/diagonal_end", + "model": "create:block/belt_casing/diagonal_start", "y": 270 }, "casing=false,facing=east,part=start,slope=upward": { @@ -191,7 +191,7 @@ "model": "create:block/belt/upward_end" }, "casing=true,facing=south,part=end,slope=upward": { - "model": "create:block/belt_casing/diagonal_start", + "model": "create:block/belt_casing/diagonal_end", "y": 180 }, "casing=false,facing=west,part=end,slope=upward": { @@ -199,7 +199,7 @@ "y": 90 }, "casing=true,facing=west,part=end,slope=upward": { - "model": "create:block/belt_casing/diagonal_start", + "model": "create:block/belt_casing/diagonal_end", "y": 270 }, "casing=false,facing=east,part=end,slope=upward": { @@ -245,7 +245,7 @@ "y": 180 }, "casing=true,facing=north,part=start,slope=downward": { - "model": "create:block/belt_casing/diagonal_start", + "model": "create:block/belt_casing/diagonal_end", "y": 180 }, "casing=false,facing=south,part=start,slope=downward": { @@ -267,7 +267,7 @@ "y": 270 }, "casing=true,facing=east,part=start,slope=downward": { - "model": "create:block/belt_casing/diagonal_start", + "model": "create:block/belt_casing/diagonal_end", "y": 270 }, "casing=false,facing=north,part=middle,slope=downward": { @@ -305,7 +305,7 @@ "y": 180 }, "casing=true,facing=north,part=end,slope=downward": { - "model": "create:block/belt_casing/diagonal_end", + "model": "create:block/belt_casing/diagonal_start", "y": 180 }, "casing=false,facing=south,part=end,slope=downward": { @@ -327,7 +327,7 @@ "y": 270 }, "casing=true,facing=east,part=end,slope=downward": { - "model": "create:block/belt_casing/diagonal_end", + "model": "create:block/belt_casing/diagonal_start", "y": 270 }, "casing=false,facing=north,part=pulley,slope=downward": { @@ -366,17 +366,18 @@ "y": 180 }, "casing=true,facing=north,part=start,slope=vertical": { - "model": "create:block/belt_casing/vertical_start", + "model": "create:block/belt_casing/sideways_end", "x": 90, - "y": 180 + "y": 270 }, "casing=false,facing=south,part=start,slope=vertical": { "model": "create:block/belt/horizontal_start", "x": 90 }, "casing=true,facing=south,part=start,slope=vertical": { - "model": "create:block/belt_casing/vertical_start", - "x": 90 + "model": "create:block/belt_casing/sideways_start", + "x": 90, + "y": 90 }, "casing=false,facing=west,part=start,slope=vertical": { "model": "create:block/belt/horizontal_end", @@ -384,9 +385,9 @@ "y": 90 }, "casing=true,facing=west,part=start,slope=vertical": { - "model": "create:block/belt_casing/vertical_start", + "model": "create:block/belt_casing/sideways_end", "x": 90, - "y": 90 + "y": 180 }, "casing=false,facing=east,part=start,slope=vertical": { "model": "create:block/belt/horizontal_start", @@ -394,9 +395,8 @@ "y": 270 }, "casing=true,facing=east,part=start,slope=vertical": { - "model": "create:block/belt_casing/vertical_start", - "x": 90, - "y": 270 + "model": "create:block/belt_casing/sideways_start", + "x": 90 }, "casing=false,facing=north,part=middle,slope=vertical": { "model": "create:block/belt/horizontal_middle", @@ -404,17 +404,18 @@ "y": 180 }, "casing=true,facing=north,part=middle,slope=vertical": { - "model": "create:block/belt_casing/vertical_middle", + "model": "create:block/belt_casing/sideways_middle", "x": 90, - "y": 180 + "y": 270 }, "casing=false,facing=south,part=middle,slope=vertical": { "model": "create:block/belt/horizontal_middle", "x": 90 }, "casing=true,facing=south,part=middle,slope=vertical": { - "model": "create:block/belt_casing/vertical_middle", - "x": 90 + "model": "create:block/belt_casing/sideways_middle", + "x": 90, + "y": 90 }, "casing=false,facing=west,part=middle,slope=vertical": { "model": "create:block/belt/horizontal_middle", @@ -422,9 +423,9 @@ "y": 90 }, "casing=true,facing=west,part=middle,slope=vertical": { - "model": "create:block/belt_casing/vertical_middle", + "model": "create:block/belt_casing/sideways_middle", "x": 90, - "y": 90 + "y": 180 }, "casing=false,facing=east,part=middle,slope=vertical": { "model": "create:block/belt/horizontal_middle", @@ -432,9 +433,8 @@ "y": 270 }, "casing=true,facing=east,part=middle,slope=vertical": { - "model": "create:block/belt_casing/vertical_middle", - "x": 90, - "y": 270 + "model": "create:block/belt_casing/sideways_middle", + "x": 90 }, "casing=false,facing=north,part=end,slope=vertical": { "model": "create:block/belt/horizontal_start", @@ -442,17 +442,18 @@ "y": 180 }, "casing=true,facing=north,part=end,slope=vertical": { - "model": "create:block/belt_casing/vertical_end", + "model": "create:block/belt_casing/sideways_start", "x": 90, - "y": 180 + "y": 270 }, "casing=false,facing=south,part=end,slope=vertical": { "model": "create:block/belt/horizontal_end", "x": 90 }, "casing=true,facing=south,part=end,slope=vertical": { - "model": "create:block/belt_casing/vertical_end", - "x": 90 + "model": "create:block/belt_casing/sideways_end", + "x": 90, + "y": 90 }, "casing=false,facing=west,part=end,slope=vertical": { "model": "create:block/belt/horizontal_start", @@ -460,9 +461,9 @@ "y": 90 }, "casing=true,facing=west,part=end,slope=vertical": { - "model": "create:block/belt_casing/vertical_end", + "model": "create:block/belt_casing/sideways_start", "x": 90, - "y": 90 + "y": 180 }, "casing=false,facing=east,part=end,slope=vertical": { "model": "create:block/belt/horizontal_end", @@ -470,9 +471,8 @@ "y": 270 }, "casing=true,facing=east,part=end,slope=vertical": { - "model": "create:block/belt_casing/vertical_end", - "x": 90, - "y": 270 + "model": "create:block/belt_casing/sideways_end", + "x": 90 }, "casing=false,facing=north,part=pulley,slope=vertical": { "model": "create:block/belt/horizontal_middle", @@ -480,17 +480,18 @@ "y": 180 }, "casing=true,facing=north,part=pulley,slope=vertical": { - "model": "create:block/belt_casing/vertical_pulley", + "model": "create:block/belt_casing/sideways_pulley", "x": 90, - "y": 180 + "y": 270 }, "casing=false,facing=south,part=pulley,slope=vertical": { "model": "create:block/belt/horizontal_middle", "x": 90 }, "casing=true,facing=south,part=pulley,slope=vertical": { - "model": "create:block/belt_casing/vertical_pulley", - "x": 90 + "model": "create:block/belt_casing/sideways_pulley", + "x": 90, + "y": 90 }, "casing=false,facing=west,part=pulley,slope=vertical": { "model": "create:block/belt/horizontal_middle", @@ -498,9 +499,9 @@ "y": 90 }, "casing=true,facing=west,part=pulley,slope=vertical": { - "model": "create:block/belt_casing/vertical_pulley", + "model": "create:block/belt_casing/sideways_pulley", "x": 90, - "y": 90 + "y": 180 }, "casing=false,facing=east,part=pulley,slope=vertical": { "model": "create:block/belt/horizontal_middle", @@ -508,9 +509,8 @@ "y": 270 }, "casing=true,facing=east,part=pulley,slope=vertical": { - "model": "create:block/belt_casing/vertical_pulley", - "x": 90, - "y": 270 + "model": "create:block/belt_casing/sideways_pulley", + "x": 90 }, "casing=false,facing=north,part=start,slope=sideways": { "model": "create:block/belt/sideways_end", @@ -518,7 +518,7 @@ "y": 180 }, "casing=true,facing=north,part=start,slope=sideways": { - "model": "create:block/belt_casing/sideways_start", + "model": "create:block/belt_casing/sideways_end", "x": 180, "y": 180 }, @@ -534,7 +534,7 @@ "y": 90 }, "casing=true,facing=west,part=start,slope=sideways": { - "model": "create:block/belt_casing/sideways_start", + "model": "create:block/belt_casing/sideways_end", "x": 180, "y": 90 }, @@ -586,7 +586,7 @@ "y": 180 }, "casing=true,facing=north,part=end,slope=sideways": { - "model": "create:block/belt_casing/sideways_end", + "model": "create:block/belt_casing/sideways_start", "x": 180, "y": 180 }, @@ -602,7 +602,7 @@ "y": 90 }, "casing=true,facing=west,part=end,slope=sideways": { - "model": "create:block/belt_casing/sideways_end", + "model": "create:block/belt_casing/sideways_start", "x": 180, "y": 90 }, diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 8bd829ffc..f97d8c8bc 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -89,8 +89,8 @@ }, { "when": { - "axis": "x", - "sticky_west": "true" + "sticky_west": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -99,8 +99,8 @@ }, { "when": { - "axis": "y", - "sticky_west": "true" + "sticky_west": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -109,8 +109,8 @@ }, { "when": { - "axis": "z", - "sticky_west": "true" + "sticky_west": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky", @@ -119,8 +119,8 @@ }, { "when": { - "axis": "x", - "sticky_west": "false" + "sticky_west": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -129,8 +129,8 @@ }, { "when": { - "axis": "y", - "sticky_west": "false" + "sticky_west": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -139,8 +139,8 @@ }, { "when": { - "axis": "z", - "sticky_west": "false" + "sticky_west": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z", @@ -149,8 +149,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "true" + "sticky_north": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky" @@ -158,8 +158,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "true" + "sticky_north": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -168,8 +168,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "true" + "sticky_north": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -178,8 +178,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "false" + "sticky_north": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x" @@ -187,8 +187,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "false" + "sticky_north": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -197,8 +197,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "false" + "sticky_north": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -207,8 +207,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "true" + "sticky_east": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -217,8 +217,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "true" + "sticky_east": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -227,8 +227,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "true" + "sticky_east": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky" @@ -236,8 +236,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "false" + "sticky_east": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -246,8 +246,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "false" + "sticky_east": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -256,8 +256,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "false" + "sticky_east": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z" diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 888df337b..05099f5e7 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -62,6 +62,7 @@ import com.simibubi.create.content.contraptions.relays.advanced.sequencer.Sequen import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; import com.simibubi.create.content.contraptions.relays.belt.BeltColor; import com.simibubi.create.content.contraptions.relays.belt.BeltGenerator; +import com.simibubi.create.content.contraptions.relays.belt.BeltModel; import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem; import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; @@ -267,9 +268,11 @@ public class AllBlocks { public static final BlockEntry BELT = REGISTRATE.block("belt", BeltBlock::new) .initialProperties(SharedProperties.beltMaterial, MaterialColor.GRAY) .properties(p -> p.sound(SoundType.CLOTH)) + .properties(p -> p.hardnessAndResistance(0.8F)) + .blockstate(new BeltGenerator()::generate) .transform(StressConfigDefaults.setImpact(1.0)) .onRegister(CreateRegistrate.blockColors(() -> BeltColor::new)) - .blockstate(new BeltGenerator()::generate) + .onRegister(CreateRegistrate.blockModel(() -> BeltModel::new)) .register(); public static final BlockEntry CREATIVE_MOTOR = @@ -390,14 +393,14 @@ public class AllBlocks { .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.standardModel(ctx, prov))) .simpleItem() .register(); - + public static final BlockEntry DEPOT = REGISTRATE.block("depot", DepotBlock::new) .initialProperties(SharedProperties::stone) .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) .item() .transform(customItemModel("_", "block")) .register(); - + public static final BlockEntry CHUTE = REGISTRATE.block("chute", ChuteBlock::new) .initialProperties(SharedProperties::softMetal) .addLayer(() -> RenderType::getCutoutMipped) @@ -686,13 +689,12 @@ public class AllBlocks { .transform(customItemModel()) .register(); - // Logistics static { REGISTRATE.startSection(AllSections.LOGISTICS); } - + public static final BlockEntry MECHANICAL_ARM = REGISTRATE.block("mechanical_arm", ArmBlock::new) .initialProperties(SharedProperties::softMetal) .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) @@ -700,7 +702,7 @@ public class AllBlocks { .item(ArmItem::new) .transform(customItemModel()) .register(); - + public static final BlockEntry REALITY_FUNNEL = REGISTRATE.block("reality_funnel", RealityFunnelBlock::new) .initialProperties(SharedProperties::softMetal) @@ -708,18 +710,19 @@ public class AllBlocks { .item(FunnelItem::new) .transform(customItemModel()) .register(); - + public static final BlockEntry BELT_FUNNEL = REGISTRATE.block("belt_funnel", BeltFunnelBlock::new) .initialProperties(SharedProperties::softMetal) .blockstate(new BeltFunnelGenerator()::generate) .loot((p, b) -> p.registerDropping(b, REALITY_FUNNEL.get())) .register(); - - public static final BlockEntry CHUTE_FUNNEL = REGISTRATE.block("chute_funnel", ChuteFunnelBlock::new) - .initialProperties(SharedProperties::softMetal) - .blockstate(new ChuteFunnelGenerator()::generate) - .loot((p, b) -> p.registerDropping(b, REALITY_FUNNEL.get())) - .register(); + + public static final BlockEntry CHUTE_FUNNEL = + REGISTRATE.block("chute_funnel", ChuteFunnelBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new ChuteFunnelGenerator()::generate) + .loot((p, b) -> p.registerDropping(b, REALITY_FUNNEL.get())) + .register(); public static final BlockEntry REDSTONE_CONTACT = REGISTRATE.block("redstone_contact", RedstoneContactBlock::new) @@ -787,7 +790,7 @@ public class AllBlocks { .item() .transform(customItemModel()) .register(); - + public static final BlockEntry PACKAGER = REGISTRATE.block("packager", PackagerBlock::new) .initialProperties(SharedProperties::softMetal) .transform(StressConfigDefaults.setImpact(4.0)) diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index d9f4f15ba..6ff0d05fe 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -51,6 +51,7 @@ public class AllSpriteShifts { public static final SpriteShiftEntry BELT = SpriteShifter.get("block/belt", "block/belt_animated"), + ANDESIDE_BELT_CASING = SpriteShifter.get("block/brass_casing_belt", "block/andesite_casing_belt"), CRAFTER_THINGIES = SpriteShifter.get("block/crafter_thingies", "block/crafter_thingies"); static { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java index e37e85ded..59b7be968 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java @@ -11,6 +11,7 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity.CasingType; import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement; @@ -121,9 +122,6 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE getDrops(BlockState state, net.minecraft.world.storage.loot.LootContext.Builder builder) { List drops = super.getDrops(state, builder); - if (state.get(CASING)) - drops.addAll(AllBlocks.BRASS_CASING.getDefaultState() - .getDrops(builder)); TileEntity tileEntity = builder.get(LootParameters.BLOCK_ENTITY); if (tileEntity instanceof BeltTileEntity && ((BeltTileEntity) tileEntity).hasPulley()) drops.addAll(AllBlocks.SHAFT.getDefaultState() @@ -222,22 +220,19 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE { + withTileEntityDo(world, pos, te -> { DyeColor dyeColor = DyeColor.getColor(heldItem); if (dyeColor == null) return; @@ -248,7 +243,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE { - player.inventory.placeItemBackInInventory(worldIn, transportedItemStack.stack); + player.inventory.placeItemBackInInventory(world, transportedItemStack.stack); return Collections.emptyList(); }); } @@ -268,25 +263,26 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE te.setCasingType(CasingType.BRASS)); + return ActionResultType.SUCCESS; + } + + if (AllBlocks.ANDESITE_CASING.isIn(heldItem)) { + if (world.isRemote) + return ActionResultType.SUCCESS; + withTileEntityDo(world, pos, te -> te.setCasingType(CasingType.ANDESITE)); return ActionResultType.SUCCESS; } @@ -297,13 +293,12 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE te.setCasingType(CasingType.NONE)); return ActionResultType.SUCCESS; } @@ -417,8 +412,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE required = new ArrayList<>(); if (state.get(PART) != Part.MIDDLE) required.add(AllBlocks.SHAFT.asStack()); - if (state.get(CASING)) - required.add(AllBlocks.BRASS_CASING.asStack()); if (state.get(PART) == Part.START) required.add(AllItems.BELT_CONNECTOR.asStack()); if (required.isEmpty()) diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java index 09c09d07f..e2e25b46b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java @@ -9,7 +9,6 @@ import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; -import net.minecraft.util.Direction.Axis; import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ModelFile; @@ -30,8 +29,9 @@ public class BeltGenerator extends SpecialBlockStateGen { Slope slope = state.get(BeltBlock.SLOPE); boolean flip = casing && slope == Slope.UPWARD; + boolean rotate = casing && slope == Slope.VERTICAL; Direction direction = state.get(BeltBlock.HORIZONTAL_FACING); - return horizontalAngle(direction) + (flip ? 180 : 0); + return horizontalAngle(direction) + (flip ? 180 : 0) + (rotate ? 90 : 0); } @Override @@ -41,7 +41,8 @@ public class BeltGenerator extends SpecialBlockStateGen { BeltBlock.Part part = state.get(BeltBlock.PART); Direction direction = state.get(BeltBlock.HORIZONTAL_FACING); Slope slope = state.get(BeltBlock.SLOPE); - boolean diagonal = slope == Slope.UPWARD || slope == Slope.DOWNWARD; + boolean downward = slope == Slope.DOWNWARD; + boolean diagonal = slope == Slope.UPWARD || downward; boolean vertical = slope == Slope.VERTICAL; boolean pulley = part == Part.PULLEY; boolean sideways = slope == Slope.SIDEWAYS; @@ -50,12 +51,13 @@ public class BeltGenerator extends SpecialBlockStateGen { if (!casing && pulley) part = Part.MIDDLE; - if ((!casing && vertical && negative || casing && diagonal && negative == (direction.getAxis() == Axis.X) - || !casing && sideways && negative) && part != Part.MIDDLE && !pulley) + if ((vertical && negative || casing && downward || sideways && negative) && part != Part.MIDDLE && !pulley) part = part == Part.END ? Part.START : Part.END; if (!casing && vertical) slope = Slope.HORIZONTAL; + if (casing && vertical) + slope = Slope.SIDEWAYS; String path = "block/" + (casing ? "belt_casing/" : "belt/"); String slopeName = slope.getName(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java new file mode 100644 index 000000000..c4d6a592d --- /dev/null +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java @@ -0,0 +1,74 @@ +package com.simibubi.create.content.contraptions.relays.belt; + +import static com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity.CASING_PROPERTY; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; + +import com.simibubi.create.AllSpriteShifts; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity.CasingType; +import com.simibubi.create.foundation.block.render.SpriteShiftEntry; +import com.simibubi.create.foundation.utility.SuperByteBuffer; + +import net.minecraft.block.BlockState; +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.Direction; +import net.minecraftforge.client.model.BakedModelWrapper; +import net.minecraftforge.client.model.data.IModelData; + +public class BeltModel extends BakedModelWrapper { + + public BeltModel(IBakedModel template) { + super(template); + } + + @Override + public List getQuads(BlockState state, Direction side, Random rand, IModelData extraData) { + List quads = new ArrayList<>(super.getQuads(state, side, rand, extraData)); + if (!extraData.hasProperty(CASING_PROPERTY)) + return quads; + CasingType type = extraData.getData(CASING_PROPERTY); + if (type == CasingType.NONE || type == CasingType.BRASS) + return quads; + + SpriteShiftEntry spriteShift = AllSpriteShifts.ANDESIDE_BELT_CASING; + + for (int i = 0; i < quads.size(); i++) { + BakedQuad quad = quads.get(i); + if (spriteShift == null) + continue; + if (quad.getSprite() != spriteShift.getOriginal()) + continue; + + TextureAtlasSprite original = quad.getSprite(); + TextureAtlasSprite target = spriteShift.getTarget(); + BakedQuad newQuad = new BakedQuad(Arrays.copyOf(quad.getVertexData(), quad.getVertexData().length), + quad.getTintIndex(), quad.getFace(), target, quad.shouldApplyDiffuseLighting()); + + VertexFormat format = DefaultVertexFormats.BLOCK; + int[] vertexData = newQuad.getVertexData(); + + for (int vertex = 0; vertex < vertexData.length; vertex += format.getIntegerSize()) { + int uvOffset = 16 / 4; + int uIndex = vertex + uvOffset; + int vIndex = vertex + uvOffset + 1; + float u = Float.intBitsToFloat(vertexData[uIndex]); + float v = Float.intBitsToFloat(vertexData[vIndex]); + vertexData[uIndex] = + Float.floatToRawIntBits(target.getInterpolatedU((SuperByteBuffer.getUnInterpolatedU(original, u)))); + vertexData[vIndex] = + Float.floatToRawIntBits(target.getInterpolatedV((SuperByteBuffer.getUnInterpolatedV(original, v)))); + } + + quads.set(i, newQuad); + } + return quads; + } + +} diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java index 61394a2b1..49005ee9f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java @@ -228,6 +228,8 @@ public class BeltShapes { if (slope == Slope.VERTICAL) return VoxelShapes.empty(); + if (slope == Slope.SIDEWAYS) + return VoxelShapes.empty(); if (slope == Slope.HORIZONTAL) { return AllShapes.CASING_11PX.get(Direction.UP); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java index d04364db7..929863ac6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java @@ -27,6 +27,7 @@ import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.DirectBeltInputBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour; import com.simibubi.create.foundation.utility.ColorHelper; +import com.simibubi.create.foundation.utility.NBTHelper; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; @@ -43,6 +44,9 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; +import net.minecraftforge.client.model.data.IModelData; +import net.minecraftforge.client.model.data.ModelDataMap; +import net.minecraftforge.client.model.data.ModelProperty; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; @@ -55,6 +59,7 @@ public class BeltTileEntity extends KineticTileEntity { public int beltLength; public int index; public Direction lastInsert; + public CasingType casing; protected BlockPos controller; protected BeltInventory inventory; @@ -62,10 +67,15 @@ public class BeltTileEntity extends KineticTileEntity { public CompoundNBT trackerUpdateTag; + public static enum CasingType { + NONE, ANDESITE, BRASS; + } + public BeltTileEntity(TileEntityType type) { super(type); controller = BlockPos.ZERO; itemHandler = LazyOptional.empty(); + casing = CasingType.NONE; color = -1; } @@ -176,12 +186,24 @@ public class BeltTileEntity extends KineticTileEntity { compound.putInt("Color", color); compound.putInt("Length", beltLength); compound.putInt("Index", index); + NBTHelper.writeEnum(compound, "Casing", casing); if (isController()) compound.put("Inventory", getInventory().write()); return super.write(compound); } + @Override + public void readClientUpdate(CompoundNBT tag) { + CasingType casingBefore = casing; + super.readClientUpdate(tag); + if (casingBefore != casing) { + requestModelDataUpdate(); + if (hasWorld()) + world.notifyBlockUpdate(getPos(), getBlockState(), getBlockState(), 16); + } + } + @Override public void read(CompoundNBT compound) { super.read(compound); @@ -200,6 +222,8 @@ public class BeltTileEntity extends KineticTileEntity { if (isController()) getInventory().read(compound.getCompound("Inventory")); + + casing = NBTHelper.readEnum(compound, "Casing", CasingType.class); } @Override @@ -353,6 +377,18 @@ public class BeltTileEntity extends KineticTileEntity { return BeltHelper.getVectorForOffset(controllerTE, transported.beltPosition); } + public void setCasingType(CasingType type) { + if (casing == type) + return; + casing = type; + boolean shouldBlockHaveCasing = type != CasingType.NONE; + BlockState blockState = getBlockState(); + if (blockState.get(BeltBlock.CASING) != shouldBlockHaveCasing) + KineticTileEntity.switchToBlockState(world, pos, blockState.with(BeltBlock.CASING, shouldBlockHaveCasing)); + markDirty(); + sendData(); + } + /** * always target a DirectBeltInsertionBehaviour */ @@ -402,4 +438,12 @@ public class BeltTileEntity extends KineticTileEntity { return empty; } + public static ModelProperty CASING_PROPERTY = new ModelProperty<>(); + + @Override + public IModelData getModelData() { + return new ModelDataMap.Builder().withInitial(CASING_PROPERTY, casing) + .build(); + } + } diff --git a/src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json b/src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json index 6b14c21f2..fba079751 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json +++ b/src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json @@ -2,10 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/belt_support_side", - "2": "create:block/brass_casing_side", + "4": "create:block/brass_casing_belt", "8": "create:block/gearbox", - "particle": "create:block/brass_casing_side" + "particle": "create:block/brass_casing" }, "elements": [ { @@ -14,9 +13,7 @@ "to": [14.9, 11, 12], "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 15, 6], "texture": "#1"}, "east": {"uv": [4, 5, 14, 12], "texture": "#8"}, - "south": {"uv": [0, 0, 15, 6], "texture": "#1"}, "west": {"uv": [2, 5, 12, 12], "texture": "#8"} } }, @@ -30,56 +27,73 @@ "west": {"uv": [6, 3, 10, 5], "texture": "#8"} } }, - { - "name": "Zfighter2", - "from": [0.5, 0.1, -0.1], - "to": [15.5, 11.1, 0.9], - "faces": { - "north": {"uv": [0, 0, 15, 10.8], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 10.8], "texture": "#2"}, - "west": {"uv": [12, 0, 13, 10.8], "texture": "#2"}, - "up": {"uv": [0, 0, 15, 1], "rotation": 180, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 15], "rotation": 270, "texture": "#2"} - } - }, - { - "name": "Right", - "from": [0, 0, 0], - "to": [16, 11, 5], - "faces": { - "north": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "east": {"uv": [12, 0, 16, 11], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 11], "texture": "#2"}, - "west": {"uv": [0, 0, 4, 11], "texture": "#2"}, - "up": {"uv": [12, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "down": {"uv": [12, 0, 16, 16], "rotation": 270, "texture": "#2"} - } - }, - { - "name": "Down", - "from": [0, 0, 5], - "to": [16, 5.1, 11], - "faces": { - "east": {"uv": [4, 5.9, 10, 11], "texture": "#2"}, - "south": {"uv": [0, 6, 16, 11], "texture": "#2"}, - "west": {"uv": [4, 5.9, 10, 11], "texture": "#2"}, - "up": {"uv": [0, 2, 16, 8], "rotation": 180, "texture": "#2"}, - "down": {"uv": [4, 0, 10, 16], "rotation": 270, "texture": "#2"} - } - }, { "name": "Top Diagonal", "from": [-0.1, 2, 11.303], "to": [16.1, 11, 19.328], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "east": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "south": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "west": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "up": {"uv": [0, 0, 8.025, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 8.025, 16], "rotation": 90, "texture": "#2"} + "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "east": {"uv": [8, 8, 12.025, 12.5], "texture": "#4"}, + "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "west": {"uv": [12, 8, 16, 12.5], "texture": "#4"}, + "up": {"uv": [12, 0, 16, 8], "rotation": 90, "texture": "#4"}, + "down": {"uv": [12, 0, 16, 8], "rotation": 90, "texture": "#4"} } + }, + { + "name": "Left", + "from": [0, 0, 0], + "to": [16, 3, 4], + "faces": { + "north": {"uv": [0, 12, 8, 13.5], "texture": "#4"}, + "east": {"uv": [6, 12, 8, 13.5], "texture": "#4"}, + "west": {"uv": [0, 12, 2, 13.5], "texture": "#4"}, + "up": {"uv": [8, 3, 16, 5], "texture": "#4"}, + "down": {"uv": [6, 0, 8, 8], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "Left", + "from": [0, 3, 0], + "to": [1, 11, 4], + "faces": { + "north": {"uv": [7.5, 8, 8, 12], "texture": "#4"}, + "east": {"uv": [6, 8, 8, 12], "texture": "#4"}, + "south": {"uv": [0, 8, 0.5, 12], "texture": "#4"}, + "west": {"uv": [0, 8, 2, 12], "texture": "#4"}, + "up": {"uv": [0, 7.5, 2, 8], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "Left", + "from": [15, 3, 0], + "to": [16, 11, 4], + "faces": { + "north": {"uv": [8, 8, 7.5, 12], "texture": "#4"}, + "east": {"uv": [2, 8, 0, 12], "texture": "#4"}, + "south": {"uv": [0.5, 8, 0, 12], "texture": "#4"}, + "west": {"uv": [8, 8, 6, 12], "texture": "#4"}, + "up": {"uv": [0, 8, 2, 7.5], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "Down", + "from": [0, 0, 4], + "to": [16, 5, 12], + "faces": { + "east": {"uv": [2, 11, 6, 13.5], "texture": "#4"}, + "west": {"uv": [2, 11, 6, 13.5], "texture": "#4"}, + "up": {"uv": [8, 2, 16, 6], "texture": "#4"}, + "down": {"uv": [10, 0, 14, 8], "rotation": 90, "texture": "#4"} + } + } + ], + "groups": [0, 1, 2, + { + "name": "horizontal_start", + "origin": [8, 8, 8], + "children": [3, 4, 5, 6] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json b/src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json index 4f16acd03..30eacb4eb 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json +++ b/src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json @@ -2,58 +2,21 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "particle": "create:block/brass_casing_side", - "2": "create:block/brass_casing_side", - "8": "create:block/gearbox" + "4": "create:block/brass_casing_belt", + "particle": "create:block/brass_casing" }, "elements": [ - { - "name": "Casing", - "from": [1.1, 11, 6], - "to": [14.9, 13, 10], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [6, 3, 10, 5], "texture": "#8"}, - "west": {"uv": [6, 3, 10, 5], "texture": "#8"} - } - }, - { - "name": "Left", - "from": [0, 0, 0], - "to": [16, 10, 5], - "faces": { - "north": {"uv": [0, 0, 10, 16], "rotation": 90, "texture": "#2"}, - "east": {"uv": [11, 1, 16, 11], "texture": "#2"}, - "south": {"uv": [0, 1, 16, 11], "texture": "#2"}, - "west": {"uv": [0, 1, 5, 11], "texture": "#2"}, - "up": {"uv": [0, 0, 5, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 5, 16], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "Down", - "from": [0, 0, 5], - "to": [16, 5.1, 11], - "faces": { - "north": {"uv": [0, 6, 16, 11], "texture": "#2"}, - "east": {"uv": [4, 5.9, 10, 11], "texture": "#2"}, - "west": {"uv": [4, 5.9, 10, 11], "texture": "#2"}, - "up": {"uv": [0, 2, 16, 8], "texture": "#2"}, - "down": {"uv": [4, 0, 10, 16], "rotation": 90, "texture": "#2"} - } - }, { "name": "Top Diagonal", "from": [-0.1, 2, -3.325], "to": [16.1, 11, 10], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "east": {"uv": [0, 0, 13.325, 9], "texture": "#2"}, - "south": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "west": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "up": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"} + "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "east": {"uv": [9.5, 8, 16, 12.5], "texture": "#4"}, + "west": {"uv": [8, 8, 14.5, 12.5], "texture": "#4"}, + "up": {"uv": [9.5, 0, 16, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [9.5, 0, 16, 8], "rotation": 270, "texture": "#4"} } }, { @@ -62,12 +25,11 @@ "to": [16.1, 11, 19.3], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "east": {"uv": [0, 0, 9.3, 9], "texture": "#2"}, - "south": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "west": {"uv": [0, 0, 9.3, 9], "texture": "#2"}, - "up": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"} + "east": {"uv": [8, 8, 13, 12.5], "texture": "#4"}, + "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "west": {"uv": [11, 8, 16, 12.5], "texture": "#4"}, + "up": {"uv": [8, 0, 12.5, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [8, 0, 12.5, 8], "rotation": 270, "texture": "#4"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json b/src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json index 86ce620c3..51ce62cfd 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json +++ b/src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json @@ -2,10 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "particle": "create:block/brass_casing_side", - "1": "create:block/belt_support_side", - "2": "create:block/brass_casing_side", - "8": "create:block/gearbox" + "4": "create:block/brass_casing_belt", + "8": "create:block/gearbox", + "particle": "create:block/brass_casing" }, "elements": [ { @@ -14,9 +13,7 @@ "to": [14.9, 11, 14], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 15, 6], "texture": "#1"}, "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "south": {"uv": [0, 0, 15, 6], "texture": "#1"}, "west": {"uv": [2, 5, 14, 11], "texture": "#8"} } }, @@ -35,24 +32,22 @@ "from": [0, 0, 0], "to": [16, 10, 5], "faces": { - "north": {"uv": [0, 0, 10, 16], "rotation": 90, "texture": "#2"}, - "east": {"uv": [11, 1, 16, 11], "texture": "#2"}, - "south": {"uv": [0, 1, 16, 11], "texture": "#2"}, - "west": {"uv": [0, 1, 5, 11], "texture": "#2"}, - "up": {"uv": [0, 0, 5, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 5, 16], "rotation": 90, "texture": "#2"} + "north": {"uv": [8, 0, 13, 8], "rotation": 90, "texture": "#4"}, + "east": {"uv": [5.5, 3, 8, 8], "texture": "#4"}, + "south": {"uv": [8, 1.5, 16, 6.5], "texture": "#4"}, + "west": {"uv": [0, 3, 2.5, 8], "texture": "#4"}, + "down": {"uv": [13.5, 0, 16, 8], "rotation": 90, "texture": "#4"} } }, { "name": "Down", "from": [0, 0, 5], - "to": [16, 5.1, 11], + "to": [16, 5, 11], "faces": { - "north": {"uv": [0, 6, 16, 11], "texture": "#2"}, - "east": {"uv": [4, 5.9, 10, 11], "texture": "#2"}, - "west": {"uv": [4, 5.9, 10, 11], "texture": "#2"}, - "up": {"uv": [0, 2, 16, 8], "texture": "#2"}, - "down": {"uv": [4, 0, 10, 16], "rotation": 90, "texture": "#2"} + "east": {"uv": [2.5, 5.5, 5.5, 8], "texture": "#4"}, + "west": {"uv": [2.5, 5.5, 5.5, 8], "texture": "#4"}, + "up": {"uv": [8, 2.5, 16, 5.5], "texture": "#4"}, + "down": {"uv": [10.5, 0, 13.5, 8], "rotation": 90, "texture": "#4"} } }, { @@ -61,12 +56,12 @@ "to": [16.1, 11, 4.7], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "east": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "south": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "west": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "up": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"} + "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "east": {"uv": [12, 8, 16, 12.5], "texture": "#4"}, + "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "west": {"uv": [8, 8, 12, 12.5], "texture": "#4"}, + "up": {"uv": [12, 0, 16, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [12, 0, 16, 8], "rotation": 270, "texture": "#4"} } }, { @@ -75,12 +70,12 @@ "to": [16.1, 11, 19.3], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "east": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "south": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "west": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "up": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"} + "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "east": {"uv": [8, 8, 12, 12.5], "texture": "#4"}, + "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "west": {"uv": [12, 8, 16, 12.5], "texture": "#4"}, + "up": {"uv": [8, 0, 12, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [8, 0, 12, 8], "rotation": 270, "texture": "#4"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json b/src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json index 252ffe61c..bbc8e8963 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json +++ b/src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json @@ -2,10 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "particle": "create:block/brass_casing_side", - "1": "create:block/belt_support_side", - "2": "create:block/brass_casing_side", - "8": "create:block/gearbox" + "4": "create:block/brass_casing_belt", + "8": "create:block/gearbox", + "particle": "create:block/brass_casing" }, "elements": [ { @@ -14,9 +13,7 @@ "to": [14.9, 11, 14], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 15, 6], "texture": "#1"}, "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "south": {"uv": [0, 0, 15, 6], "texture": "#1"}, "west": {"uv": [2, 5, 14, 11], "texture": "#8"} } }, @@ -30,69 +27,86 @@ "west": {"uv": [6, 3, 10, 5], "texture": "#8"} } }, - { - "name": "Left", - "from": [0, 0, 0], - "to": [16, 10, 5], - "faces": { - "north": {"uv": [0, 0, 10, 16], "rotation": 90, "texture": "#2"}, - "east": {"uv": [11, 1, 16, 11], "texture": "#2"}, - "south": {"uv": [0, 1, 16, 11], "texture": "#2"}, - "west": {"uv": [0, 1, 5, 11], "texture": "#2"}, - "up": {"uv": [0, 0, 5, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 5, 16], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "Zfighter2", - "from": [0.5, 0.1, 15.1], - "to": [15.5, 11.1, 16.1], - "faces": { - "east": {"uv": [12, 0, 13, 10.8], "texture": "#2"}, - "south": {"uv": [0, 0, 15, 10.8], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 10.8], "texture": "#2"}, - "up": {"uv": [0, 0, 15, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 15], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "Right", - "from": [0, 0, 11], - "to": [16, 11, 16], - "faces": { - "north": {"uv": [0, 0, 2, 11], "texture": "#2"}, - "east": {"uv": [0, 0, 4, 11], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "west": {"uv": [12, 0, 16, 11], "texture": "#2"}, - "up": {"uv": [12, 0, 16, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [12, 0, 16, 16], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "Down", - "from": [0, 0, 5], - "to": [16, 5.1, 11], - "faces": { - "north": {"uv": [0, 6, 16, 11], "texture": "#2"}, - "east": {"uv": [4, 5.9, 10, 11], "texture": "#2"}, - "west": {"uv": [4, 5.9, 10, 11], "texture": "#2"}, - "up": {"uv": [0, 2, 16, 8], "texture": "#2"}, - "down": {"uv": [4, 0, 10, 16], "rotation": 90, "texture": "#2"} - } - }, { "name": "Top Diagonal", "from": [-0.1, 2, -3.325], "to": [16.1, 11, 4.7], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "east": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "south": {"uv": [7, 0, 16, 16], "rotation": 270, "texture": "#2"}, - "west": {"uv": [0, 0, 8.025, 9], "texture": "#2"}, - "up": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 8.025, 16], "rotation": 270, "texture": "#2"} + "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "east": {"uv": [12, 8, 16, 12.5], "texture": "#4"}, + "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, + "west": {"uv": [8, 8, 12, 12.5], "texture": "#4"}, + "up": {"uv": [12, 0, 16, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [12, 0, 16, 8], "rotation": 270, "texture": "#4"} } + }, + { + "name": "Left", + "from": [0, 0, 12], + "to": [16, 3, 16], + "faces": { + "east": {"uv": [0, 12, 2, 13.5], "texture": "#4"}, + "south": {"uv": [0, 12, 8, 13.5], "texture": "#4"}, + "west": {"uv": [6, 12, 8, 13.5], "texture": "#4"}, + "up": {"uv": [8, 3, 16, 5], "rotation": 180, "texture": "#4"}, + "down": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"} + } + }, + { + "name": "Left", + "from": [15, 3, 12], + "to": [16, 11, 16], + "faces": { + "north": {"uv": [0, 8, 0.5, 12], "texture": "#4"}, + "east": {"uv": [0, 8, 2, 12], "texture": "#4"}, + "south": {"uv": [7.5, 8, 8, 12], "texture": "#4"}, + "west": {"uv": [6, 8, 8, 12], "texture": "#4"}, + "up": {"uv": [0, 7.5, 2, 8], "rotation": 270, "texture": "#4"} + } + }, + { + "name": "Left", + "from": [0, 3, 12], + "to": [1, 11, 16], + "faces": { + "north": {"uv": [0.5, 8, 0, 12], "texture": "#4"}, + "east": {"uv": [8, 8, 6, 12], "texture": "#4"}, + "south": {"uv": [8, 8, 7.5, 12], "texture": "#4"}, + "west": {"uv": [2, 8, 0, 12], "texture": "#4"}, + "up": {"uv": [0, 8, 2, 7.5], "rotation": 270, "texture": "#4"} + } + }, + { + "name": "Right", + "from": [0, 0, 0], + "to": [16, 11, 5], + "faces": { + "north": {"uv": [8, 0, 13.5, 8], "rotation": 90, "texture": "#4"}, + "east": {"uv": [5.5, 2.5, 8, 8], "texture": "#4"}, + "south": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, + "west": {"uv": [0, 8, 2.5, 13.5], "texture": "#4"}, + "up": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [8, 0, 10, 8], "rotation": 270, "texture": "#4"} + } + }, + { + "name": "Down", + "from": [0, 0, 5], + "to": [16, 5, 12], + "faces": { + "east": {"uv": [2, 11, 5.5, 13.5], "texture": "#4"}, + "west": {"uv": [2.5, 11, 6, 13.5], "texture": "#4"}, + "up": {"uv": [8, 2, 16, 5.5], "rotation": 180, "texture": "#4"}, + "down": {"uv": [10, 0, 14, 8], "rotation": 270, "texture": "#4"} + } + } + ], + "groups": [0, 1, 2, + { + "name": "horizontal_start", + "origin": [8, 8, 8], + "children": [3, 4, 5, 6, 7] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json b/src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json index cfe4b73cd..9e1bd4f0e 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json +++ b/src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json @@ -2,10 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "particle": "create:block/brass_casing_side", - "1": "create:block/belt_support_side", - "2": "create:block/brass_casing_side", - "8": "create:block/gearbox" + "4": "create:block/brass_casing_belt", + "8": "create:block/gearbox", + "particle": "create:block/brass_casing" }, "elements": [ { @@ -13,60 +12,57 @@ "from": [1, 5, 2], "to": [15, 11, 14], "faces": { - "north": {"uv": [0, 0, 15, 6], "texture": "#1"}, "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "south": {"uv": [0, 0, 15, 6], "texture": "#1"}, "west": {"uv": [2, 5, 14, 11], "texture": "#8"} } }, { "name": "Left", - "from": [0, 0, 0], - "to": [16, 11, 4], + "from": [0, 0, 12], + "to": [16, 3, 16], "faces": { - "north": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "east": {"uv": [12, 0, 16, 11], "texture": "#2"}, - "south": {"uv": [14, 0, 16, 11], "texture": "#2"}, - "west": {"uv": [0, 0, 4, 11], "texture": "#2"}, - "up": {"uv": [0, 0, 4, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 4, 16], "rotation": 90, "texture": "#2"} + "east": {"uv": [0, 12, 2, 13.5], "texture": "#4"}, + "south": {"uv": [0, 12, 8, 13.5], "texture": "#4"}, + "west": {"uv": [6, 12, 8, 13.5], "texture": "#4"}, + "up": {"uv": [8, 3, 16, 5], "rotation": 180, "texture": "#4"}, + "down": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"} } }, { - "name": "Zfighter", - "from": [0.5, 0.1, -0.1], - "to": [15.5, 10.9, 0.9], + "name": "Left", + "from": [15, 3, 12], + "to": [16, 11, 16], "faces": { - "north": {"uv": [0, 0, 15, 10.8], "texture": "#2"}, - "east": {"uv": [12, 0, 13, 10.8], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 10.8], "texture": "#2"}, - "up": {"uv": [0, 0, 15, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 15], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 8, 0.5, 12], "texture": "#4"}, + "east": {"uv": [0, 8, 2, 12], "texture": "#4"}, + "south": {"uv": [7.5, 8, 8, 12], "texture": "#4"}, + "west": {"uv": [6, 8, 8, 12], "texture": "#4"}, + "up": {"uv": [0, 7.5, 2, 8], "rotation": 270, "texture": "#4"} } }, { - "name": "Zfighter2", - "from": [0.5, 0.1, 15.1], - "to": [15.5, 10.9, 16.1], + "name": "Left", + "from": [0, 3, 12], + "to": [1, 11, 16], "faces": { - "east": {"uv": [12, 0, 13, 10.8], "texture": "#2"}, - "south": {"uv": [0, 0, 15, 10.8], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 10.8], "texture": "#2"}, - "up": {"uv": [0, 0, 15, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 15], "rotation": 90, "texture": "#2"} + "north": {"uv": [0.5, 8, 0, 12], "texture": "#4"}, + "east": {"uv": [8, 8, 6, 12], "texture": "#4"}, + "south": {"uv": [8, 8, 7.5, 12], "texture": "#4"}, + "west": {"uv": [2, 8, 0, 12], "texture": "#4"}, + "up": {"uv": [0, 8, 2, 7.5], "rotation": 270, "texture": "#4"} } }, { "name": "Right", - "from": [0, 0, 12], - "to": [16, 11, 16], + "from": [0, 0, 0], + "to": [16, 11, 4], "faces": { - "north": {"uv": [0, 0, 2, 11], "texture": "#2"}, - "east": {"uv": [0, 0, 4, 11], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "west": {"uv": [12, 0, 16, 11], "texture": "#2"}, - "up": {"uv": [12, 0, 16, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [12, 0, 16, 16], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, + "east": {"uv": [6, 8, 8, 13.5], "texture": "#4"}, + "south": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, + "west": {"uv": [0, 8, 2, 13.5], "texture": "#4"}, + "up": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [8, 0, 10, 8], "rotation": 270, "texture": "#4"} } }, { @@ -74,10 +70,10 @@ "from": [0, 0, 4], "to": [16, 4, 12], "faces": { - "east": {"uv": [4, 7, 12, 11], "texture": "#2"}, - "west": {"uv": [4, 7, 12, 11], "texture": "#2"}, - "up": {"uv": [0, 2, 16, 10], "texture": "#2"}, - "down": {"uv": [4, 0, 12, 16], "rotation": 90, "texture": "#2"} + "east": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, + "west": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, + "up": {"uv": [8, 2, 16, 6], "rotation": 180, "texture": "#4"}, + "down": {"uv": [10, 0, 14, 8], "rotation": 270, "texture": "#4"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json b/src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json index f6dd1ac0d..d72517e08 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json +++ b/src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json @@ -2,9 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "particle": "create:block/brass_casing_side", - "1": "create:block/belt_support_side", - "2": "create:block/brass_casing_side" + "3": "create:block/brass_casing_belt", + "particle": "create:block/brass_casing" }, "elements": [ { @@ -12,12 +11,12 @@ "from": [0, 0, 0], "to": [16, 11, 16], "faces": { - "north": {"uv": [0, 0, 16, 11], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 11], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 8, 8, 13.5], "texture": "#3"}, + "east": {"uv": [0, 8, 8, 13.5], "texture": "#3"}, + "south": {"uv": [0, 8, 8, 13.5], "texture": "#3"}, + "west": {"uv": [0, 8, 8, 13.5], "texture": "#3"}, + "up": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#3"}, + "down": {"uv": [8, 0, 16, 8], "rotation": 90, "texture": "#3"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json b/src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json index cfe4b73cd..a0d43fd8c 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json +++ b/src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json @@ -2,10 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "particle": "create:block/brass_casing_side", - "1": "create:block/belt_support_side", - "2": "create:block/brass_casing_side", - "8": "create:block/gearbox" + "4": "create:block/brass_casing_belt", + "8": "create:block/gearbox", + "particle": "create:block/brass_casing" }, "elements": [ { @@ -13,47 +12,21 @@ "from": [1, 5, 2], "to": [15, 11, 14], "faces": { - "north": {"uv": [0, 0, 15, 6], "texture": "#1"}, "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "south": {"uv": [0, 0, 15, 6], "texture": "#1"}, "west": {"uv": [2, 5, 14, 11], "texture": "#8"} } }, { - "name": "Left", + "name": "Right", "from": [0, 0, 0], "to": [16, 11, 4], "faces": { - "north": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "east": {"uv": [12, 0, 16, 11], "texture": "#2"}, - "south": {"uv": [14, 0, 16, 11], "texture": "#2"}, - "west": {"uv": [0, 0, 4, 11], "texture": "#2"}, - "up": {"uv": [0, 0, 4, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 4, 16], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "Zfighter", - "from": [0.5, 0.1, -0.1], - "to": [15.5, 10.9, 0.9], - "faces": { - "north": {"uv": [0, 0, 15, 10.8], "texture": "#2"}, - "east": {"uv": [12, 0, 13, 10.8], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 10.8], "texture": "#2"}, - "up": {"uv": [0, 0, 15, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 15], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "Zfighter2", - "from": [0.5, 0.1, 15.1], - "to": [15.5, 10.9, 16.1], - "faces": { - "east": {"uv": [12, 0, 13, 10.8], "texture": "#2"}, - "south": {"uv": [0, 0, 15, 10.8], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 10.8], "texture": "#2"}, - "up": {"uv": [0, 0, 15, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 15], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, + "east": {"uv": [6, 8, 8, 13.5], "texture": "#4"}, + "south": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, + "west": {"uv": [0, 8, 2, 13.5], "texture": "#4"}, + "up": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [8, 0, 10, 8], "rotation": 270, "texture": "#4"} } }, { @@ -61,12 +34,12 @@ "from": [0, 0, 12], "to": [16, 11, 16], "faces": { - "north": {"uv": [0, 0, 2, 11], "texture": "#2"}, - "east": {"uv": [0, 0, 4, 11], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "west": {"uv": [12, 0, 16, 11], "texture": "#2"}, - "up": {"uv": [12, 0, 16, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [12, 0, 16, 16], "rotation": 90, "texture": "#2"} + "north": {"uv": [8, 8, 0, 13.5], "texture": "#4"}, + "east": {"uv": [8, 8, 6, 13.5], "texture": "#4"}, + "south": {"uv": [8, 8, 0, 13.5], "texture": "#4"}, + "west": {"uv": [2, 8, 0, 13.5], "texture": "#4"}, + "up": {"uv": [8, 0, 6, 8], "rotation": 270, "texture": "#4"}, + "down": {"uv": [10, 0, 8, 8], "rotation": 270, "texture": "#4"} } }, { @@ -74,10 +47,10 @@ "from": [0, 0, 4], "to": [16, 4, 12], "faces": { - "east": {"uv": [4, 7, 12, 11], "texture": "#2"}, - "west": {"uv": [4, 7, 12, 11], "texture": "#2"}, - "up": {"uv": [0, 2, 16, 10], "texture": "#2"}, - "down": {"uv": [4, 0, 12, 16], "rotation": 90, "texture": "#2"} + "east": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, + "west": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, + "up": {"uv": [8, 2, 16, 6], "rotation": 180, "texture": "#4"}, + "down": {"uv": [10, 0, 14, 8], "rotation": 270, "texture": "#4"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json b/src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json index cfe4b73cd..042448aab 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json +++ b/src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json @@ -2,10 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "particle": "create:block/brass_casing_side", - "1": "create:block/belt_support_side", - "2": "create:block/brass_casing_side", - "8": "create:block/gearbox" + "4": "create:block/brass_casing_belt", + "8": "create:block/gearbox", + "particle": "create:block/brass_casing" }, "elements": [ { @@ -13,47 +12,44 @@ "from": [1, 5, 2], "to": [15, 11, 14], "faces": { - "north": {"uv": [0, 0, 15, 6], "texture": "#1"}, "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "south": {"uv": [0, 0, 15, 6], "texture": "#1"}, "west": {"uv": [2, 5, 14, 11], "texture": "#8"} } }, { "name": "Left", "from": [0, 0, 0], + "to": [16, 3, 4], + "faces": { + "north": {"uv": [0, 12, 8, 13.5], "texture": "#4"}, + "east": {"uv": [6, 12, 8, 13.5], "texture": "#4"}, + "west": {"uv": [0, 12, 2, 13.5], "texture": "#4"}, + "up": {"uv": [8, 3, 16, 5], "texture": "#4"}, + "down": {"uv": [6, 0, 8, 8], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "Left", + "from": [0, 3, 0], + "to": [1, 11, 4], + "faces": { + "north": {"uv": [7.5, 8, 8, 12], "texture": "#4"}, + "east": {"uv": [6, 8, 8, 12], "texture": "#4"}, + "south": {"uv": [0, 8, 0.5, 12], "texture": "#4"}, + "west": {"uv": [0, 8, 2, 12], "texture": "#4"}, + "up": {"uv": [0, 7.5, 2, 8], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "Left", + "from": [15, 3, 0], "to": [16, 11, 4], "faces": { - "north": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "east": {"uv": [12, 0, 16, 11], "texture": "#2"}, - "south": {"uv": [14, 0, 16, 11], "texture": "#2"}, - "west": {"uv": [0, 0, 4, 11], "texture": "#2"}, - "up": {"uv": [0, 0, 4, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 0, 4, 16], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "Zfighter", - "from": [0.5, 0.1, -0.1], - "to": [15.5, 10.9, 0.9], - "faces": { - "north": {"uv": [0, 0, 15, 10.8], "texture": "#2"}, - "east": {"uv": [12, 0, 13, 10.8], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 10.8], "texture": "#2"}, - "up": {"uv": [0, 0, 15, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 15], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "Zfighter2", - "from": [0.5, 0.1, 15.1], - "to": [15.5, 10.9, 16.1], - "faces": { - "east": {"uv": [12, 0, 13, 10.8], "texture": "#2"}, - "south": {"uv": [0, 0, 15, 10.8], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 10.8], "texture": "#2"}, - "up": {"uv": [0, 0, 15, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 15], "rotation": 90, "texture": "#2"} + "north": {"uv": [8, 8, 7.5, 12], "texture": "#4"}, + "east": {"uv": [2, 8, 0, 12], "texture": "#4"}, + "south": {"uv": [0.5, 8, 0, 12], "texture": "#4"}, + "west": {"uv": [8, 8, 6, 12], "texture": "#4"}, + "up": {"uv": [0, 8, 2, 7.5], "rotation": 90, "texture": "#4"} } }, { @@ -61,12 +57,12 @@ "from": [0, 0, 12], "to": [16, 11, 16], "faces": { - "north": {"uv": [0, 0, 2, 11], "texture": "#2"}, - "east": {"uv": [0, 0, 4, 11], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 11], "texture": "#2"}, - "west": {"uv": [12, 0, 16, 11], "texture": "#2"}, - "up": {"uv": [12, 0, 16, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [12, 0, 16, 16], "rotation": 90, "texture": "#2"} + "north": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, + "east": {"uv": [0, 8, 2, 13.5], "texture": "#4"}, + "south": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, + "west": {"uv": [6, 8, 8, 13.5], "texture": "#4"}, + "up": {"uv": [6, 0, 8, 8], "rotation": 90, "texture": "#4"}, + "down": {"uv": [8, 0, 10, 8], "rotation": 90, "texture": "#4"} } }, { @@ -74,10 +70,10 @@ "from": [0, 0, 4], "to": [16, 4, 12], "faces": { - "east": {"uv": [4, 7, 12, 11], "texture": "#2"}, - "west": {"uv": [4, 7, 12, 11], "texture": "#2"}, - "up": {"uv": [0, 2, 16, 10], "texture": "#2"}, - "down": {"uv": [4, 0, 12, 16], "rotation": 90, "texture": "#2"} + "east": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, + "west": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, + "up": {"uv": [8, 2, 16, 6], "texture": "#4"}, + "down": {"uv": [10, 0, 14, 8], "rotation": 90, "texture": "#4"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/sideways_end.json b/src/main/resources/assets/create/models/block/belt_casing/sideways_end.json index d158fadc8..c35d0e2ec 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/sideways_end.json +++ b/src/main/resources/assets/create/models/block/belt_casing/sideways_end.json @@ -1,5 +1,123 @@ { - "_comment": "Vertical belts cannot have casings at the moment", - "textures": {}, - "elements": [] + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "3": "create:block/brass_casing_belt", + "8": "create:block/gearbox", + "particle": "create:block/brass_casing" + }, + "elements": [ + { + "name": "Casing", + "from": [5, 0, 0], + "to": [11, 16, 4], + "faces": { + "north": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [6, 0, 8, 8], "texture": "#3"}, + "south": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [5, 15, 12], + "to": [11, 16, 16], + "faces": { + "north": {"uv": [8, 12.5, 8.5, 15.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [0, 0, 2, 0.5], "texture": "#3"}, + "south": {"uv": [8, 12.5, 8.5, 15.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [6, 0, 8, 0.5], "texture": "#3"}, + "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [2, 14, 2], + "to": [5, 16, 14], + "faces": { + "north": {"uv": [6.5, 12.5, 8, 13.5], "texture": "#3"}, + "east": {"uv": [0, 13.5, 6, 14.5], "texture": "#3"}, + "south": {"uv": [0, 12.5, 1.5, 13.5], "texture": "#3"}, + "west": {"uv": [1, 12.5, 7, 13.5], "texture": "#3"}, + "up": {"uv": [0, 13.5, 6, 15], "rotation": 90, "texture": "#3"}, + "down": {"uv": [0, 13.5, 6, 15], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [2, 0, 2], + "to": [5, 2, 14], + "faces": { + "north": {"uv": [6.5, 13.5, 8, 12.5], "texture": "#3"}, + "east": {"uv": [0, 14.5, 6, 13.5], "texture": "#3"}, + "south": {"uv": [0, 13.5, 1.5, 12.5], "texture": "#3"}, + "west": {"uv": [1, 13.5, 7, 12.5], "texture": "#3"}, + "up": {"uv": [6, 13.5, 0, 15], "rotation": 90, "texture": "#3"}, + "down": {"uv": [6, 13.5, 0, 15], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [11, 14, 2], + "to": [14, 16, 14], + "faces": { + "north": {"uv": [8, 12.5, 6.5, 13.5], "texture": "#3"}, + "east": {"uv": [7, 12.5, 1, 13.5], "texture": "#3"}, + "south": {"uv": [1.5, 12.5, 0, 13.5], "texture": "#3"}, + "west": {"uv": [6, 13.5, 0, 14.5], "texture": "#3"}, + "up": {"uv": [0, 15, 6, 13.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [0, 15, 6, 13.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [11, 0, 2], + "to": [14, 2, 14], + "faces": { + "north": {"uv": [8, 13.5, 6.5, 12.5], "texture": "#3"}, + "east": {"uv": [7, 13.5, 1, 12.5], "texture": "#3"}, + "south": {"uv": [1.5, 13.5, 0, 12.5], "texture": "#3"}, + "west": {"uv": [6, 14.5, 0, 13.5], "texture": "#3"}, + "up": {"uv": [6, 15, 0, 13.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [6, 15, 0, 13.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [5, 0, 12], + "to": [11, 1, 16], + "faces": { + "north": {"uv": [8.5, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [0, 0.5, 2, 0], "texture": "#3"}, + "south": {"uv": [8.5, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [6, 0.5, 8, 0], "texture": "#3"}, + "up": {"uv": [10, 12.5, 8, 15.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [10, 12.5, 8, 15.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [5, 1, 2], + "to": [11, 15, 14], + "faces": { + "up": {"uv": [2, 5, 14, 11], "rotation": 90, "texture": "#8"}, + "down": {"uv": [2, 5, 14, 11], "rotation": 90, "texture": "#8"} + } + } + ], + "groups": [ + { + "name": "horizontal_middle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, + { + "name": "horizontal_start", + "origin": [8, 8, 8], + "children": [7] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/sideways_middle.json b/src/main/resources/assets/create/models/block/belt_casing/sideways_middle.json index d158fadc8..9886764c4 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/sideways_middle.json +++ b/src/main/resources/assets/create/models/block/belt_casing/sideways_middle.json @@ -1,5 +1,30 @@ { - "_comment": "Vertical belts cannot have casings at the moment", - "textures": {}, - "elements": [] + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "3": "create:block/brass_casing_belt", + "particle": "create:block/brass_casing" + }, + "elements": [ + { + "name": "Casing", + "from": [5, 0, 0], + "to": [11, 16, 16], + "faces": { + "north": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#3"}, + "south": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "up": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "horizontal_middle", + "origin": [8, 8, 8], + "children": [0] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/sideways_pulley.json b/src/main/resources/assets/create/models/block/belt_casing/sideways_pulley.json index d158fadc8..0f8653d94 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/sideways_pulley.json +++ b/src/main/resources/assets/create/models/block/belt_casing/sideways_pulley.json @@ -1,5 +1,110 @@ { - "_comment": "Vertical belts cannot have casings at the moment", - "textures": {}, - "elements": [] + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "3": "create:block/brass_casing_belt", + "8": "create:block/gearbox", + "particle": "create:block/brass_casing" + }, + "elements": [ + { + "name": "Casing", + "from": [5, 0, 0], + "to": [11, 16, 4], + "faces": { + "north": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [6, 0, 8, 8], "texture": "#3"}, + "south": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [5, 0, 12], + "to": [11, 16, 16], + "faces": { + "north": {"uv": [8, 15.5, 16, 12.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [8, 0, 6, 8], "texture": "#3"}, + "south": {"uv": [8, 15.5, 16, 12.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [2, 0, 0, 8], "texture": "#3"}, + "up": {"uv": [10, 12.5, 8, 15.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [10, 12.5, 8, 15.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [2, 14, 2], + "to": [5, 16, 14], + "faces": { + "north": {"uv": [6.5, 12.5, 8, 13.5], "texture": "#3"}, + "east": {"uv": [0, 13.5, 6, 14.5], "texture": "#3"}, + "south": {"uv": [0, 12.5, 1.5, 13.5], "texture": "#3"}, + "west": {"uv": [1, 12.5, 7, 13.5], "texture": "#3"}, + "up": {"uv": [0, 13.5, 6, 15], "rotation": 90, "texture": "#3"}, + "down": {"uv": [0, 13.5, 6, 15], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [2, 0, 2], + "to": [5, 2, 14], + "faces": { + "north": {"uv": [6.5, 13.5, 8, 12.5], "texture": "#3"}, + "east": {"uv": [0, 14.5, 6, 13.5], "texture": "#3"}, + "south": {"uv": [0, 13.5, 1.5, 12.5], "texture": "#3"}, + "west": {"uv": [1, 13.5, 7, 12.5], "texture": "#3"}, + "up": {"uv": [6, 13.5, 0, 15], "rotation": 90, "texture": "#3"}, + "down": {"uv": [6, 13.5, 0, 15], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [11, 14, 2], + "to": [14, 16, 14], + "faces": { + "north": {"uv": [8, 12.5, 6.5, 13.5], "texture": "#3"}, + "east": {"uv": [7, 12.5, 1, 13.5], "texture": "#3"}, + "south": {"uv": [1.5, 12.5, 0, 13.5], "texture": "#3"}, + "west": {"uv": [6, 13.5, 0, 14.5], "texture": "#3"}, + "up": {"uv": [0, 15, 6, 13.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [0, 15, 6, 13.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [11, 0, 2], + "to": [14, 2, 14], + "faces": { + "north": {"uv": [8, 13.5, 6.5, 12.5], "texture": "#3"}, + "east": {"uv": [7, 13.5, 1, 12.5], "texture": "#3"}, + "south": {"uv": [1.5, 13.5, 0, 12.5], "texture": "#3"}, + "west": {"uv": [6, 14.5, 0, 13.5], "texture": "#3"}, + "up": {"uv": [6, 15, 0, 13.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [6, 15, 0, 13.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [5, 1, 2], + "to": [11, 15, 14], + "faces": { + "up": {"uv": [2, 5, 14, 11], "rotation": 90, "texture": "#8"}, + "down": {"uv": [2, 5, 14, 11], "rotation": 90, "texture": "#8"} + } + } + ], + "groups": [ + { + "name": "horizontal_middle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5] + }, + { + "name": "horizontal_start", + "origin": [8, 8, 8], + "children": [6] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/sideways_start.json b/src/main/resources/assets/create/models/block/belt_casing/sideways_start.json index d158fadc8..b4409d0bb 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/sideways_start.json +++ b/src/main/resources/assets/create/models/block/belt_casing/sideways_start.json @@ -1,5 +1,123 @@ { - "_comment": "Vertical belts cannot have casings at the moment", - "textures": {}, - "elements": [] + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "3": "create:block/brass_casing_belt", + "8": "create:block/gearbox", + "particle": "create:block/brass_casing" + }, + "elements": [ + { + "name": "Casing", + "from": [5, 0, 12], + "to": [11, 16, 16], + "faces": { + "north": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [6, 0, 8, 8], "texture": "#3"}, + "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [5, 15, 0], + "to": [11, 16, 4], + "faces": { + "north": {"uv": [8, 12.5, 8.5, 15.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [6, 0, 8, 0.5], "texture": "#3"}, + "south": {"uv": [8, 12.5, 8.5, 15.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0, 2, 0.5], "texture": "#3"}, + "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [11, 14, 2], + "to": [14, 16, 14], + "faces": { + "north": {"uv": [0, 12.5, 1.5, 13.5], "texture": "#3"}, + "east": {"uv": [1, 12.5, 7, 13.5], "texture": "#3"}, + "south": {"uv": [6.5, 12.5, 8, 13.5], "texture": "#3"}, + "west": {"uv": [0, 13.5, 6, 14.5], "texture": "#3"}, + "up": {"uv": [0, 13.5, 6, 15], "rotation": 270, "texture": "#3"}, + "down": {"uv": [0, 13.5, 6, 15], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [11, 0, 2], + "to": [14, 2, 14], + "faces": { + "north": {"uv": [0, 13.5, 1.5, 12.5], "texture": "#3"}, + "east": {"uv": [1, 13.5, 7, 12.5], "texture": "#3"}, + "south": {"uv": [6.5, 13.5, 8, 12.5], "texture": "#3"}, + "west": {"uv": [0, 14.5, 6, 13.5], "texture": "#3"}, + "up": {"uv": [6, 13.5, 0, 15], "rotation": 270, "texture": "#3"}, + "down": {"uv": [6, 13.5, 0, 15], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [2, 14, 2], + "to": [5, 16, 14], + "faces": { + "north": {"uv": [1.5, 12.5, 0, 13.5], "texture": "#3"}, + "east": {"uv": [6, 13.5, 0, 14.5], "texture": "#3"}, + "south": {"uv": [8, 12.5, 6.5, 13.5], "texture": "#3"}, + "west": {"uv": [7, 12.5, 1, 13.5], "texture": "#3"}, + "up": {"uv": [0, 15, 6, 13.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [0, 15, 6, 13.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [2, 0, 2], + "to": [5, 2, 14], + "faces": { + "north": {"uv": [1.5, 13.5, 0, 12.5], "texture": "#3"}, + "east": {"uv": [6, 14.5, 0, 13.5], "texture": "#3"}, + "south": {"uv": [8, 13.5, 6.5, 12.5], "texture": "#3"}, + "west": {"uv": [7, 13.5, 1, 12.5], "texture": "#3"}, + "up": {"uv": [6, 15, 0, 13.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [6, 15, 0, 13.5], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [5, 0, 0], + "to": [11, 1, 4], + "faces": { + "north": {"uv": [8.5, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [6, 0.5, 8, 0], "texture": "#3"}, + "south": {"uv": [8.5, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0.5, 2, 0], "texture": "#3"}, + "up": {"uv": [10, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, + "down": {"uv": [10, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Casing", + "from": [5, 1, 2], + "to": [11, 15, 14], + "faces": { + "up": {"uv": [2, 5, 14, 11], "rotation": 270, "texture": "#8"}, + "down": {"uv": [2, 5, 14, 11], "rotation": 270, "texture": "#8"} + } + } + ], + "groups": [ + { + "name": "horizontal_middle", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + }, + { + "name": "horizontal_start", + "origin": [8, 8, 8], + "children": [7] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/vertical_end.json b/src/main/resources/assets/create/models/block/belt_casing/vertical_end.json deleted file mode 100644 index d158fadc8..000000000 --- a/src/main/resources/assets/create/models/block/belt_casing/vertical_end.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "_comment": "Vertical belts cannot have casings at the moment", - "textures": {}, - "elements": [] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/vertical_middle.json b/src/main/resources/assets/create/models/block/belt_casing/vertical_middle.json deleted file mode 100644 index d158fadc8..000000000 --- a/src/main/resources/assets/create/models/block/belt_casing/vertical_middle.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "_comment": "Vertical belts cannot have casings at the moment", - "textures": {}, - "elements": [] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/vertical_pulley.json b/src/main/resources/assets/create/models/block/belt_casing/vertical_pulley.json deleted file mode 100644 index d158fadc8..000000000 --- a/src/main/resources/assets/create/models/block/belt_casing/vertical_pulley.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "_comment": "Vertical belts cannot have casings at the moment", - "textures": {}, - "elements": [] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/vertical_start.json b/src/main/resources/assets/create/models/block/belt_casing/vertical_start.json deleted file mode 100644 index d158fadc8..000000000 --- a/src/main/resources/assets/create/models/block/belt_casing/vertical_start.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "_comment": "Vertical belts cannot have casings at the moment", - "textures": {}, - "elements": [] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/andesite_casing_belt.png b/src/main/resources/assets/create/textures/block/andesite_casing_belt.png new file mode 100644 index 0000000000000000000000000000000000000000..e4f1303ecc8832a74cc18cdcde3e87f51be9a6a9 GIT binary patch literal 1483 zcmV;+1vL7JP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1z<@;K~z{rrB_Rj z8$}SVvBxv^%=j_3_nBR^*(3hQY6G7Azb(oIm0D6a6rllDOaxi z1H_rf1(8K0OE%t@-<}!I*h76a+s=5k$&#HU*ceVqyg=I5AyFi6%6BO3Fs-Sb2z zhmY#T5}B;H)NrU#waBeism^VU73x)+Dz;6wWs+kXbn!w>bghypE-aclS!RKj>K5}W zWS0t5sq(^RQRdu=MP=|y1}(ZJT5Oc5;uM7g9WkJ_`$$~k2N5kd%T#4j#W97nPLzk{O{JJ=S~8c$v-nRAhsPt{bfi%ZZbTY2IQmbb#DS7V)r4z{(udK&QFkEi#)2(v z8mIB$b_E<)4sJYbACShms$u{xJq_s?fYE7yujbF$(WxQs7yO zB4ZRVj{x(7F_}iPr~>#V*MfFGnBzlFeM3BeoKB~firAQ|So#bRa1oyy0Iwx=z?cg# z0E>e^olZFxB03r-YeN_34&WQ$%(4K0#l1m5y}nQT?E&qyx-|6095{WEwGMi0Xe4?| zE9=79X|-uE3OK`K`ggCx;|?7h9??N(NRRh>@{!OR(O?)z#e_cA?hky9pAqE{$;fHo zs5|6*9#W4dhPqR81KZKsd3k7qHk$BPE>l=j*lb-29tnA7WeYR_w1a=(>2ODd3eA2Feem&lL?e&=vK;^i=oD4LjgChe@UPcQ4mp{9VFi<&-b5&3> zK*`fG;H3OT`Lh^+!piE(sU+Yud3yf5eC?Y%cVgwj^W5jQW6h4>Ttx~QKYC~L zHqz+Qs>@h%c9M?22G|hc@w^L*bD26btzDIPq!vpuZs^uu9sO?1# zDio*vep266DTN+@t2J{Wy7l3!@uSCWdS!EgADj_?IHdN_=YT0o-((}kT+iFQ%k_mC z2T)?@KfDvyF4ES=UuP>spS-;m_t;G*BXn)q<#O!H$0B~NjmA@2o{)_H?e=k|>7@xg&F;gL%yA7Y^dIj8m_kXxQ zXTTTlUy1km%0>|5O@qaEkNT%>;{Rbi-INr#?91Q>f002ovPDHLkV1m{*&3XU; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/axis_top.png b/src/main/resources/assets/create/textures/block/axis_top.png index cf1eea2b7668935ed06aa3c3af4e0d1713f58677..ad458051e884fa27e25bf402098c97323c7dddee 100644 GIT binary patch delta 150 zcmV;H0BQfe0@neMNq@lr01m+cxRGn^0001NNklcG?>xBZ%82La>)HEi@96i$(g5U)Y>6Iqr)2tmJ4p)3f)5S(+waZD@x`CWhqvY=9infmPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1R+U8K~z{rtyj&D z6jczf*IzT!z3eh8M7_vC5EH=<)B_xl3yFF$a6kwLE{aCuUt#p%KVXb{Gx5NIqwz@g zfb-hh@72efHJ@ENTv3fM^y<-K z{S`S|m!xrRC|E;=sn8FMhzM7wQF|8#L?O*Lt5(X6a0!pHghJ#4tVLuXbu{!W+UxGEf zKJq9C3`M?m#F$Dx9sR9*JHz`LkD|b?0YS#PkPjta&+}3?{rmoe?u|0~^KL2}luin| zyEzfAI)p%>y3r(G+CD4GW^9koz^1r*gaDzycqbX;LUqH~hHe>qtkqCA4&VkdzGeU% z*A4=73_ZwAOw}o=Zjrs}F>V}CAm#w#tNEd0%z@kxs7~#aFS6G$Fylbv8%_>iI2M2_ z0hj{;>w9A1*i7}y+Pmw-fplERsgOkfZe>D98dpZbKt_VOA#nAwKIQdHjeRXYZk;$# zPHh!Pf^f})kR%}O1Lz5mpB)aw*-70yG_f?%kYJi*V$bCU*|k?a$dg#qA$1c)z|8~m z&`UhgOzP_dFefJ&O}Ny?LV7Zk$YN)b$LswfA~l4j@dxTM!JCyKlVe6l&YW-u(3a2ajB0?DjpM$F6@5 zy!za#IMDVzPc!?$w)W=a;b9ed^|kOiJhynSvvO)<$=R*)9=t=>-hvbd2%@@IwTp2H;lQ-xu?;yVjgIIFwP_4bc5u=m8Y-vO@Ldy<^YVooeiM z19Uw_#ee0aTw4k=A#kBr?>?P7h2ZSDQ{5WT$rslf2ilzA$Qw@yZ`+8>w_m(pbvePE zKW>W*xJ_mew*6y*LE97jFaMal^!yRJa^;%*X5Xofk@25?@-A)Myg^_8@Y_sAzII?u zJZjyD=3m2|LI87p{l59}_nF<^;vDMKh?WU~0#`ooz;|Ds@03HP;;ZO_k1iZ~;sF*` eL01R5f#@Ooy|ThwQ;O&S0000