diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index f189fed6a..727e20b5d 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -7,8 +7,6 @@ import com.simibubi.create.foundation.block.ProperStairsBlock; import com.simibubi.create.foundation.block.RenderUtilityAxisBlock; import com.simibubi.create.foundation.block.RenderUtilityBlock; import com.simibubi.create.foundation.block.RenderUtilityDirectionalBlock; -import com.simibubi.create.foundation.block.connected.CTSpriteShifter; -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; @@ -68,8 +66,11 @@ import com.simibubi.create.modules.logistics.block.inventories.FlexcrateBlock; import com.simibubi.create.modules.logistics.block.transposer.LinkedTransposerBlock; import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; import com.simibubi.create.modules.palettes.CTGlassBlock; +import com.simibubi.create.modules.palettes.CTGlassPaneBlock; import com.simibubi.create.modules.palettes.GlassPaneBlock; +import com.simibubi.create.modules.palettes.HorizontalCTGlassBlock; import com.simibubi.create.modules.palettes.LayeredCTBlock; +import com.simibubi.create.modules.palettes.VerticalCTGlassBlock; import com.simibubi.create.modules.palettes.VolcanicRockBlock; import com.simibubi.create.modules.schematics.block.CreativeCrateBlock; import com.simibubi.create.modules.schematics.block.SchematicTableBlock; @@ -90,7 +91,6 @@ 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; @@ -208,22 +208,37 @@ public enum AllBlocks { __PALETTES__(), TILED_GLASS(new GlassBlock(Properties.from(Blocks.GLASS))), + FRAMED_GLASS(new CTGlassBlock(AllCTs.FRAMED_GLASS, false)), + HORIZONTAL_FRAMED_GLASS(new HorizontalCTGlassBlock(AllCTs.HORIZONTAL_FRAMED_GLASS, AllCTs.FRAMED_GLASS, false)), + VERTICAL_FRAMED_GLASS(new VerticalCTGlassBlock(AllCTs.VERTICAL_FRAMED_GLASS, false)), + + OAK_GLASS(new VerticalCTGlassBlock(AllCTs.OAK_GLASS, false)), + SPRUCE_GLASS(new VerticalCTGlassBlock(AllCTs.SPRUCE_GLASS, false)), + BIRCH_GLASS(new VerticalCTGlassBlock(AllCTs.BIRCH_GLASS, true)), + JUNGLE_GLASS(new VerticalCTGlassBlock(AllCTs.JUNGLE_GLASS, false)), + DARK_OAK_GLASS(new VerticalCTGlassBlock(AllCTs.DARK_OAK_GLASS, false)), + ACACIA_GLASS(new VerticalCTGlassBlock(AllCTs.ACACIA_GLASS, false)), + IRON_GLASS(new VerticalCTGlassBlock(AllCTs.IRON_GLASS, false)), + TILED_GLASS_PANE(new GlassPaneBlock(Properties.from(Blocks.GLASS))), - FRAMED_GLASS(new CTGlassBlock(true)), + FRAMED_GLASS_PANE(new CTGlassPaneBlock(FRAMED_GLASS.block)), + HORIZONTAL_FRAMED_GLASS_PANE(new CTGlassPaneBlock(HORIZONTAL_FRAMED_GLASS.block)), + VERTICAL_FRAMED_GLASS_PANE(new CTGlassPaneBlock(VERTICAL_FRAMED_GLASS.block)), + OAK_GLASS_PANE(new CTGlassPaneBlock(OAK_GLASS.block)), + SPRUCE_GLASS_PANE(new CTGlassPaneBlock(SPRUCE_GLASS.block)), + BIRCH_GLASS_PANE(new CTGlassPaneBlock(BIRCH_GLASS.block)), + JUNGLE_GLASS_PANE(new CTGlassPaneBlock(JUNGLE_GLASS.block)), + DARK_OAK_GLASS_PANE(new CTGlassPaneBlock(DARK_OAK_GLASS.block)), + ACACIA_GLASS_PANE(new CTGlassPaneBlock(ACACIA_GLASS.block)), + IRON_GLASS_PANE(new CTGlassPaneBlock(IRON_GLASS.block)), 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"))), + GRANITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.GRANITE), AllCTs.GRANITE_LAYERS, AllCTs.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"))), + DIORITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.DIORITE), AllCTs.DIORITE_LAYERS, AllCTs.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"))), + ANDESITE_LAYERS( + new LayeredCTBlock(Properties.from(Blocks.ANDESITE), AllCTs.ANDESITE_LAYERS, AllCTs.POLISHED_ANDESITE)), GABBRO(new Block(Properties.from(Blocks.GRANITE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), POLISHED_GABBRO(new Block(Properties.from(GABBRO.block))), @@ -232,32 +247,26 @@ 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"))), + GABBRO_LAYERS(new LayeredCTBlock(Properties.from(GABBRO.block), AllCTs.GABBRO_LAYERS, AllCTs.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), POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block)), ComesWith.SLAB), LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(LIMESTONE.block))), - LIMESTONE_LAYERS(new LayeredCTBlock(Properties.from(LIMESTONE.block), - CTSpriteShifter.get(CTType.HORIZONTAL, "limestone_layers"), - CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_limestone"))), + LIMESTONE_LAYERS( + new LayeredCTBlock(Properties.from(LIMESTONE.block), AllCTs.LIMESTONE_LAYERS, AllCTs.POLISHED_LIMESTONE)), WEATHERED_LIMESTONE(new Block(Properties.from(Blocks.ANDESITE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), WEATHERED_LIMESTONE_BRICKS(new Block(Properties.from(WEATHERED_LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, 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"))), + AllCTs.WEATHERED_LIMESTONE_LAYERS, AllCTs.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"))), + DOLOMITE_LAYERS(new LayeredCTBlock(Properties.from(DOLOMITE.block), AllCTs.DOLOMITE_LAYERS, AllCTs.POLISHED_DOLOMITE)), VOLCANIC_ROCK(new VolcanicRockBlock()), diff --git a/src/main/java/com/simibubi/create/AllCTs.java b/src/main/java/com/simibubi/create/AllCTs.java new file mode 100644 index 000000000..acb9c3717 --- /dev/null +++ b/src/main/java/com/simibubi/create/AllCTs.java @@ -0,0 +1,81 @@ +package com.simibubi.create; + +import static com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType.HORIZONTAL; +import static com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType.OMNIDIRECTIONAL; +import static com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType.VERTICAL; + +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.CTSpriteShifter; +import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; + +import net.minecraft.util.ResourceLocation; + +public enum AllCTs { + + FRAMED_GLASS(omni("framed_glass")), + HORIZONTAL_FRAMED_GLASS(custom(HORIZONTAL, "framed_glass", "horizontal_framed_glass")), + VERTICAL_FRAMED_GLASS(custom(VERTICAL, "framed_glass", "vertical_framed_glass")), + + OAK_GLASS(vertical("oak_window")), + SPRUCE_GLASS(vertical("spruce_window")), + BIRCH_GLASS(vertical("birch_window")), + JUNGLE_GLASS(vertical("jungle_window")), + DARK_OAK_GLASS(vertical("dark_oak_window")), + ACACIA_GLASS(vertical("acacia_window")), + ACACIA_GLASS_DENSE(vertical("acacia_window_dense")), + IRON_GLASS(vertical("iron_window")), + + GRANITE_LAYERS(layers("granite")), + DIORITE_LAYERS(layers("diorite")), + ANDESITE_LAYERS(layers("andesite")), + GABBRO_LAYERS(layers("gabbro")), + DOLOMITE_LAYERS(layers("dolomite")), + LIMESTONE_LAYERS(layers("limestone")), + WEATHERED_LIMESTONE_LAYERS(layers("weathered_limestone")), + + POLISHED_GRANITE(polishedVanilla("granite")), + POLISHED_DIORITE(polishedVanilla("diorite")), + POLISHED_ANDESITE(polishedVanilla("andesite")), + POLISHED_GABBRO(polished("gabbro")), + POLISHED_DOLOMITE(polished("dolomite")), + POLISHED_LIMESTONE(polished("limestone")), + POLISHED_WEATHERED_LIMESTONE(polished("weathered_limestone")), + + ; + + private CTSpriteShiftEntry entry; + + private AllCTs(CTSpriteShiftEntry entry) { + this.entry = entry; + } + + public CTSpriteShiftEntry get() { + return entry; + } + + static CTSpriteShiftEntry omni(String name) { + return CTSpriteShifter.get(OMNIDIRECTIONAL, name); + } + + static CTSpriteShiftEntry custom(CTType type, String from, String to) { + return CTSpriteShifter.get(type, from, to); + } + + static CTSpriteShiftEntry vertical(String blockname) { + return CTSpriteShifter.get(VERTICAL, blockname); + } + + static CTSpriteShiftEntry layers(String prefix) { + return CTSpriteShifter.get(HORIZONTAL, prefix + "_layers"); + } + + static CTSpriteShiftEntry polished(String blockname) { + return omni("polished_" + blockname); + } + + static CTSpriteShiftEntry polishedVanilla(String blockname) { + return CTSpriteShifter.get(OMNIDIRECTIONAL, new ResourceLocation("block/polished_" + blockname), + "polished_" + blockname); + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java index c74e53728..a340d1ac8 100644 --- a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java +++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java @@ -55,7 +55,7 @@ public class CTModel extends BakedModelWrapper { CTData data = new CTData(); for (Direction face : Direction.values()) { - if (!Block.shouldSideBeRendered(state, world, pos, face)) + if (state.isNormalCube(world, pos) && !Block.shouldSideBeRendered(state, world, pos, face)) continue; CTSpriteShiftEntry spriteShift = behaviour.get(state, face); if (spriteShift == null) diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java b/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java index a3a2068c8..02d3149d0 100644 --- a/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java @@ -17,13 +17,21 @@ public abstract class ConnectedTextureBehaviour { } public abstract CTSpriteShiftEntry get(BlockState state, Direction direction); - + public abstract Iterable getAllCTShifts(); - protected boolean shouldFlipUVs(BlockState state, Direction face) { + protected boolean reverseUVs(BlockState state, Direction face) { return false; } + protected boolean reverseUVsHorizontally(BlockState state, Direction face) { + return reverseUVs(state, face); + } + + protected boolean reverseUVsVertically(BlockState state, Direction face) { + return reverseUVs(state, face); + } + public boolean connectsTo(BlockState state, BlockState other, IEnviromentBlockReader reader, BlockPos pos, BlockPos otherPos, Direction face) { @@ -54,27 +62,21 @@ public abstract class ConnectedTextureBehaviour { BlockPos p = pos.offset(horizontal, x).offset(vertical, y); return connectsTo(state, reader.getBlockState(p), reader, pos, p, face); }; + + boolean flipH = reverseUVsHorizontally(state, face); + boolean flipV = reverseUVsVertically(state, face); + int sh = flipH ? -1 : 1; + int sv = flipV ? -1 : 1; - boolean up = connection.test(0, 1); - boolean down = connection.test(0, -1); - boolean left = connection.test(-1, 0); - boolean right = connection.test(1, 0); - boolean topLeft = connection.test(-1, 1); - boolean topRight = connection.test(1, 1); - boolean bottomLeft = connection.test(-1, -1); - boolean bottomRight = connection.test(1, -1); - - boolean flip = shouldFlipUVs(state, face); CTContext context = new CTContext(); - - context.up = flip ? down : up; - context.down = flip ? up : down; - context.left = flip ? right : left; - context.right = flip ? left : right; - context.topLeft = flip ? bottomRight : topLeft; - context.topRight = flip ? bottomLeft : topRight; - context.bottomLeft = flip ? topRight : bottomLeft; - context.bottomRight = flip ? topLeft : bottomRight; + context.up = connection.test(0, sv); + context.down = connection.test(0, -sv); + context.left = connection.test(-sh, 0); + context.right = connection.test(sh, 0); + context.topLeft = connection.test(-sh, sv); + context.topRight = connection.test(sh, sv); + context.bottomLeft = connection.test(-sh, -sv); + context.bottomRight = connection.test(sh, -sv); return context; } diff --git a/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java b/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java index be85f0595..50decb45a 100644 --- a/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java +++ b/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java @@ -45,11 +45,10 @@ public class OxidizingBlock extends Block { if (!worldIn.isBlockPresent(neighbourPos)) continue; BlockState neighborState = worldIn.getBlockState(neighbourPos); - if (neighborState.has(OXIDIZATION)) { + if (neighborState.has(OXIDIZATION) && neighborState.get(OXIDIZATION) != 0) { neighbors.add(neighborState.get(OXIDIZATION)); } - if (Block.hasSolidSide(neighborState, worldIn, neighbourPos, - facing.getOpposite())) { + if (Block.hasSolidSide(neighborState, worldIn, neighbourPos, facing.getOpposite())) { continue; } canIncrease = true; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java index f756e1910..a160a5f7f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java @@ -209,7 +209,7 @@ public class RotationPropagator { && (newSpeed != 0 && neighbourTE.speed != 0); boolean tooFast = Math.abs(newSpeed) > parameters.maxRotationSpeed.get(); - boolean speedChangedTooOften = updateTE.speedChangeCounter > 25; + boolean speedChangedTooOften = updateTE.speedChangeCounter > 50; if (tooFast || speedChangedTooOften) { world.destroyBlock(pos, true); return; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java index 52be464b9..65cd8d2dd 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java @@ -97,10 +97,10 @@ public class LinearChassisBlock extends AbstractChassisBlock implements IHaveCon } @Override - public boolean shouldFlipUVs(BlockState state, Direction face) { + public boolean reverseUVs(BlockState state, Direction face) { if (state.get(AXIS).isHorizontal() && face.getAxisDirection() == AxisDirection.POSITIVE) return true; - return super.shouldFlipUVs(state, face); + return super.reverseUVs(state, face); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/InputCTBehaviour.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/InputCTBehaviour.java index 80bf4d996..e3b9574ef 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/InputCTBehaviour.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/InputCTBehaviour.java @@ -43,7 +43,7 @@ public class InputCTBehaviour extends ConnectedTextureBehaviour { } @Override - protected boolean shouldFlipUVs(BlockState state, Direction direction) { + protected boolean reverseUVs(BlockState state, Direction direction) { if (!direction.getAxis().isVertical()) return false; Direction facing = state.get(HORIZONTAL_FACING); diff --git a/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java b/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java index 0c853b816..b7799aa6a 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java +++ b/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java @@ -1,22 +1,41 @@ package com.simibubi.create.modules.palettes; -import com.simibubi.create.foundation.block.connected.CTSpriteShifter; -import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; +import com.simibubi.create.AllCTs; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; 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 net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.GlassBlock; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.Direction; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; public class CTGlassBlock extends GlassBlock implements IHaveConnectedTextures { private boolean hasAlpha; + protected ConnectedTextureBehaviour behaviour; - public CTGlassBlock(boolean hasAlpha) { + public CTGlassBlock(AllCTs spriteShift, boolean hasAlpha) { super(Properties.from(Blocks.GLASS)); this.hasAlpha = hasAlpha; + this.behaviour = createBehaviour(spriteShift.get()); + } + + @OnlyIn(Dist.CLIENT) + @Override + public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) { + return adjacentBlockState.getBlock() instanceof CTGlassBlock + ? (!state.canRenderInLayer(BlockRenderLayer.TRANSLUCENT) && side.getAxis().isHorizontal() + || state.getBlock() == adjacentBlockState.getBlock()) + : super.isSideInvisible(state, adjacentBlockState, side); + } + + public ConnectedTextureBehaviour createBehaviour(CTSpriteShiftEntry spriteShift) { + return new StandardCTBehaviour(spriteShift); } @Override @@ -26,7 +45,7 @@ public class CTGlassBlock extends GlassBlock implements IHaveConnectedTextures { @Override public ConnectedTextureBehaviour getBehaviour() { - return new StandardCTBehaviour(CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, getRegistryName().getPath())); + return behaviour; } } diff --git a/src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java b/src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java new file mode 100644 index 000000000..91e01c4b2 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java @@ -0,0 +1,70 @@ +package com.simibubi.create.modules.palettes; + +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +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 net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IEnviromentBlockReader; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +public class CTGlassPaneBlock extends GlassPaneBlock implements IHaveConnectedTextures { + + protected CTGlassBlock ctGlass; + protected ConnectedTextureBehaviour behaviour; + + public CTGlassPaneBlock(Block ctGlass) { + super(Properties.from(Blocks.GLASS)); + this.ctGlass = (CTGlassBlock) ctGlass; + behaviour = createBehaviour(); + } + + @Override + @OnlyIn(Dist.CLIENT) + public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) { + if (side.getAxis().isVertical()) + return adjacentBlockState == state; + return super.isSideInvisible(state, adjacentBlockState, side); + } + + + + protected ConnectedTextureBehaviour createBehaviour() { + for (CTSpriteShiftEntry ctSpriteShiftEntry : ctGlass.getBehaviour().getAllCTShifts()) { + return new StandardCTBehaviour(ctSpriteShiftEntry) { + @Override + public boolean connectsTo(BlockState state, BlockState other, IEnviromentBlockReader reader, + BlockPos pos, BlockPos otherPos, Direction face) { + return state.getBlock() == other.getBlock(); + } + + @Override + protected boolean reverseUVsHorizontally(BlockState state, net.minecraft.util.Direction face) { + if (face.getAxisDirection() == AxisDirection.NEGATIVE) + return true; + return super.reverseUVsHorizontally(state, face); + } + }; + } + return null; + } + + @Override + public BlockRenderLayer getRenderLayer() { + return ctGlass.getRenderLayer(); + } + + @Override + public ConnectedTextureBehaviour getBehaviour() { + return behaviour; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/palettes/HorizontalCTGlassBlock.java b/src/main/java/com/simibubi/create/modules/palettes/HorizontalCTGlassBlock.java new file mode 100644 index 000000000..3c6665ee2 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/palettes/HorizontalCTGlassBlock.java @@ -0,0 +1,24 @@ +package com.simibubi.create.modules.palettes; + +import javax.annotation.Nullable; + +import com.simibubi.create.AllCTs; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; + +public class HorizontalCTGlassBlock extends CTGlassBlock { + + private AllCTs topShift; + + public HorizontalCTGlassBlock(AllCTs layerShift, @Nullable AllCTs topShift, boolean hasAlpha) { + super(layerShift, hasAlpha); + this.topShift = topShift; + behaviour = createBehaviour(layerShift.get()); + } + + @Override + public ConnectedTextureBehaviour createBehaviour(CTSpriteShiftEntry spriteShift) { + return new LayeredCTBlock.LayeredCTBehaviour(spriteShift, topShift == null ? null : topShift.get()); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java b/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java index 06b79772c..c5b988416 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java +++ b/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java @@ -2,6 +2,9 @@ package com.simibubi.create.modules.palettes; import java.util.Arrays; +import javax.annotation.Nullable; + +import com.simibubi.create.AllCTs; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures; @@ -14,13 +17,13 @@ public class LayeredCTBlock extends Block implements IHaveConnectedTextures { private LayeredCTBehaviour behaviour; - public LayeredCTBlock(Properties properties, CTSpriteShiftEntry layerShift) { + public LayeredCTBlock(Properties properties, AllCTs layerShift) { this(properties, layerShift, null); } - public LayeredCTBlock(Properties properties, CTSpriteShiftEntry layerShift, CTSpriteShiftEntry topShift) { + public LayeredCTBlock(Properties properties, AllCTs layerShift, @Nullable AllCTs topShift) { super(properties); - behaviour = new LayeredCTBehaviour(layerShift, topShift); + behaviour = new LayeredCTBehaviour(layerShift.get(), topShift == null ? null : topShift.get()); } @Override @@ -28,7 +31,7 @@ public class LayeredCTBlock extends Block implements IHaveConnectedTextures { return behaviour; } - private static class LayeredCTBehaviour extends ConnectedTextureBehaviour { + static class LayeredCTBehaviour extends ConnectedTextureBehaviour { CTSpriteShiftEntry topShift; CTSpriteShiftEntry layerShift; diff --git a/src/main/java/com/simibubi/create/modules/palettes/VerticalCTGlassBlock.java b/src/main/java/com/simibubi/create/modules/palettes/VerticalCTGlassBlock.java new file mode 100644 index 000000000..4c2a67f38 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/palettes/VerticalCTGlassBlock.java @@ -0,0 +1,29 @@ +package com.simibubi.create.modules.palettes; + +import com.simibubi.create.AllCTs; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; +import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; + +import net.minecraft.block.BlockState; +import net.minecraft.util.Direction; + +public class VerticalCTGlassBlock extends CTGlassBlock { + + public VerticalCTGlassBlock(AllCTs spriteShift, boolean hasAlpha) { + super(spriteShift, hasAlpha); + } + + @Override + public ConnectedTextureBehaviour createBehaviour(CTSpriteShiftEntry spriteShift) { + return new StandardCTBehaviour(spriteShift) { + @Override + public CTSpriteShiftEntry get(BlockState state, Direction direction) { + if (direction.getAxis().isVertical()) + return null; + return super.get(state, direction); + } + }; + } + +} diff --git a/src/main/resources/assets/create/blockstates/acacia_glass.json b/src/main/resources/assets/create/blockstates/acacia_glass.json new file mode 100644 index 000000000..564ce1fc7 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/acacia_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/acacia_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/acacia_glass_pane.json b/src/main/resources/assets/create/blockstates/acacia_glass_pane.json new file mode 100644 index 000000000..d9a76fd9a --- /dev/null +++ b/src/main/resources/assets/create/blockstates/acacia_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/acacia/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/acacia/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/acacia/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/acacia/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/acacia/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/acacia/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/acacia/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/acacia/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/acacia/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/birch_glass.json b/src/main/resources/assets/create/blockstates/birch_glass.json new file mode 100644 index 000000000..b82e4daad --- /dev/null +++ b/src/main/resources/assets/create/blockstates/birch_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/birch_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/birch_glass_pane.json b/src/main/resources/assets/create/blockstates/birch_glass_pane.json new file mode 100644 index 000000000..64a3b7775 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/birch_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/birch/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/birch/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/birch/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/birch/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/birch/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/birch/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/birch/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/birch/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/birch/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/dark_oak_glass.json b/src/main/resources/assets/create/blockstates/dark_oak_glass.json new file mode 100644 index 000000000..582ba57ba --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_oak_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/dark_oak_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dark_oak_glass_pane.json b/src/main/resources/assets/create/blockstates/dark_oak_glass_pane.json new file mode 100644 index 000000000..3e493e69b --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_oak_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/dark_oak/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/dark_oak/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/dark_oak/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/dark_oak/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/dark_oak/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/dark_oak/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/dark_oak/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/dark_oak/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/dark_oak/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/framed_glass_pane.json b/src/main/resources/assets/create/blockstates/framed_glass_pane.json new file mode 100644 index 000000000..5b06a185f --- /dev/null +++ b/src/main/resources/assets/create/blockstates/framed_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/glass/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/glass/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/glass/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/horizontal_framed_glass.json b/src/main/resources/assets/create/blockstates/horizontal_framed_glass.json new file mode 100644 index 000000000..cf1f52360 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/horizontal_framed_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/framed_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/horizontal_framed_glass_pane.json b/src/main/resources/assets/create/blockstates/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..5b06a185f --- /dev/null +++ b/src/main/resources/assets/create/blockstates/horizontal_framed_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/glass/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/glass/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/glass/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/iron_glass.json b/src/main/resources/assets/create/blockstates/iron_glass.json new file mode 100644 index 000000000..004ad939e --- /dev/null +++ b/src/main/resources/assets/create/blockstates/iron_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/iron_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/iron_glass_pane.json b/src/main/resources/assets/create/blockstates/iron_glass_pane.json new file mode 100644 index 000000000..483e2f00a --- /dev/null +++ b/src/main/resources/assets/create/blockstates/iron_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/iron/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/iron/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/iron/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/iron/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/iron/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/iron/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/iron/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/iron/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/iron/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/jungle_glass.json b/src/main/resources/assets/create/blockstates/jungle_glass.json new file mode 100644 index 000000000..58105bec3 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/jungle_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/jungle_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/jungle_glass_pane.json b/src/main/resources/assets/create/blockstates/jungle_glass_pane.json new file mode 100644 index 000000000..3fc23b581 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/jungle_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/jungle/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/jungle/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/jungle/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/jungle/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/jungle/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/jungle/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/jungle/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/jungle/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/jungle/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/oak_glass.json b/src/main/resources/assets/create/blockstates/oak_glass.json new file mode 100644 index 000000000..8c41631a7 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/oak_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/oak_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/oak_glass_pane.json b/src/main/resources/assets/create/blockstates/oak_glass_pane.json new file mode 100644 index 000000000..cf33158b0 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/oak_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/oak/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/oak/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/oak/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/oak/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/oak/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/oak/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/oak/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/oak/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/oak/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/spruce_glass.json b/src/main/resources/assets/create/blockstates/spruce_glass.json new file mode 100644 index 000000000..1c83f35a6 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/spruce_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/spruce_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/spruce_glass_pane.json b/src/main/resources/assets/create/blockstates/spruce_glass_pane.json new file mode 100644 index 000000000..4d9a8d957 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/spruce_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/spruce/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/spruce/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/spruce/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/spruce/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/spruce/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/spruce/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/spruce/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/spruce/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/spruce/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/tiled_glass_pane.json b/src/main/resources/assets/create/blockstates/tiled_glass_pane.json index d26d11966..2371e27b6 100644 --- a/src/main/resources/assets/create/blockstates/tiled_glass_pane.json +++ b/src/main/resources/assets/create/blockstates/tiled_glass_pane.json @@ -1,29 +1,31 @@ { "multipart": [ - { "apply": { "model": "create:block/palettes/tiled_glass_pane_post" }}, + { + "apply": { "model": "create:block/palettes/pane/tiled/post" } + }, { "when": { "north": true }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_side" } + "apply": { "model": "create:block/palettes/pane/tiled/side" } }, { "when": { "east": true }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_side", "y": 90 } + "apply": { "model": "create:block/palettes/pane/tiled/side", "y": 90 } }, { "when": { "south": true }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_side_alt" } + "apply": { "model": "create:block/palettes/pane/tiled/side_alt" } }, { "when": { "west": true }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_side_alt", "y": 90 } + "apply": { "model": "create:block/palettes/pane/tiled/side_alt", "y": 90 } }, { "when": { "north": false }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_noside" } + "apply": { "model": "create:block/palettes/pane/tiled/noside" } }, { "when": { "east": false }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_noside_alt" } + "apply": { "model": "create:block/palettes/pane/tiled/noside_alt" } }, { "when": { "south": false }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_noside_alt", "y": 90 } + "apply": { "model": "create:block/palettes/pane/tiled/noside_alt", "y": 90 } }, { "when": { "west": false }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_noside", "y": 270 } + "apply": { "model": "create:block/palettes/pane/tiled/noside", "y": 270 } } ] } diff --git a/src/main/resources/assets/create/blockstates/vertical_framed_glass.json b/src/main/resources/assets/create/blockstates/vertical_framed_glass.json new file mode 100644 index 000000000..cf1f52360 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/vertical_framed_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/framed_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json b/src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json new file mode 100644 index 000000000..5b06a185f --- /dev/null +++ b/src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/glass/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/glass/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/glass/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index 7bf97213e..b75ab0ff1 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -135,8 +135,28 @@ "block.create.belt_tunnel": "Conveyor Tunnel", "block.create.tiled_glass": "Tiled Glass", + "block.create.framed_glass": "Large Glass Window", + "block.create.vertical_framed_glass": "Vertical Glass Window", + "block.create.horizontal_framed_glass": "Horizontal Glass Window", + "block.create.oak_glass": "Oak Window", + "block.create.spruce_glass": "Spruce Window", + "block.create.birch_glass": "Birch Window", + "block.create.jungle_glass": "Jungle Window", + "block.create.dark_oak_glass": "Dark Oak Window", + "block.create.acacia_glass": "Acacia Window", + "block.create.iron_glass": "Ornate Iron Window", + "block.create.tiled_glass_pane": "Tiled Glass Pane", - "block.create.framed_glass": "Framed Glass", + "block.create.framed_glass_pane": "Large Glass Window Pane", + "block.create.vertical_framed_glass_pane": "Vertical Glass Window Pane", + "block.create.horizontal_framed_glass_pane": "Horizontal Glass Window Pane", + "block.create.oak_glass_pane": "Oak Window Pane", + "block.create.spruce_glass_pane": "Spruce Window Pane", + "block.create.birch_glass_pane": "Birch Window Pane", + "block.create.jungle_glass_pane": "Jungle Window Pane", + "block.create.dark_oak_glass_pane": "Dark Oak Window Pane", + "block.create.acacia_glass_pane": "Acacia Window Pane", + "block.create.iron_glass_pane": "Ornate Iron Window Pane", "block.create.window_in_a_block": "Block with Glass Pane", "block.create.andesite_bricks": "Andesite Bricks", diff --git a/src/main/resources/assets/create/models/block/palettes/acacia_glass.json b/src/main/resources/assets/create/models/block/palettes/acacia_glass.json new file mode 100644 index 000000000..9c7053ebc --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/acacia_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/acacia_planks", + "side": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/birch_glass.json b/src/main/resources/assets/create/models/block/palettes/birch_glass.json new file mode 100644 index 000000000..0ab44ec14 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/birch_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/birch_planks", + "side": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_oak_glass.json b/src/main/resources/assets/create/models/block/palettes/dark_oak_glass.json new file mode 100644 index 000000000..2165748c0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_oak_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/dark_oak_planks", + "side": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/iron_glass.json b/src/main/resources/assets/create/models/block/palettes/iron_glass.json new file mode 100644 index 000000000..a2df32363 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/iron_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/iron_window_top", + "side": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/jungle_glass.json b/src/main/resources/assets/create/models/block/palettes/jungle_glass.json new file mode 100644 index 000000000..038764c69 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/jungle_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/jungle_planks", + "side": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/oak_glass.json b/src/main/resources/assets/create/models/block/palettes/oak_glass.json new file mode 100644 index 000000000..e65a926e4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/oak_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/oak_planks", + "side": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json new file mode 100644 index 000000000..968018a78 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json new file mode 100644 index 000000000..bb15f7d35 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json new file mode 100644 index 000000000..7fb566f36 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/acacia_planks", + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json new file mode 100644 index 000000000..68b589af4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/acacia_planks", + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json new file mode 100644 index 000000000..3ce093762 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/acacia_planks", + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json new file mode 100644 index 000000000..a4461d6bc --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json new file mode 100644 index 000000000..6cef11fc8 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/post.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/post.json new file mode 100644 index 000000000..ad721efa7 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/birch_planks", + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/side.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/side.json new file mode 100644 index 000000000..a06a3819a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/birch_planks", + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json new file mode 100644 index 000000000..480e1db41 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/birch_planks", + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json new file mode 100644 index 000000000..73ff4a970 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json new file mode 100644 index 000000000..6c11888ac --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json new file mode 100644 index 000000000..8e2483b40 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/dark_oak_planks", + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json new file mode 100644 index 000000000..57b35838f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/dark_oak_planks", + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json new file mode 100644 index 000000000..4a1587b11 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/dark_oak_planks", + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json new file mode 100644 index 000000000..4be41d479 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json new file mode 100644 index 000000000..94a226f8b --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/post.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/post.json new file mode 100644 index 000000000..85a852cd0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "create:block/framed_glass_pane_top", + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/side.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/side.json new file mode 100644 index 000000000..44b09f7e0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "create:block/framed_glass_pane_top", + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json new file mode 100644 index 000000000..772d74110 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "create:block/framed_glass_pane_top", + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json new file mode 100644 index 000000000..b3bee435d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json new file mode 100644 index 000000000..17eeac60f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/post.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/post.json new file mode 100644 index 000000000..621833c48 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "create:block/gabbro", + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/side.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/side.json new file mode 100644 index 000000000..ca3e18292 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "create:block/gabbro", + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json new file mode 100644 index 000000000..6ac3639eb --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "create:block/gabbro", + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json new file mode 100644 index 000000000..90b479d26 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json new file mode 100644 index 000000000..310d6c49f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json new file mode 100644 index 000000000..0e0a5db3d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/jungle_planks", + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json new file mode 100644 index 000000000..58e36e0e6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/jungle_planks", + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json new file mode 100644 index 000000000..013a1ef5e --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/jungle_planks", + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json new file mode 100644 index 000000000..b63921435 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json new file mode 100644 index 000000000..6e42a3c1a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/post.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/post.json new file mode 100644 index 000000000..e582cccc0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/oak_planks", + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/side.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/side.json new file mode 100644 index 000000000..ce403c8b4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/oak_planks", + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json new file mode 100644 index 000000000..da42e2d92 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/oak_planks", + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json new file mode 100644 index 000000000..f46fbbfeb --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json new file mode 100644 index 000000000..a13d6bcc6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json new file mode 100644 index 000000000..abb6d0ea8 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/spruce_log", + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json new file mode 100644 index 000000000..98067f28b --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/spruce_log", + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json new file mode 100644 index 000000000..1623b750c --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/spruce_log", + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/template/noside.json new file mode 100644 index 000000000..bfb3b3003 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json new file mode 100644 index 000000000..194fca211 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/post.json b/src/main/resources/assets/create/models/block/palettes/pane/template/post.json new file mode 100644 index 000000000..acf7ff4a4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/$EDGE", + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/side.json b/src/main/resources/assets/create/models/block/palettes/pane/template/side.json new file mode 100644 index 000000000..88a47ff9f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/$EDGE", + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json new file mode 100644 index 000000000..4b4582f4e --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/$EDGE", + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_noside.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_noside.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/noside.json diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside_alt.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_noside_alt.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/noside_alt.json diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_post.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/post.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_post.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/post.json diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_side.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/side.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_side.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/side.json diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/side_alt.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_side_alt.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/side_alt.json diff --git a/src/main/resources/assets/create/models/block/palettes/spruce_glass.json b/src/main/resources/assets/create/models/block/palettes/spruce_glass.json new file mode 100644 index 000000000..2a63ee140 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/spruce_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/spruce_log_top", + "side": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_noside.json b/src/main/resources/assets/create/models/block/template_glass_pane_noside.json new file mode 100644 index 000000000..af16ff940 --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_noside.json @@ -0,0 +1,14 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#pane" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json b/src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json new file mode 100644 index 000000000..771d69420 --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json @@ -0,0 +1,14 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 9 ], + "faces": { + "east": { "uv": [ 7, 0, 9, 16 ], "texture": "#pane" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_post.json b/src/main/resources/assets/create/models/block/template_glass_pane_post.json new file mode 100644 index 000000000..039229cbe --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_post.json @@ -0,0 +1,15 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge", "cullface": "down" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge", "cullface": "up" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_side.json b/src/main/resources/assets/create/models/block/template_glass_pane_side.json new file mode 100644 index 000000000..8d409abb3 --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_side.json @@ -0,0 +1,18 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge", "cullface": "down" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge", "cullface": "up" }, + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" }, + "west": { "uv": [ 16, 0, 9, 16 ], "texture": "#pane" }, + "east": { "uv": [ 9, 0, 16, 16 ], "texture": "#pane" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json b/src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json new file mode 100644 index 000000000..487efacf7 --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json @@ -0,0 +1,18 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge", "cullface": "down" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge", "cullface": "up" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "west": { "uv": [ 7, 0, 0, 16 ], "texture": "#pane" }, + "east": { "uv": [ 0, 0, 7, 16 ], "texture": "#pane" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/item/acacia_glass.json b/src/main/resources/assets/create/models/item/acacia_glass.json new file mode 100644 index 000000000..36830d048 --- /dev/null +++ b/src/main/resources/assets/create/models/item/acacia_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/acacia_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/acacia_glass_pane.json b/src/main/resources/assets/create/models/item/acacia_glass_pane.json new file mode 100644 index 000000000..4ee856b67 --- /dev/null +++ b/src/main/resources/assets/create/models/item/acacia_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/acacia_window", + "edge": "block/acacia_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/birch_glass.json b/src/main/resources/assets/create/models/item/birch_glass.json new file mode 100644 index 000000000..9e07dbc93 --- /dev/null +++ b/src/main/resources/assets/create/models/item/birch_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/birch_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/birch_glass_pane.json b/src/main/resources/assets/create/models/item/birch_glass_pane.json new file mode 100644 index 000000000..694da2f9d --- /dev/null +++ b/src/main/resources/assets/create/models/item/birch_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/birch_window", + "edge": "block/birch_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_oak_glass.json b/src/main/resources/assets/create/models/item/dark_oak_glass.json new file mode 100644 index 000000000..ea5ffeee0 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_oak_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_oak_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_oak_glass_pane.json b/src/main/resources/assets/create/models/item/dark_oak_glass_pane.json new file mode 100644 index 000000000..b15f84f31 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_oak_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/dark_oak_window", + "edge": "block/dark_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/framed_glass_pane.json b/src/main/resources/assets/create/models/item/framed_glass_pane.json new file mode 100644 index 000000000..5c7debab3 --- /dev/null +++ b/src/main/resources/assets/create/models/item/framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/framed_glass", + "edge": "create:block/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/horizontal_framed_glass.json b/src/main/resources/assets/create/models/item/horizontal_framed_glass.json new file mode 100644 index 000000000..f3c072902 --- /dev/null +++ b/src/main/resources/assets/create/models/item/horizontal_framed_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/framed_glass", + "side": "create:block/horizontal_framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json b/src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..c632d820c --- /dev/null +++ b/src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/horizontal_framed_glass", + "edge": "create:block/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/iron_glass.json b/src/main/resources/assets/create/models/item/iron_glass.json new file mode 100644 index 000000000..7c9850f60 --- /dev/null +++ b/src/main/resources/assets/create/models/item/iron_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/iron_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/iron_glass_pane.json b/src/main/resources/assets/create/models/item/iron_glass_pane.json new file mode 100644 index 000000000..2758d1965 --- /dev/null +++ b/src/main/resources/assets/create/models/item/iron_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/iron_window", + "edge": "create:block/gabbro" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/jungle_glass.json b/src/main/resources/assets/create/models/item/jungle_glass.json new file mode 100644 index 000000000..33678acee --- /dev/null +++ b/src/main/resources/assets/create/models/item/jungle_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/jungle_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/jungle_glass_pane.json b/src/main/resources/assets/create/models/item/jungle_glass_pane.json new file mode 100644 index 000000000..f14f5667e --- /dev/null +++ b/src/main/resources/assets/create/models/item/jungle_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/jungle_window", + "edge": "block/jungle_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/oak_glass.json b/src/main/resources/assets/create/models/item/oak_glass.json new file mode 100644 index 000000000..1d0b3cd9b --- /dev/null +++ b/src/main/resources/assets/create/models/item/oak_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/oak_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/oak_glass_pane.json b/src/main/resources/assets/create/models/item/oak_glass_pane.json new file mode 100644 index 000000000..8e7be69b9 --- /dev/null +++ b/src/main/resources/assets/create/models/item/oak_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/oak_window", + "edge": "block/oak_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/pane.json b/src/main/resources/assets/create/models/item/pane.json new file mode 100644 index 000000000..ba4c3bf0b --- /dev/null +++ b/src/main/resources/assets/create/models/item/pane.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "#edge", + "1": "#pane", + "particle": "#pane" + }, + "elements": [ + { + "from": [0, 0, 7], + "to": [16, 16, 9], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#0"}, + "up": {"uv": [7, 0, 9, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 0, 9, 16], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/spruce_glass.json b/src/main/resources/assets/create/models/item/spruce_glass.json new file mode 100644 index 000000000..61516407d --- /dev/null +++ b/src/main/resources/assets/create/models/item/spruce_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/spruce_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/spruce_glass_pane.json b/src/main/resources/assets/create/models/item/spruce_glass_pane.json new file mode 100644 index 000000000..221576c36 --- /dev/null +++ b/src/main/resources/assets/create/models/item/spruce_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/spruce_window", + "edge": "block/spruce_log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/tiled_glass_pane.json b/src/main/resources/assets/create/models/item/tiled_glass_pane.json index c9cd61f76..4b8269ba7 100644 --- a/src/main/resources/assets/create/models/item/tiled_glass_pane.json +++ b/src/main/resources/assets/create/models/item/tiled_glass_pane.json @@ -1,6 +1,7 @@ { - "parent": "item/generated", - "textures": { - "layer0": "create:block/tiled_glass" - } + "parent": "create:item/pane", + "textures": { + "pane": "create:block/tiled_glass", + "edge": "block/glass_pane_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/vertical_framed_glass.json b/src/main/resources/assets/create/models/item/vertical_framed_glass.json new file mode 100644 index 000000000..966f5bfa9 --- /dev/null +++ b/src/main/resources/assets/create/models/item/vertical_framed_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/framed_glass", + "side": "create:block/vertical_framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json b/src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json new file mode 100644 index 000000000..0ac498a9b --- /dev/null +++ b/src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/vertical_framed_glass", + "edge": "create:block/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/acacia_window.png b/src/main/resources/assets/create/textures/block/acacia_window.png new file mode 100644 index 000000000..d4789b289 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/acacia_window.png differ diff --git a/src/main/resources/assets/create/textures/block/birch_window.png b/src/main/resources/assets/create/textures/block/birch_window.png new file mode 100644 index 000000000..4020f4578 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/birch_window.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/CT_TEMPLATE.png b/src/main/resources/assets/create/textures/block/connected/CT_TEMPLATE.png new file mode 100644 index 000000000..3a7cce1c8 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/CT_TEMPLATE.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/acacia_window.png b/src/main/resources/assets/create/textures/block/connected/acacia_window.png new file mode 100644 index 000000000..12cb594b2 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/acacia_window.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/birch_window.png b/src/main/resources/assets/create/textures/block/connected/birch_window.png new file mode 100644 index 000000000..a57dbdce9 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/birch_window.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/dark_oak_window.png b/src/main/resources/assets/create/textures/block/connected/dark_oak_window.png new file mode 100644 index 000000000..c9a76c119 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/dark_oak_window.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/frGlassTM.png b/src/main/resources/assets/create/textures/block/connected/frGlassTM.png new file mode 100644 index 000000000..59f8d38e4 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/frGlassTM.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/framed_glass.png b/src/main/resources/assets/create/textures/block/connected/framed_glass.png index 240f72174..18ed111a6 100644 Binary files a/src/main/resources/assets/create/textures/block/connected/framed_glass.png and b/src/main/resources/assets/create/textures/block/connected/framed_glass.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/horizontal_framed_glass.png b/src/main/resources/assets/create/textures/block/connected/horizontal_framed_glass.png new file mode 100644 index 000000000..4125642b9 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/horizontal_framed_glass.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/iron_window.png b/src/main/resources/assets/create/textures/block/connected/iron_window.png new file mode 100644 index 000000000..593bcecf8 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/iron_window.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/jungle_window.png b/src/main/resources/assets/create/textures/block/connected/jungle_window.png new file mode 100644 index 000000000..5ed48cd23 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/jungle_window.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/oak_window.png b/src/main/resources/assets/create/textures/block/connected/oak_window.png index 467f31b3d..68f87f93e 100644 Binary files a/src/main/resources/assets/create/textures/block/connected/oak_window.png and b/src/main/resources/assets/create/textures/block/connected/oak_window.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/spruce_window.png b/src/main/resources/assets/create/textures/block/connected/spruce_window.png new file mode 100644 index 000000000..7c2fad33a Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/spruce_window.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/vertical_framed_glass.png b/src/main/resources/assets/create/textures/block/connected/vertical_framed_glass.png new file mode 100644 index 000000000..9815c7da1 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/vertical_framed_glass.png differ diff --git a/src/main/resources/assets/create/textures/block/dark_oak_window.png b/src/main/resources/assets/create/textures/block/dark_oak_window.png new file mode 100644 index 000000000..432e338b4 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/dark_oak_window.png differ diff --git a/src/main/resources/assets/create/textures/block/framed_glass.png b/src/main/resources/assets/create/textures/block/framed_glass.png index 9c22d68c8..ebe1235d9 100644 Binary files a/src/main/resources/assets/create/textures/block/framed_glass.png and b/src/main/resources/assets/create/textures/block/framed_glass.png differ diff --git a/src/main/resources/assets/create/textures/block/framed_glass_pane_top.png b/src/main/resources/assets/create/textures/block/framed_glass_pane_top.png new file mode 100644 index 000000000..1b42f026c Binary files /dev/null and b/src/main/resources/assets/create/textures/block/framed_glass_pane_top.png differ diff --git a/src/main/resources/assets/create/textures/block/horizontal_framed_glass.png b/src/main/resources/assets/create/textures/block/horizontal_framed_glass.png new file mode 100644 index 000000000..d24ea9599 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/horizontal_framed_glass.png differ diff --git a/src/main/resources/assets/create/textures/block/iron_window.png b/src/main/resources/assets/create/textures/block/iron_window.png new file mode 100644 index 000000000..cf196999f Binary files /dev/null and b/src/main/resources/assets/create/textures/block/iron_window.png differ diff --git a/src/main/resources/assets/create/textures/block/iron_window_top.png b/src/main/resources/assets/create/textures/block/iron_window_top.png new file mode 100644 index 000000000..258c4a558 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/iron_window_top.png differ diff --git a/src/main/resources/assets/create/textures/block/jungle_window.png b/src/main/resources/assets/create/textures/block/jungle_window.png new file mode 100644 index 000000000..61d33a326 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/jungle_window.png differ diff --git a/src/main/resources/assets/create/textures/block/oak_window.png b/src/main/resources/assets/create/textures/block/oak_window.png new file mode 100644 index 000000000..eea236f75 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/oak_window.png differ diff --git a/src/main/resources/assets/create/textures/block/spruce_window.png b/src/main/resources/assets/create/textures/block/spruce_window.png new file mode 100644 index 000000000..e19bf9756 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/spruce_window.png differ diff --git a/src/main/resources/assets/create/textures/block/vertical_framed_glass.png b/src/main/resources/assets/create/textures/block/vertical_framed_glass.png new file mode 100644 index 000000000..8e27dcaf6 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/vertical_framed_glass.png differ diff --git a/src/main/resources/data/create/loot_tables/blocks/acacia_glass.json b/src/main/resources/data/create/loot_tables/blocks/acacia_glass.json new file mode 100644 index 000000000..7ef422fd0 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/acacia_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:acacia_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/acacia_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/acacia_glass_pane.json new file mode 100644 index 000000000..3b202a989 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/acacia_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:acacia_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/birch_glass.json b/src/main/resources/data/create/loot_tables/blocks/birch_glass.json new file mode 100644 index 000000000..4d8932ca1 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/birch_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:birch_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/birch_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/birch_glass_pane.json new file mode 100644 index 000000000..dee0b289d --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/birch_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:birch_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass.json b/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass.json new file mode 100644 index 000000000..e90196415 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:dark_oak_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass_pane.json new file mode 100644 index 000000000..5200f9c80 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:dark_oak_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/framed_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/framed_glass_pane.json new file mode 100644 index 000000000..6f9a53469 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/framed_glass_pane.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:framed_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass.json b/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass.json new file mode 100644 index 000000000..8043511ee --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:horizontal_framed_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..99d31d4b7 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass_pane.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:horizontal_framed_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/iron_glass.json b/src/main/resources/data/create/loot_tables/blocks/iron_glass.json new file mode 100644 index 000000000..fe9436387 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/iron_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:iron_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/iron_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/iron_glass_pane.json new file mode 100644 index 000000000..8ea376231 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/iron_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:iron_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/jungle_glass.json b/src/main/resources/data/create/loot_tables/blocks/jungle_glass.json new file mode 100644 index 000000000..07bcbedad --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/jungle_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:jungle_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/jungle_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/jungle_glass_pane.json new file mode 100644 index 000000000..8db321b96 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/jungle_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:jungle_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/oak_glass.json b/src/main/resources/data/create/loot_tables/blocks/oak_glass.json new file mode 100644 index 000000000..355f49440 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/oak_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:oak_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/oak_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/oak_glass_pane.json new file mode 100644 index 000000000..7c0e840a4 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/oak_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:oak_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/spruce_glass.json b/src/main/resources/data/create/loot_tables/blocks/spruce_glass.json new file mode 100644 index 000000000..45f929e3e --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/spruce_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:spruce_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/spruce_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/spruce_glass_pane.json new file mode 100644 index 000000000..e5bc370e2 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/spruce_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:spruce_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass.json b/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass.json new file mode 100644 index 000000000..ee02fe589 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:vertical_framed_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass_pane.json new file mode 100644 index 000000000..05208f24c --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass_pane.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:vertical_framed_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json new file mode 100644 index 000000000..ee9aa413f --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:acacia_planks" + } + }, + "result": { + "item": "create:acacia_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json new file mode 100644 index 000000000..da116603a --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:acacia_glass" + } + }, + "result": { + "item": "create:acacia_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json new file mode 100644 index 000000000..5048cb608 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:birch_planks" + } + }, + "result": { + "item": "create:birch_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json new file mode 100644 index 000000000..ada5713f3 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:birch_glass" + } + }, + "result": { + "item": "create:birch_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json new file mode 100644 index 000000000..562a94005 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:dark_oak_planks" + } + }, + "result": { + "item": "create:dark_oak_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json new file mode 100644 index 000000000..ba2ffe6cb --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:dark_oak_glass" + } + }, + "result": { + "item": "create:dark_oak_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json index 604b66f73..f34e747b6 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:dolomite_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json new file mode 100644 index 000000000..a9bb02d74 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:framed_glass" + } + }, + "result": { + "item": "create:framed_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json index 78eb249e4..c9b9cdcbf 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:gabbro_bricks_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json index cec9db652..dbf3db7d3 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:gabbro_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..276621f48 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:horizontal_framed_glass" + } + }, + "result": { + "item": "create:horizontal_framed_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json new file mode 100644 index 000000000..cb3d7180c --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "create:andesite_alloy" + } + }, + "result": { + "item": "create:iron_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json new file mode 100644 index 000000000..ed5ab6e84 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:iron_glass" + } + }, + "result": { + "item": "create:iron_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json new file mode 100644 index 000000000..f15383737 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:jungle_planks" + } + }, + "result": { + "item": "create:jungle_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json new file mode 100644 index 000000000..da5a5a4e2 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:jungle_glass" + } + }, + "result": { + "item": "create:jungle_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json index 089e27eb4..3ad232736 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:limestone_bricks_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json index 8b35a34ff..1fc316735 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:limestone_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json new file mode 100644 index 000000000..abaa47387 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:oak_planks" + } + }, + "result": { + "item": "create:oak_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json new file mode 100644 index 000000000..2a4ad1e7a --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:oak_glass" + } + }, + "result": { + "item": "create:oak_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json new file mode 100644 index 000000000..6152517b9 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:spruce_planks" + } + }, + "result": { + "item": "create:spruce_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json new file mode 100644 index 000000000..6854031c5 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:spruce_glass" + } + }, + "result": { + "item": "create:spruce_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json new file mode 100644 index 000000000..d2e1854a7 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:vertical_framed_glass" + } + }, + "result": { + "item": "create:vertical_framed_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json index 45e99caef..c0833d7b8 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:weathered_limestone_bricks_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json index 86be2dc18..239b0ac10 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:weathered_limestone_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/smelting/dolomite.json b/src/main/resources/data/create/recipes/smelting/diorite.json similarity index 100% rename from src/main/resources/data/create/recipes/smelting/dolomite.json rename to src/main/resources/data/create/recipes/smelting/diorite.json diff --git a/src/main/resources/data/create/recipes/smelting/bread.json b/src/main/resources/data/create/recipes/smelting/dough.json similarity index 100% rename from src/main/resources/data/create/recipes/smelting/bread.json rename to src/main/resources/data/create/recipes/smelting/dough.json diff --git a/src/main/resources/data/create/recipes/smelting/framed_glass.json b/src/main/resources/data/create/recipes/smelting/framed_glass.json new file mode 100644 index 000000000..409c71227 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:framed_glass" + }, + "result": "minecraft:glass", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json new file mode 100644 index 000000000..f1fff7a63 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:framed_glass_pane" + }, + "result": "minecraft:glass_pane", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/gabbro.json b/src/main/resources/data/create/recipes/smelting/granite.json similarity index 100% rename from src/main/resources/data/create/recipes/smelting/gabbro.json rename to src/main/resources/data/create/recipes/smelting/granite.json diff --git a/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json new file mode 100644 index 000000000..863c9fdc3 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:horizontal_framed_glass" + }, + "result": "minecraft:glass", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..471c8fe8f --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:horizontal_framed_glass_pane" + }, + "result": "minecraft:glass_pane", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/limestone.json b/src/main/resources/data/create/recipes/smelting/limesand.json similarity index 100% rename from src/main/resources/data/create/recipes/smelting/limestone.json rename to src/main/resources/data/create/recipes/smelting/limesand.json diff --git a/src/main/resources/data/create/recipes/smelting/tiled_glass.json b/src/main/resources/data/create/recipes/smelting/tiled_glass.json new file mode 100644 index 000000000..0b08b9391 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/tiled_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:tiled_glass" + }, + "result": "minecraft:glass", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json b/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json new file mode 100644 index 000000000..49af92059 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:tiled_glass_pane" + }, + "result": "minecraft:glass_pane", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json new file mode 100644 index 000000000..506467d55 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:vertical_framed_glass" + }, + "result": "minecraft:glass", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json new file mode 100644 index 000000000..87ebc95ca --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:vertical_framed_glass_pane" + }, + "result": "minecraft:glass_pane", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/framed_glass.json new file mode 100644 index 000000000..e9e589b69 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass" + }, + "result": "create:framed_glass", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json new file mode 100644 index 000000000..940f6d18c --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass_pane" + }, + "result": "create:framed_glass_pane", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json new file mode 100644 index 000000000..ca088b488 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass" + }, + "result": "create:horizontal_framed_glass", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..bace23148 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass_pane" + }, + "result": "create:horizontal_framed_glass_pane", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json new file mode 100644 index 000000000..d1c6ed910 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass" + }, + "result": "create:vertical_framed_glass", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json new file mode 100644 index 000000000..c8ba1ca6e --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass_pane" + }, + "result": "create:vertical_framed_glass_pane", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file