diff --git a/src/resources/contentcreator/blockstates/end_stone_brick_slab.json b/src/resources/contentcreator/blockstates/end_stone_brick_slab.json new file mode 100644 index 0000000..e79378d --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_stone_brick_slab.json @@ -0,0 +1,22 @@ +{ + "forge_marker":1, + "defaults":{ + "transform":"forge:default-block", + "model":"half_slab", + "textures":{ + "top":"minecraft:blocks/end_bricks", + "bottom":"minecraft:blocks/end_bricks", + "side":"minecraft:blocks/end_bricks" + } + }, + "variants":{ + "half":{ + "bottom":{}, + "top":{"model":"upper_slab"} + }, + "variant":{ + "normal":{} + }, + "inventory":[{}] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/end_stone_brick_slab_double.json b/src/resources/contentcreator/blockstates/end_stone_brick_slab_double.json new file mode 100644 index 0000000..0e34187 --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_stone_brick_slab_double.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_column", + "textures": { + "end": "minecraft:blocks/end_bricks", + "side": "minecraft:blocks/end_bricks" + } + }, + "variants": { + "half": { + "bottom": {}, + "top": {} + }, + "variant": { + "normal": {} + }, + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/end_stone_brick_stairs.json b/src/resources/contentcreator/blockstates/end_stone_brick_stairs.json new file mode 100644 index 0000000..d71f61b --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_stone_brick_stairs.json @@ -0,0 +1,184 @@ +{ + "forge_marker": 1, + "ambient_occlusion": false, + "defaults": { + "textures": { + "bottom": "minecraft:blocks/end_bricks", + "top": "minecraft:blocks/end_bricks", + "side": "minecraft:blocks/end_bricks" + }, + "uvlock": true + }, + "variants": { + "facing=east,half=bottom,shape=straight": { + "model": "stairs" + }, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=straight": { + "model": "stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 270 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 180 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "inner_stairs" + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180 + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180 + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 270 + }, + "facing=east,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 180 + }, + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180 + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180 + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270 + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180 + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180 + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/menril_fence.json b/src/resources/contentcreator/blockstates/menril_fence.json new file mode 100644 index 0000000..0e6e80b --- /dev/null +++ b/src/resources/contentcreator/blockstates/menril_fence.json @@ -0,0 +1,44 @@ +{ + "forge_marker": 1, + "defaults": { + "transform":"forge:default-block", + "model":"fence_post", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } + }, + "variants": { + "north": { + "true": { + "submodel": { + "side_north": {"model": "fence_side", "uvlock": true} + } + }, + "false": {} + }, + "east": { + "true": { + "submodel": { + "side_east": {"model": "fence_side", "y": 90, "uvlock": true} + } + }, + "false": {} + }, + "south": { + "true": { + "submodel": { + "side_south": {"model": "fence_side", "y": 180, "uvlock": true} + } + }, + "false": {} + }, + "west": { + "true": { + "submodel": { + "side_west": {"model": "fence_side", "y": 270, "uvlock": true} + } + }, + "false": {} + } + } +} diff --git a/src/resources/contentcreator/blockstates/menril_fence_gate.json b/src/resources/contentcreator/blockstates/menril_fence_gate.json new file mode 100644 index 0000000..e12c850 --- /dev/null +++ b/src/resources/contentcreator/blockstates/menril_fence_gate.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false,powered=false": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true }, + "facing=south,in_wall=false,open=false,powered=true": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true }, + "facing=west,in_wall=false,open=false,powered=false": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=west,in_wall=false,open=false,powered=true": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false,powered=false": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=north,in_wall=false,open=false,powered=true": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false,powered=false": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=east,in_wall=false,open=false,powered=true": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true,powered=false": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true }, + "facing=south,in_wall=false,open=true,powered=true": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true,powered=false": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=west,in_wall=false,open=true,powered=true": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true,powered=false": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=north,in_wall=false,open=true,powered=true": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true,powered=false": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=east,in_wall=false,open=true,powered=true": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false,powered=false": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true }, + "facing=south,in_wall=true,open=false,powered=true": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true }, + "facing=west,in_wall=true,open=false,powered=false": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=west,in_wall=true,open=false,powered=true": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false,powered=false": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=north,in_wall=true,open=false,powered=true": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false,powered=false": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=east,in_wall=true,open=false,powered=true": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true,powered=false": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true }, + "facing=south,in_wall=true,open=true,powered=true": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true }, + "facing=west,in_wall=true,open=true,powered=false": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=west,in_wall=true,open=true,powered=true": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true,powered=false": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=north,in_wall=true,open=true,powered=true": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true,powered=false": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 270 }, + "facing=east,in_wall=true,open=true,powered=true": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 270 } + } +} diff --git a/src/resources/contentcreator/blockstates/menril_slab.json b/src/resources/contentcreator/blockstates/menril_slab.json new file mode 100644 index 0000000..1c61c12 --- /dev/null +++ b/src/resources/contentcreator/blockstates/menril_slab.json @@ -0,0 +1,22 @@ +{ + "forge_marker":1, + "defaults":{ + "transform":"forge:default-block", + "model":"half_slab", + "textures":{ + "top":"integrateddynamics:blocks/menril_planks", + "bottom":"integrateddynamics:blocks/menril_planks", + "side":"integrateddynamics:blocks/menril_planks" + } + }, + "variants":{ + "half":{ + "bottom":{}, + "top":{"model":"upper_slab"} + }, + "variant":{ + "normal":{} + }, + "inventory":[{}] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/menril_slab_double.json b/src/resources/contentcreator/blockstates/menril_slab_double.json new file mode 100644 index 0000000..4e0c3f6 --- /dev/null +++ b/src/resources/contentcreator/blockstates/menril_slab_double.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_column", + "textures": { + "end": "integrateddynamics:blocks/menril_planks", + "side": "integrateddynamics:blocks/menril_planks" + } + }, + "variants": { + "half": { + "bottom": {}, + "top": {} + }, + "variant": { + "normal": {} + }, + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/wyrmwood_fence.json b/src/resources/contentcreator/blockstates/wyrmwood_fence.json new file mode 100644 index 0000000..65a9276 --- /dev/null +++ b/src/resources/contentcreator/blockstates/wyrmwood_fence.json @@ -0,0 +1,44 @@ +{ + "forge_marker": 1, + "defaults": { + "transform":"forge:default-block", + "model":"fence_post", + "textures": { + "texture": "stygian:block/endplanks" + } + }, + "variants": { + "north": { + "true": { + "submodel": { + "side_north": {"model": "fence_side", "uvlock": true} + } + }, + "false": {} + }, + "east": { + "true": { + "submodel": { + "side_east": {"model": "fence_side", "y": 90, "uvlock": true} + } + }, + "false": {} + }, + "south": { + "true": { + "submodel": { + "side_south": {"model": "fence_side", "y": 180, "uvlock": true} + } + }, + "false": {} + }, + "west": { + "true": { + "submodel": { + "side_west": {"model": "fence_side", "y": 270, "uvlock": true} + } + }, + "false": {} + } + } +} diff --git a/src/resources/contentcreator/blockstates/wyrmwood_fence_gate.json b/src/resources/contentcreator/blockstates/wyrmwood_fence_gate.json new file mode 100644 index 0000000..00f88e8 --- /dev/null +++ b/src/resources/contentcreator/blockstates/wyrmwood_fence_gate.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true }, + "facing=south,in_wall=false,open=false,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true }, + "facing=west,in_wall=false,open=false,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=west,in_wall=false,open=false,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=north,in_wall=false,open=false,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=east,in_wall=false,open=false,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true }, + "facing=south,in_wall=false,open=true,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=west,in_wall=false,open=true,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=north,in_wall=false,open=true,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=east,in_wall=false,open=true,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true }, + "facing=south,in_wall=true,open=false,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true }, + "facing=west,in_wall=true,open=false,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=west,in_wall=true,open=false,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=north,in_wall=true,open=false,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=east,in_wall=true,open=false,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true }, + "facing=south,in_wall=true,open=true,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true }, + "facing=west,in_wall=true,open=true,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=west,in_wall=true,open=true,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=north,in_wall=true,open=true,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 270 }, + "facing=east,in_wall=true,open=true,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 270 } + } +} diff --git a/src/resources/contentcreator/blockstates/wyrmwood_slab.json b/src/resources/contentcreator/blockstates/wyrmwood_slab.json new file mode 100644 index 0000000..7dd34d6 --- /dev/null +++ b/src/resources/contentcreator/blockstates/wyrmwood_slab.json @@ -0,0 +1,22 @@ +{ + "forge_marker":1, + "defaults":{ + "transform":"forge:default-block", + "model":"half_slab", + "textures":{ + "top":"stygian:block/endplanks", + "bottom":"stygian:block/endplanks", + "side":"stygian:block/endplanks" + } + }, + "variants":{ + "half":{ + "bottom":{}, + "top":{"model":"upper_slab"} + }, + "variant":{ + "normal":{} + }, + "inventory":[{}] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/wyrmwood_slab_double.json b/src/resources/contentcreator/blockstates/wyrmwood_slab_double.json new file mode 100644 index 0000000..6f7d3c3 --- /dev/null +++ b/src/resources/contentcreator/blockstates/wyrmwood_slab_double.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_column", + "textures": { + "end": "stygian:block/endplanks", + "side": "stygian:block/endplanks" + } + }, + "variants": { + "half": { + "bottom": {}, + "top": {} + }, + "variant": { + "normal": {} + }, + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/wyrmwood_stairs.json b/src/resources/contentcreator/blockstates/wyrmwood_stairs.json new file mode 100644 index 0000000..236f398 --- /dev/null +++ b/src/resources/contentcreator/blockstates/wyrmwood_stairs.json @@ -0,0 +1,184 @@ +{ + "forge_marker": 1, + "ambient_occlusion": false, + "defaults": { + "textures": { + "bottom": "stygian:block/endplanks", + "top": "stygian:block/endplanks", + "side": "stygian:block/endplanks" + }, + "uvlock": true + }, + "variants": { + "facing=east,half=bottom,shape=straight": { + "model": "stairs" + }, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=straight": { + "model": "stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 270 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 180 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "inner_stairs" + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180 + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180 + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 270 + }, + "facing=east,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 180 + }, + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180 + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180 + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270 + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180 + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180 + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/lang/en_us.lang b/src/resources/contentcreator/lang/en_us.lang new file mode 100644 index 0000000..d9e1a34 --- /dev/null +++ b/src/resources/contentcreator/lang/en_us.lang @@ -0,0 +1,11 @@ +tile.contentcreator.wyrmwood_slab.name=Wyrmwood Slab +tile.contentcreator.wyrmwood_stairs.name=Wyrmwood Stairs +tile.contentcreator.wyrmwood_fence.name=Wyrmwood Fence +tile.contentcreator.wyrmwood_fence_gate.name=Wyrmwood Fence Gate + +tile.contentcreator.menril_slab.name=Menril Wood Slab +tile.contentcreator.menril_fence.name=Menril Fence +tile.contentcreator.menril_fence_gate.name=Menril Fence Gate + +tile.contentcreator.end_stone_brick_slab.name=End Stone Brick Slab +tile.contentcreator.end_stone_brick_stairs.name=End Stone Brick Stairs \ No newline at end of file diff --git a/src/resources/contentcreator/lang/zh_cn.lang b/src/resources/contentcreator/lang/zh_cn.lang new file mode 100644 index 0000000..cf93d88 --- /dev/null +++ b/src/resources/contentcreator/lang/zh_cn.lang @@ -0,0 +1,11 @@ +tile.contentcreator.wyrmwood_slab.name=龙木台阶 +tile.contentcreator.wyrmwood_stairs.name=龙木楼梯 +tile.contentcreator.wyrmwood_fence.name=龙木栅栏 +tile.contentcreator.wyrmwood_fence_gate.name=龙木栅栏门 + +tile.contentcreator.menril_slab.name=门瑞欧木台阶 +tile.contentcreator.menril_fence.name=门瑞欧木栅栏 +tile.contentcreator.menril_fence_gate.name=门瑞欧木栅栏门 + +tile.contentcreator.end_stone_brick_slab.name=末地石砖台阶 +tile.contentcreator.end_stone_brick_stairs.name=末地石砖楼梯 \ No newline at end of file diff --git a/src/resources/contentcreator/models/block/menril_fence_gate_closed.json b/src/resources/contentcreator/models/block/menril_fence_gate_closed.json new file mode 100644 index 0000000..cd739fd --- /dev/null +++ b/src/resources/contentcreator/models/block/menril_fence_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_closed", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/block/menril_fence_gate_open.json b/src/resources/contentcreator/models/block/menril_fence_gate_open.json new file mode 100644 index 0000000..3ec8857 --- /dev/null +++ b/src/resources/contentcreator/models/block/menril_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_open", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/block/menril_wall_gate_closed.json b/src/resources/contentcreator/models/block/menril_wall_gate_closed.json new file mode 100644 index 0000000..c26754c --- /dev/null +++ b/src/resources/contentcreator/models/block/menril_wall_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_gate_closed", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/block/menril_wall_gate_open.json b/src/resources/contentcreator/models/block/menril_wall_gate_open.json new file mode 100644 index 0000000..7859903 --- /dev/null +++ b/src/resources/contentcreator/models/block/menril_wall_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_gate_open", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/block/wyrmwood_fence_gate_closed.json b/src/resources/contentcreator/models/block/wyrmwood_fence_gate_closed.json new file mode 100644 index 0000000..44c84c3 --- /dev/null +++ b/src/resources/contentcreator/models/block/wyrmwood_fence_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_closed", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/block/wyrmwood_fence_gate_open.json b/src/resources/contentcreator/models/block/wyrmwood_fence_gate_open.json new file mode 100644 index 0000000..e336aac --- /dev/null +++ b/src/resources/contentcreator/models/block/wyrmwood_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_open", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/block/wyrmwood_wall_gate_closed.json b/src/resources/contentcreator/models/block/wyrmwood_wall_gate_closed.json new file mode 100644 index 0000000..5caf4a5 --- /dev/null +++ b/src/resources/contentcreator/models/block/wyrmwood_wall_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_gate_closed", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/block/wyrmwood_wall_gate_open.json b/src/resources/contentcreator/models/block/wyrmwood_wall_gate_open.json new file mode 100644 index 0000000..88c83b5 --- /dev/null +++ b/src/resources/contentcreator/models/block/wyrmwood_wall_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_gate_open", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/item/end_stone_brick_stairs.json b/src/resources/contentcreator/models/item/end_stone_brick_stairs.json new file mode 100644 index 0000000..8593818 --- /dev/null +++ b/src/resources/contentcreator/models/item/end_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "minecraft:blocks/end_bricks", + "top": "minecraft:blocks/end_bricks", + "side": "minecraft:blocks/end_bricks" + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/models/item/menril_fence.json b/src/resources/contentcreator/models/item/menril_fence.json new file mode 100644 index 0000000..07d1977 --- /dev/null +++ b/src/resources/contentcreator/models/item/menril_fence.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/item/menril_fence_gate.json b/src/resources/contentcreator/models/item/menril_fence_gate.json new file mode 100644 index 0000000..9d73c74 --- /dev/null +++ b/src/resources/contentcreator/models/item/menril_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_closed", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/models/item/wyrmwood_fence.json b/src/resources/contentcreator/models/item/wyrmwood_fence.json new file mode 100644 index 0000000..9d1b79a --- /dev/null +++ b/src/resources/contentcreator/models/item/wyrmwood_fence.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/item/wyrmwood_fence_gate.json b/src/resources/contentcreator/models/item/wyrmwood_fence_gate.json new file mode 100644 index 0000000..deec153 --- /dev/null +++ b/src/resources/contentcreator/models/item/wyrmwood_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_closed", + "textures": { + "texture": "stygian:block/endplanks" + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/models/item/wyrmwood_stairs.json b/src/resources/contentcreator/models/item/wyrmwood_stairs.json new file mode 100644 index 0000000..384ae83 --- /dev/null +++ b/src/resources/contentcreator/models/item/wyrmwood_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "stygian:block/endplanks", + "top": "stygian:block/endplanks", + "side": "stygian:block/endplanks" + } +} \ No newline at end of file diff --git a/src/scripts/Events.zs b/src/scripts/Events.zs index 8c5daff..eec5cf3 100644 --- a/src/scripts/Events.zs +++ b/src/scripts/Events.zs @@ -18,11 +18,12 @@ import scripts.ct.Function; //every ender teleport now creates a extraterrestrail matter on the ground events.onEnderTeleport(function(event as EnderTeleportEvent) { if (!event.entityLivingBase.world.remote && event.entityLivingBase instanceof IPlayer) { - event.entityLivingBase.world.spawnEntity(.createEntityItem(event.entityLivingBase.world, event.targetX, event.targetY, event.targetZ)); + event.entityLivingBase.world.spawnEntity(.createEntityItem(event.entityLivingBase.world, event.targetX as float, event.targetY as float, event.targetZ as float)); } }); //breaking endstone with hands now drops endstone shards +//Also fixes Wyrmwood and menril double slabs not dropping themselves static blacklist as IItemStack[] = [, , , ] as IItemStack[]; events.onBlockBreak(function(event as BlockBreakEvent) { if (!event.world.remote && event.blockState == && event.isPlayer && !extrautilities2.Tweaker.XUTweaker.isPlayerFake(event.player) && event.player.creative == false) { @@ -87,7 +88,7 @@ events.onPlayerTick(function(event as PlayerTickEvent) { if data has "FallingDistance" { var distance = data.memberGet("FallingDistance") as int; if distance >= 100 { - event.player.world.spawnEntity(.withTag({EasterEgg: 1}).createEntityItem(event.player.world, player.x, 255, player.z)); + event.player.world.spawnEntity(.withTag({EasterEgg: 1}).createEntityItem(event.player.world, player.x as float, 255 as float, player.z as float)); player.update(data + {"FallingDistance": distance - 100}); } } diff --git a/src/scripts/OredictPatches.zs b/src/scripts/OredictPatches.zs index 8a0fbac..0b803ba 100644 --- a/src/scripts/OredictPatches.zs +++ b/src/scripts/OredictPatches.zs @@ -41,4 +41,10 @@ .addItems([]); //Warp -.addItems([]); \ No newline at end of file +.addItems([]); + +//New wooden slabs and stairs +.addItems([, ]); +.addItems([]); +.addItems([, ]); +.addItems([, ]); \ No newline at end of file diff --git a/src/scripts/contentcreator/end_stone_bricks.zs b/src/scripts/contentcreator/end_stone_bricks.zs new file mode 100644 index 0000000..e4bd8c9 --- /dev/null +++ b/src/scripts/contentcreator/end_stone_bricks.zs @@ -0,0 +1,18 @@ +#loader preinit +import mods.contenttweaker.VanillaFactory; +import contentcreator.block.GenericBlock; +import crafttweaker.block.IMaterial; +import contentcreator.block.SoundType; + +//Wyrmwood +var end_stone_brick_slab = GenericBlock.createSlab(IMaterial.rock(), "end_stone_brick_slab"); +end_stone_brick_slab.setStrength(1.5, 9.0); +end_stone_brick_slab.setSoundType(SoundType.get("stone")); +end_stone_brick_slab.setHarvestLevel("pickaxe", 0); +end_stone_brick_slab.register(); + +var end_stone_brick_stairs = GenericBlock.createStairs("end_stone_brick_stairs", ); +end_stone_brick_stairs.setStrength(1.5, 9.0); +end_stone_brick_stairs.setSoundType(SoundType.get("stone")); +end_stone_brick_stairs.setHarvestLevel("pickaxe", 0); +end_stone_brick_stairs.register(); \ No newline at end of file diff --git a/src/scripts/contentcreator/wood_slabs.zs b/src/scripts/contentcreator/wood_slabs.zs new file mode 100644 index 0000000..8355ebf --- /dev/null +++ b/src/scripts/contentcreator/wood_slabs.zs @@ -0,0 +1,46 @@ +#loader preinit +import mods.contenttweaker.VanillaFactory; +import contentcreator.block.GenericBlock; +import crafttweaker.block.IMaterial; +import contentcreator.block.SoundType; + +//Wyrmwood +var wyrmwood_slab = GenericBlock.createSlab(IMaterial.wood(), "wyrmwood_slab"); +wyrmwood_slab.setStrength(2.0, 3.0); +wyrmwood_slab.setSoundType(SoundType.get("wood")); +wyrmwood_slab.setHarvestLevel("axe", 0); +wyrmwood_slab.register(); + +var wyrmwood_stairs = GenericBlock.createStairs("wyrmwood_stairs", ); +wyrmwood_stairs.register(); + +var wyrmwood_fence = GenericBlock.createFence(IMaterial.wood(), "wyrmwood_fence"); +wyrmwood_fence.setStrength(2.0, 3.0); +wyrmwood_fence.setSoundType(SoundType.get("wood")); +wyrmwood_fence.setHarvestLevel("axe", 0); +wyrmwood_fence.register(); + +var wyrmwood_fence_gate = GenericBlock.createFenceGate(IMaterial.wood(), "wyrmwood_fence_gate"); +wyrmwood_fence_gate.setStrength(2.0, 3.0); +wyrmwood_fence_gate.setSoundType(SoundType.get("wood")); +wyrmwood_fence_gate.setHarvestLevel("axe", 0); +wyrmwood_fence_gate.register(); + +//Menril wood +var menril_slab = GenericBlock.createSlab(IMaterial.wood(), "menril_slab"); +menril_slab.setStrength(2.0, 3.0); +menril_slab.setSoundType(SoundType.get("wood")); +menril_slab.setHarvestLevel("axe", 0); +menril_slab.register(); + +var menril_fence = GenericBlock.createFence(IMaterial.wood(), "menril_fence"); +menril_fence.setStrength(2.0, 3.0); +menril_fence.setSoundType(SoundType.get("wood")); +menril_fence.setHarvestLevel("axe", 0); +menril_fence.register(); + +var menril_fence_gate = GenericBlock.createFenceGate(IMaterial.wood(), "menril_fence_gate"); +menril_fence_gate.setStrength(2.0, 3.0); +menril_fence_gate.setSoundType(SoundType.get("wood")); +menril_fence_gate.setHarvestLevel("axe", 0); +menril_fence_gate.register(); \ No newline at end of file diff --git a/src/scripts/ct/CoT.zs b/src/scripts/ct/CoT.zs index a9085c4..15fa685 100644 --- a/src/scripts/ct/CoT.zs +++ b/src/scripts/ct/CoT.zs @@ -92,4 +92,21 @@ recipes.addShaped(, [[.withTag({Fluid //Dilithium recipes.addShapeless(, [, , , , , , , , ]); -recipes.addShapeless( * 9, []); \ No newline at end of file +recipes.addShapeless( * 9, []); + +//New wooden slabs and stairs +recipes.addShaped(*6, [[, , ]]); +recipes.addShapedMirrored(*4, [[, null, null], [, , null], [, , ]]); +recipes.addShapeless(, [, ]); +recipes.addShaped(*3, [[, , ], [, , ]]); +recipes.addShaped(, [[, , ], [, , ]]); + +recipes.addShaped(*6, [[, , ]]); +recipes.addShapeless(, [, ]); +recipes.addShaped(*3, [[, , ], [, , ]]); +recipes.addShaped(, [[, , ], [, , ]]); + +//End Stone Brick Slabs and Stairs +recipes.addShaped(*6, [[, , ]]); +recipes.addShapedMirrored(*4, [[, null, null], [, , null], [, , ]]); +recipes.addShapeless(, [, ]); \ No newline at end of file