Remove ColoredLights integration

This commit is contained in:
Vincent Lee committed 2016-06-03 19:28:15 -05:00
1 parent a5df917d5a
commit fab5fc0087
16 files changed
+3 -291

No files matched your search

@@ -37,9 +37,6 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent;
import vazkii.botania.common.core.handler.IMCHandler;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.proxy.CommonProxy;
import vazkii.botania.common.integration.coloredlights.ILightHelper;
import vazkii.botania.common.integration.coloredlights.LightHelperColored;
import vazkii.botania.common.integration.coloredlights.LightHelperVanilla;
import vazkii.botania.common.lib.LibMisc;
@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES,
@@ -57,8 +54,6 @@ public class Botania {
public static boolean storageDrawersLoaded = false;
public static boolean quarkLoaded = false;
public static ILightHelper lightHelper;
@Instance(LibMisc.MOD_ID)
public static Botania instance;
@@ -79,8 +74,6 @@ public class Botania {
storageDrawersLoaded = Loader.isModLoaded("StorageDrawers");
lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla();
proxy.preInit(event);
MinecraftForge.EVENT_BUS.register(this);
}
@@ -46,7 +46,6 @@ import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.block.tile.TileFloatingSpecialFlower;
import vazkii.botania.common.block.tile.TileSpecialFlower;
import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe;
import vazkii.botania.common.integration.coloredlights.LightHelper;
import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lib.LibBlockNames;
@@ -92,10 +91,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
return world.getBlockState(pos).getLightValue(world, pos);
TileEntity tile = world.getTileEntity(pos);
int currentLight = tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : -1;
if(currentLight == -1)
currentLight = originalLight;
return LightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), currentLight);
return tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : lightValue;
}
@Override
@@ -24,8 +24,6 @@ import javax.annotation.Nonnull;
public class BlockMod extends Block {
protected int originalLight;
public BlockMod(Material par2Material, String name) {
super(par2Material);
setUnlocalizedName(name);
@@ -39,16 +37,8 @@ public class BlockMod extends Block {
GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName());
}
@Nonnull
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
return super.setLightLevel(p_149715_1_);
}
protected boolean registerInCreative() {
return true;
}
}
@@ -51,8 +51,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8);
public int originalLight;
protected BlockModFlower() {
this(LibBlockNames.FLOWER);
}
@@ -120,13 +118,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
par3List.add(new ItemStack(par1, 1, i));
}
@Nonnull
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
return super.setLightLevel(p_149715_1_);
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
@@ -55,7 +55,6 @@ import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.common.block.tile.TileSpecialFlower;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.integration.coloredlights.LightHelper;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lib.LibBlockNames;
@@ -179,10 +178,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
int currentLight = world.getTileEntity(pos) == null ? -1 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue();
if(currentLight == -1)
currentLight = 0;
return LightHelper.getPackedColor(state.getValue(BotaniaStateProps.COLOR), currentLight);
return world.getTileEntity(pos) == null ? 0 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue();
}
@Override
@@ -18,11 +18,9 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
import vazkii.botania.api.state.BotaniaStateProps;
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;
@@ -44,14 +42,6 @@ public class BlockBuriedPetals extends BlockModFlower {
return AABB;
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight);
}
@Override
public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) {
EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR);
@@ -55,7 +55,6 @@ import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.block.tile.TileFloatingFlower;
import vazkii.botania.common.block.tile.TileFloatingSpecialFlower;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import vazkii.botania.common.item.IFloatingFlowerVariant;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
@@ -164,14 +163,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu
}
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight);
}
@Override
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
@@ -38,7 +38,6 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.BotaniaCreativeTab;
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;
@@ -52,7 +51,6 @@ import java.util.Random;
public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8);
private int originalLight;
public BlockModMushroom() {
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM));
@@ -114,22 +112,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis
par3List.add(new ItemStack(par1, 1, i));
}
@Nonnull
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
return super.setLightLevel(p_149715_1_);
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight);
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
@@ -12,26 +12,18 @@ package vazkii.botania.common.block.decor;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
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;
import javax.annotation.Nonnull;
public class BlockSeaLamp extends BlockMod implements ILexiconable {
private int coloredLight = -1;
public BlockSeaLamp() {
super(Material.GLASS, LibBlockNames.SEA_LAMP);
setHardness(0.3F);
@@ -39,15 +31,6 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable {
setLightLevel(1.0F);
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight;
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.prismarine;
@@ -20,10 +20,8 @@ import net.minecraftforge.fml.common.Optional;
import thaumcraft.api.crafting.IInfusionStabiliser;
import vazkii.botania.api.item.IHornHarvestable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.BlockModFlower;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -37,15 +35,6 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili
setLightLevel(1F);
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight);
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.shinyFlowers;
@@ -12,7 +12,6 @@ package vazkii.botania.common.block.tile;
import net.minecraft.nbt.NBTTagCompound;
import vazkii.botania.common.Botania;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
public class TileManaFlame extends TileMod {
@@ -63,10 +62,7 @@ public class TileManaFlame extends TileMod {
public int getLightColor() {
if(lightColor == -1) {
float r = (float) (color >> 16 & 0xFF) / 0xFF;
float g = (float) (color >> 8 & 0xFF) / 0xFF;
float b = (float) (color & 0xFF) / 0xFF;
lightColor = ColoredLightHelper.makeRGBLightValue(r, g, b, 1F);
lightColor = 0xFFFFFF;
}
return lightColor;
@@ -1,74 +0,0 @@
/**
* 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 the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Dec 26, 2014, 7:26:31 PM (GMT)]
*/
package vazkii.botania.common.integration.coloredlights;
import net.minecraft.item.EnumDyeColor;
import java.util.EnumMap;
import java.util.Map;
/*
* 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 final int[] r = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 };
public static final int[] g = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 };
public static final 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 Map<EnumDyeColor, int[]> packedColors = null;
public static int getPackedColor(EnumDyeColor color, int light) {
if(packedColors == null)
initPackedColors();
return packedColors.get(color)[light];
}
private static void initPackedColors() {
packedColors = new EnumMap<>(EnumDyeColor.class);
for(EnumDyeColor color : EnumDyeColor.values()) {
packedColors.put(color, new int[16]);
for(int j = 0; j < 16; j++)
packedColors.get(color)[j] = makeRGBLightValue(r[15 - color.getMetadata()], g[15 - color.getMetadata()], b[15 - color.getMetadata()], j / 16F);
}
}
}
@@ -1,23 +0,0 @@
/**
* This class was created by <SoundLogic>. 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 the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [May 16, 2015, 8:30:41 PM (GMT)]
*/
package vazkii.botania.common.integration.coloredlights;
import net.minecraft.item.EnumDyeColor;
/*
* This interface is use for wrappers for compatibility with the colored lights mod.
* It has one version for colored lights, and one version which leaves the light values unmodified for vanilla
*/
public interface ILightHelper {
public int makeRGBLightValue(float r, float g, float b, int currentLightValue);
public int getPackedColor(EnumDyeColor meta, int light);
}
@@ -1,28 +0,0 @@
/**
* This class was created by <SoundLogic>. 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 the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [May 16, 2015, 8:30:41 PM (GMT)]
*/
package vazkii.botania.common.integration.coloredlights;
import net.minecraft.item.EnumDyeColor;
import vazkii.botania.common.Botania;
/*
* This class acts as ColoredLightHelper if the colored lights mod is installed, and leaves the light values unmodified otherwise
*/
public class LightHelper {
public static int makeRGBLightValue(float r, float g, float b, float currentLightValue) {
return Botania.lightHelper.makeRGBLightValue(r, g, b, (int) currentLightValue);
}
public static int getPackedColor(EnumDyeColor meta, int light) {
return Botania.lightHelper.getPackedColor(meta, light);
}
}
@@ -1,30 +0,0 @@
/**
* This class was created by <SoundLogic>. 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 the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [May 16, 2015, 8:30:41 PM (GMT)]
*/
package vazkii.botania.common.integration.coloredlights;
import net.minecraft.item.EnumDyeColor;
/*
* This is an implementation of ILightHelper for when the colored lights mod is installed
*/
public class LightHelperColored implements ILightHelper {
@Override
public int makeRGBLightValue(float r, float g, float b, int currentLightValue) {
return ColoredLightHelper.makeRGBLightValue(r, g, b, currentLightValue);
}
@Override
public int getPackedColor(EnumDyeColor color, int light) {
return ColoredLightHelper.getPackedColor(color, light);
}
}
@@ -1,30 +0,0 @@
/**
* This class was created by <SoundLogic>. 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 the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [May 16, 2015, 8:30:41 PM (GMT)]
*/
package vazkii.botania.common.integration.coloredlights;
import net.minecraft.item.EnumDyeColor;
/*
* This is an implementation of ILightHelper for when the colored lights mod isn't installed
*/
public class LightHelperVanilla implements ILightHelper {
@Override
public int makeRGBLightValue(float r, float g, float b, int currentLightValue) {
return currentLightValue;
}
@Override
public int getPackedColor(EnumDyeColor meta, int light) {
return light;
}
}