From 3a7118be0f03f232bb390261940e93731084f5f4 Mon Sep 17 00:00:00 2001 From: Brennan Ward Date: Sat, 16 Nov 2019 03:26:10 -0500 Subject: [PATCH] add the rest of the lamp --- .../actuallyadditions/mod/block/AABlocks.java | 46 ++++++++-- .../mod/block/ColoredLampBlock.java | 91 +++++++++---------- .../mod/block/LampColor.java | 55 +++++++++++ .../mod/block/LampColors.java | 53 ----------- .../blockstates/black_lamp.json | 6 ++ .../blockstates/blue_lamp.json | 6 ++ .../blockstates/brown_lamp.json | 6 ++ .../blockstates/colored_lamp_block.json | 36 -------- .../blockstates/cyan_lamp.json | 6 ++ .../blockstates/gray_lamp.json | 6 ++ .../blockstates/green_lamp.json | 6 ++ .../blockstates/light_blue_lamp.json | 6 ++ .../blockstates/light_gray_lamp.json | 6 ++ .../blockstates/lime_lamp.json | 6 ++ .../blockstates/magenta_lamp.json | 6 ++ .../blockstates/orange_lamp.json | 6 ++ .../blockstates/pink_lamp.json | 6 ++ .../blockstates/purple_lamp.json | 6 ++ .../blockstates/red_lamp.json | 6 ++ .../blockstates/white_lamp.json | 6 ++ .../blockstates/yellow_lamp.json | 6 ++ .../assets/actuallyadditions/lang/en_us.json | 18 +++- .../models/item/black_lamp.json | 3 + .../models/item/blue_lamp.json | 3 + .../models/item/brown_lamp.json | 3 + .../models/item/cyan_lamp.json | 3 + .../models/item/gray_lamp.json | 3 + .../models/item/green_lamp.json | 3 + .../models/item/light_blue_lamp.json | 3 + .../models/item/light_gray_lamp.json | 3 + .../models/item/lime_lamp.json | 3 + .../models/item/magenta_lamp.json | 3 + .../models/item/orange_lamp.json | 3 + .../models/item/pink_lamp.json | 3 + .../models/item/purple_lamp.json | 3 + .../models/item/red_lamp.json | 3 + ...olored_lamp_block.json => white_lamp.json} | 0 .../models/item/yellow_lamp.json | 3 + .../loot_tables/blocks/black_lamp.json | 19 ++++ .../loot_tables/blocks/blue_lamp.json | 19 ++++ .../loot_tables/blocks/brown_lamp.json | 19 ++++ .../loot_tables/blocks/cyan_lamp.json | 19 ++++ .../loot_tables/blocks/gray_lamp.json | 19 ++++ .../loot_tables/blocks/green_lamp.json | 19 ++++ .../loot_tables/blocks/light_blue_lamp.json | 19 ++++ .../loot_tables/blocks/light_gray_lamp.json | 19 ++++ .../loot_tables/blocks/lime_lamp.json | 19 ++++ .../loot_tables/blocks/magenta_lamp.json | 19 ++++ .../loot_tables/blocks/orange_lamp.json | 19 ++++ .../loot_tables/blocks/pink_lamp.json | 19 ++++ .../loot_tables/blocks/purple_lamp.json | 19 ++++ .../loot_tables/blocks/red_lamp.json | 19 ++++ .../loot_tables/blocks/white_lamp.json | 19 ++++ .../loot_tables/blocks/yellow_lamp.json | 19 ++++ 54 files changed, 601 insertions(+), 143 deletions(-) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColor.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColors.java create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/black_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blue_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/brown_lamp.json delete mode 100644 src/main/resources/assets/actuallyadditions/blockstates/colored_lamp_block.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/cyan_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/gray_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/green_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/light_blue_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/light_gray_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/lime_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/magenta_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/orange_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/pink_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/purple_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/red_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/white_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/yellow_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/black_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blue_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/brown_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/cyan_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/gray_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/green_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/light_blue_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/light_gray_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/lime_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/magenta_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/orange_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/pink_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/purple_lamp.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/red_lamp.json rename src/main/resources/assets/actuallyadditions/models/item/{colored_lamp_block.json => white_lamp.json} (100%) create mode 100644 src/main/resources/assets/actuallyadditions/models/item/yellow_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/black_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/blue_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/brown_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/cyan_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/gray_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/green_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/light_blue_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/light_gray_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/lime_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/magenta_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/orange_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/pink_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/purple_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/red_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/white_lamp.json create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/yellow_lamp.json diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java index 739b821c9..aa8a5eb51 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java @@ -24,9 +24,24 @@ public class AABlocks { public static final Block CHISELED_BLACK_QUARTZ_BLOCK = null; public static final Block BLACK_QUARTZ_PILLAR = null; public static final Block BLACK_QUARTZ_SLAB = null; - public static final Block COLORED_LAMP_BLOCK = null; - - @SubscribeEvent + public static final ColoredLampBlock WHITE_LAMP = null; + public static final ColoredLampBlock ORANGE_LAMP = null; + public static final ColoredLampBlock MAGENTA_LAMP = null; + public static final ColoredLampBlock LIGHT_BLUE_LAMP = null; + public static final ColoredLampBlock YELLOW_LAMP = null; + public static final ColoredLampBlock LIME_LAMP = null; + public static final ColoredLampBlock PINK_LAMP = null; + public static final ColoredLampBlock GRAY_LAMP = null; + public static final ColoredLampBlock LIGHT_GRAY_LAMP = null; + public static final ColoredLampBlock CYAN_LAMP = null; + public static final ColoredLampBlock PURPLE_LAMP = null; + public static final ColoredLampBlock BLUE_LAMP = null; + public static final ColoredLampBlock BROWN_LAMP = null; + public static final ColoredLampBlock GREEN_LAMP = null; + public static final ColoredLampBlock RED_LAMP = null; + public static final ColoredLampBlock BLACK_LAMP = null; + + @SubscribeEvent public static void register(Register e) { //Formatter::off e.getRegistry().registerAll( @@ -35,22 +50,39 @@ public class AABlocks { new Block(Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("chiseled_black_quartz_block"), new RotatedPillarBlock(Block.Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_pillar"), new SlabBlock(Block.Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_slab"), - new ColoredLampBlock().setRegistryName("colored_lamp_block") + new ColoredLampBlock(LampColor.WHITE).setRegistryName("white_lamp"), + new ColoredLampBlock(LampColor.ORANGE).setRegistryName("orange_lamp"), + new ColoredLampBlock(LampColor.MAGENTA).setRegistryName("magenta_lamp"), + new ColoredLampBlock(LampColor.LIGHT_BLUE).setRegistryName("light_blue_lamp"), + new ColoredLampBlock(LampColor.YELLOW).setRegistryName("yellow_lamp"), + new ColoredLampBlock(LampColor.LIME).setRegistryName("lime_lamp"), + new ColoredLampBlock(LampColor.PINK).setRegistryName("pink_lamp"), + new ColoredLampBlock(LampColor.GRAY).setRegistryName("gray_lamp"), + new ColoredLampBlock(LampColor.LIGHT_GRAY).setRegistryName("light_gray_lamp"), + new ColoredLampBlock(LampColor.CYAN).setRegistryName("cyan_lamp"), + new ColoredLampBlock(LampColor.PURPLE).setRegistryName("purple_lamp"), + new ColoredLampBlock(LampColor.BLUE).setRegistryName("blue_lamp"), + new ColoredLampBlock(LampColor.BROWN).setRegistryName("brown_lamp"), + new ColoredLampBlock(LampColor.GREEN).setRegistryName("green_lamp"), + new ColoredLampBlock(LampColor.RED).setRegistryName("red_lamp"), + new ColoredLampBlock(LampColor.BLACK).setRegistryName("black_lamp") ); //Formatter::on } @SubscribeEvent public static void registerItemBlocks(Register e) { - //Formatter::off + //Formatter::off e.getRegistry().registerAll( new BlockItem(BLACK_QUARTZ_ORE, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_ORE.getRegistryName()), new BlockItem(BLACK_QUARTZ_BLOCK, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_BLOCK.getRegistryName()), new BlockItem(CHISELED_BLACK_QUARTZ_BLOCK, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(CHISELED_BLACK_QUARTZ_BLOCK.getRegistryName()), new BlockItem(BLACK_QUARTZ_PILLAR, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_PILLAR.getRegistryName()), - new BlockItem(BLACK_QUARTZ_SLAB, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_SLAB.getRegistryName()), - new BlockItem(COLORED_LAMP_BLOCK, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(COLORED_LAMP_BLOCK.getRegistryName()) + new BlockItem(BLACK_QUARTZ_SLAB, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_SLAB.getRegistryName()) ); //Formatter::on + for (Block b : ColoredLampBlock.LAMPS.values()) { + e.getRegistry().register(new BlockItem(b, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(b.getRegistryName())); + } } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/block/ColoredLampBlock.java b/src/main/java/de/ellpeck/actuallyadditions/mod/block/ColoredLampBlock.java index 5d30eae32..094276dab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/block/ColoredLampBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/block/ColoredLampBlock.java @@ -1,61 +1,60 @@ package de.ellpeck.actuallyadditions.mod.block; +import java.util.EnumMap; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.RedstoneLampBlock; import net.minecraft.block.material.Material; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.StateContainer.Builder; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IEnviromentBlockReader; import net.minecraft.world.World; import net.minecraftforge.common.ToolType; -import javax.annotation.Nullable; +public class ColoredLampBlock extends RedstoneLampBlock { + + public static final EnumMap LAMPS = new EnumMap<>(LampColor.class); + + protected LampColor color; + + public ColoredLampBlock(LampColor color) { + super(Properties.create(Material.REDSTONE_LIGHT).harvestTool(ToolType.PICKAXE).lightValue(15).hardnessAndResistance(0.5F, 3.0F)); + this.setDefaultState(getDefaultState().with(LIT, false)); + this.color = color; + LAMPS.put(color, this); + } + + @Override + @Deprecated + public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ItemStack stack = player.getHeldItem(hand); + if (player.isSneaking() && stack.isEmpty()) { + world.setBlockState(pos, state.cycle(LIT)); + return true; + } + + LampColor color = LampColor.getColorFromStack(stack); + if (color != null && color != this.color) { + world.setBlockState(pos, LAMPS.get(color).getDefaultState().with(LIT, state.get(LIT))); + if (!player.abilities.isCreativeMode) { + stack.shrink(1); + } + return true; + } + + return false; + } + + @Override + public void neighborChanged(BlockState state, World world, BlockPos pos, Block from, BlockPos fromPos, boolean isMoving) { + if (!world.isRemote) { + if (world.getBlockState(fromPos).canProvidePower()) { + world.setBlockState(pos, state.with(LIT, world.isBlockPowered(pos))); + } + } + } -public class ColoredLampBlock extends Block { - - public static final EnumProperty COLOR = EnumProperty.create("color", LampColors.class); - public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); - - public ColoredLampBlock() { - super(Properties.create(Material.REDSTONE_LIGHT).harvestTool(ToolType.PICKAXE).harvestLevel(0).hardnessAndResistance(0.5F, 3.0F)); - } - - public void onBlockPlacedBy(World worldIn, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { - super.onBlockPlacedBy(worldIn, pos, state.with(ACTIVE, false).with(COLOR, LampColors.WHITE), placer, stack); - } - - public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ItemStack stack = player.getHeldItemMainhand(); - if (hand == Hand.MAIN_HAND && (stack == null || stack.isEmpty())) { - world.setBlockState(pos, state.with(ACTIVE, !state.get(ACTIVE)), 3); - return true; - } - - LampColors color = LampColors.getColorFromStack(stack); - if (color != null) { - world.setBlockState(pos, state.with(COLOR, color), 3); - world.markAndNotifyBlock(pos, world.getChunkAt(pos), state, world.getBlockState(pos), 3); - if (!player.abilities.isCreativeMode) { - player.inventory.decrStackSize(player.inventory.currentItem, 1); - } - } - - - return super.onBlockActivated(state, world, pos, player, hand, hit); - } - - public int getLightValue(BlockState state, IEnviromentBlockReader world, BlockPos pos) { - return state.get(ACTIVE) ? 15 : 0; - } - - protected void fillStateContainer(Builder builder) { - builder.add(COLOR, ACTIVE); - } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColor.java new file mode 100644 index 000000000..45d47e0bb --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColor.java @@ -0,0 +1,55 @@ +/* + * This file ("TheColoredLampColors.java") is part of the Actually Additions mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2015-2017 Ellpeck + */ + +package de.ellpeck.actuallyadditions.mod.block; + +import javax.annotation.Nullable; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tags.Tag; +import net.minecraftforge.common.Tags; + +public enum LampColor { + + WHITE(Tags.Items.DYES_WHITE), + ORANGE(Tags.Items.DYES_ORANGE), + MAGENTA(Tags.Items.DYES_MAGENTA), + LIGHT_BLUE(Tags.Items.DYES_LIGHT_BLUE), + YELLOW(Tags.Items.DYES_YELLOW), + LIME(Tags.Items.DYES_LIME), + PINK(Tags.Items.DYES_PINK), + GRAY(Tags.Items.DYES_GRAY), + LIGHT_GRAY(Tags.Items.DYES_LIGHT_GRAY), + CYAN(Tags.Items.DYES_CYAN), + PURPLE(Tags.Items.DYES_PURPLE), + BLUE(Tags.Items.DYES_BLUE), + BROWN(Tags.Items.DYES_BROWN), + GREEN(Tags.Items.DYES_GREEN), + RED(Tags.Items.DYES_RED), + BLACK(Tags.Items.DYES_BLACK); + + Tag tag; + + LampColor(Tag tag) { + this.tag = tag; + } + + private static final LampColor[] values = values(); + + @Nullable + public static LampColor getColorFromStack(ItemStack stack) { + for (LampColor c : values) { + if (c.tag.contains(stack.getItem())) return c; + } + return null; + } + +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColors.java b/src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColors.java deleted file mode 100644 index 990cdb7b4..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColors.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file ("TheColoredLampColors.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.block; - -import net.minecraft.item.ItemStack; -import net.minecraft.tags.ItemTags; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; -import org.codehaus.plexus.util.StringUtils; - -import java.util.Collection; - -public enum LampColors implements IStringSerializable { - - WHITE("White", "white"), ORANGE("Orange", "orange"), MAGENTA("Magenta", "magenta"), LIGHT_BLUE("LightBlue", "light_blue"), YELLOW("Yellow", "yellow"), LIME("Lime", "lime"), PINK("Pink", "pink"), GRAY("Gray", "gray"), LIGHT_GRAY("LightGray", "light_gray"), CYAN("Cyan", "cyan"), PURPLE("Purple", "purple"), BLUE("Blue", "blue"), BROWN("Brown", "brown"), GREEN("Green", "green"), RED("Red", "red"), BLACK("Black", "black"); - - public final String regName; - public final String oreName; - - LampColors(String oreName, String regName) { - this.oreName = oreName; - this.regName = regName; - } - - public static LampColors getColorFromStack(ItemStack stack) { - Collection owningTags = ItemTags.getCollection().getOwningTags(stack.getItem()); - String dyeColor = ""; - for (ResourceLocation rl : owningTags) { - String path = rl.getPath(); - if (path.contains("dyes/")) { - dyeColor = path.substring(5); - break; - } - } - if (StringUtils.isEmpty(dyeColor)) { - return null; - } - return valueOf(dyeColor.toUpperCase()); - } - - @Override - public String getName() { - return this.regName; - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/black_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/black_lamp.json new file mode 100644 index 000000000..b94b3ee46 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/black_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_black" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_black" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blue_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/blue_lamp.json new file mode 100644 index 000000000..5431d17c7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blue_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_blue" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_blue" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/brown_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/brown_lamp.json new file mode 100644 index 000000000..352f7f6bd --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/brown_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_brown" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_brown" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/colored_lamp_block.json b/src/main/resources/assets/actuallyadditions/blockstates/colored_lamp_block.json deleted file mode 100644 index d8f49df1f..000000000 --- a/src/main/resources/assets/actuallyadditions/blockstates/colored_lamp_block.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "active=true,color=white": { "model": "actuallyadditions:block/colored_lamp_block_on_white" }, - "active=false,color=white": { "model": "actuallyadditions:block/colored_lamp_block_white" }, - "active=true,color=black": { "model": "actuallyadditions:block/colored_lamp_block_on_black" }, - "active=false,color=black": { "model": "actuallyadditions:block/colored_lamp_block_black" }, - "active=true,color=blue": { "model": "actuallyadditions:block/colored_lamp_block_on_blue" }, - "active=false,color=blue": { "model": "actuallyadditions:block/colored_lamp_block_blue" }, - "active=true,color=brown": { "model": "actuallyadditions:block/colored_lamp_block_on_brown" }, - "active=false,color=brown": { "model": "actuallyadditions:block/colored_lamp_block_brown" }, - "active=true,color=cyan": { "model": "actuallyadditions:block/colored_lamp_block_on_cyan" }, - "active=false,color=cyan": { "model": "actuallyadditions:block/colored_lamp_block_cyan" }, - "active=true,color=gray": { "model": "actuallyadditions:block/colored_lamp_block_on_gray" }, - "active=false,color=gray": { "model": "actuallyadditions:block/colored_lamp_block_gray" }, - "active=true,color=green": { "model": "actuallyadditions:block/colored_lamp_block_on_green" }, - "active=false,color=green": { "model": "actuallyadditions:block/colored_lamp_block_green" }, - "active=true,color=light_blue": { "model": "actuallyadditions:block/colored_lamp_block_on_light_blue" }, - "active=false,color=light_blue": { "model": "actuallyadditions:block/colored_lamp_block_light_blue" }, - "active=true,color=light_gray": { "model": "actuallyadditions:block/colored_lamp_block_on_light_gray" }, - "active=false,color=light_gray": { "model": "actuallyadditions:block/colored_lamp_block_light_gray" }, - "active=true,color=lime": { "model": "actuallyadditions:block/colored_lamp_block_on_lime" }, - "active=false,color=lime": { "model": "actuallyadditions:block/colored_lamp_block_lime" }, - "active=true,color=magenta": { "model": "actuallyadditions:block/colored_lamp_block_on_magenta" }, - "active=false,color=magenta": { "model": "actuallyadditions:block/colored_lamp_block_magenta" }, - "active=true,color=orange": { "model": "actuallyadditions:block/colored_lamp_block_on_orange" }, - "active=false,color=orange": { "model": "actuallyadditions:block/colored_lamp_block_orange" }, - "active=true,color=pink": { "model": "actuallyadditions:block/colored_lamp_block_on_pink" }, - "active=false,color=pink": { "model": "actuallyadditions:block/colored_lamp_block_pink" }, - "active=true,color=purple": { "model": "actuallyadditions:block/colored_lamp_block_on_purple" }, - "active=false,color=purple": { "model": "actuallyadditions:block/colored_lamp_block_purple" }, - "active=true,color=red": { "model": "actuallyadditions:block/colored_lamp_block_on_red" }, - "active=false,color=red": { "model": "actuallyadditions:block/colored_lamp_block_red" }, - "active=true,color=yellow": { "model": "actuallyadditions:block/colored_lamp_block_on_yellow" }, - "active=false,color=yellow": { "model": "actuallyadditions:block/colored_lamp_block_yellow" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/cyan_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/cyan_lamp.json new file mode 100644 index 000000000..881a6b0c5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/cyan_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_cyan" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_cyan" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/gray_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/gray_lamp.json new file mode 100644 index 000000000..44bf2079e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/gray_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_gray" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_gray" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/green_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/green_lamp.json new file mode 100644 index 000000000..0b812ba8d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/green_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_green" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_green" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/light_blue_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/light_blue_lamp.json new file mode 100644 index 000000000..b487a8818 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/light_blue_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_light_blue" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_light_blue" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/light_gray_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/light_gray_lamp.json new file mode 100644 index 000000000..caf4e941b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/light_gray_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_light_gray" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_light_gray" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/lime_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/lime_lamp.json new file mode 100644 index 000000000..8472f123e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/lime_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_lime" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_lime" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/magenta_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/magenta_lamp.json new file mode 100644 index 000000000..e06860e57 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/magenta_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_magenta" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_magenta" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/orange_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/orange_lamp.json new file mode 100644 index 000000000..794a240f9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/orange_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_orange" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_orange" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/pink_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/pink_lamp.json new file mode 100644 index 000000000..58e3cd895 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/pink_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_pink" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_pink" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/purple_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/purple_lamp.json new file mode 100644 index 000000000..fae16fcad --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/purple_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_purple" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_purple" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/red_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/red_lamp.json new file mode 100644 index 000000000..317cbe168 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/red_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_red" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_red" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/white_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/white_lamp.json new file mode 100644 index 000000000..2b59a8c7d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/white_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_white" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_white" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/yellow_lamp.json b/src/main/resources/assets/actuallyadditions/blockstates/yellow_lamp.json new file mode 100644 index 000000000..69875df75 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/yellow_lamp.json @@ -0,0 +1,6 @@ +{ + "variants": { + "lit=true": { "model": "actuallyadditions:block/colored_lamp_block_on_yellow" }, + "lit=false": { "model": "actuallyadditions:block/colored_lamp_block_yellow" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 8f4d78e72..a28e68bd2 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -6,5 +6,21 @@ "block.actuallyadditions.black_quartz_pillar": "Black Quartz Pillar", "block.actuallyadditions.black_quartz_slab": "Black Quartz Slab", "block.actuallyadditions.black_quartz_ore": "Black Quartz Ore", - "block.actuallyadditions.colored_lamp_block": "Colored Lamp" + "block.actuallyadditions.white_lamp": "White Lamp", + "block.actuallyadditions.orange_lamp": "Orange Lamp", + "block.actuallyadditions.magenta_lamp": "Magenta Lamp", + "block.actuallyadditions.light_blue_lamp": "Light Blue Lamp", + "block.actuallyadditions.yellow_lamp": "Yellow Lamp", + "block.actuallyadditions.lime_lamp": "Lime Lamp", + "block.actuallyadditions.pink_lamp": "Pink Lamp", + "block.actuallyadditions.gray_lamp": "Gray Lamp", + "block.actuallyadditions.light_gray_lamp": "Light Gray Lamp", + "block.actuallyadditions.cyan_lamp": "Cyan Lamp", + "block.actuallyadditions.purple_lamp": "Purple Lamp", + "block.actuallyadditions.blue_lamp": "Blue Lamp", + "block.actuallyadditions.brown_lamp": "Brown Lamp", + "block.actuallyadditions.green_lamp": "Green Lamp", + "block.actuallyadditions.red_lamp": "Red Lamp", + "block.actuallyadditions.black_lamp": "Black Lamp" + } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/black_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/black_lamp.json new file mode 100644 index 000000000..0e4124db2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/black_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_black" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blue_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/blue_lamp.json new file mode 100644 index 000000000..5bc3106d1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blue_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_blue" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/brown_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/brown_lamp.json new file mode 100644 index 000000000..b0db96171 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/brown_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_brown" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/cyan_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/cyan_lamp.json new file mode 100644 index 000000000..26dd49098 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/cyan_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_cyan" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/gray_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/gray_lamp.json new file mode 100644 index 000000000..4a3688559 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/gray_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_gray" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/green_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/green_lamp.json new file mode 100644 index 000000000..5f7288f92 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/green_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_green" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/light_blue_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/light_blue_lamp.json new file mode 100644 index 000000000..dd0a6611e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/light_blue_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_light_blue" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/light_gray_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/light_gray_lamp.json new file mode 100644 index 000000000..43ed4598c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/light_gray_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_light_gray" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/lime_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/lime_lamp.json new file mode 100644 index 000000000..aeccb9747 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/lime_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_lime" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/magenta_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/magenta_lamp.json new file mode 100644 index 000000000..a9d62b512 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/magenta_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_magenta" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/orange_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/orange_lamp.json new file mode 100644 index 000000000..ac9e6dadd --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/orange_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_orange" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/pink_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/pink_lamp.json new file mode 100644 index 000000000..aa344249e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/pink_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_pink" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/purple_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/purple_lamp.json new file mode 100644 index 000000000..0c1effa84 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/purple_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_purple" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/red_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/red_lamp.json new file mode 100644 index 000000000..21775a02e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/red_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_red" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/colored_lamp_block.json b/src/main/resources/assets/actuallyadditions/models/item/white_lamp.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/item/colored_lamp_block.json rename to src/main/resources/assets/actuallyadditions/models/item/white_lamp.json diff --git a/src/main/resources/assets/actuallyadditions/models/item/yellow_lamp.json b/src/main/resources/assets/actuallyadditions/models/item/yellow_lamp.json new file mode 100644 index 000000000..851c9ec7b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/yellow_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_yellow" +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_lamp.json new file mode 100644 index 000000000..75b19ed8d --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:black_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/blue_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/blue_lamp.json new file mode 100644 index 000000000..3b7576e36 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/blue_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:blue_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/brown_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/brown_lamp.json new file mode 100644 index 000000000..e2a0df664 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/brown_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:brown_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/cyan_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/cyan_lamp.json new file mode 100644 index 000000000..6e3f7644a --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/cyan_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:cyan_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/gray_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/gray_lamp.json new file mode 100644 index 000000000..89802f0c5 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/gray_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:gray_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/green_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/green_lamp.json new file mode 100644 index 000000000..29a0c98ae --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/green_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:green_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/light_blue_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/light_blue_lamp.json new file mode 100644 index 000000000..d00029ecc --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/light_blue_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:light_blue_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/light_gray_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/light_gray_lamp.json new file mode 100644 index 000000000..e04b78ba1 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/light_gray_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:light_gray_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/lime_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/lime_lamp.json new file mode 100644 index 000000000..b9754437e --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/lime_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:lime_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/magenta_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/magenta_lamp.json new file mode 100644 index 000000000..2e3237ebb --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/magenta_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:magenta_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/orange_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/orange_lamp.json new file mode 100644 index 000000000..d80dd1799 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/orange_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:orange_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/pink_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/pink_lamp.json new file mode 100644 index 000000000..57fb200ef --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/pink_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:pink_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/purple_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/purple_lamp.json new file mode 100644 index 000000000..8b7017810 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/purple_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:purple_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/red_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/red_lamp.json new file mode 100644 index 000000000..303880866 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/red_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:red_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/white_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/white_lamp.json new file mode 100644 index 000000000..b510de97e --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/white_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:white_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/yellow_lamp.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/yellow_lamp.json new file mode 100644 index 000000000..a38b7bc02 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/yellow_lamp.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:yellow_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file