From 32af77723c446131123481e5f008ff69eadc4c54 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Wed, 14 Oct 2020 15:37:51 +0300 Subject: [PATCH] Fixed names and sign texture --- .../mixin/client/ModelVariantMapMixin.java | 3 +++ ...ck_slab.json => violecite_bricks_slab.json} | 0 ...tairs.json => violecite_bricks_stairs.json} | 0 ...ck_wall.json => violecite_bricks_wall.json} | 0 ...ab.json => violecite_bricks_half_slab.json} | 0 ...json => violecite_bricks_inner_stairs.json} | 0 ...json => violecite_bricks_outer_stairs.json} | 0 ...tairs.json => violecite_bricks_stairs.json} | 0 ...on => violecite_bricks_wall_inventory.json} | 0 ...st.json => violecite_bricks_wall_post.json} | 0 ...de.json => violecite_bricks_wall_side.json} | 0 ...on => violecite_bricks_wall_side_tall.json} | 0 ...ck_slab.json => violecite_bricks_slab.json} | 0 ...tairs.json => violecite_bricks_stairs.json} | 0 ...ck_wall.json => violecite_bricks_wall.json} | 0 .../textures/entity/sign/pythadendron_sign.png | Bin 981 -> 1512 bytes 16 files changed, 3 insertions(+) rename src/main/resources/assets/betterend/blockstates/{violecite_brick_slab.json => violecite_bricks_slab.json} (100%) rename src/main/resources/assets/betterend/blockstates/{violecite_brick_stairs.json => violecite_bricks_stairs.json} (100%) rename src/main/resources/assets/betterend/blockstates/{violecite_brick_wall.json => violecite_bricks_wall.json} (100%) rename src/main/resources/assets/betterend/models/block/{violecite_brick_half_slab.json => violecite_bricks_half_slab.json} (100%) rename src/main/resources/assets/betterend/models/block/{violecite_brick_inner_stairs.json => violecite_bricks_inner_stairs.json} (100%) rename src/main/resources/assets/betterend/models/block/{violecite_brick_outer_stairs.json => violecite_bricks_outer_stairs.json} (100%) rename src/main/resources/assets/betterend/models/block/{violecite_brick_stairs.json => violecite_bricks_stairs.json} (100%) rename src/main/resources/assets/betterend/models/block/{violecite_brick_wall_inventory.json => violecite_bricks_wall_inventory.json} (100%) rename src/main/resources/assets/betterend/models/block/{violecite_brick_wall_post.json => violecite_bricks_wall_post.json} (100%) rename src/main/resources/assets/betterend/models/block/{violecite_brick_wall_side.json => violecite_bricks_wall_side.json} (100%) rename src/main/resources/assets/betterend/models/block/{violecite_brick_wall_side_tall.json => violecite_bricks_wall_side_tall.json} (100%) rename src/main/resources/assets/betterend/models/item/{violecite_brick_slab.json => violecite_bricks_slab.json} (100%) rename src/main/resources/assets/betterend/models/item/{violecite_brick_stairs.json => violecite_bricks_stairs.json} (100%) rename src/main/resources/assets/betterend/models/item/{violecite_brick_wall.json => violecite_bricks_wall.json} (100%) diff --git a/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java b/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java index 311345f2..22a16afd 100644 --- a/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java @@ -35,6 +35,9 @@ 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_brick_slab.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json similarity index 100% rename from src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json rename to src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json diff --git a/src/main/resources/assets/betterend/blockstates/violecite_brick_stairs.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json similarity index 100% rename from src/main/resources/assets/betterend/blockstates/violecite_brick_stairs.json rename to src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json diff --git a/src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json similarity index 100% rename from src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json rename to src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_half_slab.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_half_slab.json similarity index 100% rename from src/main/resources/assets/betterend/models/block/violecite_brick_half_slab.json rename to src/main/resources/assets/betterend/models/block/violecite_bricks_half_slab.json diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_inner_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_inner_stairs.json similarity index 100% rename from src/main/resources/assets/betterend/models/block/violecite_brick_inner_stairs.json rename to src/main/resources/assets/betterend/models/block/violecite_bricks_inner_stairs.json diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_outer_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_outer_stairs.json similarity index 100% rename from src/main/resources/assets/betterend/models/block/violecite_brick_outer_stairs.json rename to src/main/resources/assets/betterend/models/block/violecite_bricks_outer_stairs.json diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_stairs.json similarity index 100% rename from src/main/resources/assets/betterend/models/block/violecite_brick_stairs.json rename to src/main/resources/assets/betterend/models/block/violecite_bricks_stairs.json diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_inventory.json similarity index 100% rename from src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json rename to src/main/resources/assets/betterend/models/block/violecite_bricks_wall_inventory.json diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_post.json similarity index 100% rename from src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json rename to src/main/resources/assets/betterend/models/block/violecite_bricks_wall_post.json diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side.json similarity index 100% rename from src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json rename to src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side.json diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side_tall.json similarity index 100% rename from src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json rename to src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side_tall.json diff --git a/src/main/resources/assets/betterend/models/item/violecite_brick_slab.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json similarity index 100% rename from src/main/resources/assets/betterend/models/item/violecite_brick_slab.json rename to src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json diff --git a/src/main/resources/assets/betterend/models/item/violecite_brick_stairs.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json similarity index 100% rename from src/main/resources/assets/betterend/models/item/violecite_brick_stairs.json rename to src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json diff --git a/src/main/resources/assets/betterend/models/item/violecite_brick_wall.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json similarity index 100% rename from src/main/resources/assets/betterend/models/item/violecite_brick_wall.json rename to src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json diff --git a/src/main/resources/assets/betterend/textures/entity/sign/pythadendron_sign.png b/src/main/resources/assets/betterend/textures/entity/sign/pythadendron_sign.png index e9f8d2dcf76ca9bb818f4b01e4273aec8ffefb7f..af4c061a5dcc877e2790bf2a368f11bd9a670559 100644 GIT binary patch delta 1495 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