diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index ffd001116..d690e83bf 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -12,6 +12,7 @@ import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.world.OxidizingBlock; import com.simibubi.create.modules.IModule; +import com.simibubi.create.modules.contraptions.CasingBlock; import com.simibubi.create.modules.contraptions.components.actors.DrillBlock; import com.simibubi.create.modules.contraptions.components.actors.DrillBlock.DrillHeadBlock; import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock; @@ -92,6 +93,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.BlockColors; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ToolType; @@ -162,6 +164,10 @@ public enum AllBlocks { CART_ASSEMBLER(new CartAssemblerBlock()), MINECART_ANCHOR(new MinecartAnchorBlock()), + ANDESITE_CASING(new CasingBlock("andesite_casing")), + COPPER_CASING(new CasingBlock("copper_casing")), + BRASS_CASING(new CasingBlock("crafter_top")), + __LOGISTICS__(), CONTACT(new ContactBlock()), REDSTONE_BRIDGE(new RedstoneLinkBlock()), @@ -206,9 +212,20 @@ public enum AllBlocks { TILED_GLASS_PANE(new GlassPaneBlock(Properties.from(Blocks.GLASS))), FRAMED_GLASS(new CTGlassBlock(true)), - ANDESITE_BRICKS(new Block(Properties.from(Blocks.ANDESITE))), - DIORITE_BRICKS(new Block(Properties.from(Blocks.DIORITE))), GRANITE_BRICKS(new Block(Properties.from(Blocks.GRANITE))), + GRANITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.GRANITE), + CTSpriteShifter.get(CTType.HORIZONTAL, "granite_layers"), + CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, new ResourceLocation("block/polished_granite"), "polished_granite"))), + DIORITE_BRICKS(new Block(Properties.from(Blocks.DIORITE))), + DIORITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.DIORITE), + CTSpriteShifter.get(CTType.HORIZONTAL, "diorite_layers"), + CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, new ResourceLocation("block/polished_diorite"), "polished_diorite"))), + ANDESITE_BRICKS(new Block(Properties.from(Blocks.ANDESITE))), + ANDESITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.ANDESITE), + CTSpriteShifter.get(CTType.HORIZONTAL, "andesite_layers"), + CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, new ResourceLocation("block/polished_andesite"), + "polished_andesite"))), + GABBRO(new Block(Properties.from(Blocks.GRANITE)), 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), @@ -216,6 +233,9 @@ public enum AllBlocks { 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))), + GABBRO_LAYERS( + new LayeredCTBlock(Properties.from(GABBRO.block), CTSpriteShifter.get(CTType.HORIZONTAL, "gabbro_layers"), + CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_gabbro"))), LIMESAND(new FallingBlock(Properties.from(Blocks.SAND))), LIMESTONE(new Block(Properties.from(Blocks.SANDSTONE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), @@ -229,10 +249,16 @@ public enum AllBlocks { ComesWith.WALL), POLISHED_WEATHERED_LIMESTONE(new Block(Properties.from(WEATHERED_LIMESTONE.block)), ComesWith.SLAB), WEATHERED_LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(WEATHERED_LIMESTONE.block))), + WEATHERED_LIMESTONE_LAYERS(new LayeredCTBlock(Properties.from(WEATHERED_LIMESTONE.block), + CTSpriteShifter.get(CTType.HORIZONTAL, "weathered_limestone_layers"), + CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_weathered_limestone"))), 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))), + DOLOMITE_LAYERS(new LayeredCTBlock(Properties.from(DOLOMITE.block), + CTSpriteShifter.get(CTType.HORIZONTAL, "dolomite_layers"), + CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_dolomite"))), VOLCANIC_ROCK(new VolcanicRockBlock()), diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShifter.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShifter.java index 321fe3538..cc2677c5f 100644 --- a/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShifter.java +++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShifter.java @@ -15,17 +15,20 @@ public class CTSpriteShifter extends SpriteShifter { return get(type, blockTextureName, blockTextureName); } + public static CTSpriteShiftEntry get(CTType type, String blockTextureName, String connectedTextureName) { - String originalLocation = "block/" + blockTextureName; + return get(type, new ResourceLocation(Create.ID, "block/" + blockTextureName), connectedTextureName); + } + + public static CTSpriteShiftEntry get(CTType type, ResourceLocation blockTexture, String connectedTextureName) { String targetLocation = "block/connected/" + connectedTextureName; - String key = type.name() + ":" + originalLocation + "->" + targetLocation; + String key = type.name() + ":" + blockTexture.getNamespace() + ":" + blockTexture.getPath() + "->" + targetLocation; if (textures.containsKey(key)) return (CTSpriteShiftEntry) textures.get(key); CTSpriteShiftEntry entry = create(type); - ResourceLocation originalTextureLocation = new ResourceLocation(Create.ID, originalLocation); ResourceLocation targetTextureLocation = new ResourceLocation(Create.ID, targetLocation); - entry.set(originalTextureLocation, targetTextureLocation); + entry.set(blockTexture, targetTextureLocation); textures.put(key, entry); return entry; diff --git a/src/main/java/com/simibubi/create/foundation/world/CopperOreBlock.java b/src/main/java/com/simibubi/create/foundation/world/CopperOreBlock.java deleted file mode 100644 index 3baa8f270..000000000 --- a/src/main/java/com/simibubi/create/foundation/world/CopperOreBlock.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.simibubi.create.foundation.world; - -import net.minecraft.block.Blocks; - -public class CopperOreBlock extends OxidizingBlock { - - public CopperOreBlock() { - super(Properties.from(Blocks.IRON_ORE), 1); - } - -} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/CasingBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/CasingBlock.java new file mode 100644 index 000000000..22d3d8d88 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/CasingBlock.java @@ -0,0 +1,33 @@ +package com.simibubi.create.modules.contraptions; + +import com.simibubi.create.foundation.block.connected.CTSpriteShifter; +import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; +import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures; +import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; +import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraftforge.common.ToolType; + +public class CasingBlock extends Block implements IHaveConnectedTextures { + + String textureFrom; + + public CasingBlock(String textureFrom) { + super(Properties.from(Blocks.ANDESITE)); + this.textureFrom = textureFrom; + } + + @Override + public boolean isToolEffective(BlockState state, ToolType tool) { + return tool == ToolType.PICKAXE || tool == ToolType.AXE; + } + + @Override + public ConnectedTextureBehaviour getBehaviour() { + return new StandardCTBehaviour(CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, textureFrom, getRegistryName().getPath())); + } + +} diff --git a/src/main/resources/assets/create/blockstates/andesite_casing.json b/src/main/resources/assets/create/blockstates/andesite_casing.json new file mode 100644 index 000000000..f709c9e67 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/andesite_casing.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/andesite_casing" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/andesite_layers.json b/src/main/resources/assets/create/blockstates/andesite_layers.json new file mode 100644 index 000000000..099fa9c8a --- /dev/null +++ b/src/main/resources/assets/create/blockstates/andesite_layers.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/andesite_layers" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/brass_casing.json b/src/main/resources/assets/create/blockstates/brass_casing.json new file mode 100644 index 000000000..57aaf1e18 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/brass_casing.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/brass_casing" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/copper_casing.json b/src/main/resources/assets/create/blockstates/copper_casing.json new file mode 100644 index 000000000..e3889caa5 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/copper_casing.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/copper_casing" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/diorite_layers.json b/src/main/resources/assets/create/blockstates/diorite_layers.json new file mode 100644 index 000000000..dd73eefb3 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/diorite_layers.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/diorite_layers" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dolomite_layers.json b/src/main/resources/assets/create/blockstates/dolomite_layers.json new file mode 100644 index 000000000..4671d278b --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dolomite_layers.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/dolomite_layers" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gabbro_layers.json b/src/main/resources/assets/create/blockstates/gabbro_layers.json new file mode 100644 index 000000000..d82a58faa --- /dev/null +++ b/src/main/resources/assets/create/blockstates/gabbro_layers.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/gabbro_layers" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/granite_layers.json b/src/main/resources/assets/create/blockstates/granite_layers.json new file mode 100644 index 000000000..3f9f9807b --- /dev/null +++ b/src/main/resources/assets/create/blockstates/granite_layers.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/granite_layers" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_layers.json b/src/main/resources/assets/create/blockstates/weathered_limestone_layers.json new file mode 100644 index 000000000..0670a07ed --- /dev/null +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_layers.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/weathered_limestone_layers" } + } +} \ 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 bf6e7114d..16430c611 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -68,6 +68,10 @@ "block.create.copper_ore": "Copper Ore", "block.create.zinc_ore": "Zinc Ore", + + "block.create.andesite_casing": "Andesite Casing", + "block.create.brass_casing": "Brass Casing", + "block.create.copper_casing": "Copper Casing", "block.create.cogwheel": "Cogwheel", "block.create.large_cogwheel": "Large Cogwheel", @@ -127,8 +131,11 @@ "block.create.window_in_a_block": "Block with Glass Pane", "block.create.andesite_bricks": "Andesite Bricks", + "block.create.andesite_layers": "Layered Andesite", "block.create.diorite_bricks": "Diorite Bricks", + "block.create.diorite_layers": "Layered Diorite", "block.create.granite_bricks": "Granite Bricks", + "block.create.granite_layers": "Layered Granite", "block.create.volcanic_rock": "Basalt", @@ -146,6 +153,7 @@ "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.gabbro_layers": "Layered Gabbro", "block.create.weathered_limestone": "Weathered Limestone", "block.create.weathered_limestone_stairs": "Weathered Limestone Stairs", @@ -158,6 +166,7 @@ "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.weathered_limestone_layers": "Weathered Layered Limestone", "block.create.dolomite_pillar": "Dolomite Pillar", "block.create.dolomite": "Dolomite", @@ -169,6 +178,7 @@ "block.create.dolomite_bricks_stairs": "Dolomite Brick Stairs", "block.create.dolomite_bricks_slab": "Dolomite Brick Slab", "block.create.polished_dolomite": "Polished Dolomite", + "block.create.dolomite_layers": "Layered Dolomite", "block.create.limesand": "Limesand", "block.create.limestone": "Limestone", @@ -182,7 +192,7 @@ "block.create.polished_limestone": "Polished Limestone", "block.create.polished_limestone_slab": "Polished Limestone Slab", "block.create.limestone_pillar": "Limestone Pillar", - "block.create.limestone_layers": "Limestone Layers", + "block.create.limestone_layers": "Layered Limestone", "block.create.schematicannon": "Schematicannon", "block.create.schematic_table": "Schematic Table", diff --git a/src/main/resources/assets/create/models/block/andesite_casing.json b/src/main/resources/assets/create/models/block/andesite_casing.json new file mode 100644 index 000000000..71b9ae315 --- /dev/null +++ b/src/main/resources/assets/create/models/block/andesite_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/andesite_casing" + } +} diff --git a/src/main/resources/assets/create/models/block/brass_casing.json b/src/main/resources/assets/create/models/block/brass_casing.json new file mode 100644 index 000000000..283ed4c16 --- /dev/null +++ b/src/main/resources/assets/create/models/block/brass_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/crafter_top" + } +} diff --git a/src/main/resources/assets/create/models/block/copper_casing.json b/src/main/resources/assets/create/models/block/copper_casing.json new file mode 100644 index 000000000..26e7e9293 --- /dev/null +++ b/src/main/resources/assets/create/models/block/copper_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/copper_casing" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/andesite_layers.json b/src/main/resources/assets/create/models/block/palettes/andesite_layers.json new file mode 100644 index 000000000..b3e7b80bf --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/andesite_layers.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/polished_andesite", + "side": "create:block/andesite_layers" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/diorite_layers.json b/src/main/resources/assets/create/models/block/palettes/diorite_layers.json new file mode 100644 index 000000000..dc663461b --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/diorite_layers.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/polished_diorite", + "side": "create:block/diorite_layers" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dolomite_layers.json b/src/main/resources/assets/create/models/block/palettes/dolomite_layers.json new file mode 100644 index 000000000..da80983c2 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dolomite_layers.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/polished_dolomite", + "side": "create:block/dolomite_layers" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/gabbro_layers.json b/src/main/resources/assets/create/models/block/palettes/gabbro_layers.json new file mode 100644 index 000000000..51e242132 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/gabbro_layers.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/polished_gabbro", + "side": "create:block/gabbro_layers" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/granite_layers.json b/src/main/resources/assets/create/models/block/palettes/granite_layers.json new file mode 100644 index 000000000..ec32d1aba --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/granite_layers.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/polished_granite", + "side": "create:block/granite_layers" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/weathered_limestone_layers.json b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_layers.json new file mode 100644 index 000000000..796ee1bdc --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/weathered_limestone_layers.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/polished_weathered_limestone", + "side": "create:block/weathered_limestone_layers" + } +} diff --git a/src/main/resources/assets/create/models/item/andesite_casing.json b/src/main/resources/assets/create/models/item/andesite_casing.json new file mode 100644 index 000000000..027388fcc --- /dev/null +++ b/src/main/resources/assets/create/models/item/andesite_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/andesite_casing" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/andesite_layers.json b/src/main/resources/assets/create/models/item/andesite_layers.json new file mode 100644 index 000000000..83f760954 --- /dev/null +++ b/src/main/resources/assets/create/models/item/andesite_layers.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/andesite_layers" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/brass_casing.json b/src/main/resources/assets/create/models/item/brass_casing.json new file mode 100644 index 000000000..96559a7f5 --- /dev/null +++ b/src/main/resources/assets/create/models/item/brass_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/brass_casing" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/copper_casing.json b/src/main/resources/assets/create/models/item/copper_casing.json new file mode 100644 index 000000000..956bb3a8d --- /dev/null +++ b/src/main/resources/assets/create/models/item/copper_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/copper_casing" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/diorite_layers.json b/src/main/resources/assets/create/models/item/diorite_layers.json new file mode 100644 index 000000000..166cec79d --- /dev/null +++ b/src/main/resources/assets/create/models/item/diorite_layers.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/diorite_layers" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dolomite_layers.json b/src/main/resources/assets/create/models/item/dolomite_layers.json new file mode 100644 index 000000000..faf872a97 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dolomite_layers.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dolomite_layers" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/gabbro_layers.json b/src/main/resources/assets/create/models/item/gabbro_layers.json new file mode 100644 index 000000000..588aa8801 --- /dev/null +++ b/src/main/resources/assets/create/models/item/gabbro_layers.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/gabbro_layers" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/granite_layers.json b/src/main/resources/assets/create/models/item/granite_layers.json new file mode 100644 index 000000000..fe104eef3 --- /dev/null +++ b/src/main/resources/assets/create/models/item/granite_layers.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/granite_layers" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/weathered_limestone_layers.json b/src/main/resources/assets/create/models/item/weathered_limestone_layers.json new file mode 100644 index 000000000..d99ec47b7 --- /dev/null +++ b/src/main/resources/assets/create/models/item/weathered_limestone_layers.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/weathered_limestone_layers" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/andesite_casing.png b/src/main/resources/assets/create/textures/block/andesite_casing.png new file mode 100644 index 000000000..472e90e4a Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_layers.png b/src/main/resources/assets/create/textures/block/andesite_layers.png new file mode 100644 index 000000000..fc70719bd Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/andesite_casing.png b/src/main/resources/assets/create/textures/block/connected/andesite_casing.png new file mode 100644 index 000000000..ca0e7c1ef Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/andesite_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/andesite_layers.png b/src/main/resources/assets/create/textures/block/connected/andesite_layers.png new file mode 100644 index 000000000..ffd43e35d Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/andesite_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/copper_casing.png b/src/main/resources/assets/create/textures/block/connected/copper_casing.png new file mode 100644 index 000000000..7419f159e Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/copper_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/diorite_layers.png b/src/main/resources/assets/create/textures/block/connected/diorite_layers.png new file mode 100644 index 000000000..d7282818a Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/diorite_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/dolomite_layers.png b/src/main/resources/assets/create/textures/block/connected/dolomite_layers.png new file mode 100644 index 000000000..72430f5cc Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/dolomite_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/gabbro_layers.png b/src/main/resources/assets/create/textures/block/connected/gabbro_layers.png new file mode 100644 index 000000000..03901c4cd Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/gabbro_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/granite_layers.png b/src/main/resources/assets/create/textures/block/connected/granite_layers.png new file mode 100644 index 000000000..2c76b694d Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/granite_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/polished_andesite.png b/src/main/resources/assets/create/textures/block/connected/polished_andesite.png new file mode 100644 index 000000000..48f1be3b7 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/polished_andesite.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/polished_diorite.png b/src/main/resources/assets/create/textures/block/connected/polished_diorite.png new file mode 100644 index 000000000..8c8a8bc9c Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/polished_diorite.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/polished_dolomite.png b/src/main/resources/assets/create/textures/block/connected/polished_dolomite.png new file mode 100644 index 000000000..eb2c5e10d Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/polished_dolomite.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/polished_gabbro.png b/src/main/resources/assets/create/textures/block/connected/polished_gabbro.png new file mode 100644 index 000000000..670505ab9 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/polished_gabbro.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/polished_granite.png b/src/main/resources/assets/create/textures/block/connected/polished_granite.png new file mode 100644 index 000000000..7854c74ef Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/polished_granite.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/polished_weathered_limestone.png b/src/main/resources/assets/create/textures/block/connected/polished_weathered_limestone.png new file mode 100644 index 000000000..4f538af12 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/polished_weathered_limestone.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/weathered_limestone_layers.png b/src/main/resources/assets/create/textures/block/connected/weathered_limestone_layers.png new file mode 100644 index 000000000..81d3a7d64 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/weathered_limestone_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_casing.png b/src/main/resources/assets/create/textures/block/copper_casing.png index a42508803..251bfd28c 100644 Binary files a/src/main/resources/assets/create/textures/block/copper_casing.png and b/src/main/resources/assets/create/textures/block/copper_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/diorite_layers.png b/src/main/resources/assets/create/textures/block/diorite_layers.png new file mode 100644 index 000000000..93c8bde53 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diorite_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/dolomite_layers.png b/src/main/resources/assets/create/textures/block/dolomite_layers.png new file mode 100644 index 000000000..a375ccd79 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/dolomite_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/gabbro_layers.png b/src/main/resources/assets/create/textures/block/gabbro_layers.png new file mode 100644 index 000000000..bc9b62f37 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/gabbro_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/granite_layers.png b/src/main/resources/assets/create/textures/block/granite_layers.png new file mode 100644 index 000000000..44bd0fb82 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/granite_layers.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 fd6202225..00e564635 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_weathered_limestone.png b/src/main/resources/assets/create/textures/block/polished_weathered_limestone.png index 71d5b1c01..0d931b6dc 100644 Binary files a/src/main/resources/assets/create/textures/block/polished_weathered_limestone.png and b/src/main/resources/assets/create/textures/block/polished_weathered_limestone.png differ diff --git a/src/main/resources/assets/create/textures/block/weathered_limestone_layers.png b/src/main/resources/assets/create/textures/block/weathered_limestone_layers.png new file mode 100644 index 000000000..8631ad5e0 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/weathered_limestone_layers.png differ diff --git a/src/main/resources/data/create/loot_tables/blocks/andesite_layers.json b/src/main/resources/data/create/loot_tables/blocks/andesite_layers.json new file mode 100644 index 000000000..9c40b4382 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/andesite_layers.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:andesite_layers" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/diorite_layers.json b/src/main/resources/data/create/loot_tables/blocks/diorite_layers.json new file mode 100644 index 000000000..00969c8bd --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/diorite_layers.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:diorite_layers" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dolomite_layers.json b/src/main/resources/data/create/loot_tables/blocks/dolomite_layers.json new file mode 100644 index 000000000..4501c8cc8 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dolomite_layers.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:dolomite_layers" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/gabbro_layers.json b/src/main/resources/data/create/loot_tables/blocks/gabbro_layers.json new file mode 100644 index 000000000..6e08b563b --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/gabbro_layers.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:gabbro_layers" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/granite_layers.json b/src/main/resources/data/create/loot_tables/blocks/granite_layers.json new file mode 100644 index 000000000..45f02b6ed --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/granite_layers.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:granite_layers" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/weathered_limestone_layers.json b/src/main/resources/data/create/loot_tables/blocks/weathered_limestone_layers.json new file mode 100644 index 000000000..08d778adb --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/weathered_limestone_layers.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:weathered_limestone_layers" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/andesite_layers.json b/src/main/resources/data/create/recipes/stonecutting/andesite_layers.json new file mode 100644 index 000000000..72fb3fb64 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/andesite_layers.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "create:andesite_layers", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/diorite_layers.json b/src/main/resources/data/create/recipes/stonecutting/diorite_layers.json new file mode 100644 index 000000000..85f348298 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/diorite_layers.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "create:diorite_layers", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dolomite_layers.json b/src/main/resources/data/create/recipes/stonecutting/dolomite_layers.json new file mode 100644 index 000000000..fd3dca791 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dolomite_layers.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dolomite" + }, + "result": "create:dolomite_layers", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_layers.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_layers.json new file mode 100644 index 000000000..0deb2d2e8 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_layers.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:gabbro" + }, + "result": "create:gabbro_layers", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/granite_layers.json b/src/main/resources/data/create/recipes/stonecutting/granite_layers.json new file mode 100644 index 000000000..ab8911072 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/granite_layers.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "create:granite_layers", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_layers.json b/src/main/resources/data/create/recipes/stonecutting/limestone_layers.json new file mode 100644 index 000000000..474cda5e5 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_layers.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:limestone" + }, + "result": "create:limestone_layers", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_layers.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_layers.json new file mode 100644 index 000000000..598fcdd3f --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_layers.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:weathered_limestone" + }, + "result": "create:weathered_limestone_layers", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file