From 7160236d450ab21614507f6b59ff1fa9504ab23a Mon Sep 17 00:00:00 2001 From: Firestar311 Date: Sat, 16 Nov 2019 01:26:17 -0600 Subject: [PATCH] Add colored lamps (#1297) --- .gitignore | 8 +++ .../actuallyadditions/mod/block/AABlocks.java | 15 +++-- .../mod/block/ColoredLampBlock.java | 61 ++++++++++++++++++ .../mod/block/LampColors.java | 53 +++++++++++++++ .../blockstates/colored_lamp_block.json | 36 +++++++++++ .../assets/actuallyadditions/lang/en_us.json | 3 +- .../block/colored_lamp_block_black.json | 6 ++ .../models/block/colored_lamp_block_blue.json | 6 ++ .../block/colored_lamp_block_brown.json | 6 ++ .../models/block/colored_lamp_block_cyan.json | 6 ++ .../models/block/colored_lamp_block_gray.json | 6 ++ .../block/colored_lamp_block_green.json | 6 ++ .../block/colored_lamp_block_light_blue.json | 6 ++ .../block/colored_lamp_block_light_gray.json | 6 ++ .../models/block/colored_lamp_block_lime.json | 6 ++ .../block/colored_lamp_block_magenta.json | 6 ++ .../block/colored_lamp_block_on_black.json | 6 ++ .../block/colored_lamp_block_on_blue.json | 6 ++ .../block/colored_lamp_block_on_brown.json | 6 ++ .../block/colored_lamp_block_on_cyan.json | 6 ++ .../block/colored_lamp_block_on_gray.json | 6 ++ .../block/colored_lamp_block_on_green.json | 6 ++ .../colored_lamp_block_on_light_blue.json | 6 ++ .../colored_lamp_block_on_light_gray.json | 6 ++ .../block/colored_lamp_block_on_lime.json | 6 ++ .../block/colored_lamp_block_on_magenta.json | 6 ++ .../block/colored_lamp_block_on_orange.json | 6 ++ .../block/colored_lamp_block_on_pink.json | 6 ++ .../block/colored_lamp_block_on_purple.json | 6 ++ .../block/colored_lamp_block_on_red.json | 6 ++ .../block/colored_lamp_block_on_white.json | 6 ++ .../block/colored_lamp_block_on_yellow.json | 6 ++ .../block/colored_lamp_block_orange.json | 6 ++ .../models/block/colored_lamp_block_pink.json | 6 ++ .../block/colored_lamp_block_purple.json | 6 ++ .../models/block/colored_lamp_block_red.json | 6 ++ .../block/colored_lamp_block_white.json | 6 ++ .../block/colored_lamp_block_yellow.json | 6 ++ .../models/item/colored_lamp_block.json | 3 + .../block/colored_lamp_block_black.png | Bin 0 -> 306 bytes .../block/colored_lamp_block_blue.png | Bin 0 -> 533 bytes .../block/colored_lamp_block_brown.png | Bin 0 -> 445 bytes .../block/colored_lamp_block_cyan.png | Bin 0 -> 378 bytes .../block/colored_lamp_block_gray.png | Bin 0 -> 372 bytes .../block/colored_lamp_block_green.png | Bin 0 -> 422 bytes .../block/colored_lamp_block_light_blue.png | Bin 0 -> 436 bytes .../block/colored_lamp_block_light_gray.png | Bin 0 -> 404 bytes .../block/colored_lamp_block_lime.png | Bin 0 -> 558 bytes .../block/colored_lamp_block_magenta.png | Bin 0 -> 518 bytes .../block/colored_lamp_block_on_black.png | Bin 0 -> 361 bytes .../block/colored_lamp_block_on_blue.png | Bin 0 -> 623 bytes .../block/colored_lamp_block_on_brown.png | Bin 0 -> 481 bytes .../block/colored_lamp_block_on_cyan.png | Bin 0 -> 493 bytes .../block/colored_lamp_block_on_gray.png | Bin 0 -> 459 bytes .../block/colored_lamp_block_on_green.png | Bin 0 -> 464 bytes .../colored_lamp_block_on_light_blue.png | Bin 0 -> 492 bytes .../colored_lamp_block_on_light_gray.png | Bin 0 -> 507 bytes .../block/colored_lamp_block_on_lime.png | Bin 0 -> 635 bytes .../block/colored_lamp_block_on_magenta.png | Bin 0 -> 606 bytes .../block/colored_lamp_block_on_orange.png | Bin 0 -> 514 bytes .../block/colored_lamp_block_on_pink.png | Bin 0 -> 521 bytes .../block/colored_lamp_block_on_purple.png | Bin 0 -> 600 bytes .../block/colored_lamp_block_on_red.png | Bin 0 -> 453 bytes .../block/colored_lamp_block_on_white.png | Bin 0 -> 569 bytes .../block/colored_lamp_block_on_yellow.png | Bin 0 -> 595 bytes .../block/colored_lamp_block_orange.png | Bin 0 -> 470 bytes .../block/colored_lamp_block_pink.png | Bin 0 -> 471 bytes .../block/colored_lamp_block_purple.png | Bin 0 -> 489 bytes .../textures/block/colored_lamp_block_red.png | Bin 0 -> 380 bytes .../block/colored_lamp_block_white.png | Bin 0 -> 439 bytes .../block/colored_lamp_block_yellow.png | Bin 0 -> 527 bytes 71 files changed, 364 insertions(+), 7 deletions(-) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/block/ColoredLampBlock.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColors.java create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/colored_lamp_block.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_black.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_blue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_brown.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_cyan.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_gray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_green.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_light_blue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_light_gray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_lime.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_magenta.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_black.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_blue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_brown.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_cyan.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_gray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_green.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_light_blue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_light_gray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_lime.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_magenta.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_orange.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_pink.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_purple.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_red.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_white.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_yellow.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_orange.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_pink.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_purple.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_red.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_white.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_yellow.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/colored_lamp_block.json create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_black.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_blue.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_brown.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_cyan.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_gray.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_green.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_light_blue.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_light_gray.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_lime.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_magenta.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_black.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_blue.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_brown.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_cyan.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_gray.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_green.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_light_blue.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_light_gray.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_lime.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_magenta.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_orange.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_pink.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_purple.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_red.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_white.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_yellow.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_orange.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_pink.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_purple.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_red.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_white.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_yellow.png diff --git a/.gitignore b/.gitignore index 771e78b6f..315181ae1 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,11 @@ .settings/org.eclipse.jdt.core.prefs *.prefs /run/ +.DS_Store +src/.DS_Store +src/main/.DS_Store +src/main/java/.DS_Store +src/main/java/de/.DS_Store +src/main/java/de/ellpeck/.DS_Store +src/main/java/de/ellpeck/actuallyadditions/.DS_Store +src/main/java/de/ellpeck/actuallyadditions/mod/.DS_Store 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 42e964507..739b821c9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java @@ -24,8 +24,9 @@ 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; - - @SubscribeEvent + public static final Block COLORED_LAMP_BLOCK = null; + + @SubscribeEvent public static void register(Register e) { //Formatter::off e.getRegistry().registerAll( @@ -33,8 +34,9 @@ public class AABlocks { new Block(Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_block"), 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 SlabBlock(Block.Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_slab"), + new ColoredLampBlock().setRegistryName("colored_lamp_block") + ); //Formatter::on } @@ -46,8 +48,9 @@ public class AABlocks { 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(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()) + ); //Formatter::on } } \ 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 new file mode 100644 index 000000000..5d30eae32 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/block/ColoredLampBlock.java @@ -0,0 +1,61 @@ +package de.ellpeck.actuallyadditions.mod.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +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 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/LampColors.java b/src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColors.java new file mode 100644 index 000000000..990cdb7b4 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/block/LampColors.java @@ -0,0 +1,53 @@ +/* + * 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/colored_lamp_block.json b/src/main/resources/assets/actuallyadditions/blockstates/colored_lamp_block.json new file mode 100644 index 000000000..d8f49df1f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/colored_lamp_block.json @@ -0,0 +1,36 @@ +{ + "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/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index b4b43c5ed..8f4d78e72 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -5,5 +5,6 @@ "block.actuallyadditions.chiseled_black_quartz_block": "Chiseled Black Quartz Block", "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.black_quartz_ore": "Black Quartz Ore", + "block.actuallyadditions.colored_lamp_block": "Colored Lamp" } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_black.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_black.json new file mode 100644 index 000000000..38b3abcbb --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_black.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_black" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_blue.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_blue.json new file mode 100644 index 000000000..2d95c9d5c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_brown.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_brown.json new file mode 100644 index 000000000..69848b1ab --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_brown" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_cyan.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_cyan.json new file mode 100644 index 000000000..80b231ccd --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_gray.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_gray.json new file mode 100644 index 000000000..3eb9a54ba --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_green.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_green.json new file mode 100644 index 000000000..01369477d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_green.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_light_blue.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_light_blue.json new file mode 100644 index 000000000..040a3baa0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_light_blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_light_gray.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_light_gray.json new file mode 100644 index 000000000..6e9fe107d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_light_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_light_gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_lime.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_lime.json new file mode 100644 index 000000000..ff7020a64 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_magenta.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_magenta.json new file mode 100644 index 000000000..e6ed4092a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_magenta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_black.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_black.json new file mode 100644 index 000000000..f2fd0549a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_black.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_black" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_blue.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_blue.json new file mode 100644 index 000000000..5ec0cf764 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_brown.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_brown.json new file mode 100644 index 000000000..3dc3a7356 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_brown" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_cyan.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_cyan.json new file mode 100644 index 000000000..d7625c73c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_gray.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_gray.json new file mode 100644 index 000000000..3eb9a54ba --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_green.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_green.json new file mode 100644 index 000000000..f91a5b14c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_green.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_light_blue.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_light_blue.json new file mode 100644 index 000000000..5017f7e2e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_light_blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_light_gray.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_light_gray.json new file mode 100644 index 000000000..d9e2ccf64 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_light_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_light_gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_lime.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_lime.json new file mode 100644 index 000000000..15266fd9a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_magenta.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_magenta.json new file mode 100644 index 000000000..e6dd7e876 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_magenta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_orange.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_orange.json new file mode 100644 index 000000000..22033d72f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_orange" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_pink.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_pink.json new file mode 100644 index 000000000..3e993e31d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_pink" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_purple.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_purple.json new file mode 100644 index 000000000..91bd43b76 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_purple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_red.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_red.json new file mode 100644 index 000000000..a0fddcaed --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_red.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_white.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_white.json new file mode 100644 index 000000000..c659bec69 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_white.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_white" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_yellow.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_yellow.json new file mode 100644 index 000000000..9dbf50e5e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_on_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_on_yellow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_orange.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_orange.json new file mode 100644 index 000000000..21b665a60 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_orange" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_pink.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_pink.json new file mode 100644 index 000000000..16fa08e26 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_pink" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_purple.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_purple.json new file mode 100644 index 000000000..4cbe11dc6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_purple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_red.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_red.json new file mode 100644 index 000000000..1efe20dc3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_red.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_white.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_white.json new file mode 100644 index 000000000..72d2e5e28 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_white.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_white" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_yellow.json b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_yellow.json new file mode 100644 index 000000000..4954cb08f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/colored_lamp_block_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/colored_lamp_block_yellow" + } +} \ 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/colored_lamp_block.json new file mode 100644 index 000000000..264f42f37 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/colored_lamp_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/colored_lamp_block_white" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_black.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_black.png new file mode 100644 index 0000000000000000000000000000000000000000..ef4b1bec3e42cd46cf257138318f5c57443ed928 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7iN-*fg`1)z{@W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6rbkl;uvCadTH=Ou44)uUydyJUVoS6`)RxMZMt@eXO39= z>wdY{`_Euz-wDBh(0UfWZ}tpEn~(M<2r7oEeoM$+yCx-#C1D=pog(|!eJU4scy&$M z%ldzt^O*%Q)pwn){x0Me-4P_1{KrJ+`~0X!<})p)T|Z@AxiL#Lnq!sMRh^=HDiX;$ rpUQH7TF=PtDgXVtcaQC|GgV3A8#@zq7d<>&kwgO-7i_*!Sk46rhl7W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`$7P>Eak-aXNJJ!8|cTo|gTEVN8Ck+b-2RigvI&?)h)5 zpcufv_Sg5Q(7P!XH*UuAt+t3vx0zR1QvCaJLPCPHCPQ-bk$s1HvYQ(YGRfYq`BSp6 zHQ<26OreRdB?MU0jP}LJZ#c{J=yO#fPx1Gsv9UoLEgx~Re0ctEYU$pBy>>$16qxqa z|D7PpvzC){8*h&A#4XXM>+iq27p}d?!^!&M+q?g_COEfrT;Q{7W89p=*0X9(tXhMK ztMT6F`?gLp`1DAL^{{YZm-$q?b83@UHlLW&$~8$${ddfj)2)l@^;iTpdvV6r%Io@= zr}3=3$iii9o-AW4@1tfd`j@3!EBkkWV(uloQX!r02_cVEJ>F+#hir5WiaZjR%4OO1 z@~-*?o9b%gnPJ5Og%{?W+&eq>vmN*CGKTl(6T5cgKD+*Yx{&|xrNz;ovwi>Ut-tFY zXTIG&XLjk{C(fP88%)@bZ3unu9r^Rimj)3X0gvYA&yR09`FoChv&x%|^Zl(4{$chN Vy(fIeMkERpJD#q7F6*2UngHHL)!6_5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_brown.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..6ffca11b4a6acebe54992abac33180ac9965b9bf GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7haJ8o-~5l~1rGbEzKIX^cyHLnE7WngeFN=+}Aba4!^I9)s0JMXXokBfXHW9w#*yK)P@?~k3V^GGkm zSNzv)Hy(*;s*?^&_PzQ2I+lU6k>T;vE-N~(t3H^fyhJEu(b9PlhI!E}jtoC` zu&C_N%U@c?x27ZOM`h{#e-YCU{2!j(@B?(CwB91(VtEfy9SwcU;TaQF_(CZX%kvzC6?x9s(XRAE+LwiVgD zHhZ_PZ=BUvVj8?k(=IW*)q7R-|G7S?wfEO{rcEwLo4}%#eDy-?SNFviw6eZA>80te zYA>Tz_lc`Htk9?3{)7 jlgj73)xY?&&glgTe~DWM4fk|waa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_cyan.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..08a1e55b6a876a90600d2a302133ff9996cee264 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~n~aDo(}p^EN1%{wW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6u;-`;uvCax^=Q6-(dwF7WHZRnOE%>{L|X+9$J6FS#R29 zX3y6G9y*E(O|#2-CG#$CVMt(mr*J59#lP=qFWjz7S$9%V=lLP#3(tk`NFLjm;@UN< zYX32#^BG40`m3f+83tYZC zeWmKRH!eRW-3bzWb0WXtoYeKrPwr(tk`$XC%HmjBufZ3fx_#-Ah!=OSymGZ!zALIA z{b$Xs`70B%XFfMzZ`d1`;kDak^Jk^~P18PGom!R9w)g&T{k@OcnFP%rb65SXY2&() Qk_id|Pgg&ebxsLQ08coUbpQYW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_gray.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..c25d65952193d8d9bd1f09906d10314ca89a7b79 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7hq+kIU&P@X|HGbEzKIX^cyHLnE7WngeFN=+i7TuFRIYB&aqfp^0%8ytFg}V+Mwk57XU>ex$V(#fmd5xMn5yJgKg)E}NGjz$58?Im3Z%x!g`B`gf|2 z7s>>Lc7(6l+UFn`DU|kW`;8m3XCAzLYSP{v(KBDV{tDc{<70I7|4W18)72Lmg((#= zYwv$1Gt;Gn;k{mdK II;Vst00hvEZvX%Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_green.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_green.png new file mode 100644 index 0000000000000000000000000000000000000000..c750e12ad0fda737dfa555c362066938475e6311 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7haNj>w?G@y`dW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`)4m>Eak-ak@6xG4HSek8&!rHGlN}4gdeIe*25@_??5( z4yW8?k|@*(RMKq!Qzgu>fSJi5Dd%5R#(TaitbbM{oLS&^a@URf(ku&_n0Xj$^d}!; zJz@6iUPCmiJnzDpC(iGBK4r;@k8{s>G|2E;7A0kJzupw<(Xn&Wj$^9|$~^DOo?dKs z|L7s6S4DfH75>e1vftEwIAT+d*p$AuFrBy6`g7+#3vB8SIp!4S5Y~8Yrh0)n+j7RY zY!@dSWk?mfsn)f!i>=65*X6`IGpBlN}1b@d7}8V&j1^LFSkF!XPm^RzNY=2HD!?jMYtH?y1+zD7<21(&C* KpUXO@geCxhTB2A0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_light_blue.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_light_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..5ae1e56c1eda14a172d4c1cb31757846a243e9ad GIT binary patch literal 436 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7hQ{$W!yCs0T>GbEzKIX^cyHLnE7WngeFN=+;m2PE zvkR*{1o`H?{e1I9-T&f-YYYxd<#l?QZ`K|Z>-!xy;TUT}m1*AgLxmw{_NL$ZJ}F^y!lR$}Gr2vvqq}dUDW6_*T*hSIg_E+| z7)nn4nxfO}av>;e<8}k44V!+(8SA;m+QEp3?`)SYwPbN{tMzJ%skVusEh<^HE+Utf9UJl*m#PuAM>*Ew^p z*|cX~JE`=#@XE`B8m2F6!?P0E-j|P a^8H_XX2p#=x(5S5f#>P!=d#Wzp$P!@qqBPe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_light_gray.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_light_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..6bd5c42c52a9b1292d86ec39f64aca5f7cfb6ba7 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7hq;X=)(-#{VR%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dDE`CK#WBR-hiR?b`a-G2Ht>5y;9>UvN2 zesy=`n6M)D`csAn?+VIiNT$rb87|*Y8$P9Cp1Q|72iB)9bB{~xXJ81(Zr%OZf^Wu6 zxBjV0ALa;e4eK#@B?C+Bo7x%F!A`<4^V*XF7`n`6C>;Xv*EjI|HHnWFU8GbZ8()Nlj2>E@cM*00ELoL_t(I%T<%HauzWR zgg;5XhR{R9kYOMcG|cci6udBHiliZV2*QxFwG^_QpYz<t@_1h5#0ipBWV{iXtT5@hSO9`2Aya9C2e)9O825!*rL-pbvE#fvMbe-Ju6Oq_V$1G}_jk8AB!K2-73HIhYlHmI4X8$OwBiE$`;uZu4V({zt w9p0c>13EnZxkp*R=0$IkD4X+Te_KD`A52BqJK)M<1^@s607*qoM6N<$g3#;X0{{R3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_magenta.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..c405604af4e01704bd39a2e758972d3474d9dadb GIT binary patch literal 518 zcmV+h0{Q)kP)WFU8GbZ8()Nlj2>E@cM*00C-AL_t(I%cYaOPUSEV zg+F^@I~4bdW+fyVYC0%+f6=kk@(xHeh+?^k<1vNp;ReyHcA89__{{mS-Sy$7@*g#g z<`9oKJOC91*u8)6-`BS;ln)&pnF zeyW8iGu{cSp2#H=B(!NRkR)+`^?-8@pz{JIA8pE7PVJ);)0(E4Ab}`zlTz#6gH2bG zB#J6UwWE821d1xTW^?TvcpAnGonxBTLYKTNt)&^`Tg=pQANCG za=|=F)4badW#-T8lSy#nHXh^UkC$eYQFcPDb$^)vTlm-d1lfDL84G_2%>V!Z07*qo IM6N<$f-36QEC2ui literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_black.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_black.png new file mode 100644 index 0000000000000000000000000000000000000000..fad394f46b65948076624c874969f2ee3d69dbea GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-9JtVxyvEDo{u^GbEzKIX^cyHLnE7WngeFN=+oui1d7Sjn%&_^mzI4b* z<2jbKM(^%>sJOFUefXv-&qyZw??$#2-~UZ+zxTVAZ_}R0z_W**9xRl(d^*HkKyb^o xV+vcZC8Qm0zxnam-MfFKRVIlSmM?w(ga2s3N^|Qs9gjdh_H^}gS?83{1OStChq?d& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_blue.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d7eb831fc53c2298a0e1b2facb59132ac2d09c GIT binary patch literal 623 zcmV-#0+9WQP)WFU8GbZ8()Nlj2>E@cM*00GlUL_t(I%T<%RZq+~# zhQFEh`WQ+CuK)-M5+MpgO@$~B4Ub1dLr0Y+JqQ{SUIQr&C^_fYJ3qx7FNq~<*WpWN9Hz~B1(A~4SBzAkTELq@EV_w9(Wa4@bLL7MJ8Ug!#P>L~>94NK_E*(YuX`Pn#(p3C`P&YM%M(GZ)?vDX zB6(h2M`{weUmaSh0XPI#*TLs6zx&0hHH&W2T7{e@=k)CIaO4a2@cBncjicieA`(pm z{VuG?w!64x<@wLAxQ`6x6#{-;{2(oj! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_brown.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f8e8d873df68772dff7b8f03d069d7c5ab3845 GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7i(Ec@leT%eF_W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`*G0>Eak-ak@6x(eH=>&m7N9LVJ}IPlI&Hs^zPQgU8|PVPG;Xxa9eEK@zM{IAEo6@ zQdnzpaOy7OH^+9Z_1KjCQ2+K;ri9=X8QekH+xKl#Jw?~_4m%_F{)2xS zyF28raEUV)>XxbZx-Gc7K62~aCy%pNZr|-7G)eX70lyOmmbT8<*)#XquIKZvY`dEG z=%Z11JyXNu)MF-m7B#n;^~0jyM7`P99rot$m(_`=!z%y) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_cyan.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..e7855bae6ce5dc2131013442be37874e019c72a1 GIT binary patch literal 493 zcmVoHx03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00B`+L_t(I%Wadrasn|7 zgg-krcjRsILsBq#=# zW5ZZu?;$4w=?o&gZZ-_A{+sGS#J-pD{`dnTI6ja1_WVRqcpt$7!GUNk=woRlhioJs z5hC!hhSCz65VF?d(0~Ap4z^>%hLP5=6-i43h%>l|m8L2uBhbb!YLb`j%tRd*fe@Iu zPtpa}Uo_9A63oxCXhGCwG8edeJ_4mIfWIv)Rm{pPCnt*969s2C-(=4IP*X7hh}aPO zNjKl|&^^zsP-|WU2m#M9;$4-lEumMEnq2L$i<(<>&kwgO-7i}ob~I3T|gn(%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6_|fq_xq)5S5w;&f@S_ol-J9KuR_UD7{Udc3diQ_IW?e4uL; zFzZ`oGXFGFj}t|^?{%bcAzHR(+?atrBHj{S5 z=q<>&kwgO-7hOXIgiLI8aD7GbEzKIX^cyHLnE7WngeFN=+*0;~FF_%8SNMaYI@b$m zZK<$$v+nxBld9j2&6Dgm-}JLenPGu|ih?xb9=Wx4T5n^k*O7`AKs6 z3XIKMUmlAVINXnKV93<5^*d0v&xz0afr)eF`i@^aWsgq2@=QAWo}({=@Qb?W{n`nJ zvpEAIBJ(7Q%hD!iIAyxbV>AjjThlz{+36`+b2b$0Re8>wkt)4+9b>dX#`L2T#4qh$ zI635J<>&kwgO-7hW^UC#qQa~Zu%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6_|fq^l=)5S5w;&f?HbRLr-kBl|H1(#6N4#RM#4IF(J@9WLJ z@t31)Q|RpZ5$BG`^|$Ly*Jo`AVhDBRU=jRNJ>z#Qm%!V{CT|6peljy0x$!ROm-|Gq z`+3|Uq7x-89(NFMxjrj~nYiA}V6bxK?L&$H+L7;Jhv z(eGSr=Ix$ZkChuM_ivZ(6qC4nv31q2NJ++k^zAx#Gjb9Zr*58hX_w%|<>&kwgO-7heEA8{2WT232W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`z*q>Eak-aXNK!;H6gv9Ig8W9%a=Otgh6_>5 z3AfEY*-37_22?D#@Y<>A;tN(SKD8~kT}+87)HO77ZJ^h|yZfb58fIRMI((P^%Vt(% z>7;2vZR>wG*v@9T8|}jLfpLP#cSg=xbuK;s>K#o5FK4Z-SDP^9Y)^-RJAcjc4et#n z*G*Rw7S1uSxe(~;;&$O>iPUqM-1oIdI!}Zjne#GkN0j#7@@=`+1~2!1uG{~A`vfM{ zvm(Zmg@1hhDHHKbMa4XC-t&dO0)+jEP)WFU8GbZ8()Nlj2>E@cM*00G}gL_t(I%T?1cjwD48 z1<)7S*)`ow3l{@Uvf2Y+VBoDVK;jMv|M(H{`h(QzXR;9!I@yWxax&sFjX3Jasr`8*e)+{4yEq7;xqxa5nu}^HrK_ge zdiUr30DSdce)ZY6E;)PS2i0VwYG$FVFFk9!TH$N!O)rA4j1$#Xp+a zWCtcYdq>~ok3vx<7Ip06u%evu5p44gblqJX?BZY_M@7+H^_hArFz4Cc(N%NRz(!R~ zu9`W|iZa+m5rR&QX*6kezSVLU2bq1>v098&s=hLS$?brde>FcG7pokJLj`a)Rk4X|F{7A zINC%V7AZc7PgT>}ywsiY(Jl_Et*A>6wlUe}9o`IHZ~CaHV!FdT9i1&tjkI;VW{tDo1d*ClC{rLK+K$I002ovPDHLkV1l3l99aMW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_magenta.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..187ced2289dafef9be18b2e3935537fd5d1ca4e8 GIT binary patch literal 606 zcmV-k0-^nhP)WFU8GbZ8()Nlj2>E@cM*00F{DL_t(I%YBn!Zqq;z zg}<4#YZFIlEA=L=Kn;Q`a09poh0|~W#2G+piqxYZRV|5|WW6)|*m#p5gjbel$M&1| z-t5Tdi%$+OASEuNG&zD{UQSZyn6AH z+kqbejC4IZp0W?VGCYBv@~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_orange.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..77e382cfdd097ac0f2b8d67ebd621fc7914f4551 GIT binary patch literal 514 zcmV+d0{#7oP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Ra1{@Ou z1^*PIxBvhE7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHU`a$lR5(vf zlFdrPP!NUhOJvzi1vfsGRI2zS!P26XW>shxg5XPtqM=Dk5cEx=VA74>nYl>{Ct>c) zoHIZ7hW$<0--h?A@NyaQsf^dj@ONW(EqIzfQtLFS=i{HnSv?y8jA+ltf*GDERh`qM z$?w}TYY*$DSoMbRu>j5?StP_1CQz)7Ur%KJz1@j+LI%GN=XBK(J|A64u`;8Y6WVIi zR9mSW)*N~VYW@8siY&bB{)zChJyaoa>wIc{7M@u5m7KA8fEs4njNU~J*gG#lD z1QzTSyt?<(Lwx!%vTs)RqMh1`6h_;G{U{&-r_9jRJq!e!%;{zQ+qAqGVuslWb-g7$q%_f@PBWFU8GbZ8()Nlj2>E@cM*00C`DL_t(I%XO1UP6IIz zMW3fwAvp}2903rD#9@&lc8Ht6A%ITfp;$PsI8CtB^3XN>`oGG2>~=z}NJ@}1tX5Df z|1N6*FwP+<;bop7XKwEAG3#|R%DL^{pYMzF*Wmy;W8QCXWpj6jq{Qao0TTjPi=>2c zPS1cM`+j|GL0(?4{QQ9TY@eP0kWw%)Vw|HMk1bFL4R#2a7}-2NY8h5*>kw;2=2;E; zGBJYpZ9gq31+TZ9+s|6hBwE|Dcaj%GQY)U-3UaWFU8GbZ8()Nlj2>E@cM*00F#7L_t(I%XO1MZqz^! zMPF67F&=?n#R?_S5Qzm6mto0{qae1vHVz?)og+V~-`UWT`B7 z{rdmcZ~JimML{4505hBGe?4Y4*OJIZ1%R_>Tk=E4GnAnMq^2G&gYaZ1YLh2pcY6as zHZv}sZz;Wa`Q|a+80Mf6aF&_{`1;cwFD@?m_G5=jA~nYAcTZ6O0nNt2Vb}*6!6zoE zHF9UXdiw;+71WPOm9{!{U7Ij2IzUZ$lDgV8uPpe;rgrjMS+kL=mYqRD?H`{^_7Kz(hMWwvwQ+ z?%vFZp$;gAm_2YwlwOoU^HFzjRYWX?uw_~Kmk z;P5B-di4uMjjo><>&kwgO-7i3&-u0HXP}U5W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`&^K>Eak-ak_MJpx+S#9+&x(b1eDfIo4VTy1Qz(2pnH{ zMb_?`-aUqitJM15&fF+l9Vf=P;|L#5!t?)EALXa*ICA1Z`#s5r8(J@S{0|dSKXLT$ zu6)5g%-@42nW_4uy?-~S`uWwl({9eMvY)d{k~f08$|$O#`27sYw6Z%F&ni6GQL6e^m-Pm%i|M?p&>6%UX20s%ODY-;Az?%B6RkE^ctry{NkJXr1QN_i6j1 zY>bkZ#(tj~>05UtbACy`{j-EAR-u1?hrF20^t5t{-rEDyUHGd{JD$>i8LF1O$mMj{ z1LHqNeSsNjdvz~-+H>r$(Z#&VpF*4OE@Lm%niO=Z-C8-yGV08?=Iow7UQ s_tC#m+{TMN_pmnaWjXhD&f7^p*pyP|1?<*Ro&pL@Pgg&ebxsLQ0C4-eA^-pY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_white.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_on_white.png new file mode 100644 index 0000000000000000000000000000000000000000..eaf3c0c7bec19f1688b5bb27219a45e4e2d99862 GIT binary patch literal 569 zcmV-90>=G`P)WFU8GbZ8()Nlj2>E@cM*00EszL_t(I%UzPuPNXpi zMh}!WK9UzEV|*|lO{3B16PbTH1@>Z=I=kG^HUU0PKY4zB&dkK!i3nP2WG0!3i0llI znY7jb5E0xRTWjI&JUl$mdq-7SYat?-8JWpi>z~G|%G=u;5rK&ar_%{{=l=d4Gebm( z2t;I00(SoT`r>pt@&5jfx;tjZ)6)}~NklNlKtwo>gNUH_j)>5EXNh?(Xi02qFRiRmIGR2ricks=6DfDw&D3)^K;$ zT2z#p|05zcU{$@UtV6+acT{z&>b>t==i9KFRQYy#sZ-VcGnvVpb1T*|&|2$C^{)@g zR3frHP#juoo0Z;9A7kvI0#^6lI}yS8e5UulztLK2wAME5l4fSOJLmKH7nm7yPJVuV zaQEw=%*4#Ltn&YyljAtH7mnlDjEc!_Fz4juE?TNMBR03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Fm2L_t(I%T<$2juSx) zg+Es+)%hC^z-Ex(LaY$iV8MzdXMhvrNGzk#2-uB~fJ~-Ssnla(cfv#}#d7=Sy=U8Y z52$w-M`#U7f!_V4bo~dnOL04A&&h{_C%$?07PAGALDi!yqE*2%&_Nw6bN78qYhd4g zpxc-45S4{}02MD{N6_qQ18@T1s4rld`=47AIvV9a<29gD6!@x%% zQwjt-Fjki?(ms4afsSd7vGU?1pi(R3DL{;%4bb8N%s>OskUaqj(+x%fGQC4C1yBQf z;(|tNM8Ar8`E|tPbMSc@3z~tQfHR_naA#0!M0qYb&16Ylj4}oq7_y>#(nu9v6{Wk^Ye&Yd{3uZ4OIXQegBm3(UvrNvRfsbn* z+(S$)ov-bI84|z%c0l$E)JO?Z@3FE0)3;AxkH~(9CIb5tg;%Z(Tnk8hMm~plIo4Sh zTAq+DRE~TFE94xv&>FnHeIJKX0!ah&g@KNAz$lol5l43STUINu-2)m&hf}McY|j3s h5l`PHf34S({s)ox(?lkfN<#nu002ovPDHLkV1o79>uCT0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_orange.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..29990eb361a4c3e989a0d228739f70c7be106dfc GIT binary patch literal 470 zcmV;{0V)28P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Ra1{@Oz zFiKOtPyhe`7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHG)Y83R5(vn zlEF^HFc3t2MXHGSiW0<`v@SvsTp@09=$SU{|NjDSJZ>DMjWuiU%&gZ5<4YJ{!|)uw zw;{CxKij$*99xCU^ilfz_Hf=cm-u+@HUyyHU8Bgrl~N^#Fc16r_W< zMM6x+nQ%LOsXBFQ4uH7ChOP?XcKWnZDZ0B|r+%J#RKV2%WDV;%N}8h9sfUTKF6}$i zI?i%wC8TIMS`vY_3W2j#O9Hu6{S=2xV8E4-P1YfrJyY~#^)CNr3dq7v4dAe%t9Ph` z>}wy7h47TkDGp0ZMa=Rr?^a5|`Rz1TK0jO`WFU8GbZ8()Nlj2>E@cM*00BEmL_t(I%XO2{PQx$^ zMUT@)+B$9D!NVjbz5t2;N7EkQPqM+tpv4rU0(D*IIA@WS_!H&D6rpx>&qSp>! z@myiqjH?8-tmGo6+CrD?7pQok;(fV({+$L$JxlCjZK5Q#Cs`!+PLPB z&G@`tTM72M-)ja=!?5~j2!qrG0nerUp1WG#rIe>A`~a%Hz5K_n9Q*(P N002ovPDHLkV1mzT&;I}b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_purple.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..00d90cd81563c51fe6ed9654d813f7ed05d94c51 GIT binary patch literal 489 zcmVC=<03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00B)&L_t(I%bk!x@w-QC0Cgb9DVxn#|S)?7Bn{)3pa=LqAM&Z9> z@Xd$eh(RJEf|&szA^`Qh9h-T*6#zIMR?L<--@776Kt#xvQM5h-b$xz&ZOq_@ul^5olGlBHU!7KY_R$7@NZGIb<#nR&POp1|AXVVYU} zA3T$(OxqK6=m-=bm5KY8JIt)>y`zgr^&KVh^!iY3%E|7T`F(Jj_VW1qY^hq!mcK5O fpcthV{yIJZ#LU4IoB6X`00000NkvXXu0mjfn_J1V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_red.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_red.png new file mode 100644 index 0000000000000000000000000000000000000000..aa185ecd30f93bfc9635453ea186aefea2e45de4 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7j2N?t>g87L&184^+AoS&PUnpXnkGB7w7r6!i7 zrYMwWmSiZnd-?{X=%um)#UFUOIEGl9?wx!wm)VfVS^nzn1)f&U-{!BHzD4@Vo8vbd z7je0=$ef#?I%|n;tTNAopPkp8HrGY>s&~$iP8K`*r+;VMR>n8q7#Rwt8GO)N$g+rO z$D_RBi8peS6zg6nyuV~2Bz*R3>NTymwwdLVyIJPg-YyEhHdDG-kL$;@l|fx`odM3} zmhTU}TgzN<>&kwgO-7i*YE@gfA5cg(GbEzKIX^cyHLnE7WngeFN=+GRI=yz5Jp*r4Mrv@>9; zi;?8&obvPTsT2Q9ThN^-5!5=(;fnamz?qA){!G2Ho=fjhNC0z7-1kZMnfw2`=1*S| z-qf+<*OCXXYE$1oU%36|>it<0ZoG~>b?)Wm92dLvxNKKXCME| d|25lRNIol-q0->d%?F_H^K|udS?83{1OOnMu^IpX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_yellow.png b/src/main/resources/assets/actuallyadditions/textures/block/colored_lamp_block_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..380d3dc2d407d33b495cf25a11ed4f4948321de7 GIT binary patch literal 527 zcmV+q0`UEbP)WFU8GbZ8()Nlj2>E@cM*00DDJL_t(I%Vm>IZWTcc zguimnNG$S_DrJ+P{!?YiUavGp%a|-d)~<8ekB;yvjQ|$bf-tyk4Jihe?9F%Ll+|e1@5DWFkFgP3XD1BMwG+nV+)v6kKT>zL9=cW zx&>B;iS+!Lw=nsS=fko7l-O8;Bw1WP!6{+RWA#L-J0I|?{C>@I9f3&nw={$lOQq984 z^%u97kM#In15|H7It) literal 0 HcmV?d00001