MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More names fixes

Browse source
This commit is contained in:
Aleksey 2020-10-14 15:47:30 +03:00
parent 32af77723c
commit 683235ebe9
7 changed files with 54 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java
View file

@ -35,9 +35,6 @@ public abstract class ModelVariantMapMixin {
idContext.removeId(); idContext.removeId();
if (block instanceof Patterned) { if (block instanceof Patterned) {
String pattern = ((Patterned) block).getStatesPattern(reader); String pattern = ((Patterned) block).getStatesPattern(reader);
if (data[1].contains("violecite")) {
System.out.println(pattern);
}
info.setReturnValue(deserialize(context, new StringReader(pattern))); info.setReturnValue(deserialize(context, new StringReader(pattern)));
info.cancel(); info.cancel();
} }

4
src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json
View file

@ -1,13 +1,13 @@
{ {
"variants": { "variants": {
"type=bottom": { "type=bottom": {
"model": "betterend:block/violecite_brick_half_slab" "model": "betterend:block/violecite_bricks_half_slab"
}, },
"type=double": { "type=double": {
"model": "betterend:block/violecite_bricks" "model": "betterend:block/violecite_bricks"
}, },
"type=top": { "type=top": {
"model": "betterend:block/violecite_brick_half_slab", "model": "betterend:block/violecite_bricks_half_slab",
"uvlock": true, "uvlock": true,
"x": 180 "x": 180
} }

80
src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json
View file

@ -1,206 +1,206 @@
{ {
"variants": { "variants": {
"facing=east,half=bottom,shape=inner_left": { "facing=east,half=bottom,shape=inner_left": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=east,half=bottom,shape=inner_right": { "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": { "facing=east,half=bottom,shape=outer_left": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=east,half=bottom,shape=outer_right": { "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": { "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": { "facing=east,half=top,shape=inner_left": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=east,half=top,shape=inner_right": { "facing=east,half=top,shape=inner_right": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=east,half=top,shape=outer_left": { "facing=east,half=top,shape=outer_left": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=east,half=top,shape=outer_right": { "facing=east,half=top,shape=outer_right": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=east,half=top,shape=straight": { "facing=east,half=top,shape=straight": {
"model": "betterend:block/violecite_brick_stairs", "model": "betterend:block/violecite_bricks_stairs",
"uvlock": true, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=bottom,shape=inner_left": { "facing=north,half=bottom,shape=inner_left": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=north,half=bottom,shape=inner_right": { "facing=north,half=bottom,shape=inner_right": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=bottom,shape=outer_left": { "facing=north,half=bottom,shape=outer_left": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=north,half=bottom,shape=outer_right": { "facing=north,half=bottom,shape=outer_right": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=bottom,shape=straight": { "facing=north,half=bottom,shape=straight": {
"model": "betterend:block/violecite_brick_stairs", "model": "betterend:block/violecite_bricks_stairs",
"uvlock": true, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=inner_left": { "facing=north,half=top,shape=inner_left": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=inner_right": { "facing=north,half=top,shape=inner_right": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=top,shape=outer_left": { "facing=north,half=top,shape=outer_left": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=outer_right": { "facing=north,half=top,shape=outer_right": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=top,shape=straight": { "facing=north,half=top,shape=straight": {
"model": "betterend:block/violecite_brick_stairs", "model": "betterend:block/violecite_bricks_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=south,half=bottom,shape=inner_left": { "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": { "facing=south,half=bottom,shape=inner_right": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=bottom,shape=outer_left": { "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": { "facing=south,half=bottom,shape=outer_right": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=bottom,shape=straight": { "facing=south,half=bottom,shape=straight": {
"model": "betterend:block/violecite_brick_stairs", "model": "betterend:block/violecite_bricks_stairs",
"uvlock": true, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=inner_left": { "facing=south,half=top,shape=inner_left": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=inner_right": { "facing=south,half=top,shape=inner_right": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=south,half=top,shape=outer_left": { "facing=south,half=top,shape=outer_left": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=outer_right": { "facing=south,half=top,shape=outer_right": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=south,half=top,shape=straight": { "facing=south,half=top,shape=straight": {
"model": "betterend:block/violecite_brick_stairs", "model": "betterend:block/violecite_bricks_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=inner_left": { "facing=west,half=bottom,shape=inner_left": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=inner_right": { "facing=west,half=bottom,shape=inner_right": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=bottom,shape=outer_left": { "facing=west,half=bottom,shape=outer_left": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=outer_right": { "facing=west,half=bottom,shape=outer_right": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=bottom,shape=straight": { "facing=west,half=bottom,shape=straight": {
"model": "betterend:block/violecite_brick_stairs", "model": "betterend:block/violecite_bricks_stairs",
"uvlock": true, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=inner_left": { "facing=west,half=top,shape=inner_left": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=inner_right": { "facing=west,half=top,shape=inner_right": {
"model": "betterend:block/violecite_brick_inner_stairs", "model": "betterend:block/violecite_bricks_inner_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=west,half=top,shape=outer_left": { "facing=west,half=top,shape=outer_left": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=outer_right": { "facing=west,half=top,shape=outer_right": {
"model": "betterend:block/violecite_brick_outer_stairs", "model": "betterend:block/violecite_bricks_outer_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=west,half=top,shape=straight": { "facing=west,half=top,shape=straight": {
"model": "betterend:block/violecite_brick_stairs", "model": "betterend:block/violecite_bricks_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180

18
src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json
View file

@ -5,7 +5,7 @@
"up": "true" "up": "true"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_post" "model": "betterend:block/violecite_bricks_wall_post"
} }
}, },
{ {
@ -13,7 +13,7 @@
"north": "low" "north": "low"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_side", "model": "betterend:block/violecite_bricks_wall_side",
"uvlock": true "uvlock": true
} }
}, },
@ -22,7 +22,7 @@
"east": "low" "east": "low"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_side", "model": "betterend:block/violecite_bricks_wall_side",
"y": 90, "y": 90,
"uvlock": true "uvlock": true
} }
@ -32,7 +32,7 @@
"south": "low" "south": "low"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_side", "model": "betterend:block/violecite_bricks_wall_side",
"y": 180, "y": 180,
"uvlock": true "uvlock": true
} }
@ -42,7 +42,7 @@
"west": "low" "west": "low"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_side", "model": "betterend:block/violecite_bricks_wall_side",
"y": 270, "y": 270,
"uvlock": true "uvlock": true
} }
@ -52,7 +52,7 @@
"north": "tall" "north": "tall"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_side_tall", "model": "betterend:block/violecite_bricks_wall_side_tall",
"uvlock": true "uvlock": true
} }
}, },
@ -61,7 +61,7 @@
"east": "tall" "east": "tall"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_side_tall", "model": "betterend:block/violecite_bricks_wall_side_tall",
"y": 90, "y": 90,
"uvlock": true "uvlock": true
} }
@ -71,7 +71,7 @@
"south": "tall" "south": "tall"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_side_tall", "model": "betterend:block/violecite_bricks_wall_side_tall",
"y": 180, "y": 180,
"uvlock": true "uvlock": true
} }
@ -81,7 +81,7 @@
"west": "tall" "west": "tall"
}, },
"apply": { "apply": {
"model": "betterend:block/violecite_brick_wall_side_tall", "model": "betterend:block/violecite_bricks_wall_side_tall",
"y": 270, "y": 270,
"uvlock": true "uvlock": true
} }

2
src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json
View file

@ -1,3 +1,3 @@
{ {
"parent": "betterend:block/violecite_brick_half_slab" "parent": "betterend:block/violecite_bricks_half_slab"
} }

2
src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json
View file

@ -1,3 +1,3 @@
{ {
"parent": "betterend:block/violecite_brick_stairs" "parent": "betterend:block/violecite_bricks_stairs"
} }

2
src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json
View file

@ -1,3 +1,3 @@
{ {
"parent": "betterend:block/violecite_brick_wall_inventory" "parent": "betterend:block/violecite_bricks_wall_inventory"
} }