mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
Update buildcraft api to 7.2.0 and integration mostly
This commit is contained in:
1 parent
a9b060257f
commit
5379cda754
81 files changed
+1615
-1898
No files matched your search
@@ -4,7 +4,7 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import vazkii.botania.api.mana.IManaBlock;
|
||||
import vazkii.botania.api.mana.IManaReceiver;
|
||||
import vazkii.botania.common.block.tile.TileRuneAltar;
|
||||
@@ -44,7 +44,7 @@ public class StatementAPIPlugin implements ITriggerProvider {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ITriggerExternal> getExternalTriggers(ForgeDirection side, TileEntity tile) {
|
||||
public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
|
||||
ArrayList<ITriggerExternal> list = new ArrayList<ITriggerExternal>();
|
||||
|
||||
if (tile instanceof IManaBlock) {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import buildcraft.api.statements.IStatement;
|
||||
import buildcraft.api.statements.IStatementParameter;
|
||||
|
||||
public abstract class StatementBase implements IStatement {
|
||||
protected IIcon icon;
|
||||
protected TextureAtlasSprite icon;
|
||||
|
||||
@Override
|
||||
public IIcon getIcon() {
|
||||
public TextureAtlasSprite getGuiSprite() {
|
||||
return icon;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import com.google.common.base.Predicates;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
@@ -20,7 +22,7 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister iconRegister) {
|
||||
public void registerIcons(TextureMap iconRegister) {
|
||||
icon = IconHelper.forName(iconRegister, "triggers/manaDetector");
|
||||
}
|
||||
|
||||
@@ -32,9 +34,9 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern
|
||||
@Override
|
||||
public boolean isTriggerActive(IStatementContainer source, IStatementParameter[] parameters) {
|
||||
World world = source.getTile().getWorld();
|
||||
int x = source.getTile().xCoord, y = source.getTile().yCoord, z = source.getTile().zCoord;
|
||||
int x = source.getTile().getPos().getX(), y = source.getTile().getPos().getY(), z = source.getTile().getPos().getZ();
|
||||
|
||||
boolean output = world.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)).size() != 0;
|
||||
boolean output = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1), Predicates.instanceOf(IManaBurst.class)).size() != 0;
|
||||
|
||||
if(output) for(int i = 0; i < 4; i++)
|
||||
Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5);
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
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.common.util.ForgeDirection;
|
||||
|
||||
import org.apache.commons.lang3.text.WordUtils;
|
||||
|
||||
@@ -35,7 +35,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister iconRegister) {
|
||||
public void registerIcons(TextureMap iconRegister) {
|
||||
icon = IconHelper.forName(iconRegister, "triggers/mana" + WordUtils.capitalizeFully(state.name()));
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTriggerActive(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) {
|
||||
public boolean isTriggerActive(TileEntity target, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
|
||||
if(target instanceof IManaBlock) {
|
||||
if(state == State.EMPTY) return ((IManaBlock) target).getCurrentMana() == 0;
|
||||
else if(state == State.CONTAINS) return ((IManaBlock) target).getCurrentMana() > 0;
|
||||
|
||||
+4
-4
@@ -1,9 +1,9 @@
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
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.common.util.ForgeDirection;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.block.tile.TileRuneAltar;
|
||||
import vazkii.botania.common.lib.LibTriggerNames;
|
||||
@@ -19,7 +19,7 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister iconRegister) {
|
||||
public void registerIcons(TextureMap iconRegister) {
|
||||
icon = IconHelper.forName(iconRegister, "triggers/runeAltarCanCraft");
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTriggerActive(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) {
|
||||
public boolean isTriggerActive(TileEntity target, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
|
||||
if(target instanceof TileRuneAltar) return ((TileRuneAltar) target).hasValidRecipe();
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user