Add colored lamps (#1297)

.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

src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java

@@ -24,6 +24,7 @@ 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 void register(Register<Block> e) {
@@ -33,7 +34,8 @@ 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,7 +48,8 @@ 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
 	}

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<LampColors> 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<Block, BlockState> builder) {
+        builder.add(COLOR, ACTIVE);
+    }
+}

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<ResourceLocation> 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;
+    }
+}

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" }
+  }
+}

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"
 }

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/colored_lamp_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "actuallyadditions:block/colored_lamp_block_white"
+}