Added Colored Lights support.

This commit is contained in:
Lizbeth Rika committed 2014-12-26 21:14:48 +00:00
1 parent 8441c497a6
commit 7860775593
10 files changed
+148 -1

No files matched your search

@@ -25,6 +25,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockMod extends Block {
public int originalLight;
public BlockMod(Material par2Material) {
super(par2Material);
if(registerInCreative())
@@ -42,6 +44,12 @@ public class BlockMod extends Block {
return true;
}
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
return super.setLightLevel(p_149715_1_);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
@@ -26,6 +26,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public abstract class BlockModContainer<T extends TileEntity> extends BlockContainer {
public int originalLight;
protected BlockModContainer(Material par2Material) {
super(par2Material);
if(registerInCreative())
@@ -42,6 +44,12 @@ public abstract class BlockModContainer<T extends TileEntity> extends BlockConta
protected boolean shouldRegisterInNameSet() {
return true;
}
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
return super.setLightLevel(p_149715_1_);
}
@Override
@SideOnly(Side.CLIENT)
@@ -43,6 +43,8 @@ public class BlockModFlower extends BlockFlower implements ILexiconable {
public static IIcon[] icons;
public static IIcon[] iconsAlt;
public int originalLight;
public static final String ALT_DIR = "alt";
protected BlockModFlower() {
@@ -86,6 +88,12 @@ public class BlockModFlower extends BlockFlower implements ILexiconable {
iconsAlt[i] = IconHelper.forBlock(par1IconRegister, this, i, ALT_DIR);
}
}
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
return super.setLightLevel(p_149715_1_);
}
@Override
public IIcon getIcon(int par1, int par2) {
@@ -13,14 +13,17 @@ package vazkii.botania.common.block.decor;
import java.util.Random;
import cpw.mods.fml.common.Optional;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.item.Item;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.BlockModFlower;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
@@ -29,7 +32,14 @@ public class BlockBuriedPetals extends BlockModFlower {
public BlockBuriedPetals() {
super(LibBlockNames.BURIED_PETALS);
setBlockBounds(0F, 0F, 0F, 1F, 0.1F, 1F);
setLightLevel(0.25F);
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(IBlockAccess world, int x, int y, int z) {
return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight);
}
@Override
public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
@@ -25,6 +25,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import thaumcraft.api.crafting.IInfusionStabiliser;
import vazkii.botania.api.lexicon.ILexiconable;
@@ -34,6 +35,7 @@ import vazkii.botania.common.Botania;
import vazkii.botania.common.block.BlockModContainer;
import vazkii.botania.common.block.tile.TileFloatingFlower;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -57,6 +59,12 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab
float f = 0.1F;
setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f);
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(IBlockAccess world, int x, int y, int z) {
return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight);
}
@Override
protected boolean shouldRegisterInNameSet() {
@@ -11,6 +11,7 @@
*/
package vazkii.botania.common.block.decor;
import cpw.mods.fml.common.Optional;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
@@ -21,6 +22,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import vazkii.botania.common.block.BlockModContainer;
import vazkii.botania.common.block.tile.TileManaFlame;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockManaFlame extends BlockModContainer {
@@ -34,6 +36,12 @@ public class BlockManaFlame extends BlockModContainer {
setLightLevel(1F);
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(IBlockAccess world, int x, int y, int z) {
return ((TileManaFlame) world.getTileEntity(x, y, z)).getLightColor();
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
@@ -11,13 +11,16 @@
*/
package vazkii.botania.common.block.decor;
import cpw.mods.fml.common.Optional;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -30,6 +33,14 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable {
setLightLevel(1.0F);
setBlockName(LibBlockNames.SEA_LAMP);
}
int coloredLight = -1;
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(IBlockAccess world, int x, int y, int z) {
return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight;
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
@@ -12,15 +12,18 @@
package vazkii.botania.common.block.decor;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import thaumcraft.api.crafting.IInfusionStabiliser;
import vazkii.botania.api.item.IGrassHornExcempt;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.BlockModFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import cpw.mods.fml.common.Optional;
@@ -32,7 +35,13 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili
super(LibBlockNames.SHINY_FLOWER);
setLightLevel(1F);
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(IBlockAccess world, int x, int y, int z) {
return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight);
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
@@ -12,6 +12,7 @@
package vazkii.botania.common.block.tile;
import vazkii.botania.common.Botania;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import net.minecraft.nbt.NBTTagCompound;
public class TileManaFlame extends TileMod {
@@ -52,6 +53,13 @@ public class TileManaFlame extends TileMod {
}
}
public int getLightColor() {
float r = (float) ((color >> 16) & 0xFF) / 0xFF;
float g = (float) ((color >> 8) & 0xFF) / 0xFF;
float b = (float) (color & 0xFF) / 0xFF;
return ColoredLightHelper.makeRGBLightValue(r, g, b, 1F);
}
@Override
public void writeCustomNBT(NBTTagCompound cmp) {
cmp.setInteger(TAG_COLOR, color);
@@ -0,0 +1,69 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* File Created @ [Dec 26, 2014, 7:26:31 PM (GMT)]
*/
package vazkii.botania.common.integration.coloredlights;
/*
* This class is presentto help with the Colored Lights mod without needing to package
* the API or hold a dependency, please understand.
*/
public class ColoredLightHelper {
// Begin API Copypasta
// https://github.com/CptSpaceToaster/CptsModdingLight/blob/1.7.2/src/main/java/coloredlightscore/src/api/CLApi.java
public static int r[] = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 };
public static int g[] = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 };
public static int b[] = new int[] { 0, 0, 0, 0, 15, 15, 15, 10, 5, 13, 0, 0, 15, 15, 10, 15 };
public static int makeRGBLightValue(float r, float g, float b, float currentLightValue) {
// Clamp color channels
if (r < 0.0f)
r = 0.0f;
else if (r > 1.0f)
r = 1.0f;
if (g < 0.0f)
g = 0.0f;
else if (g > 1.0f)
g = 1.0f;
if (b < 0.0f)
b = 0.0f;
else if (b > 1.0f)
b = 1.0f;
int brightness = (int) (currentLightValue * 15.0f);
brightness &= 0xf;
return brightness | ((((int) (15.0F * b)) << 15) + (((int) (15.0F * g)) << 10) + (((int) (15.0F * r)) << 5));
}
// End API Copypasta
private static int packedColors[][] = null;
public static int getPackedColor(int meta, int light) {
if(packedColors == null)
initPackedColors();
return packedColors[meta][light];
}
private static void initPackedColors() {
packedColors = new int[16][16];
for(int i = 0; i < 16; i++)
for(int j = 0; j < 16; j++)
packedColors[i][j] = makeRGBLightValue(r[15 - i], g[15 - i], b[15 - i], (float) j / 16F);
}
}