mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-22 13:09:42 +00:00
Finish BC integratoin
This commit is contained in:
1 parent
5379cda754
commit
a23f317368
5 files changed
+28
-11
No files matched your search
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+5
-3
@@ -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
|
||||
|
||||
Reference in new issue
Block a user