From fab5fc0087909b5975c6875d824114fc6586086a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 19:28:15 -0500 Subject: [PATCH] Remove ColoredLights integration --- .../java/vazkii/botania/common/Botania.java | 7 -- .../block/BlockFloatingSpecialFlower.java | 6 +- .../vazkii/botania/common/block/BlockMod.java | 10 --- .../botania/common/block/BlockModFlower.java | 9 --- .../common/block/BlockSpecialFlower.java | 6 +- .../common/block/decor/BlockBuriedPetals.java | 10 --- .../block/decor/BlockFloatingFlower.java | 9 --- .../common/block/decor/BlockModMushroom.java | 18 ----- .../common/block/decor/BlockSeaLamp.java | 17 ----- .../common/block/decor/BlockShinyFlower.java | 11 --- .../common/block/tile/TileManaFlame.java | 6 +- .../coloredlights/ColoredLightHelper.java | 74 ------------------- .../coloredlights/ILightHelper.java | 23 ------ .../coloredlights/LightHelper.java | 28 ------- .../coloredlights/LightHelperColored.java | 30 -------- .../coloredlights/LightHelperVanilla.java | 30 -------- 16 files changed, 3 insertions(+), 291 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 0387c914c..76ee58996 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index c3dce0dd0..86c50c82d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index e3d83c09b..d8c4168be 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -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; } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 2c1db1c00..be580596e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 8f8dbbff2..aba119a41 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 73ecac89a..340f40d8c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index ce738363f..ca71d8d92 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -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()); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 9dd6e974b..b9c2ddaa9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index 644031dc9..1691341a1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index d04672e8c..07174cff1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 8f54ea183..64754b76f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java deleted file mode 100644 index d60697f2f..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * This class was created by . 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 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); - } - } - -} diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java deleted file mode 100644 index 3ad64401a..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This class was created by . 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); -} diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java deleted file mode 100644 index 9721b5da2..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This class was created by . 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); - } -} diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java deleted file mode 100644 index 51315523a..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * This class was created by . 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); - } - -} diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java deleted file mode 100644 index bb793708f..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * This class was created by . 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; - } - -}