From a23f3173685f9b794ee16b6ee0a68b1e4c4459f6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 19:49:51 -0600 Subject: [PATCH] Finish BC integratoin --- .../vazkii/botania/common/core/proxy/CommonProxy.java | 5 +++-- .../integration/buildcraft/StatementAPIPlugin.java | 10 ++++++++++ .../integration/buildcraft/TriggerManaDetector.java | 8 +++++--- .../integration/buildcraft/TriggerManaLevel.java | 8 +++++--- .../buildcraft/TriggerRuneAltarCanCraft.java | 8 +++++--- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 150212ed3..342eefd36 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -64,6 +64,7 @@ import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.ModEntities; //import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; todo 1.8 //import vazkii.botania.common.block.ModBanners; +import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -132,8 +133,8 @@ public class CommonProxy { FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); -// if(Botania.bcTriggersLoaded) todo 1.8 -// new StatementAPIPlugin(); + if(Botania.bcTriggersLoaded) + new StatementAPIPlugin(); } public void postInit(FMLPostInitializationEvent event) { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index 2f2bc4d34..838d8beb9 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -5,6 +5,7 @@ import java.util.Collection; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileRuneAltar; @@ -34,6 +35,15 @@ public class StatementAPIPlugin implements ITriggerProvider { StatementManager.registerStatement(triggerRuneAltarCanCraft); StatementManager.registerTriggerProvider(this); + + // Register them all to the event bus so they can stitch textures + MinecraftForge.EVENT_BUS.register(triggerManaEmpty); + MinecraftForge.EVENT_BUS.register(triggerManaContains); + MinecraftForge.EVENT_BUS.register(triggerManaSpace); + MinecraftForge.EVENT_BUS.register(triggerManaFull); + MinecraftForge.EVENT_BUS.register(triggerManaDetector); + + MinecraftForge.EVENT_BUS.register(triggerRuneAltarCanCraft); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 68737cac2..a1801d6aa 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -6,6 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; @@ -21,9 +23,9 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern return "botania:manaDetector"; } - @Override - public void registerIcons(TextureMap iconRegister) { - icon = IconHelper.forName(iconRegister, "triggers/manaDetector"); + @SubscribeEvent + public void registerIcons(TextureStitchEvent.Pre evt) { + icon = IconHelper.forName(evt.map, "triggers/manaDetector"); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 4361e9773..a7f9bbb3d 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -5,6 +5,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.mana.IManaBlock; @@ -34,9 +36,9 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal return "botania:mana" + state.name(); } - @Override - public void registerIcons(TextureMap iconRegister) { - icon = IconHelper.forName(iconRegister, "triggers/mana" + WordUtils.capitalizeFully(state.name())); + @SubscribeEvent + public void registerIcons(TextureStitchEvent.Pre evt) { + icon = IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(state.name())); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index 9ec63f7bf..c519ae9e3 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -4,6 +4,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; @@ -18,9 +20,9 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE return "botania:runeAltarCanCraft"; } - @Override - public void registerIcons(TextureMap iconRegister) { - icon = IconHelper.forName(iconRegister, "triggers/runeAltarCanCraft"); + @SubscribeEvent + public void registerIcons(TextureStitchEvent.Pre evt) { + icon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft"); } @Override