diff --git a/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java b/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java index 22a16afd..311345f2 100644 --- a/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java @@ -35,9 +35,6 @@ public abstract class ModelVariantMapMixin { idContext.removeId(); if (block instanceof Patterned) { String pattern = ((Patterned) block).getStatesPattern(reader); - if (data[1].contains("violecite")) { - System.out.println(pattern); - } info.setReturnValue(deserialize(context, new StringReader(pattern))); info.cancel(); } diff --git a/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json index 607275c8..6565493f 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json @@ -1,13 +1,13 @@ { "variants": { "type=bottom": { - "model": "betterend:block/violecite_brick_half_slab" + "model": "betterend:block/violecite_bricks_half_slab" }, "type=double": { "model": "betterend:block/violecite_bricks" }, "type=top": { - "model": "betterend:block/violecite_brick_half_slab", + "model": "betterend:block/violecite_bricks_half_slab", "uvlock": true, "x": 180 } diff --git a/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json index 9d0c276a..57f46dfe 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_brick_inner_stairs" + "model": "betterend:block/violecite_bricks_inner_stairs" }, "facing=east,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_brick_outer_stairs" + "model": "betterend:block/violecite_bricks_outer_stairs" }, "facing=east,half=bottom,shape=straight": { - "model": "betterend:block/violecite_brick_stairs" + "model": "betterend:block/violecite_bricks_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "betterend:block/violecite_brick_stairs", + "model": "betterend:block/violecite_bricks_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "betterend:block/violecite_brick_stairs", + "model": "betterend:block/violecite_bricks_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "betterend:block/violecite_brick_stairs", + "model": "betterend:block/violecite_bricks_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_brick_inner_stairs" + "model": "betterend:block/violecite_bricks_inner_stairs" }, "facing=south,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_brick_outer_stairs" + "model": "betterend:block/violecite_bricks_outer_stairs" }, "facing=south,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "betterend:block/violecite_brick_stairs", + "model": "betterend:block/violecite_bricks_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "betterend:block/violecite_brick_stairs", + "model": "betterend:block/violecite_bricks_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "betterend:block/violecite_brick_stairs", + "model": "betterend:block/violecite_bricks_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "betterend:block/violecite_brick_inner_stairs", + "model": "betterend:block/violecite_bricks_inner_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "betterend:block/violecite_brick_outer_stairs", + "model": "betterend:block/violecite_bricks_outer_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "betterend:block/violecite_brick_stairs", + "model": "betterend:block/violecite_bricks_stairs", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json index dd4890b5..26bc65d2 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "betterend:block/violecite_brick_wall_post" + "model": "betterend:block/violecite_bricks_wall_post" } }, { @@ -13,7 +13,7 @@ "north": "low" }, "apply": { - "model": "betterend:block/violecite_brick_wall_side", + "model": "betterend:block/violecite_bricks_wall_side", "uvlock": true } }, @@ -22,7 +22,7 @@ "east": "low" }, "apply": { - "model": "betterend:block/violecite_brick_wall_side", + "model": "betterend:block/violecite_bricks_wall_side", "y": 90, "uvlock": true } @@ -32,7 +32,7 @@ "south": "low" }, "apply": { - "model": "betterend:block/violecite_brick_wall_side", + "model": "betterend:block/violecite_bricks_wall_side", "y": 180, "uvlock": true } @@ -42,7 +42,7 @@ "west": "low" }, "apply": { - "model": "betterend:block/violecite_brick_wall_side", + "model": "betterend:block/violecite_bricks_wall_side", "y": 270, "uvlock": true } @@ -52,7 +52,7 @@ "north": "tall" }, "apply": { - "model": "betterend:block/violecite_brick_wall_side_tall", + "model": "betterend:block/violecite_bricks_wall_side_tall", "uvlock": true } }, @@ -61,7 +61,7 @@ "east": "tall" }, "apply": { - "model": "betterend:block/violecite_brick_wall_side_tall", + "model": "betterend:block/violecite_bricks_wall_side_tall", "y": 90, "uvlock": true } @@ -71,7 +71,7 @@ "south": "tall" }, "apply": { - "model": "betterend:block/violecite_brick_wall_side_tall", + "model": "betterend:block/violecite_bricks_wall_side_tall", "y": 180, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "betterend:block/violecite_brick_wall_side_tall", + "model": "betterend:block/violecite_bricks_wall_side_tall", "y": 270, "uvlock": true } diff --git a/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json index 25eadef2..90478bb0 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json +++ b/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/violecite_brick_half_slab" + "parent": "betterend:block/violecite_bricks_half_slab" } diff --git a/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json index 10918c92..0ce09c5a 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json +++ b/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/violecite_brick_stairs" + "parent": "betterend:block/violecite_bricks_stairs" } diff --git a/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json index 84a70ea6..36388d2c 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json +++ b/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/violecite_brick_wall_inventory" + "parent": "betterend:block/violecite_bricks_wall_inventory" }