diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index aaa71a97b..c6cd245b2 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -59,60 +59,38 @@ import net.minecraftforge.registries.IForgeRegistry; public enum AllBlocks { // Schematics - SCHEMATICANNON(new SchematicannonBlock()), - SCHEMATICANNON_CONNECTOR(new RenderUtilityBlock()), - SCHEMATICANNON_PIPE(new RenderUtilityBlock()), - CREATIVE_CRATE(new CreativeCrateBlock()), + SCHEMATICANNON(new SchematicannonBlock()), SCHEMATICANNON_CONNECTOR(new RenderUtilityBlock()), + SCHEMATICANNON_PIPE(new RenderUtilityBlock()), CREATIVE_CRATE(new CreativeCrateBlock()), SCHEMATIC_TABLE(new SchematicTableBlock()), // Kinetics - SHAFT(new ShaftBlock(Properties.from(Blocks.ANDESITE))), - COGWHEEL(new CogWheelBlock(false)), - LARGE_COGWHEEL(new CogWheelBlock(true)), - ENCASED_SHAFT(new EncasedShaftBlock()), - ENCASED_BELT(new EncasedBeltBlock()), - CLUTCH(new ClutchBlock()), - GEARSHIFT(new GearshiftBlock()), - GEARBOX(new GearboxBlock()), - BELT(new BeltBlock()), - BELT_PULLEY(new RenderUtilityAxisBlock()), + SHAFT(new ShaftBlock(Properties.from(Blocks.ANDESITE))), COGWHEEL(new CogWheelBlock(false)), + LARGE_COGWHEEL(new CogWheelBlock(true)), ENCASED_SHAFT(new EncasedShaftBlock()), + ENCASED_BELT(new EncasedBeltBlock()), CLUTCH(new ClutchBlock()), GEARSHIFT(new GearshiftBlock()), + GEARBOX(new GearboxBlock()), BELT(new BeltBlock()), BELT_PULLEY(new RenderUtilityAxisBlock()), BELT_ANIMATION(new RenderUtilityBlock()), - MOTOR(new MotorBlock()), - WATER_WHEEL(new WaterWheelBlock()), + MOTOR(new MotorBlock()), WATER_WHEEL(new WaterWheelBlock()), - ENCASED_FAN(new EncasedFanBlock()), - ENCASED_FAN_INNER(new RenderUtilityAxisBlock()), - TURNTABLE(new TurntableBlock()), - SHAFT_HALF(new ShaftHalfBlock()), - CRUSHING_WHEEL(new CrushingWheelBlock()), + ENCASED_FAN(new EncasedFanBlock()), ENCASED_FAN_INNER(new RenderUtilityAxisBlock()), + TURNTABLE(new TurntableBlock()), SHAFT_HALF(new ShaftHalfBlock()), CRUSHING_WHEEL(new CrushingWheelBlock()), CRUSHING_WHEEL_CONTROLLER(new CrushingWheelControllerBlock()), - MECHANICAL_PISTON(new MechanicalPistonBlock(false)), - STICKY_MECHANICAL_PISTON(new MechanicalPistonBlock(true)), - MECHANICAL_PISTON_HEAD(new MechanicalPistonHeadBlock()), - PISTON_POLE(new PistonPoleBlock()), - CONSTRUCT(new ChassisBlock(ChassisBlock.Type.NORMAL)), - STICKY_CONSTRUCT(new ChassisBlock(ChassisBlock.Type.STICKY)), + MECHANICAL_PISTON(new MechanicalPistonBlock(false)), STICKY_MECHANICAL_PISTON(new MechanicalPistonBlock(true)), + MECHANICAL_PISTON_HEAD(new MechanicalPistonHeadBlock()), PISTON_POLE(new PistonPoleBlock()), + CONSTRUCT(new ChassisBlock(ChassisBlock.Type.NORMAL)), STICKY_CONSTRUCT(new ChassisBlock(ChassisBlock.Type.STICKY)), RELOCATION_CONSTRUCT(new ChassisBlock(ChassisBlock.Type.RELOCATING)), - DRILL(new DrillBlock()), - HARVESTER(new HarvesterBlock()), - CONTACT(new ContactBlock()), + DRILL(new DrillBlock()), HARVESTER(new HarvesterBlock()), CONTACT(new ContactBlock()), // Logistics - PULSE_REPEATER(new PulseRepeaterBlock()), - REDSTONE_BRIDGE(new RedstoneBridgeBlock()), - STOCKSWITCH(new StockswitchBlock()), - FLEXCRATE(new FlexcrateBlock()), - EXTRACTOR(new ExtractorBlock()), - LINKED_EXTRACTOR(new LinkedExtractorBlock()), - BELT_FUNNEL(new BeltFunnelBlock()), + PULSE_REPEATER(new PulseRepeaterBlock()), REDSTONE_BRIDGE(new RedstoneBridgeBlock()), + STOCKSWITCH(new StockswitchBlock()), FLEXCRATE(new FlexcrateBlock()), EXTRACTOR(new ExtractorBlock()), + LINKED_EXTRACTOR(new LinkedExtractorBlock()), BELT_FUNNEL(new BeltFunnelBlock()), ENTITY_DETECTOR(new EntityDetectorBlock()), // Symmetry - SYMMETRY_PLANE(new PlaneSymmetryBlock()), - SYMMETRY_CROSSPLANE(new CrossPlaneSymmetryBlock()), + SYMMETRY_PLANE(new PlaneSymmetryBlock()), SYMMETRY_CROSSPLANE(new CrossPlaneSymmetryBlock()), SYMMETRY_TRIPLEPLANE(new TriplePlaneSymmetryBlock()), // Gardens @@ -126,24 +104,26 @@ public enum AllBlocks { DIORITE_BRICKS(new Block(Properties.from(Blocks.DIORITE))), GRANITE_BRICKS(new Block(Properties.from(Blocks.GRANITE))), - GABBRO(new Block(Properties.from(Blocks.ANDESITE))), - POLISHED_GABBRO(new Block(Properties.from(GABBRO.block))), - GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))), - PAVED_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))), - INDENTED_GABBRO(new Block(Properties.from(GABBRO.block))), + GABBRO(new Block(Properties.from(Blocks.ANDESITE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + POLISHED_GABBRO(new Block(Properties.from(GABBRO.block))), + GABBRO_BRICKS(new Block(Properties.from(GABBRO.block)), ComesWith.STAIRS, ComesWith.WALL), + PAVED_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block)), ComesWith.SLAB), + INDENTED_GABBRO(new Block(Properties.from(GABBRO.block)), ComesWith.SLAB), SLIGHTLY_MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))), MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))), - - LIMESTONE(new Block(Properties.from(Blocks.SANDSTONE))), - POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block))), - LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block))), + + LIMESTONE(new Block(Properties.from(Blocks.GRANITE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block)), ComesWith.SLAB), LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(LIMESTONE.block))), - QUARTZIORITE(new Block(Properties.from(Blocks.QUARTZ_BLOCK))), - QUARTZIORITE_BRICKS(new Block(Properties.from(QUARTZIORITE.block))), - POLISHED_QUARTZIORITE(new Block(Properties.from(QUARTZIORITE.block))), + WEATHERED_LIMESTONE(new Block(Properties.from(Blocks.SANDSTONE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + POLISHED_WEATHERED_LIMESTONE(new Block(Properties.from(WEATHERED_LIMESTONE.block)), ComesWith.SLAB), + WEATHERED_LIMESTONE_BRICKS(new Block(Properties.from(WEATHERED_LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, + ComesWith.WALL), + WEATHERED_LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(WEATHERED_LIMESTONE.block))), - DOLOMITE(new Block(Properties.from(Blocks.GRANITE))), + DOLOMITE(new Block(Properties.from(Blocks.QUARTZ_BLOCK)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), DOLOMITE_BRICKS(new Block(Properties.from(DOLOMITE.block))), POLISHED_DOLOMITE(new Block(Properties.from(DOLOMITE.block))), DOLOMITE_PILLAR(new RotatedPillarBlock(Properties.from(DOLOMITE.block))), diff --git a/src/main/resources/assets/create/blockstates/dolomite_bricks_slab.json b/src/main/resources/assets/create/blockstates/dolomite_bricks_slab.json new file mode 100644 index 000000000..fb5a720bf --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dolomite_bricks_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/dolomite_bricks_slab_top" }, + "bottom": { "model":"create:block/palettes/dolomite_bricks_slab" }, + "double": { "model":"create:block/palettes/dolomite_bricks" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dolomite_bricks_stairs.json b/src/main/resources/assets/create/blockstates/dolomite_bricks_stairs.json new file mode 100644 index 000000000..4441f039d --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dolomite_bricks_stairs.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "facing":{ + "east":{}, + "west":{"y": 180}, + "south":{"y": 90}, + "north":{"y": 270} + }, + "half":{ + "bottom":{}, + "top":{"x": 180} + }, + "shape":{ + "straight":{"model":"create:block/palettes/dolomite_bricks_stairs"}, + "outer_right":{"model":"create:block/palettes/dolomite_bricks_stairs_outer"}, + "outer_left":{"model":"create:block/palettes/dolomite_bricks_stairs_outer"}, + "inner_right":{"model":"create:block/palettes/dolomite_bricks_stairs_inner"}, + "inner_left":{"model":"create:block/palettes/dolomite_bricks_stairs_inner"} + }, + "facing=east,half=bottom,shape=outer_left": {"y": 270}, + "facing=west,half=bottom,shape=outer_left": {"y": 90}, + "facing=south,half=bottom,shape=outer_left": {"y": 0}, + "facing=north,half=bottom,shape=outer_left": {"y": 180}, + "facing=east,half=bottom,shape=inner_left": {"y": 270}, + "facing=west,half=bottom,shape=inner_left": {"y": 90}, + "facing=south,half=bottom,shape=inner_left": {"y": 0}, + "facing=north,half=bottom,shape=inner_left": {"y": 180}, + "facing=west,half=top,shape=straight": {"x": 180, "y": 180}, + "facing=south,half=top,shape=straight": {"x": 180, "y": 90}, + "facing=north,half=top,shape=straight": {"x": 180, "y": 270}, + "facing=west,half=top,shape=outer_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=outer_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=outer_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0}, + "facing=east,half=top,shape=inner_right": {"x": 180, "y": 0}, + "facing=west,half=top,shape=inner_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=inner_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=inner_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dolomite_bricks_wall.json b/src/main/resources/assets/create/blockstates/dolomite_bricks_wall.json new file mode 100644 index 000000000..b238ecfb0 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dolomite_bricks_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "create:block/palettes/dolomite_bricks_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "create:block/palettes/dolomite_bricks_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "create:block/palettes/dolomite_bricks_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "create:block/palettes/dolomite_bricks_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "create:block/palettes/dolomite_bricks_wall_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dolomite_pillar.json b/src/main/resources/assets/create/blockstates/dolomite_pillar.json index 68c72bc3a..26c76865b 100644 --- a/src/main/resources/assets/create/blockstates/dolomite_pillar.json +++ b/src/main/resources/assets/create/blockstates/dolomite_pillar.json @@ -1,7 +1,7 @@ { "variants": { - "axis=y": { "model": "create:block/palettes/dolomite_pillar" }, "axis=z": { "model": "create:block/palettes/dolomite_pillar", "x": 90 }, + "axis=y": { "model": "create:block/palettes/dolomite_pillar" }, "axis=x": { "model": "create:block/palettes/dolomite_pillar", "x": 90, "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dolomite_slab.json b/src/main/resources/assets/create/blockstates/dolomite_slab.json new file mode 100644 index 000000000..8a7c3108b --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dolomite_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/dolomite_slab_top" }, + "bottom": { "model":"create:block/palettes/dolomite_slab" }, + "double": { "model":"create:block/palettes/dolomite" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dolomite_stairs.json b/src/main/resources/assets/create/blockstates/dolomite_stairs.json new file mode 100644 index 000000000..cc108d952 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dolomite_stairs.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "facing":{ + "east":{}, + "west":{"y": 180}, + "south":{"y": 90}, + "north":{"y": 270} + }, + "half":{ + "bottom":{}, + "top":{"x": 180} + }, + "shape":{ + "straight":{"model":"create:block/palettes/dolomite_stairs"}, + "outer_right":{"model":"create:block/palettes/dolomite_stairs_outer"}, + "outer_left":{"model":"create:block/palettes/dolomite_stairs_outer"}, + "inner_right":{"model":"create:block/palettes/dolomite_stairs_inner"}, + "inner_left":{"model":"create:block/palettes/dolomite_stairs_inner"} + }, + "facing=east,half=bottom,shape=outer_left": {"y": 270}, + "facing=west,half=bottom,shape=outer_left": {"y": 90}, + "facing=south,half=bottom,shape=outer_left": {"y": 0}, + "facing=north,half=bottom,shape=outer_left": {"y": 180}, + "facing=east,half=bottom,shape=inner_left": {"y": 270}, + "facing=west,half=bottom,shape=inner_left": {"y": 90}, + "facing=south,half=bottom,shape=inner_left": {"y": 0}, + "facing=north,half=bottom,shape=inner_left": {"y": 180}, + "facing=west,half=top,shape=straight": {"x": 180, "y": 180}, + "facing=south,half=top,shape=straight": {"x": 180, "y": 90}, + "facing=north,half=top,shape=straight": {"x": 180, "y": 270}, + "facing=west,half=top,shape=outer_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=outer_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=outer_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0}, + "facing=east,half=top,shape=inner_right": {"x": 180, "y": 0}, + "facing=west,half=top,shape=inner_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=inner_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=inner_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dolomite_wall.json b/src/main/resources/assets/create/blockstates/dolomite_wall.json new file mode 100644 index 000000000..d8aeed01a --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dolomite_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "create:block/palettes/dolomite_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "create:block/palettes/dolomite_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "create:block/palettes/dolomite_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "create:block/palettes/dolomite_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "create:block/palettes/dolomite_wall_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gabbro_bricks_stairs.json b/src/main/resources/assets/create/blockstates/gabbro_bricks_stairs.json new file mode 100644 index 000000000..bd21f14a9 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/gabbro_bricks_stairs.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "facing":{ + "east":{}, + "west":{"y": 180}, + "south":{"y": 90}, + "north":{"y": 270} + }, + "half":{ + "bottom":{}, + "top":{"x": 180} + }, + "shape":{ + "straight":{"model":"create:block/palettes/gabbro_bricks_stairs"}, + "outer_right":{"model":"create:block/palettes/gabbro_bricks_stairs_outer"}, + "outer_left":{"model":"create:block/palettes/gabbro_bricks_stairs_outer"}, + "inner_right":{"model":"create:block/palettes/gabbro_bricks_stairs_inner"}, + "inner_left":{"model":"create:block/palettes/gabbro_bricks_stairs_inner"} + }, + "facing=east,half=bottom,shape=outer_left": {"y": 270}, + "facing=west,half=bottom,shape=outer_left": {"y": 90}, + "facing=south,half=bottom,shape=outer_left": {"y": 0}, + "facing=north,half=bottom,shape=outer_left": {"y": 180}, + "facing=east,half=bottom,shape=inner_left": {"y": 270}, + "facing=west,half=bottom,shape=inner_left": {"y": 90}, + "facing=south,half=bottom,shape=inner_left": {"y": 0}, + "facing=north,half=bottom,shape=inner_left": {"y": 180}, + "facing=west,half=top,shape=straight": {"x": 180, "y": 180}, + "facing=south,half=top,shape=straight": {"x": 180, "y": 90}, + "facing=north,half=top,shape=straight": {"x": 180, "y": 270}, + "facing=west,half=top,shape=outer_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=outer_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=outer_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0}, + "facing=east,half=top,shape=inner_right": {"x": 180, "y": 0}, + "facing=west,half=top,shape=inner_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=inner_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=inner_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gabbro_bricks_wall.json b/src/main/resources/assets/create/blockstates/gabbro_bricks_wall.json new file mode 100644 index 000000000..aaebe7295 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/gabbro_bricks_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "create:block/palettes/gabbro_bricks_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "create:block/palettes/gabbro_bricks_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "create:block/palettes/gabbro_bricks_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "create:block/palettes/gabbro_bricks_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "create:block/palettes/gabbro_bricks_wall_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gabbro_slab.json b/src/main/resources/assets/create/blockstates/gabbro_slab.json new file mode 100644 index 000000000..1a1b587b2 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/gabbro_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/gabbro_slab_top" }, + "bottom": { "model":"create:block/palettes/gabbro_slab" }, + "double": { "model":"create:block/palettes/gabbro" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gabbro_stairs.json b/src/main/resources/assets/create/blockstates/gabbro_stairs.json new file mode 100644 index 000000000..948c7fb38 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/gabbro_stairs.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "facing":{ + "east":{}, + "west":{"y": 180}, + "south":{"y": 90}, + "north":{"y": 270} + }, + "half":{ + "bottom":{}, + "top":{"x": 180} + }, + "shape":{ + "straight":{"model":"create:block/palettes/gabbro_stairs"}, + "outer_right":{"model":"create:block/palettes/gabbro_stairs_outer"}, + "outer_left":{"model":"create:block/palettes/gabbro_stairs_outer"}, + "inner_right":{"model":"create:block/palettes/gabbro_stairs_inner"}, + "inner_left":{"model":"create:block/palettes/gabbro_stairs_inner"} + }, + "facing=east,half=bottom,shape=outer_left": {"y": 270}, + "facing=west,half=bottom,shape=outer_left": {"y": 90}, + "facing=south,half=bottom,shape=outer_left": {"y": 0}, + "facing=north,half=bottom,shape=outer_left": {"y": 180}, + "facing=east,half=bottom,shape=inner_left": {"y": 270}, + "facing=west,half=bottom,shape=inner_left": {"y": 90}, + "facing=south,half=bottom,shape=inner_left": {"y": 0}, + "facing=north,half=bottom,shape=inner_left": {"y": 180}, + "facing=west,half=top,shape=straight": {"x": 180, "y": 180}, + "facing=south,half=top,shape=straight": {"x": 180, "y": 90}, + "facing=north,half=top,shape=straight": {"x": 180, "y": 270}, + "facing=west,half=top,shape=outer_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=outer_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=outer_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0}, + "facing=east,half=top,shape=inner_right": {"x": 180, "y": 0}, + "facing=west,half=top,shape=inner_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=inner_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=inner_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gabbro_wall.json b/src/main/resources/assets/create/blockstates/gabbro_wall.json new file mode 100644 index 000000000..bbb8c3485 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/gabbro_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "create:block/palettes/gabbro_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "create:block/palettes/gabbro_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "create:block/palettes/gabbro_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "create:block/palettes/gabbro_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "create:block/palettes/gabbro_wall_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json b/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json new file mode 100644 index 000000000..4e5db95dc --- /dev/null +++ b/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/indented_gabbro_slab_top" }, + "bottom": { "model":"create:block/palettes/indented_gabbro_slab" }, + "double": { "model":"create:block/palettes/indented_gabbro" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/limestone_bricks_slab.json b/src/main/resources/assets/create/blockstates/limestone_bricks_slab.json new file mode 100644 index 000000000..7893da168 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/limestone_bricks_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/limestone_bricks_slab_top" }, + "bottom": { "model":"create:block/palettes/limestone_bricks_slab" }, + "double": { "model":"create:block/palettes/limestone_bricks" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/limestone_bricks_stairs.json b/src/main/resources/assets/create/blockstates/limestone_bricks_stairs.json new file mode 100644 index 000000000..100202a77 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/limestone_bricks_stairs.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "facing":{ + "east":{}, + "west":{"y": 180}, + "south":{"y": 90}, + "north":{"y": 270} + }, + "half":{ + "bottom":{}, + "top":{"x": 180} + }, + "shape":{ + "straight":{"model":"create:block/palettes/limestone_bricks_stairs"}, + "outer_right":{"model":"create:block/palettes/limestone_bricks_stairs_outer"}, + "outer_left":{"model":"create:block/palettes/limestone_bricks_stairs_outer"}, + "inner_right":{"model":"create:block/palettes/limestone_bricks_stairs_inner"}, + "inner_left":{"model":"create:block/palettes/limestone_bricks_stairs_inner"} + }, + "facing=east,half=bottom,shape=outer_left": {"y": 270}, + "facing=west,half=bottom,shape=outer_left": {"y": 90}, + "facing=south,half=bottom,shape=outer_left": {"y": 0}, + "facing=north,half=bottom,shape=outer_left": {"y": 180}, + "facing=east,half=bottom,shape=inner_left": {"y": 270}, + "facing=west,half=bottom,shape=inner_left": {"y": 90}, + "facing=south,half=bottom,shape=inner_left": {"y": 0}, + "facing=north,half=bottom,shape=inner_left": {"y": 180}, + "facing=west,half=top,shape=straight": {"x": 180, "y": 180}, + "facing=south,half=top,shape=straight": {"x": 180, "y": 90}, + "facing=north,half=top,shape=straight": {"x": 180, "y": 270}, + "facing=west,half=top,shape=outer_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=outer_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=outer_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0}, + "facing=east,half=top,shape=inner_right": {"x": 180, "y": 0}, + "facing=west,half=top,shape=inner_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=inner_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=inner_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/limestone_bricks_wall.json b/src/main/resources/assets/create/blockstates/limestone_bricks_wall.json new file mode 100644 index 000000000..0febf0d65 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/limestone_bricks_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "create:block/palettes/limestone_bricks_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "create:block/palettes/limestone_bricks_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "create:block/palettes/limestone_bricks_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "create:block/palettes/limestone_bricks_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "create:block/palettes/limestone_bricks_wall_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/limestone_pillar.json b/src/main/resources/assets/create/blockstates/limestone_pillar.json index 219e727d6..1694f9605 100644 --- a/src/main/resources/assets/create/blockstates/limestone_pillar.json +++ b/src/main/resources/assets/create/blockstates/limestone_pillar.json @@ -1,7 +1,7 @@ { "variants": { - "axis=z": { "model": "create:block/palettes/limestone_pillar", "x": 90 }, "axis=y": { "model": "create:block/palettes/limestone_pillar" }, + "axis=z": { "model": "create:block/palettes/limestone_pillar", "x": 90 }, "axis=x": { "model": "create:block/palettes/limestone_pillar", "x": 90, "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/limestone_slab.json b/src/main/resources/assets/create/blockstates/limestone_slab.json new file mode 100644 index 000000000..4a176b7ae --- /dev/null +++ b/src/main/resources/assets/create/blockstates/limestone_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/limestone_slab_top" }, + "bottom": { "model":"create:block/palettes/limestone_slab" }, + "double": { "model":"create:block/palettes/limestone" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/limestone_stairs.json b/src/main/resources/assets/create/blockstates/limestone_stairs.json new file mode 100644 index 000000000..213cbecea --- /dev/null +++ b/src/main/resources/assets/create/blockstates/limestone_stairs.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "facing":{ + "east":{}, + "west":{"y": 180}, + "south":{"y": 90}, + "north":{"y": 270} + }, + "half":{ + "bottom":{}, + "top":{"x": 180} + }, + "shape":{ + "straight":{"model":"create:block/palettes/limestone_stairs"}, + "outer_right":{"model":"create:block/palettes/limestone_stairs_outer"}, + "outer_left":{"model":"create:block/palettes/limestone_stairs_outer"}, + "inner_right":{"model":"create:block/palettes/limestone_stairs_inner"}, + "inner_left":{"model":"create:block/palettes/limestone_stairs_inner"} + }, + "facing=east,half=bottom,shape=outer_left": {"y": 270}, + "facing=west,half=bottom,shape=outer_left": {"y": 90}, + "facing=south,half=bottom,shape=outer_left": {"y": 0}, + "facing=north,half=bottom,shape=outer_left": {"y": 180}, + "facing=east,half=bottom,shape=inner_left": {"y": 270}, + "facing=west,half=bottom,shape=inner_left": {"y": 90}, + "facing=south,half=bottom,shape=inner_left": {"y": 0}, + "facing=north,half=bottom,shape=inner_left": {"y": 180}, + "facing=west,half=top,shape=straight": {"x": 180, "y": 180}, + "facing=south,half=top,shape=straight": {"x": 180, "y": 90}, + "facing=north,half=top,shape=straight": {"x": 180, "y": 270}, + "facing=west,half=top,shape=outer_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=outer_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=outer_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0}, + "facing=east,half=top,shape=inner_right": {"x": 180, "y": 0}, + "facing=west,half=top,shape=inner_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=inner_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=inner_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/limestone_wall.json b/src/main/resources/assets/create/blockstates/limestone_wall.json new file mode 100644 index 000000000..0f308d911 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/limestone_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "create:block/palettes/limestone_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "create:block/palettes/limestone_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "create:block/palettes/limestone_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "create:block/palettes/limestone_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "create:block/palettes/limestone_wall_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/paved_gabbro_bricks_slab.json b/src/main/resources/assets/create/blockstates/paved_gabbro_bricks_slab.json new file mode 100644 index 000000000..765a75864 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/paved_gabbro_bricks_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/paved_gabbro_bricks_slab_top" }, + "bottom": { "model":"create:block/palettes/paved_gabbro_bricks_slab" }, + "double": { "model":"create:block/palettes/paved_gabbro_bricks" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/polished_limestone_slab.json b/src/main/resources/assets/create/blockstates/polished_limestone_slab.json new file mode 100644 index 000000000..c1226742f --- /dev/null +++ b/src/main/resources/assets/create/blockstates/polished_limestone_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/polished_limestone_slab_top" }, + "bottom": { "model":"create:block/palettes/polished_limestone_slab" }, + "double": { "model":"create:block/palettes/polished_limestone_double_slab" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/polished_quartziorite.json b/src/main/resources/assets/create/blockstates/polished_quartziorite.json deleted file mode 100644 index 489f3727e..000000000 --- a/src/main/resources/assets/create/blockstates/polished_quartziorite.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/palettes/polished_quartziorite" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/polished_weathered_limestone.json b/src/main/resources/assets/create/blockstates/polished_weathered_limestone.json new file mode 100644 index 000000000..de07b5e48 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/polished_weathered_limestone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/polished_weathered_limestone" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/polished_weathered_limestone_slab.json b/src/main/resources/assets/create/blockstates/polished_weathered_limestone_slab.json new file mode 100644 index 000000000..9419f4175 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/polished_weathered_limestone_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/polished_weathered_limestone_slab_top" }, + "bottom": { "model":"create:block/palettes/polished_weathered_limestone_slab" }, + "double": { "model":"create:block/palettes/polished_weathered_limestone_double_slab" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/quartziorite.json b/src/main/resources/assets/create/blockstates/quartziorite.json deleted file mode 100644 index f88b632c8..000000000 --- a/src/main/resources/assets/create/blockstates/quartziorite.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/palettes/quartziorite" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/quartziorite_bricks.json b/src/main/resources/assets/create/blockstates/quartziorite_bricks.json deleted file mode 100644 index 4cf16733f..000000000 --- a/src/main/resources/assets/create/blockstates/quartziorite_bricks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/palettes/quartziorite_bricks" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone.json b/src/main/resources/assets/create/blockstates/weathered_limestone.json new file mode 100644 index 000000000..49febfdc7 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/weathered_limestone" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_bricks.json b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks.json new file mode 100644 index 000000000..7b81c4b3e --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/weathered_limestone_bricks" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_slab.json b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_slab.json new file mode 100644 index 000000000..e2e245b76 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/weathered_limestone_bricks_slab_top" }, + "bottom": { "model":"create:block/palettes/weathered_limestone_bricks_slab" }, + "double": { "model":"create:block/palettes/weathered_limestone_bricks" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_stairs.json b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_stairs.json new file mode 100644 index 000000000..117f6e20e --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_stairs.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "facing":{ + "east":{}, + "west":{"y": 180}, + "south":{"y": 90}, + "north":{"y": 270} + }, + "half":{ + "bottom":{}, + "top":{"x": 180} + }, + "shape":{ + "straight":{"model":"create:block/palettes/weathered_limestone_bricks_stairs"}, + "outer_right":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_outer"}, + "outer_left":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_outer"}, + "inner_right":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_inner"}, + "inner_left":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_inner"} + }, + "facing=east,half=bottom,shape=outer_left": {"y": 270}, + "facing=west,half=bottom,shape=outer_left": {"y": 90}, + "facing=south,half=bottom,shape=outer_left": {"y": 0}, + "facing=north,half=bottom,shape=outer_left": {"y": 180}, + "facing=east,half=bottom,shape=inner_left": {"y": 270}, + "facing=west,half=bottom,shape=inner_left": {"y": 90}, + "facing=south,half=bottom,shape=inner_left": {"y": 0}, + "facing=north,half=bottom,shape=inner_left": {"y": 180}, + "facing=west,half=top,shape=straight": {"x": 180, "y": 180}, + "facing=south,half=top,shape=straight": {"x": 180, "y": 90}, + "facing=north,half=top,shape=straight": {"x": 180, "y": 270}, + "facing=west,half=top,shape=outer_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=outer_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=outer_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0}, + "facing=east,half=top,shape=inner_right": {"x": 180, "y": 0}, + "facing=west,half=top,shape=inner_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=inner_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=inner_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_wall.json b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_wall.json new file mode 100644 index 000000000..81ecb8569 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_bricks_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_bricks_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_bricks_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_bricks_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_bricks_wall_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_pillar.json b/src/main/resources/assets/create/blockstates/weathered_limestone_pillar.json new file mode 100644 index 000000000..fa782385a --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_pillar.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=z": { "model": "create:block/palettes/weathered_limestone_pillar", "x": 90 }, + "axis=y": { "model": "create:block/palettes/weathered_limestone_pillar" }, + "axis=x": { "model": "create:block/palettes/weathered_limestone_pillar", "x": 90, "y": 90 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_slab.json b/src/main/resources/assets/create/blockstates/weathered_limestone_slab.json new file mode 100644 index 000000000..078dbb787 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_slab.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "type": { + "top": { "model":"create:block/palettes/weathered_limestone_slab_top" }, + "bottom": { "model":"create:block/palettes/weathered_limestone_slab" }, + "double": { "model":"create:block/palettes/weathered_limestone" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_stairs.json b/src/main/resources/assets/create/blockstates/weathered_limestone_stairs.json new file mode 100644 index 000000000..a4f9c7f2c --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_stairs.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "uvlock": true + }, + "variants": { + "facing":{ + "east":{}, + "west":{"y": 180}, + "south":{"y": 90}, + "north":{"y": 270} + }, + "half":{ + "bottom":{}, + "top":{"x": 180} + }, + "shape":{ + "straight":{"model":"create:block/palettes/weathered_limestone_stairs"}, + "outer_right":{"model":"create:block/palettes/weathered_limestone_stairs_outer"}, + "outer_left":{"model":"create:block/palettes/weathered_limestone_stairs_outer"}, + "inner_right":{"model":"create:block/palettes/weathered_limestone_stairs_inner"}, + "inner_left":{"model":"create:block/palettes/weathered_limestone_stairs_inner"} + }, + "facing=east,half=bottom,shape=outer_left": {"y": 270}, + "facing=west,half=bottom,shape=outer_left": {"y": 90}, + "facing=south,half=bottom,shape=outer_left": {"y": 0}, + "facing=north,half=bottom,shape=outer_left": {"y": 180}, + "facing=east,half=bottom,shape=inner_left": {"y": 270}, + "facing=west,half=bottom,shape=inner_left": {"y": 90}, + "facing=south,half=bottom,shape=inner_left": {"y": 0}, + "facing=north,half=bottom,shape=inner_left": {"y": 180}, + "facing=west,half=top,shape=straight": {"x": 180, "y": 180}, + "facing=south,half=top,shape=straight": {"x": 180, "y": 90}, + "facing=north,half=top,shape=straight": {"x": 180, "y": 270}, + "facing=west,half=top,shape=outer_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=outer_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=outer_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0}, + "facing=east,half=top,shape=inner_right": {"x": 180, "y": 0}, + "facing=west,half=top,shape=inner_right": {"x": 180, "y": 180}, + "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90}, + "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270}, + "facing=east,half=top,shape=inner_left": {"x": 180, "y": 90}, + "facing=west,half=top,shape=inner_left": {"x": 180, "y": 270}, + "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180}, + "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_wall.json b/src/main/resources/assets/create/blockstates/weathered_limestone_wall.json new file mode 100644 index 000000000..3415ad75d --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "create:block/palettes/weathered_limestone_wall_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index 49f11f7a8..783fb674a 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -64,24 +64,56 @@ "block.create.andesite_bricks": "Andesite Bricks", "block.create.diorite_bricks": "Diorite Bricks", "block.create.granite_bricks": "Granite Bricks", + "block.create.gabbro": "Gabbro", + "block.create.gabbro_stairs": "Gabbro Stairs", + "block.create.gabbro_slab": "Gabbro Slab", + "block.create.gabbro_wall": "Gabbro Wall", "block.create.polished_gabbro": "Polished Gabbro", "block.create.gabbro_bricks": "Gabbro Bricks", + "block.create.gabbro_bricks_stairs": "Gabbro Brick Stairs", + "block.create.gabbro_bricks_wall": "Gabbro Brick Wall", "block.create.paved_gabbro_bricks": "Paved Gabbro Bricks", + "block.create.paved_gabbro_bricks_slab": "Paved Gabbro Bricks Slab", "block.create.indented_gabbro": "Indented Gabbro Tile", + "block.create.indented_gabbro_slab": "Indented Gabbro Slab", "block.create.slightly_mossy_gabbro_bricks": "Mossy Gabbro Bricks", "block.create.mossy_gabbro_bricks": "Overgrown Gabbro Bricks", - "block.create.limestone": "Limestone", - "block.create.polished_limestone": "Polished Limestone", - "block.create.limestone_bricks": "Limestone Bricks", - "block.create.limestone_pillar": "Limestone Pillar", - "block.create.quartziorite": "Quartziorite", - "block.create.quartziorite_bricks": "Quartziorite Bricks", - "block.create.polished_quartziorite": "Polished Quartziorite", - "block.create.dolomite": "Dolomite", - "block.create.dolomite_bricks": "Dolomite Bricks", - "block.create.polished_dolomite": "Polished Dolomite", + + "block.create.weathered_limestone": "Weathered Limestone", + "block.create.weathered_limestone_stairs": "Weathered Limestone Stairs", + "block.create.weathered_limestone_wall": "Weathered Limestone Wall", + "block.create.weathered_limestone_slab": "Weathered Limestone Slab", + "block.create.polished_weathered_limestone": "Polished Weathered Limestone", + "block.create.polished_weathered_limestone_slab": "Polished Weathered Limestone Slab", + "block.create.weathered_limestone_bricks": "Weathered Limestone Bricks", + "block.create.weathered_limestone_bricks_stairs": "Weathered Limestone Brick Stairs", + "block.create.weathered_limestone_bricks_wall": "Weathered Limestone Brick Wall", + "block.create.weathered_limestone_bricks_slab": "Weathered Limestone Brick Slab", + "block.create.weathered_limestone_pillar": "Weathered Limestone Pillar", + "block.create.dolomite_pillar": "Dolomite Pillar", + "block.create.dolomite": "Dolomite", + "block.create.dolomite_stairs": "Dolomite Stairs", + "block.create.dolomite_wall": "Dolomite Wall", + "block.create.dolomite_slab": "Dolomite Slab", + "block.create.dolomite_bricks": "Dolomite Bricks", + "block.create.dolomite_bricks_wall": "Dolomite Brick Wall", + "block.create.dolomite_bricks_stairs": "Dolomite Brick Stairs", + "block.create.dolomite_bricks_slab": "Dolomite Brick Slab", + "block.create.polished_dolomite": "Polished Dolomite", + + "block.create.limestone": "Limestone", + "block.create.limestone_stairs": "Limestone Stairs", + "block.create.limestone_slab": "Limestone Slab", + "block.create.limestone_wall": "Limestone Wall", + "block.create.limestone_bricks": "Limestone Bricks", + "block.create.limestone_bricks_stairs": "Limestone Brick Stairs", + "block.create.limestone_bricks_slab": "Limestone Brick Slab", + "block.create.limestone_bricks_wall": "Limestone Brick Wall", + "block.create.polished_limestone": "Polished Limestone", + "block.create.polished_limestone_slab": "Polished Limestone Slab", + "block.create.limestone_pillar": "Limestone Pillar", "block.create.schematicannon": "Schematicannon", "block.create.schematic_table": "Schematic Table", diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks.json b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks.json index 0b8f76d02..95306dab1 100644 --- a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks.json +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks.json @@ -1,6 +1,8 @@ { - "parent": "block/cube_all", + "parent": "block/cube_bottom_top", "textures": { - "all": "create:block/dolomite_bricks" + "bottom": "create:block/dolomite", + "top": "create:block/polished_dolomite", + "side": "create:block/dolomite_bricks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_slab.json b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_slab.json new file mode 100644 index 000000000..fae78b6e3 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/paved_slab", + "textures": { + "bottom": "create:block/polished_dolomite", + "top": "create:block/polished_dolomite", + "side": "create:block/dolomite_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_slab_top.json b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_slab_top.json new file mode 100644 index 000000000..0b24ba0c5 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/polished_dolomite", + "top": "create:block/polished_dolomite", + "side": "create:block/dolomite_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs.json b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs.json new file mode 100644 index 000000000..79ef77aba --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/dolomite_bricks", + "top": "create:block/dolomite_bricks", + "side": "create:block/dolomite_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs_inner.json new file mode 100644 index 000000000..0aa035a5a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/dolomite_bricks", + "top": "create:block/dolomite_bricks", + "side": "create:block/dolomite_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs_outer.json new file mode 100644 index 000000000..3188cefe6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/dolomite_bricks", + "top": "create:block/dolomite_bricks", + "side": "create:block/dolomite_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_wall_post.json b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_wall_post.json new file mode 100644 index 000000000..7bd4360f5 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/dolomite_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_wall_side.json b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_wall_side.json new file mode 100644 index 000000000..dec7156ec --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_bricks_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/dolomite_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_slab.json b/src/main/resources/assets/create/models/block/palettes/dolomite_slab.json new file mode 100644 index 000000000..6d3be5d7d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/dolomite", + "top": "create:block/dolomite", + "side": "create:block/dolomite" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_slab_top.json b/src/main/resources/assets/create/models/block/palettes/dolomite_slab_top.json new file mode 100644 index 000000000..0c2c7c94f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/dolomite", + "top": "create:block/dolomite", + "side": "create:block/dolomite" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_stairs.json b/src/main/resources/assets/create/models/block/palettes/dolomite_stairs.json new file mode 100644 index 000000000..f9f5a3a4d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/dolomite", + "top": "create:block/dolomite", + "side": "create:block/dolomite" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/dolomite_stairs_inner.json new file mode 100644 index 000000000..bb8fc74ab --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/dolomite", + "top": "create:block/dolomite", + "side": "create:block/dolomite" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/dolomite_stairs_outer.json new file mode 100644 index 000000000..043a16485 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/dolomite", + "top": "create:block/dolomite", + "side": "create:block/dolomite" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_wall_post.json b/src/main/resources/assets/create/models/block/palettes/dolomite_wall_post.json new file mode 100644 index 000000000..ff90aa010 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/dolomite" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_wall_side.json b/src/main/resources/assets/create/models/block/palettes/dolomite_wall_side.json new file mode 100644 index 000000000..4b793d268 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/dolomite" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs.json b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs.json new file mode 100644 index 000000000..ce4fc4b8d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/full_gabbro_bricks", + "top": "create:block/full_gabbro_bricks", + "side": "create:block/full_gabbro_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs_inner.json new file mode 100644 index 000000000..6552e0bde --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/full_gabbro_bricks", + "top": "create:block/full_gabbro_bricks", + "side": "create:block/full_gabbro_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs_outer.json new file mode 100644 index 000000000..295eba2b6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/full_gabbro_bricks", + "top": "create:block/full_gabbro_bricks", + "side": "create:block/full_gabbro_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_wall_post.json b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_wall_post.json new file mode 100644 index 000000000..ab9b3f48d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/full_gabbro_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_wall_side.json b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_wall_side.json new file mode 100644 index 000000000..7d781c721 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_bricks_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/full_gabbro_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_slab.json b/src/main/resources/assets/create/models/block/palettes/gabbro_slab.json new file mode 100644 index 000000000..13a66391f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/gabbro", + "top": "create:block/gabbro", + "side": "create:block/gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_slab_top.json b/src/main/resources/assets/create/models/block/palettes/gabbro_slab_top.json new file mode 100644 index 000000000..df49d25e6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/gabbro", + "top": "create:block/gabbro", + "side": "create:block/gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_stairs.json b/src/main/resources/assets/create/models/block/palettes/gabbro_stairs.json new file mode 100644 index 000000000..5d5ca4074 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/gabbro", + "top": "create:block/gabbro", + "side": "create:block/gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/gabbro_stairs_inner.json new file mode 100644 index 000000000..62e4e7a03 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/gabbro", + "top": "create:block/gabbro", + "side": "create:block/gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/gabbro_stairs_outer.json new file mode 100644 index 000000000..4289b0014 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/gabbro", + "top": "create:block/gabbro", + "side": "create:block/gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_wall_post.json b/src/main/resources/assets/create/models/block/palettes/gabbro_wall_post.json new file mode 100644 index 000000000..c39942b24 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_wall_side.json b/src/main/resources/assets/create/models/block/palettes/gabbro_wall_side.json new file mode 100644 index 000000000..594ff8470 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/indented_gabbro_slab.json b/src/main/resources/assets/create/models/block/palettes/indented_gabbro_slab.json new file mode 100644 index 000000000..368c4de52 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/indented_gabbro_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/polished_gabbro", + "top": "create:block/polished_gabbro", + "side": "create:block/indented_gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/indented_gabbro_slab_top.json b/src/main/resources/assets/create/models/block/palettes/indented_gabbro_slab_top.json new file mode 100644 index 000000000..3a24a7272 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/indented_gabbro_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/polished_gabbro", + "top": "create:block/polished_gabbro", + "side": "create:block/indented_gabbro" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_bricks_slab.json b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_slab.json new file mode 100644 index 000000000..6e8c25fd5 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/limestone_bricks", + "top": "create:block/limestone_bricks", + "side": "create:block/limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_bricks_slab_top.json b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_slab_top.json new file mode 100644 index 000000000..f5abb6326 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/limestone_bricks", + "top": "create:block/limestone_bricks", + "side": "create:block/limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs.json b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs.json new file mode 100644 index 000000000..1a9dec76e --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/limestone_bricks", + "top": "create:block/limestone_bricks", + "side": "create:block/limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs_inner.json new file mode 100644 index 000000000..e177ba515 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/limestone_bricks", + "top": "create:block/limestone_bricks", + "side": "create:block/limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs_outer.json new file mode 100644 index 000000000..6bbfa5e3a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/limestone_bricks", + "top": "create:block/limestone_bricks", + "side": "create:block/limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_bricks_wall_post.json b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_wall_post.json new file mode 100644 index 000000000..0048086e2 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_bricks_wall_side.json b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_wall_side.json new file mode 100644 index 000000000..68b3cd583 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_bricks_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_slab.json b/src/main/resources/assets/create/models/block/palettes/limestone_slab.json new file mode 100644 index 000000000..e99a05aa8 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/limestone", + "top": "create:block/limestone", + "side": "create:block/limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_slab_top.json b/src/main/resources/assets/create/models/block/palettes/limestone_slab_top.json new file mode 100644 index 000000000..a81fe496d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/limestone", + "top": "create:block/limestone", + "side": "create:block/limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_stairs.json b/src/main/resources/assets/create/models/block/palettes/limestone_stairs.json new file mode 100644 index 000000000..3719fa952 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/limestone", + "top": "create:block/limestone", + "side": "create:block/limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/limestone_stairs_inner.json new file mode 100644 index 000000000..17841762f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/limestone", + "top": "create:block/limestone", + "side": "create:block/limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/limestone_stairs_outer.json new file mode 100644 index 000000000..6094bbdf4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/limestone", + "top": "create:block/limestone", + "side": "create:block/limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_wall_post.json b/src/main/resources/assets/create/models/block/palettes/limestone_wall_post.json new file mode 100644 index 000000000..6227805c3 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_wall_side.json b/src/main/resources/assets/create/models/block/palettes/limestone_wall_side.json new file mode 100644 index 000000000..e1e69d5a0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/limestone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/paved_gabbro_bricks_slab.json b/src/main/resources/assets/create/models/block/palettes/paved_gabbro_bricks_slab.json new file mode 100644 index 000000000..ce9b70383 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/paved_gabbro_bricks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/paved_slab", + "textures": { + "bottom": "create:block/full_gabbro_bricks", + "top": "create:block/polished_gabbro", + "side": "create:block/gabbro_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/paved_gabbro_bricks_slab_top.json b/src/main/resources/assets/create/models/block/palettes/paved_gabbro_bricks_slab_top.json new file mode 100644 index 000000000..39f3a87c3 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/paved_gabbro_bricks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/full_gabbro_bricks", + "top": "create:block/polished_gabbro", + "side": "create:block/gabbro_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_limestone_double_slab.json b/src/main/resources/assets/create/models/block/palettes/polished_limestone_double_slab.json new file mode 100644 index 000000000..e369cf707 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_limestone_double_slab.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/polished_limestone", + "side": "create:block/polished_limestone_slab" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_limestone_slab.json b/src/main/resources/assets/create/models/block/palettes/polished_limestone_slab.json new file mode 100644 index 000000000..bc0daab23 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_limestone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/polished_limestone", + "top": "create:block/polished_limestone", + "side": "create:block/polished_limestone_slab" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_limestone_slab_top.json b/src/main/resources/assets/create/models/block/palettes/polished_limestone_slab_top.json new file mode 100644 index 000000000..5f801705e --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_limestone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/polished_limestone", + "top": "create:block/polished_limestone", + "side": "create:block/polished_limestone_slab" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone.json b/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone.json new file mode 100644 index 000000000..cd611a55a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/polished_weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_double_slab.json b/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_double_slab.json new file mode 100644 index 000000000..95352da4b --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_double_slab.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/polished_weathered_limestone", + "side": "create:block/polished_weathered_limestone_slab" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_slab.json b/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_slab.json new file mode 100644 index 000000000..8ff02259c --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/polished_weathered_limestone", + "top": "create:block/polished_weathered_limestone", + "side": "create:block/polished_weathered_limestone_slab" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_slab_top.json b/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_slab_top.json new file mode 100644 index 000000000..0586fcf56 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_weathered_limestone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/polished_weathered_limestone", + "top": "create:block/polished_weathered_limestone", + "side": "create:block/polished_weathered_limestone_slab" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/quartziorite_bricks.json b/src/main/resources/assets/create/models/block/palettes/quartziorite_bricks.json deleted file mode 100644 index 52a9f1fcf..000000000 --- a/src/main/resources/assets/create/models/block/palettes/quartziorite_bricks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/quartziorite", - "top": "create:block/polished_quartziorite", - "side": "create:block/quartziorite_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/palettes/quartziorite.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone.json similarity index 54% rename from src/main/resources/assets/create/models/block/palettes/quartziorite.json rename to src/main/resources/assets/create/models/block/palettes/weathered_limestone.json index 820c40545..27de47b4d 100644 --- a/src/main/resources/assets/create/models/block/palettes/quartziorite.json +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "create:block/quartziorite" + "all": "create:block/weathered_limestone" } } diff --git a/src/main/resources/assets/create/models/block/palettes/polished_quartziorite.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks.json similarity index 51% rename from src/main/resources/assets/create/models/block/palettes/polished_quartziorite.json rename to src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks.json index b03d37b97..4767f73a9 100644 --- a/src/main/resources/assets/create/models/block/palettes/polished_quartziorite.json +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "create:block/polished_quartziorite" + "all": "create:block/weathered_limestone_bricks" } } diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_slab.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_slab.json new file mode 100644 index 000000000..774a73459 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/weathered_limestone_bricks", + "top": "create:block/weathered_limestone_bricks", + "side": "create:block/weathered_limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_slab_top.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_slab_top.json new file mode 100644 index 000000000..a1dc64437 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/weathered_limestone_bricks", + "top": "create:block/weathered_limestone_bricks", + "side": "create:block/weathered_limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs.json new file mode 100644 index 000000000..c09acc19f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/weathered_limestone_bricks", + "top": "create:block/weathered_limestone_bricks", + "side": "create:block/weathered_limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs_inner.json new file mode 100644 index 000000000..f8221605c --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/weathered_limestone_bricks", + "top": "create:block/weathered_limestone_bricks", + "side": "create:block/weathered_limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs_outer.json new file mode 100644 index 000000000..15220646d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/weathered_limestone_bricks", + "top": "create:block/weathered_limestone_bricks", + "side": "create:block/weathered_limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_wall_post.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_wall_post.json new file mode 100644 index 000000000..9b881d135 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/weathered_limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_wall_side.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_wall_side.json new file mode 100644 index 000000000..495b533d8 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_bricks_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/weathered_limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_pillar.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_pillar.json new file mode 100644 index 000000000..381f79ec8 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/weathered_limestone_pillar_top", + "side": "create:block/weathered_limestone_pillar" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_slab.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_slab.json new file mode 100644 index 000000000..3970aae98 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/weathered_limestone", + "top": "create:block/weathered_limestone", + "side": "create:block/weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_slab_top.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_slab_top.json new file mode 100644 index 000000000..316b7afa7 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/weathered_limestone", + "top": "create:block/weathered_limestone", + "side": "create:block/weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs.json new file mode 100644 index 000000000..69ccf8b13 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/weathered_limestone", + "top": "create:block/weathered_limestone", + "side": "create:block/weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs_inner.json new file mode 100644 index 000000000..6dba195f7 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/weathered_limestone", + "top": "create:block/weathered_limestone", + "side": "create:block/weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs_outer.json new file mode 100644 index 000000000..0d0df9a4b --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/weathered_limestone", + "top": "create:block/weathered_limestone", + "side": "create:block/weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_wall_post.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_wall_post.json new file mode 100644 index 000000000..57a8b667c --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_wall_side.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_wall_side.json new file mode 100644 index 000000000..fa906bdc2 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/models/block/paved_slab.json b/src/main/resources/assets/create/models/block/paved_slab.json new file mode 100644 index 000000000..045c56e75 --- /dev/null +++ b/src/main/resources/assets/create/models/block/paved_slab.json @@ -0,0 +1,19 @@ +{ + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 0, 16, 8 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 8 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/item/dolomite_bricks.json b/src/main/resources/assets/create/models/item/dolomite_bricks.json index 9fb741508..95306dab1 100644 --- a/src/main/resources/assets/create/models/item/dolomite_bricks.json +++ b/src/main/resources/assets/create/models/item/dolomite_bricks.json @@ -1,3 +1,8 @@ { - "parent": "create:block/palettes/dolomite_bricks" -} + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "create:block/dolomite", + "top": "create:block/polished_dolomite", + "side": "create:block/dolomite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dolomite_bricks_slab.json b/src/main/resources/assets/create/models/item/dolomite_bricks_slab.json new file mode 100644 index 000000000..73cf373a4 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dolomite_bricks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dolomite_bricks_slab" +} diff --git a/src/main/resources/assets/create/models/item/dolomite_bricks_stairs.json b/src/main/resources/assets/create/models/item/dolomite_bricks_stairs.json new file mode 100644 index 000000000..387d2dac2 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dolomite_bricks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dolomite_bricks_stairs" +} diff --git a/src/main/resources/assets/create/models/item/dolomite_bricks_wall.json b/src/main/resources/assets/create/models/item/dolomite_bricks_wall.json new file mode 100644 index 000000000..b227b0513 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dolomite_bricks_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/dolomite_bricks" + } +} diff --git a/src/main/resources/assets/create/models/item/dolomite_slab.json b/src/main/resources/assets/create/models/item/dolomite_slab.json new file mode 100644 index 000000000..cc9dc5dfb --- /dev/null +++ b/src/main/resources/assets/create/models/item/dolomite_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dolomite_slab" +} diff --git a/src/main/resources/assets/create/models/item/dolomite_stairs.json b/src/main/resources/assets/create/models/item/dolomite_stairs.json new file mode 100644 index 000000000..c46bcdcee --- /dev/null +++ b/src/main/resources/assets/create/models/item/dolomite_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dolomite_stairs" +} diff --git a/src/main/resources/assets/create/models/item/dolomite_wall.json b/src/main/resources/assets/create/models/item/dolomite_wall.json new file mode 100644 index 000000000..dabc34f71 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dolomite_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/dolomite" + } +} diff --git a/src/main/resources/assets/create/models/item/gabbro_bricks_stairs.json b/src/main/resources/assets/create/models/item/gabbro_bricks_stairs.json new file mode 100644 index 000000000..7331dbc77 --- /dev/null +++ b/src/main/resources/assets/create/models/item/gabbro_bricks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/gabbro_bricks_stairs" +} diff --git a/src/main/resources/assets/create/models/item/gabbro_bricks_wall.json b/src/main/resources/assets/create/models/item/gabbro_bricks_wall.json new file mode 100644 index 000000000..7463ffdf8 --- /dev/null +++ b/src/main/resources/assets/create/models/item/gabbro_bricks_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/gabbro_bricks" + } +} diff --git a/src/main/resources/assets/create/models/item/gabbro_slab.json b/src/main/resources/assets/create/models/item/gabbro_slab.json new file mode 100644 index 000000000..43c5b4853 --- /dev/null +++ b/src/main/resources/assets/create/models/item/gabbro_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/gabbro_slab" +} diff --git a/src/main/resources/assets/create/models/item/gabbro_stairs.json b/src/main/resources/assets/create/models/item/gabbro_stairs.json new file mode 100644 index 000000000..32c811b94 --- /dev/null +++ b/src/main/resources/assets/create/models/item/gabbro_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/gabbro_stairs" +} diff --git a/src/main/resources/assets/create/models/item/gabbro_wall.json b/src/main/resources/assets/create/models/item/gabbro_wall.json new file mode 100644 index 000000000..e6e09f396 --- /dev/null +++ b/src/main/resources/assets/create/models/item/gabbro_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/gabbro" + } +} diff --git a/src/main/resources/assets/create/models/item/indented_gabbro_slab.json b/src/main/resources/assets/create/models/item/indented_gabbro_slab.json new file mode 100644 index 000000000..e94fb4fd5 --- /dev/null +++ b/src/main/resources/assets/create/models/item/indented_gabbro_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/indented_gabbro_slab" +} diff --git a/src/main/resources/assets/create/models/item/limestone_bricks.json b/src/main/resources/assets/create/models/item/limestone_bricks.json index c5d0dec32..a5d3f081b 100644 --- a/src/main/resources/assets/create/models/item/limestone_bricks.json +++ b/src/main/resources/assets/create/models/item/limestone_bricks.json @@ -1,3 +1,3 @@ { "parent": "create:block/palettes/limestone_bricks" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/models/item/limestone_bricks_slab.json b/src/main/resources/assets/create/models/item/limestone_bricks_slab.json new file mode 100644 index 000000000..49f3a5d1d --- /dev/null +++ b/src/main/resources/assets/create/models/item/limestone_bricks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/limestone_bricks_slab" +} diff --git a/src/main/resources/assets/create/models/item/limestone_bricks_stairs.json b/src/main/resources/assets/create/models/item/limestone_bricks_stairs.json new file mode 100644 index 000000000..e454dfbd0 --- /dev/null +++ b/src/main/resources/assets/create/models/item/limestone_bricks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/limestone_bricks_stairs" +} diff --git a/src/main/resources/assets/create/models/item/limestone_bricks_wall.json b/src/main/resources/assets/create/models/item/limestone_bricks_wall.json new file mode 100644 index 000000000..0f9f9032f --- /dev/null +++ b/src/main/resources/assets/create/models/item/limestone_bricks_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/item/limestone_slab.json b/src/main/resources/assets/create/models/item/limestone_slab.json new file mode 100644 index 000000000..f2499a611 --- /dev/null +++ b/src/main/resources/assets/create/models/item/limestone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/limestone_slab" +} diff --git a/src/main/resources/assets/create/models/item/limestone_stairs.json b/src/main/resources/assets/create/models/item/limestone_stairs.json new file mode 100644 index 000000000..9b960646d --- /dev/null +++ b/src/main/resources/assets/create/models/item/limestone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/limestone_stairs" +} diff --git a/src/main/resources/assets/create/models/item/limestone_wall.json b/src/main/resources/assets/create/models/item/limestone_wall.json new file mode 100644 index 000000000..6e49e97c3 --- /dev/null +++ b/src/main/resources/assets/create/models/item/limestone_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/limestone" + } +} diff --git a/src/main/resources/assets/create/models/item/paved_gabbro_bricks_slab.json b/src/main/resources/assets/create/models/item/paved_gabbro_bricks_slab.json new file mode 100644 index 000000000..39d7d3f22 --- /dev/null +++ b/src/main/resources/assets/create/models/item/paved_gabbro_bricks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/paved_gabbro_bricks_slab" +} diff --git a/src/main/resources/assets/create/models/item/polished_limestone_slab.json b/src/main/resources/assets/create/models/item/polished_limestone_slab.json new file mode 100644 index 000000000..3124a97fb --- /dev/null +++ b/src/main/resources/assets/create/models/item/polished_limestone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/polished_limestone_slab" +} diff --git a/src/main/resources/assets/create/models/item/polished_quartziorite.json b/src/main/resources/assets/create/models/item/polished_quartziorite.json deleted file mode 100644 index e3e78a8a3..000000000 --- a/src/main/resources/assets/create/models/item/polished_quartziorite.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/palettes/polished_quartziorite" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/polished_weathered_limestone.json b/src/main/resources/assets/create/models/item/polished_weathered_limestone.json new file mode 100644 index 000000000..7ddb31c12 --- /dev/null +++ b/src/main/resources/assets/create/models/item/polished_weathered_limestone.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/polished_weathered_limestone" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/polished_weathered_limestone_slab.json b/src/main/resources/assets/create/models/item/polished_weathered_limestone_slab.json new file mode 100644 index 000000000..ee80f5fe0 --- /dev/null +++ b/src/main/resources/assets/create/models/item/polished_weathered_limestone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/polished_weathered_limestone_slab" +} diff --git a/src/main/resources/assets/create/models/item/quartziorite.json b/src/main/resources/assets/create/models/item/quartziorite.json deleted file mode 100644 index 8322fe6c9..000000000 --- a/src/main/resources/assets/create/models/item/quartziorite.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/palettes/quartziorite" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/quartziorite_bricks.json b/src/main/resources/assets/create/models/item/quartziorite_bricks.json deleted file mode 100644 index 52a9f1fcf..000000000 --- a/src/main/resources/assets/create/models/item/quartziorite_bricks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/quartziorite", - "top": "create:block/polished_quartziorite", - "side": "create:block/quartziorite_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/weathered_limestone.json b/src/main/resources/assets/create/models/item/weathered_limestone.json new file mode 100644 index 000000000..00b960f46 --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/weathered_limestone" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_bricks.json b/src/main/resources/assets/create/models/item/weathered_limestone_bricks.json new file mode 100644 index 000000000..d8c85b1ae --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/weathered_limestone_bricks" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_bricks_slab.json b/src/main/resources/assets/create/models/item/weathered_limestone_bricks_slab.json new file mode 100644 index 000000000..82e5976e5 --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_bricks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/weathered_limestone_bricks_slab" +} diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_bricks_stairs.json b/src/main/resources/assets/create/models/item/weathered_limestone_bricks_stairs.json new file mode 100644 index 000000000..b52d5e679 --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_bricks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/weathered_limestone_bricks_stairs" +} diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_bricks_wall.json b/src/main/resources/assets/create/models/item/weathered_limestone_bricks_wall.json new file mode 100644 index 000000000..020060215 --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_bricks_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/weathered_limestone_bricks" + } +} diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_pillar.json b/src/main/resources/assets/create/models/item/weathered_limestone_pillar.json new file mode 100644 index 000000000..32d993788 --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/weathered_limestone_pillar" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_slab.json b/src/main/resources/assets/create/models/item/weathered_limestone_slab.json new file mode 100644 index 000000000..92ecaeb6a --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/weathered_limestone_slab" +} diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_stairs.json b/src/main/resources/assets/create/models/item/weathered_limestone_stairs.json new file mode 100644 index 000000000..2fb61845a --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/weathered_limestone_stairs" +} diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_wall.json b/src/main/resources/assets/create/models/item/weathered_limestone_wall.json new file mode 100644 index 000000000..e113a4f8d --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/weathered_limestone" + } +} diff --git a/src/main/resources/assets/create/textures/block/dolomite.png b/src/main/resources/assets/create/textures/block/dolomite.png index b818cb13a..6926ca208 100644 Binary files a/src/main/resources/assets/create/textures/block/dolomite.png and b/src/main/resources/assets/create/textures/block/dolomite.png differ diff --git a/src/main/resources/assets/create/textures/block/dolomite_bricks.png b/src/main/resources/assets/create/textures/block/dolomite_bricks.png index e4a1d4de9..de3255f93 100644 Binary files a/src/main/resources/assets/create/textures/block/dolomite_bricks.png and b/src/main/resources/assets/create/textures/block/dolomite_bricks.png differ diff --git a/src/main/resources/assets/create/textures/block/dolomite_pillar.png b/src/main/resources/assets/create/textures/block/dolomite_pillar.png index a396eaf72..a023de609 100644 Binary files a/src/main/resources/assets/create/textures/block/dolomite_pillar.png and b/src/main/resources/assets/create/textures/block/dolomite_pillar.png differ diff --git a/src/main/resources/assets/create/textures/block/dolomite_pillar_top.png b/src/main/resources/assets/create/textures/block/dolomite_pillar_top.png index 6cb1acd96..8f6ad0a8b 100644 Binary files a/src/main/resources/assets/create/textures/block/dolomite_pillar_top.png and b/src/main/resources/assets/create/textures/block/dolomite_pillar_top.png differ diff --git a/src/main/resources/assets/create/textures/block/limestone.png b/src/main/resources/assets/create/textures/block/limestone.png index 4472f194e..b818cb13a 100644 Binary files a/src/main/resources/assets/create/textures/block/limestone.png and b/src/main/resources/assets/create/textures/block/limestone.png differ diff --git a/src/main/resources/assets/create/textures/block/limestone_bricks.png b/src/main/resources/assets/create/textures/block/limestone_bricks.png index 13ce2ac0b..e4a1d4de9 100644 Binary files a/src/main/resources/assets/create/textures/block/limestone_bricks.png and b/src/main/resources/assets/create/textures/block/limestone_bricks.png differ diff --git a/src/main/resources/assets/create/textures/block/limestone_pillar.png b/src/main/resources/assets/create/textures/block/limestone_pillar.png index fcba307d4..a396eaf72 100644 Binary files a/src/main/resources/assets/create/textures/block/limestone_pillar.png and b/src/main/resources/assets/create/textures/block/limestone_pillar.png differ diff --git a/src/main/resources/assets/create/textures/block/limestone_pillar_top.png b/src/main/resources/assets/create/textures/block/limestone_pillar_top.png index f6968f262..6cb1acd96 100644 Binary files a/src/main/resources/assets/create/textures/block/limestone_pillar_top.png and b/src/main/resources/assets/create/textures/block/limestone_pillar_top.png differ diff --git a/src/main/resources/assets/create/textures/block/polished_dolomite.png b/src/main/resources/assets/create/textures/block/polished_dolomite.png index e96f755ce..fd6202225 100644 Binary files a/src/main/resources/assets/create/textures/block/polished_dolomite.png and b/src/main/resources/assets/create/textures/block/polished_dolomite.png differ diff --git a/src/main/resources/assets/create/textures/block/polished_limestone.png b/src/main/resources/assets/create/textures/block/polished_limestone.png index 71d5b1c01..e96f755ce 100644 Binary files a/src/main/resources/assets/create/textures/block/polished_limestone.png and b/src/main/resources/assets/create/textures/block/polished_limestone.png differ diff --git a/src/main/resources/assets/create/textures/block/polished_limestone_slab.png b/src/main/resources/assets/create/textures/block/polished_limestone_slab.png new file mode 100644 index 000000000..67df9d322 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/polished_limestone_slab.png differ diff --git a/src/main/resources/assets/create/textures/block/polished_quartziorite.png b/src/main/resources/assets/create/textures/block/polished_quartziorite.png deleted file mode 100644 index fd6202225..000000000 Binary files a/src/main/resources/assets/create/textures/block/polished_quartziorite.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/polished_weathered_limestone.png b/src/main/resources/assets/create/textures/block/polished_weathered_limestone.png new file mode 100644 index 000000000..71d5b1c01 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/polished_weathered_limestone.png differ diff --git a/src/main/resources/assets/create/textures/block/polished_weathered_limestone_slab.png b/src/main/resources/assets/create/textures/block/polished_weathered_limestone_slab.png new file mode 100644 index 000000000..5215e44d4 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/polished_weathered_limestone_slab.png differ diff --git a/src/main/resources/assets/create/textures/block/quartziorite.png b/src/main/resources/assets/create/textures/block/quartziorite.png deleted file mode 100644 index 6926ca208..000000000 Binary files a/src/main/resources/assets/create/textures/block/quartziorite.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/quartziorite_bricks.png b/src/main/resources/assets/create/textures/block/quartziorite_bricks.png deleted file mode 100644 index de3255f93..000000000 Binary files a/src/main/resources/assets/create/textures/block/quartziorite_bricks.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/weathered_limestone.png b/src/main/resources/assets/create/textures/block/weathered_limestone.png new file mode 100644 index 000000000..4472f194e Binary files /dev/null and b/src/main/resources/assets/create/textures/block/weathered_limestone.png differ diff --git a/src/main/resources/assets/create/textures/block/weathered_limestone_bricks.png b/src/main/resources/assets/create/textures/block/weathered_limestone_bricks.png new file mode 100644 index 000000000..13ce2ac0b Binary files /dev/null and b/src/main/resources/assets/create/textures/block/weathered_limestone_bricks.png differ diff --git a/src/main/resources/assets/create/textures/block/weathered_limestone_pillar.png b/src/main/resources/assets/create/textures/block/weathered_limestone_pillar.png new file mode 100644 index 000000000..fcba307d4 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/weathered_limestone_pillar.png differ diff --git a/src/main/resources/assets/create/textures/block/weathered_limestone_pillar_top.png b/src/main/resources/assets/create/textures/block/weathered_limestone_pillar_top.png new file mode 100644 index 000000000..f6968f262 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/weathered_limestone_pillar_top.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index 116020db5..87e29446a 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -1,6 +1,14 @@ { "replace": false, "values": [ - "create:belt", "create:crushing_wheel" + "create:belt", + "create:crushing_wheel", + "create:limestone_wall", + "create:limestone_bricks_wall", + "create:weathered_limestone_wall", + "create:weathered_limestone_bricks_wall", + "create:dolomite_wall", + "create:gabbro_wall", + "create:gabbro_bricks_wall" ] } \ No newline at end of file