diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java index 7d27f41289..6242c6da0f 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java @@ -982,10 +982,10 @@ public static Pair, DeferredBlock, DeferredBlock> EBONY_NOXWOOD_SIGN = registerSign("ebony_noxwood", SpectrumWoodTypes.EBONY_NOXWOOD, noxcap(MapColor.TERRACOTTA_BLACK)); - public static final Pair, DeferredBlock> IVORY_NOXWOOD_SIGN = registerSign("ivory_noxwood", SpectrumWoodTypes.IVORY_NOXWOOD, noxcap(MapColor.QUARTZ)); - public static final Pair, DeferredBlock> SLATE_NOXWOOD_SIGN = registerSign("slate_noxwood", SpectrumWoodTypes.SLATE_NOXWOOD, noxcap(MapColor.COLOR_GRAY)); - public static final Pair, DeferredBlock> CHESTNUT_NOXWOOD_SIGN = registerSign("chestnut_noxwood", SpectrumWoodTypes.CHESTNUT_NOXWOOD, noxcap(MapColor.CRIMSON_NYLIUM)); + public static final Pair, DeferredBlock> EBONY_NOXWOOD_SIGN = registerSign("ebony_noxwood", SpectrumWoodTypes.EBONY_NOXWOOD, noxcap(MapColor.TERRACOTTA_BLACK).noCollission()); + public static final Pair, DeferredBlock> IVORY_NOXWOOD_SIGN = registerSign("ivory_noxwood", SpectrumWoodTypes.IVORY_NOXWOOD, noxcap(MapColor.QUARTZ).noCollission()); + public static final Pair, DeferredBlock> SLATE_NOXWOOD_SIGN = registerSign("slate_noxwood", SpectrumWoodTypes.SLATE_NOXWOOD, noxcap(MapColor.COLOR_GRAY).noCollission()); + public static final Pair, DeferredBlock> CHESTNUT_NOXWOOD_SIGN = registerSign("chestnut_noxwood", SpectrumWoodTypes.CHESTNUT_NOXWOOD, noxcap(MapColor.CRIMSON_NYLIUM).noCollission()); public static Pair, DeferredBlock> registerHangingSign(String name, WoodType woodType, BlockBehaviour.Properties properties) { DeferredBlock sign = register(block(name + "_hanging_sign", () -> new CeilingHangingSignBlock(woodType, properties))); @@ -1037,7 +1037,7 @@ public static BlockBehaviour.Properties galaWood(MapColor color) { public static final DeferredBlock WEEPING_GALA_LANTERN = register(blockWithItem("weeping_gala_lantern", () -> new WeepingGalaLanternBlock(galaWood(MapColor.COLOR_BROWN).lightLevel(state -> 13).noOcclusion().pushReaction(PushReaction.DESTROY))).withBlockModel((ctx, block) -> MultiVariantGenerator.multiVariant(block).with(PropertyDispatch.property(BlockStateProperties.HANGING).select(false, Variant.variant()).select(true, Variant.variant().with(VariantProperties.X_ROT, VariantProperties.Rotation.R180))).with(PropertyDispatch.properties(DiagonalBlock.DIAGONAL, FlexLanternBlock.TALL).generate((diagonal, tall) -> SpectrumModelHelper.createModelVariant(SpectrumTexturedModelProviders.baseTransLantern(diagonal, tall).createWithSuffix(block, (diagonal ? "_diagonal" : "") + (tall ? "_tall" : "_small"), ctx.modelOutput))))).withItemModel((ctx, item) -> SpectrumModelHelper.registerItemModel(ctx, item, "_item"))); public static final DeferredBlock WEEPING_GALA_LAMP = register(redstoneLamp(blockWithItem("weeping_gala_lamp", () -> new FlammableRedstoneLampBlock(galaWood(MapColor.COLOR_BROWN).lightLevel(LANTERN_LIGHT_PROVIDER))))); public static final DeferredBlock WEEPING_GALA_LIGHT = register(axisRotated(blockWithItem("weeping_gala_light", () -> new FlammableRotatedPillarBlock(galaWood(MapColor.COLOR_BROWN).lightLevel(state -> 15).noOcclusion())), SpectrumTexturedModelProviders.BASE_TRANS_LIGHT_CORE)); - public static final Pair, DeferredBlock> WEEPING_GALA_SIGN = registerSign("weeping_gala", SpectrumWoodTypes.WEEPING_GALA, galaWood(MapColor.COLOR_BROWN)); + public static final Pair, DeferredBlock> WEEPING_GALA_SIGN = registerSign("weeping_gala", SpectrumWoodTypes.WEEPING_GALA, galaWood(MapColor.COLOR_BROWN).noCollission()); public static final Pair, DeferredBlock> WEEPING_GALA_HANGING_SIGN = registerHangingSign("weeping_gala", SpectrumWoodTypes.WEEPING_GALA, galaWood(MapColor.COLOR_BROWN)); public static BlockBehaviour.Properties basalMarble() { @@ -1589,7 +1589,7 @@ public static DeferredBlock registerColoredWood(String name, S public static final DeferredBlock YELLOW_WOOD = registerColoredWood("yellow_wood", STRIPPED_YELLOW_WOOD, YELLOW_LOG, InkColors.YELLOW, SpectrumLootTableKeys.YELLOW_LOG_STRIPPING); public static DeferredBlock registerColoredTrapdoor(String name, InkColor color) { - return register(blockWithItem(name, () -> new TrapDoorBlock(SpectrumBlockSetTypes.COLORED_WOOD, copyWithMapColor(OAK_WOOD, color.getMapColor())))); + return register(blockWithItem(name, () -> new TrapDoorBlock(SpectrumBlockSetTypes.COLORED_WOOD, copyWithMapColor(OAK_WOOD, color.getMapColor()).noOcclusion()))); } public static final DeferredBlock BLACK_TRAPDOOR = registerColoredTrapdoor("black_trapdoor", InkColors.BLACK); @@ -1610,7 +1610,7 @@ public static DeferredBlock registerColoredTrapdoor(String name, public static final DeferredBlock YELLOW_TRAPDOOR = registerColoredTrapdoor("yellow_trapdoor", InkColors.YELLOW); public static DeferredBlock registerColoredDoor(String name, InkColor color) { - return register(blockWithItem(name, () -> new DoorBlock(SpectrumBlockSetTypes.COLORED_WOOD, copyWithMapColor(OAK_WOOD, color.getMapColor())))); + return register(blockWithItem(name, () -> new DoorBlock(SpectrumBlockSetTypes.COLORED_WOOD, copyWithMapColor(OAK_WOOD, color.getMapColor()).noOcclusion()))); } public static final DeferredBlock BLACK_DOOR = registerColoredDoor("black_door", InkColors.BLACK); @@ -1630,22 +1630,22 @@ public static DeferredBlock registerColoredDoor(String name, InkColor public static final DeferredBlock WHITE_DOOR = registerColoredDoor("white_door", InkColors.WHITE); public static final DeferredBlock YELLOW_DOOR = registerColoredDoor("yellow_door", InkColors.YELLOW); - public static final Pair, DeferredBlock> BLACK_SIGN = registerSign("black", SpectrumWoodTypes.BLACK, copyWithMapColor(OAK_WOOD, InkColors.BLACK.getMapColor())); - public static final Pair, DeferredBlock> BLUE_SIGN = registerSign("blue", SpectrumWoodTypes.BLUE, copyWithMapColor(OAK_WOOD, InkColors.BLUE.getMapColor())); - public static final Pair, DeferredBlock> BROWN_SIGN = registerSign("brown", SpectrumWoodTypes.BROWN, copyWithMapColor(OAK_WOOD, InkColors.BROWN.getMapColor())); - public static final Pair, DeferredBlock> CYAN_SIGN = registerSign("cyan", SpectrumWoodTypes.CYAN, copyWithMapColor(OAK_WOOD, InkColors.CYAN.getMapColor())); - public static final Pair, DeferredBlock> GRAY_SIGN = registerSign("gray", SpectrumWoodTypes.GRAY, copyWithMapColor(OAK_WOOD, InkColors.GRAY.getMapColor())); - public static final Pair, DeferredBlock> GREEN_SIGN = registerSign("green", SpectrumWoodTypes.GREEN, copyWithMapColor(OAK_WOOD, InkColors.GREEN.getMapColor())); - public static final Pair, DeferredBlock> LIGHT_BLUE_SIGN = registerSign("light_blue", SpectrumWoodTypes.LIGHT_BLUE, copyWithMapColor(OAK_WOOD, InkColors.LIGHT_BLUE.getMapColor())); - public static final Pair, DeferredBlock> LIGHT_GRAY_SIGN = registerSign("light_gray", SpectrumWoodTypes.LIGHT_GRAY, copyWithMapColor(OAK_WOOD, InkColors.LIGHT_GRAY.getMapColor())); - public static final Pair, DeferredBlock> LIME_SIGN = registerSign("lime", SpectrumWoodTypes.LIME, copyWithMapColor(OAK_WOOD, InkColors.LIME.getMapColor())); - public static final Pair, DeferredBlock> MAGENTA_SIGN = registerSign("magenta", SpectrumWoodTypes.MAGENTA, copyWithMapColor(OAK_WOOD, InkColors.MAGENTA.getMapColor())); - public static final Pair, DeferredBlock> ORANGE_SIGN = registerSign("orange", SpectrumWoodTypes.ORANGE, copyWithMapColor(OAK_WOOD, InkColors.ORANGE.getMapColor())); - public static final Pair, DeferredBlock> PINK_SIGN = registerSign("pink", SpectrumWoodTypes.PINK, copyWithMapColor(OAK_WOOD, InkColors.PINK.getMapColor())); - public static final Pair, DeferredBlock> PURPLE_SIGN = registerSign("purple", SpectrumWoodTypes.PURPLE, copyWithMapColor(OAK_WOOD, InkColors.PURPLE.getMapColor())); - public static final Pair, DeferredBlock> RED_SIGN = registerSign("red", SpectrumWoodTypes.RED, copyWithMapColor(OAK_WOOD, InkColors.RED.getMapColor())); - public static final Pair, DeferredBlock> WHITE_SIGN = registerSign("white", SpectrumWoodTypes.WHITE, copyWithMapColor(OAK_WOOD, InkColors.WHITE.getMapColor())); - public static final Pair, DeferredBlock> YELLOW_SIGN = registerSign("yellow", SpectrumWoodTypes.YELLOW, copyWithMapColor(OAK_WOOD, InkColors.YELLOW.getMapColor())); + public static final Pair, DeferredBlock> BLACK_SIGN = registerSign("black", SpectrumWoodTypes.BLACK, copyWithMapColor(OAK_WOOD, InkColors.BLACK.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> BLUE_SIGN = registerSign("blue", SpectrumWoodTypes.BLUE, copyWithMapColor(OAK_WOOD, InkColors.BLUE.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> BROWN_SIGN = registerSign("brown", SpectrumWoodTypes.BROWN, copyWithMapColor(OAK_WOOD, InkColors.BROWN.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> CYAN_SIGN = registerSign("cyan", SpectrumWoodTypes.CYAN, copyWithMapColor(OAK_WOOD, InkColors.CYAN.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> GRAY_SIGN = registerSign("gray", SpectrumWoodTypes.GRAY, copyWithMapColor(OAK_WOOD, InkColors.GRAY.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> GREEN_SIGN = registerSign("green", SpectrumWoodTypes.GREEN, copyWithMapColor(OAK_WOOD, InkColors.GREEN.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> LIGHT_BLUE_SIGN = registerSign("light_blue", SpectrumWoodTypes.LIGHT_BLUE, copyWithMapColor(OAK_WOOD, InkColors.LIGHT_BLUE.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> LIGHT_GRAY_SIGN = registerSign("light_gray", SpectrumWoodTypes.LIGHT_GRAY, copyWithMapColor(OAK_WOOD, InkColors.LIGHT_GRAY.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> LIME_SIGN = registerSign("lime", SpectrumWoodTypes.LIME, copyWithMapColor(OAK_WOOD, InkColors.LIME.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> MAGENTA_SIGN = registerSign("magenta", SpectrumWoodTypes.MAGENTA, copyWithMapColor(OAK_WOOD, InkColors.MAGENTA.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> ORANGE_SIGN = registerSign("orange", SpectrumWoodTypes.ORANGE, copyWithMapColor(OAK_WOOD, InkColors.ORANGE.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> PINK_SIGN = registerSign("pink", SpectrumWoodTypes.PINK, copyWithMapColor(OAK_WOOD, InkColors.PINK.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> PURPLE_SIGN = registerSign("purple", SpectrumWoodTypes.PURPLE, copyWithMapColor(OAK_WOOD, InkColors.PURPLE.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> RED_SIGN = registerSign("red", SpectrumWoodTypes.RED, copyWithMapColor(OAK_WOOD, InkColors.RED.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> WHITE_SIGN = registerSign("white", SpectrumWoodTypes.WHITE, copyWithMapColor(OAK_WOOD, InkColors.WHITE.getMapColor()).noCollission()); + public static final Pair, DeferredBlock> YELLOW_SIGN = registerSign("yellow", SpectrumWoodTypes.YELLOW, copyWithMapColor(OAK_WOOD, InkColors.YELLOW.getMapColor()).noCollission()); public static final Pair, DeferredBlock> BLACK_HANGING_SIGN = registerHangingSign("black", SpectrumWoodTypes.BLACK, copyWithMapColor(OAK_WOOD, InkColors.BLACK.getMapColor())); public static final Pair, DeferredBlock> BLUE_HANGING_SIGN = registerHangingSign("blue", SpectrumWoodTypes.BLUE, copyWithMapColor(OAK_WOOD, InkColors.BLUE.getMapColor())); @@ -2481,6 +2481,40 @@ public static void registerClient(FMLClientSetupEvent event) { ItemBlockRenderTypes.setRenderLayer(MEDIUM_MOONSTONE_BUD.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(SMALL_MOONSTONE_BUD.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BLACK_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BLUE_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(LIGHT_BLUE_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BROWN_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(WHITE_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(LIGHT_GRAY_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(GRAY_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(RED_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ORANGE_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(YELLOW_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(LIME_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(GREEN_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(CYAN_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(PURPLE_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(MAGENTA_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(PINK_DOOR.get(), RenderType.cutout()); + + ItemBlockRenderTypes.setRenderLayer(BLACK_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BLUE_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(LIGHT_BLUE_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BROWN_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(WHITE_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(LIGHT_GRAY_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(GRAY_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(RED_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ORANGE_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(YELLOW_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(LIME_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(GREEN_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(CYAN_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(PURPLE_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(MAGENTA_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(PINK_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(PEDESTAL_BASIC_TOPAZ.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(PEDESTAL_BASIC_AMETHYST.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(PEDESTAL_BASIC_CITRINE.get(), RenderType.cutout()); diff --git a/src/main/resources/assets/spectrum/models/block/black_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/black_trapdoor_bottom.json index aed2d8604b..26dd32de7d 100644 --- a/src/main/resources/assets/spectrum/models/block/black_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/black_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/black_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/black_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/black_trapdoor_open.json index 7290b4f1b2..8af4dcdcf8 100644 --- a/src/main/resources/assets/spectrum/models/block/black_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/black_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/black_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/black_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/black_trapdoor_top.json index 90a9211ec8..5ae77d50a7 100644 --- a/src/main/resources/assets/spectrum/models/block/black_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/black_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/black_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/blue_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/blue_trapdoor_bottom.json index 1ef285bd54..e56cdad4e7 100644 --- a/src/main/resources/assets/spectrum/models/block/blue_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/blue_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/blue_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/blue_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/blue_trapdoor_open.json index 994fe2621d..cda25e811a 100644 --- a/src/main/resources/assets/spectrum/models/block/blue_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/blue_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/blue_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/blue_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/blue_trapdoor_top.json index a2d7a1f00e..f91128df4d 100644 --- a/src/main/resources/assets/spectrum/models/block/blue_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/blue_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/blue_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/brown_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/brown_trapdoor_bottom.json index a3344186dd..e54a7267e0 100644 --- a/src/main/resources/assets/spectrum/models/block/brown_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/brown_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/brown_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/brown_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/brown_trapdoor_open.json index 3df129dfb0..bcad4ab02d 100644 --- a/src/main/resources/assets/spectrum/models/block/brown_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/brown_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/brown_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/brown_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/brown_trapdoor_top.json index 16298eea9d..b1446a227f 100644 --- a/src/main/resources/assets/spectrum/models/block/brown_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/brown_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/brown_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_bottom.json index 43e2e7d38a..88ec11ca1e 100644 --- a/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/cyan_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_open.json index 07f740308c..d5ab231919 100644 --- a/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/cyan_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_top.json index 0567f00715..1393d663b1 100644 --- a/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/cyan_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/cyan_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/gray_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/gray_trapdoor_bottom.json index 46aa39dc35..3a51774ac4 100644 --- a/src/main/resources/assets/spectrum/models/block/gray_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/gray_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/gray_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/gray_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/gray_trapdoor_open.json index beceb9da90..d30c8dbb82 100644 --- a/src/main/resources/assets/spectrum/models/block/gray_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/gray_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/gray_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/gray_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/gray_trapdoor_top.json index 3872224c0c..59960b10ea 100644 --- a/src/main/resources/assets/spectrum/models/block/gray_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/gray_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/gray_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/green_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/green_trapdoor_bottom.json index 98de3a3d3b..10e2cbadae 100644 --- a/src/main/resources/assets/spectrum/models/block/green_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/green_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/green_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/green_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/green_trapdoor_open.json index 9a5f7aab89..eb6a0754bd 100644 --- a/src/main/resources/assets/spectrum/models/block/green_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/green_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/green_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/green_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/green_trapdoor_top.json index c5e3e0b63a..6b86eae0fe 100644 --- a/src/main/resources/assets/spectrum/models/block/green_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/green_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/green_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_bottom.json index 7cfd798766..aacb57426b 100644 --- a/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/light_blue_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_open.json index 1ed9978a8f..ce7ad3e254 100644 --- a/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/light_blue_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_top.json index 15e68261fb..1bcb6d41a0 100644 --- a/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/light_blue_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/light_blue_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_bottom.json index 66624d971e..f2b455214a 100644 --- a/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/light_gray_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_open.json index d531847e72..e9fb9ba5a3 100644 --- a/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/light_gray_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_top.json index b04826c046..0853ce1cb0 100644 --- a/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/light_gray_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/light_gray_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/lime_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/lime_trapdoor_bottom.json index 85c1c7e5af..21924554df 100644 --- a/src/main/resources/assets/spectrum/models/block/lime_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/lime_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/lime_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/lime_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/lime_trapdoor_open.json index 46b4aacdad..7a3aead450 100644 --- a/src/main/resources/assets/spectrum/models/block/lime_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/lime_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/lime_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/lime_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/lime_trapdoor_top.json index d2491b03af..ea37caaef4 100644 --- a/src/main/resources/assets/spectrum/models/block/lime_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/lime_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/lime_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_bottom.json index 4e9df29c28..60b64c700f 100644 --- a/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/magenta_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_open.json index 74af23bd7d..78f45f2687 100644 --- a/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/magenta_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_top.json index bcb19d3d49..7320dad224 100644 --- a/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/magenta_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/magenta_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/orange_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/orange_trapdoor_bottom.json index 7671b56d97..a3a50285b2 100644 --- a/src/main/resources/assets/spectrum/models/block/orange_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/orange_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/orange_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/orange_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/orange_trapdoor_open.json index 3e58ee3c3c..70bb4738aa 100644 --- a/src/main/resources/assets/spectrum/models/block/orange_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/orange_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/orange_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/orange_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/orange_trapdoor_top.json index 9c3df06e41..079b6566c1 100644 --- a/src/main/resources/assets/spectrum/models/block/orange_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/orange_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/orange_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/pink_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/pink_trapdoor_bottom.json index 2a190216d0..b728b9abbd 100644 --- a/src/main/resources/assets/spectrum/models/block/pink_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/pink_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/pink_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/pink_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/pink_trapdoor_open.json index 18df10d950..3588b4a9ae 100644 --- a/src/main/resources/assets/spectrum/models/block/pink_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/pink_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/pink_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/pink_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/pink_trapdoor_top.json index 54484d56ec..9864af7e08 100644 --- a/src/main/resources/assets/spectrum/models/block/pink_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/pink_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/pink_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/purple_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/purple_trapdoor_bottom.json index 9d32a3337b..0eb0f5bd8c 100644 --- a/src/main/resources/assets/spectrum/models/block/purple_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/purple_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/purple_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/purple_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/purple_trapdoor_open.json index 2da41dbd3c..49d7c3e0bf 100644 --- a/src/main/resources/assets/spectrum/models/block/purple_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/purple_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/purple_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/purple_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/purple_trapdoor_top.json index 1429c7987c..a33fe7b666 100644 --- a/src/main/resources/assets/spectrum/models/block/purple_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/purple_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/purple_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/red_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/red_trapdoor_bottom.json index 75d0934ee0..c43eea1a1e 100644 --- a/src/main/resources/assets/spectrum/models/block/red_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/red_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/red_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/red_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/red_trapdoor_open.json index 7d36eac6fc..074abbe32d 100644 --- a/src/main/resources/assets/spectrum/models/block/red_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/red_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/red_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/red_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/red_trapdoor_top.json index f989ef64d0..8c8c9ce658 100644 --- a/src/main/resources/assets/spectrum/models/block/red_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/red_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/red_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/white_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/white_trapdoor_bottom.json index 8f9e0d0af1..4965a3324c 100644 --- a/src/main/resources/assets/spectrum/models/block/white_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/white_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/white_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/white_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/white_trapdoor_open.json index 07baecdc35..24e6a118ce 100644 --- a/src/main/resources/assets/spectrum/models/block/white_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/white_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/white_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/white_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/white_trapdoor_top.json index 42d3f8d8bf..d035ccc55e 100644 --- a/src/main/resources/assets/spectrum/models/block/white_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/white_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/white_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_bottom.json index 50221352f7..cd71f2953e 100644 --- a/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_bottom.json +++ b/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "parent": "spectrum:improved_vanilla/colored_trapdoor_bottom", "textures": { "texture": "spectrum:block/yellow_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_open.json b/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_open.json index a7702eb361..302f519409 100644 --- a/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_open.json +++ b/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_open.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_open", + "parent": "spectrum:improved_vanilla/colored_trapdoor_open", "textures": { "texture": "spectrum:block/yellow_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_top.json b/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_top.json index 90410d1b57..705087fc96 100644 --- a/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_top.json +++ b/src/main/resources/assets/spectrum/models/block/yellow_trapdoor_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/template_orientable_trapdoor_top", + "parent": "spectrum:improved_vanilla/colored_trapdoor_top", "textures": { "texture": "spectrum:block/yellow_trapdoor" } diff --git a/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_bottom.json b/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_bottom.json new file mode 100644 index 0000000000..4953ebcd98 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_bottom.json @@ -0,0 +1,20 @@ +{ + "parent": "block/thin_block", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 3, 16], + "faces": { + "north": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#texture", "cullface": "north"}, + "east": {"uv": [13, 0, 16, 16], "rotation": 90, "texture": "#texture", "cullface": "east"}, + "south": {"uv": [13, 0, 16, 16], "rotation": 270, "texture": "#texture", "cullface": "south"}, + "west": {"uv": [0, 0, 3, 16], "rotation": 270, "texture": "#texture", "cullface": "west"}, + "up": {"uv": [16, 16, 0, 0], "texture": "#texture"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_open.json b/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_open.json new file mode 100644 index 0000000000..a9d564c813 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_open.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "from": [0, 0, 13], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [16, 16, 0, 0], "texture": "#texture"}, + "east": {"uv": [3, 0, 0, 16], "rotation": 180, "texture": "#texture", "cullface": "east"}, + "south": {"uv": [16, 16, 0, 0], "texture": "#texture", "cullface": "south"}, + "west": {"uv": [13, 0, 16, 16], "rotation": 180, "texture": "#texture", "cullface": "west"}, + "up": {"uv": [3, 0, 0, 16], "rotation": 90, "texture": "#texture", "cullface": "up"}, + "down": {"uv": [13, 0, 16, 16], "rotation": 270, "texture": "#texture", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_top.json b/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_top.json new file mode 100644 index 0000000000..ada83954c3 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/improved_vanilla/colored_trapdoor_top.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "from": [0, 13, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#texture", "cullface": "north"}, + "east": {"uv": [0, 0, 3, 16], "rotation": 90, "texture": "#texture", "cullface": "east"}, + "south": {"uv": [13, 0, 16, 16], "rotation": 270, "texture": "#texture", "cullface": "south"}, + "west": {"uv": [13, 0, 16, 16], "rotation": 90, "texture": "#texture", "cullface": "west"}, + "up": {"uv": [16, 16, 0, 0], "texture": "#texture", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/black_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/black_door_bottom.png new file mode 100644 index 0000000000..8520ab2d91 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/black_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/black_door_top.png b/src/main/resources/assets/spectrum/textures/block/black_door_top.png new file mode 100644 index 0000000000..ce6a39d217 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/black_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/black_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/black_trapdoor.png new file mode 100644 index 0000000000..d8058f8f03 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/black_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/blue_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/blue_door_bottom.png new file mode 100644 index 0000000000..3f937f2c83 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/blue_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/blue_door_top.png b/src/main/resources/assets/spectrum/textures/block/blue_door_top.png new file mode 100644 index 0000000000..1a9868c5b4 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/blue_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/blue_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/blue_trapdoor.png new file mode 100644 index 0000000000..9f2bb20a23 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/blue_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/brown_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/brown_door_bottom.png new file mode 100644 index 0000000000..10cc84af2c Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/brown_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/brown_door_top.png b/src/main/resources/assets/spectrum/textures/block/brown_door_top.png new file mode 100644 index 0000000000..a3b70e40f9 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/brown_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/brown_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/brown_trapdoor.png new file mode 100644 index 0000000000..2e843aaf00 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/brown_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/cyan_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/cyan_door_bottom.png new file mode 100644 index 0000000000..2754f206d1 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/cyan_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/cyan_door_top.png b/src/main/resources/assets/spectrum/textures/block/cyan_door_top.png new file mode 100644 index 0000000000..b40033241c Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/cyan_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/cyan_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/cyan_trapdoor.png new file mode 100644 index 0000000000..7bcc785761 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/cyan_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/gray_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/gray_door_bottom.png new file mode 100644 index 0000000000..59962c8f17 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/gray_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/gray_door_top.png b/src/main/resources/assets/spectrum/textures/block/gray_door_top.png new file mode 100644 index 0000000000..88665c9280 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/gray_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/gray_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/gray_trapdoor.png new file mode 100644 index 0000000000..7cdba548eb Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/gray_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/green_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/green_door_bottom.png new file mode 100644 index 0000000000..6e1064774c Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/green_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/green_door_top.png b/src/main/resources/assets/spectrum/textures/block/green_door_top.png new file mode 100644 index 0000000000..6216d45eb1 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/green_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/green_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/green_trapdoor.png new file mode 100644 index 0000000000..0470fde538 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/green_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/light_blue_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/light_blue_door_bottom.png new file mode 100644 index 0000000000..beb139a3a1 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/light_blue_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/light_blue_door_top.png b/src/main/resources/assets/spectrum/textures/block/light_blue_door_top.png new file mode 100644 index 0000000000..65e77e906c Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/light_blue_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/light_blue_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/light_blue_trapdoor.png new file mode 100644 index 0000000000..44c71f9446 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/light_blue_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/light_gray_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/light_gray_door_bottom.png new file mode 100644 index 0000000000..427466935d Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/light_gray_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/light_gray_door_top.png b/src/main/resources/assets/spectrum/textures/block/light_gray_door_top.png new file mode 100644 index 0000000000..85816465df Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/light_gray_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/light_gray_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/light_gray_trapdoor.png new file mode 100644 index 0000000000..77dbc66294 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/light_gray_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/lime_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/lime_door_bottom.png new file mode 100644 index 0000000000..f80d4255c9 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/lime_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/lime_door_top.png b/src/main/resources/assets/spectrum/textures/block/lime_door_top.png new file mode 100644 index 0000000000..840a014ece Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/lime_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/lime_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/lime_trapdoor.png new file mode 100644 index 0000000000..f9c0a37c3c Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/lime_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/magenta_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/magenta_door_bottom.png new file mode 100644 index 0000000000..44bdd30858 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/magenta_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/magenta_door_top.png b/src/main/resources/assets/spectrum/textures/block/magenta_door_top.png new file mode 100644 index 0000000000..60f7c9b400 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/magenta_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/magenta_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/magenta_trapdoor.png new file mode 100644 index 0000000000..22f29bcdfd Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/magenta_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/orange_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/orange_door_bottom.png new file mode 100644 index 0000000000..ca43c96cb9 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/orange_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/orange_door_top.png b/src/main/resources/assets/spectrum/textures/block/orange_door_top.png new file mode 100644 index 0000000000..9c4e6cd1ba Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/orange_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/orange_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/orange_trapdoor.png new file mode 100644 index 0000000000..57f45cc535 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/orange_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/pink_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/pink_door_bottom.png new file mode 100644 index 0000000000..25d3c01349 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/pink_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/pink_door_top.png b/src/main/resources/assets/spectrum/textures/block/pink_door_top.png new file mode 100644 index 0000000000..dab9262dbc Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/pink_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/pink_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/pink_trapdoor.png new file mode 100644 index 0000000000..b33528a876 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/pink_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/purple_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/purple_door_bottom.png new file mode 100644 index 0000000000..124e53a057 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/purple_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/purple_door_top.png b/src/main/resources/assets/spectrum/textures/block/purple_door_top.png new file mode 100644 index 0000000000..74e11900fe Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/purple_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/purple_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/purple_trapdoor.png new file mode 100644 index 0000000000..525d6209e7 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/purple_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/red_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/red_door_bottom.png new file mode 100644 index 0000000000..0ce252b3fa Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/red_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/red_door_top.png b/src/main/resources/assets/spectrum/textures/block/red_door_top.png new file mode 100644 index 0000000000..e0b316e638 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/red_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/red_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/red_trapdoor.png new file mode 100644 index 0000000000..f4ab9e0ee9 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/red_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/white_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/white_door_bottom.png new file mode 100644 index 0000000000..7751bd71c0 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/white_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/white_door_top.png b/src/main/resources/assets/spectrum/textures/block/white_door_top.png new file mode 100644 index 0000000000..77de427063 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/white_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/white_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/white_trapdoor.png new file mode 100644 index 0000000000..8354a1afe2 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/white_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/yellow_door_bottom.png b/src/main/resources/assets/spectrum/textures/block/yellow_door_bottom.png new file mode 100644 index 0000000000..3b16e2c1d8 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/yellow_door_bottom.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/yellow_door_top.png b/src/main/resources/assets/spectrum/textures/block/yellow_door_top.png new file mode 100644 index 0000000000..0c4b325b9e Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/yellow_door_top.png differ diff --git a/src/main/resources/assets/spectrum/textures/block/yellow_trapdoor.png b/src/main/resources/assets/spectrum/textures/block/yellow_trapdoor.png new file mode 100644 index 0000000000..9f58203638 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/block/yellow_trapdoor.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/black_door.png b/src/main/resources/assets/spectrum/textures/item/black_door.png new file mode 100644 index 0000000000..c75250c8d9 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/black_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/blue_door.png b/src/main/resources/assets/spectrum/textures/item/blue_door.png new file mode 100644 index 0000000000..06cac5faf2 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/blue_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/brown_door.png b/src/main/resources/assets/spectrum/textures/item/brown_door.png new file mode 100644 index 0000000000..d5d455442a Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/brown_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/cyan_door.png b/src/main/resources/assets/spectrum/textures/item/cyan_door.png new file mode 100644 index 0000000000..e1cad92749 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/cyan_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/gray_door.png b/src/main/resources/assets/spectrum/textures/item/gray_door.png new file mode 100644 index 0000000000..fddbf5f13e Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/gray_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/green_door.png b/src/main/resources/assets/spectrum/textures/item/green_door.png new file mode 100644 index 0000000000..3842797690 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/green_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/light_blue_door.png b/src/main/resources/assets/spectrum/textures/item/light_blue_door.png new file mode 100644 index 0000000000..11db87cbe3 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/light_blue_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/light_gray_door.png b/src/main/resources/assets/spectrum/textures/item/light_gray_door.png new file mode 100644 index 0000000000..4cd35f03f3 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/light_gray_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/lime_door.png b/src/main/resources/assets/spectrum/textures/item/lime_door.png new file mode 100644 index 0000000000..c21ae6cee8 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/lime_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/magenta_door.png b/src/main/resources/assets/spectrum/textures/item/magenta_door.png new file mode 100644 index 0000000000..98bd085a66 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/magenta_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/orange_door.png b/src/main/resources/assets/spectrum/textures/item/orange_door.png new file mode 100644 index 0000000000..4989a9b498 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/orange_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/pink_door.png b/src/main/resources/assets/spectrum/textures/item/pink_door.png new file mode 100644 index 0000000000..2bc9bfbe66 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/pink_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/purple_door.png b/src/main/resources/assets/spectrum/textures/item/purple_door.png new file mode 100644 index 0000000000..00e2d47253 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/purple_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/red_door.png b/src/main/resources/assets/spectrum/textures/item/red_door.png new file mode 100644 index 0000000000..7e373a9608 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/red_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/white_door.png b/src/main/resources/assets/spectrum/textures/item/white_door.png new file mode 100644 index 0000000000..1629f79d2a Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/white_door.png differ diff --git a/src/main/resources/assets/spectrum/textures/item/yellow_door.png b/src/main/resources/assets/spectrum/textures/item/yellow_door.png new file mode 100644 index 0000000000..78404c68fb Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/item/yellow_door.png differ diff --git a/src/main/resources/data/spectrum/loot_table/blocks/black_door.json b/src/main/resources/data/spectrum/loot_table/blocks/black_door.json index 5fa46b5977..f40a79e5bc 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/black_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/black_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:black_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:black_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:black_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/blue_door.json b/src/main/resources/data/spectrum/loot_table/blocks/blue_door.json index e32cc83a97..79b81c43e9 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/blue_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/blue_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:blue_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:blue_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:blue_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/brown_door.json b/src/main/resources/data/spectrum/loot_table/blocks/brown_door.json index 121f3886a9..3e3e1379ff 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/brown_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/brown_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:brown_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:brown_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:brown_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/cyan_door.json b/src/main/resources/data/spectrum/loot_table/blocks/cyan_door.json index 9c6f17b304..6e4a4942c7 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/cyan_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/cyan_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:cyan_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:cyan_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:cyan_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/gray_door.json b/src/main/resources/data/spectrum/loot_table/blocks/gray_door.json index 4beb7ac844..e32cdbba89 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/gray_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/gray_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:gray_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:gray_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:gray_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/green_door.json b/src/main/resources/data/spectrum/loot_table/blocks/green_door.json index 6912718ba8..c80cf9730b 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/green_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/green_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:green_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:green_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:green_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/light_blue_door.json b/src/main/resources/data/spectrum/loot_table/blocks/light_blue_door.json index 88089df5e1..8cc073b566 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/light_blue_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/light_blue_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:light_blue_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:light_blue_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:light_blue_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/light_gray_door.json b/src/main/resources/data/spectrum/loot_table/blocks/light_gray_door.json index 3cf77555f3..a6e227c6fd 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/light_gray_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/light_gray_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:light_gray_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:light_gray_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:light_gray_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/lime_door.json b/src/main/resources/data/spectrum/loot_table/blocks/lime_door.json index b9a9f17e3a..eabef6a0c6 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/lime_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/lime_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:lime_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:lime_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:lime_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/magenta_door.json b/src/main/resources/data/spectrum/loot_table/blocks/magenta_door.json index 93238d948c..177651128f 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/magenta_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/magenta_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:magenta_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:magenta_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:magenta_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/orange_door.json b/src/main/resources/data/spectrum/loot_table/blocks/orange_door.json index 798e1b7b7e..f7c958a291 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/orange_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/orange_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:orange_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:orange_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:orange_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/pink_door.json b/src/main/resources/data/spectrum/loot_table/blocks/pink_door.json index c2ca21ec7a..1318789cf7 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/pink_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/pink_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:pink_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:pink_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:pink_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/purple_door.json b/src/main/resources/data/spectrum/loot_table/blocks/purple_door.json index 40153436d1..acd80c7418 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/purple_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/purple_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:purple_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:purple_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:purple_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/red_door.json b/src/main/resources/data/spectrum/loot_table/blocks/red_door.json index 23f78ba72c..aaace7a895 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/red_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/red_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:red_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:red_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:red_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/white_door.json b/src/main/resources/data/spectrum/loot_table/blocks/white_door.json index 15f4080105..84b00554e6 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/white_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/white_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:white_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:white_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:white_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/yellow_door.json b/src/main/resources/data/spectrum/loot_table/blocks/yellow_door.json index b0632c58b4..398a193cf3 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/yellow_door.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/yellow_door.json @@ -1,14 +1,29 @@ { - "type": "minecraft:block", - "pools": [{ - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [{ - "type": "minecraft:item", - "name": "spectrum:yellow_door" - }], - "conditions": [{ - "condition": "minecraft:survives_explosion" - }] - }] + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "spectrum:yellow_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "spectrum:yellow_door" + } + ], + "rolls": 1.0 + } + ] } \ No newline at end of file