From 55977e5bd9548e9dc3db9057c966e993ddf6ac34 Mon Sep 17 00:00:00 2001 From: SoundLogic Date: Mon, 18 May 2015 07:52:19 -0500 Subject: [PATCH] Added hooks for subtiles to control redstone behavior and light. --- .../java/vazkii/botania/api/package-info.java | 2 +- .../botania/api/subtile/SubTileEntity.java | 23 ++++++++++++ .../java/vazkii/botania/common/Botania.java | 16 +++++++++ .../block/BlockFloatingSpecialFlower.java | 35 ++++++++++++++++++ .../common/block/BlockSpecialFlower.java | 36 +++++++++++++++++++ .../common/block/tile/TileSpecialFlower.java | 18 ++++++++++ .../coloredlights/ILightHelper.java | 21 +++++++++++ .../coloredlights/LightHelper.java | 27 ++++++++++++++ .../coloredlights/LightHelperColored.java | 28 +++++++++++++++ .../coloredlights/LightHelperVanilla.java | 28 +++++++++++++++ 10 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java create mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java create mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java create mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index e071d02ea..fca568a6e 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "49", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "50", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 30dd5b7fe..eda70ce96 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -192,4 +192,27 @@ public class SubTileEntity { public void renderHUD(Minecraft mc, ScaledResolution res) { // NO-OP } + + /** + * Gets the light value for this SubTileEntity, this is a int (-1 to default to the flower) + */ + public int getLightValue() { + return -1; + } + + /** + * Gets the comparator input value for this SubTileEntity + */ + public int getComparatorInputOverride(int side) { + return 0; + } + + /** + * Gets the redstone power level for this SubTileEntity + */ + public int getPowerLevel(int side) { + return 0; + } + + } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 69dd97da9..de962f836 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -13,9 +13,13 @@ package vazkii.botania.common; 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; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.ModAPIManager; @@ -33,6 +37,8 @@ public class Botania { public static boolean thaumcraftLoaded = false; public static boolean bcTriggersLoaded = false; public static boolean bloodMagicLoaded = false; + + public static ILightHelper lightHelper; @Instance(LibMisc.MOD_ID) public static Botania instance; @@ -45,10 +51,20 @@ public class Botania { thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements"); bloodMagicLoaded = Loader.isModLoaded("AWWayofTime"); // Psh, noob + + if(lightHelper == null) + lightHelper = new LightHelperVanilla(); proxy.preInit(event); } + @EventHandler + @Optional.Method(modid = "easycoloredlights") + public void preInitColoredLights(FMLPreInitializationEvent event) { + System.out.println("easycolor!"); + lightHelper = new LightHelperColored(); + } + @EventHandler public void init(FMLInitializationEvent event) { proxy.init(event); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 8e35d3954..a583e4573 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -23,6 +23,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -35,6 +36,7 @@ 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; @@ -49,6 +51,39 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); } + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + int currentLight = ((TileSpecialFlower) world.getTileEntity(x, y, z)).getLightValue(); + if(currentLight == -1) + currentLight = originalLight; + return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight); + } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + @Override + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getComparatorInputOverride(side); + } + + @Override + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getPowerLevel(side); + } + + @Override + public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) { + return this.isProvidingWeakPower(world, x, y, z, side); + } + + @Override + public boolean canProvidePower() { + return true; + } + @Override public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { // NO-OP diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index d5780ad14..418269b04 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -41,8 +41,11 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; +import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { @@ -110,6 +113,39 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + int currentLight = ((TileSpecialFlower) world.getTileEntity(x, y, z)).getLightValue(); + if(currentLight == -1) + currentLight = 0; + return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight); + } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + @Override + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getComparatorInputOverride(side); + } + + @Override + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getPowerLevel(side); + } + + @Override + public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) { + return this.isProvidingWeakPower(world, x, y, z, side); + } + + @Override + public boolean canProvidePower() { + return true; + } + + @Override public int getRenderType() { return LibRenderIDs.idSpecialFlower; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 1027c9d00..43a802f74 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -193,4 +193,22 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil return false; return subTile.bindTo(player, wand, x, y, z, side); } + + public int getLightValue() { + if(subTile == null) + return -1; + return subTile.getLightValue(); + } + + public int getComparatorInputOverride(int side) { + if(subTile == null) + return 0; + return subTile.getComparatorInputOverride(side); + } + + public int getPowerLevel(int side) { + if(subTile == null) + return 0; + return subTile.getPowerLevel(side); + } } diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java new file mode 100644 index 000000000..e813b5132 --- /dev/null +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java @@ -0,0 +1,21 @@ +/** + * 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; + +/* + * 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(int 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 new file mode 100644 index 000000000..a2788419e --- /dev/null +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java @@ -0,0 +1,27 @@ +/** + * 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 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(int 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 new file mode 100644 index 000000000..9b9f4580c --- /dev/null +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java @@ -0,0 +1,28 @@ +/** + * 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; + +/* + * 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(int meta, int light) { + return ColoredLightHelper.getPackedColor(meta, 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 new file mode 100644 index 000000000..441d0dd57 --- /dev/null +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java @@ -0,0 +1,28 @@ +/** + * 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; + +/* + * 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(int meta, int light) { + return light; + } + +}