diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 03742e9d8..d24b2afd5 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -443,6 +443,7 @@ public class AllBlocks { public static final BlockEntry CLUTCH = REGISTRATE.block("clutch", ClutchBlock::new) .initialProperties(SharedProperties::stone) + .addLayer(() -> RenderType::cutoutMipped) .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.color(MaterialColor.PODZOL)) .transform(BlockStressDefaults.setNoImpact()) @@ -454,6 +455,7 @@ public class AllBlocks { public static final BlockEntry GEARSHIFT = REGISTRATE.block("gearshift", GearshiftBlock::new) .initialProperties(SharedProperties::stone) + .addLayer(() -> RenderType::cutoutMipped) .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.color(MaterialColor.PODZOL)) .transform(BlockStressDefaults.setNoImpact()) diff --git a/src/main/resources/assets/create/models/block/basin/block_directional.json b/src/main/resources/assets/create/models/block/basin/block_directional.json index c71081fc6..8a17e04c8 100644 --- a/src/main/resources/assets/create/models/block/basin/block_directional.json +++ b/src/main/resources/assets/create/models/block/basin/block_directional.json @@ -22,8 +22,8 @@ }, { "name": "Basin Interior", - "from": [2, 16, 2], - "to": [14, 2, 14], + "from": [1.95, 16, 1.95], + "to": [14.05, 2, 14.05], "faces": { "north": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#1"}, "east": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#1"}, diff --git a/src/main/resources/assets/create/models/block/bearing/top.json b/src/main/resources/assets/create/models/block/bearing/top.json index b8cfe38cc..fe1c7ecf9 100644 --- a/src/main/resources/assets/create/models/block/bearing/top.json +++ b/src/main/resources/assets/create/models/block/bearing/top.json @@ -4,7 +4,7 @@ "bearing_top": "create:block/bearing_top", "particle": "create:block/mechanical_bearing_side", "bearing_side": "create:block/mechanical_bearing_side", - "brass_casing": "create:block/brass_casing" + "brass_casing": "create:block/brass_block" }, "elements": [ { @@ -12,12 +12,11 @@ "from": [6, 12, 16], "to": [10, 14, 17], "faces": { - "north": {"uv": [3, 0, 7, 2], "texture": "#brass_casing"}, - "east": {"uv": [7, 0, 8, 2], "texture": "#brass_casing"}, - "south": {"uv": [6, 0, 10, 2], "texture": "#brass_casing"}, - "west": {"uv": [8, 0, 9, 2], "texture": "#brass_casing"}, - "up": {"uv": [6, 0, 10, 1], "texture": "#brass_casing"}, - "down": {"uv": [6, 1, 10, 2], "texture": "#brass_casing"} + "east": {"uv": [10, 9, 11, 11], "texture": "#brass_casing"}, + "south": {"uv": [6, 9, 10, 11], "texture": "#brass_casing"}, + "west": {"uv": [5, 9, 6, 11], "texture": "#brass_casing"}, + "up": {"uv": [6, 8, 10, 9], "texture": "#brass_casing"}, + "down": {"uv": [6, 11, 10, 12], "texture": "#brass_casing"} } }, { diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json index 690dd1676..e6f21e1a3 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json @@ -26,7 +26,7 @@ { "name": "RearBackPlate", "from": [0.1, -5, 13], - "to": [15.9, -2, 16], + "to": [15.9, -2, 15.9], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { "north": {"uv": [0, 10, 16, 13], "texture": "#particle"}, diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json index d1004cb3c..3ff98968f 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json @@ -26,7 +26,7 @@ { "name": "RearBackPlate", "from": [0.1, -5, 13], - "to": [15.9, -2, 16], + "to": [15.9, -2, 15.9], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { "north": {"uv": [0, 10, 16, 13], "texture": "#particle"}, diff --git a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json index 751c3262f..75ed31b8a 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json +++ b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json @@ -13,7 +13,7 @@ { "name": "Top", "from": [0.1, -1, 12], - "to": [15.9, 2, 16], + "to": [15.9, 2, 16.2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 4]}, "faces": { "north": {"uv": [0, 9, 16, 12], "texture": "#block"}, diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json b/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json index fe91b31c6..879831f7b 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json @@ -4,7 +4,7 @@ "textures": { "0": "create:block/axis", "6": "create:block/pinion_bottom", - "8": "create:block/bearing_top_wooden", + "8": "create:block/bearing_top", "9": "create:block/windmill_bearing_side", "10": "create:block/pinion", "opening": "create:block/gearbox", diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/item.json b/src/main/resources/assets/create/models/block/gantry_carriage/item.json index fb29e3cc0..e99bd3f23 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/item.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/item.json @@ -5,7 +5,7 @@ "textures": { "0": "create:block/axis", "3": "create:block/cogwheel", - "8": "create:block/bearing_top_wooden", + "8": "create:block/bearing_top", "9": "create:block/windmill_bearing_side", "10": "create:block/pinion", "11": "create:block/axis_top", diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json b/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json index e578ea0e0..c337440d7 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json @@ -4,7 +4,7 @@ "textures": { "0": "create:block/axis", "6": "create:block/pinion_bottom", - "8": "create:block/bearing_top_wooden", + "8": "create:block/bearing_top", "9": "create:block/windmill_bearing_side", "10": "create:block/pinion", "opening": "create:block/gearbox", diff --git a/src/main/resources/assets/create/models/block/rope_pulley/block.json b/src/main/resources/assets/create/models/block/rope_pulley/block.json index 44db60bdc..965644d1c 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/block.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/block.json @@ -4,7 +4,7 @@ "textures": { "3": "create:block/gearbox_top", "4": "create:block/gearbox", - "6": "create:block/andesite_casing", + "6": "create:block/pulley_top", "particle": "create:block/pulley_rope" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/rope_pulley/item.json b/src/main/resources/assets/create/models/block/rope_pulley/item.json index a2bf64f48..35746dbbf 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/item.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/item.json @@ -8,8 +8,8 @@ "4": "create:block/gearbox", "5": "create:block/pulley_rope", "6": "create:block/pulley_magnet", - "8": "create:block/andesite_casing", - "particle": "create:block/andesite_casing" + "8": "create:block/pulley_top", + "particle": "create:block/pulley_top" }, "elements": [ { diff --git a/src/main/resources/assets/create/textures/block/bars/andesite_bars.png b/src/main/resources/assets/create/textures/block/bars/andesite_bars.png index 87380d6f6..e8fde4c5a 100644 Binary files a/src/main/resources/assets/create/textures/block/bars/andesite_bars.png and b/src/main/resources/assets/create/textures/block/bars/andesite_bars.png differ diff --git a/src/main/resources/assets/create/textures/block/bars/andesite_bars_edge.png b/src/main/resources/assets/create/textures/block/bars/andesite_bars_edge.png index 8dacc08df..1aaf5ce6f 100644 Binary files a/src/main/resources/assets/create/textures/block/bars/andesite_bars_edge.png and b/src/main/resources/assets/create/textures/block/bars/andesite_bars_edge.png differ diff --git a/src/main/resources/assets/create/textures/block/bars/brass_bars.png b/src/main/resources/assets/create/textures/block/bars/brass_bars.png index 0a1e279ea..2aea9367e 100644 Binary files a/src/main/resources/assets/create/textures/block/bars/brass_bars.png and b/src/main/resources/assets/create/textures/block/bars/brass_bars.png differ diff --git a/src/main/resources/assets/create/textures/block/bars/copper_bars.png b/src/main/resources/assets/create/textures/block/bars/copper_bars.png index 97a7e47ac..f1ae533dd 100644 Binary files a/src/main/resources/assets/create/textures/block/bars/copper_bars.png and b/src/main/resources/assets/create/textures/block/bars/copper_bars.png differ diff --git a/src/main/resources/assets/create/textures/block/copycat_base.png b/src/main/resources/assets/create/textures/block/copycat_base.png index 7c2dd598c..c17925948 100644 Binary files a/src/main/resources/assets/create/textures/block/copycat_base.png and b/src/main/resources/assets/create/textures/block/copycat_base.png differ diff --git a/src/main/resources/assets/create/textures/block/crushing_wheel_insert.png b/src/main/resources/assets/create/textures/block/crushing_wheel_insert.png index f48d417cc..5bb0a6731 100644 Binary files a/src/main/resources/assets/create/textures/block/crushing_wheel_insert.png and b/src/main/resources/assets/create/textures/block/crushing_wheel_insert.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png b/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png index 662660f6c..427a52176 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png and b/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png differ diff --git a/src/main/resources/assets/create/textures/block/palettes/spruce_window.png b/src/main/resources/assets/create/textures/block/palettes/spruce_window.png index 9e51b4e32..328f17f3c 100644 Binary files a/src/main/resources/assets/create/textures/block/palettes/spruce_window.png and b/src/main/resources/assets/create/textures/block/palettes/spruce_window.png differ diff --git a/src/main/resources/assets/create/textures/block/palettes/spruce_window_connected.png b/src/main/resources/assets/create/textures/block/palettes/spruce_window_connected.png index ddfeaac83..7084e8343 100644 Binary files a/src/main/resources/assets/create/textures/block/palettes/spruce_window_connected.png and b/src/main/resources/assets/create/textures/block/palettes/spruce_window_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/pinion.png b/src/main/resources/assets/create/textures/block/pinion.png index 083500368..ac0ee67f8 100644 Binary files a/src/main/resources/assets/create/textures/block/pinion.png and b/src/main/resources/assets/create/textures/block/pinion.png differ diff --git a/src/main/resources/assets/create/textures/block/pinion_bottom.png b/src/main/resources/assets/create/textures/block/pinion_bottom.png index adceda564..18495064a 100644 Binary files a/src/main/resources/assets/create/textures/block/pinion_bottom.png and b/src/main/resources/assets/create/textures/block/pinion_bottom.png differ diff --git a/src/main/resources/assets/create/textures/block/pulley_top.png b/src/main/resources/assets/create/textures/block/pulley_top.png new file mode 100644 index 000000000..7b01bde17 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/pulley_top.png differ diff --git a/src/main/resources/assets/create/textures/block/redstone_bridge.png b/src/main/resources/assets/create/textures/block/redstone_bridge.png index fa95fdd74..f0b904fdc 100644 Binary files a/src/main/resources/assets/create/textures/block/redstone_bridge.png and b/src/main/resources/assets/create/textures/block/redstone_bridge.png differ diff --git a/src/main/resources/assets/create/textures/block/redstone_bridge_powered.png b/src/main/resources/assets/create/textures/block/redstone_bridge_powered.png index 8fa364247..ac7f9ddb6 100644 Binary files a/src/main/resources/assets/create/textures/block/redstone_bridge_powered.png and b/src/main/resources/assets/create/textures/block/redstone_bridge_powered.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside.png b/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside.png index c3dff5e01..c009fbb6a 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside.png and b/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside_connected.png b/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside_connected.png index 14db56800..50ee92222 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside_connected.png and b/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold.png b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold.png index c13d91c12..b9361a808 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold.png and b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected.png b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected.png index dcf655a3a..912108ca0 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected.png and b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside.png b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside.png index fba275b19..7e6bc176c 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside.png and b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside_connected.png b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside_connected.png index 76d1d5b22..4749b6cb6 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside_connected.png and b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/weighted_ejector_casing.png b/src/main/resources/assets/create/textures/block/weighted_ejector_casing.png index d0a1859b3..ca3c85b06 100644 Binary files a/src/main/resources/assets/create/textures/block/weighted_ejector_casing.png and b/src/main/resources/assets/create/textures/block/weighted_ejector_casing.png differ diff --git a/src/main/resources/assets/create/textures/item/netherite_diving_helmet.png b/src/main/resources/assets/create/textures/item/netherite_diving_helmet.png index 211fc65ed..6d1381457 100644 Binary files a/src/main/resources/assets/create/textures/item/netherite_diving_helmet.png and b/src/main/resources/assets/create/textures/item/netherite_diving_helmet.png differ