IC2 Classic API support (This is all you are getting)

If this is broken I dont care, if it has broken other things I will care.
This commit is contained in:
modmuss50 2016-01-07 10:46:13 +00:00
parent e03bbacfcf
commit b588e8c08a
136 changed files with 2824 additions and 346 deletions

View file

@ -43,7 +43,7 @@ public class GuiBlastFurnace extends GuiContainer {
GuiButton button = new GuiButton(212, k + 4, l + 6, 20, 20, "");
buttonList.add(button);
super.initGui();
CoordTriplet coordinates = new CoordTriplet(blastfurnace.getPos().getX() - (EnumFacing.getFront(blastfurnace.getFacing()).getFrontOffsetX() * 2), blastfurnace.getPos().getY() - 1, blastfurnace.getPos().getZ() - (EnumFacing.getFront(blastfurnace.getFacing()).getFrontOffsetZ() * 2));
CoordTriplet coordinates = new CoordTriplet(blastfurnace.getPos().getX() - (EnumFacing.getFront(blastfurnace.getFacingInt()).getFrontOffsetX() * 2), blastfurnace.getPos().getY() - 1, blastfurnace.getPos().getZ() - (EnumFacing.getFront(blastfurnace.getFacingInt()).getFrontOffsetZ() * 2));
if(coordinates.equals(ClientProxy.multiblockRenderEvent.anchor) && blastfurnace.getHeat() != 0){
ClientProxy.multiblockRenderEvent.setMultiblock(null);
button.displayString = "B";
@ -136,7 +136,7 @@ public class GuiBlastFurnace extends GuiContainer {
MultiblockSet set = new MultiblockSet(multiblock);
ClientProxy.multiblockRenderEvent.setMultiblock(set);
ClientProxy.multiblockRenderEvent.partent = new Location(blastfurnace.getPos().getX(), blastfurnace.getPos().getY(), blastfurnace.getPos().getZ(), blastfurnace.getWorld());
ClientProxy.multiblockRenderEvent.anchor = new CoordTriplet(blastfurnace.getPos().getX() - (EnumFacing.getFront(blastfurnace.getFacing()).getFrontOffsetX() * 2), blastfurnace.getPos().getY() - 1, blastfurnace.getPos().getZ() - (EnumFacing.getFront(blastfurnace.getFacing()).getFrontOffsetZ() * 2));
ClientProxy.multiblockRenderEvent.anchor = new CoordTriplet(blastfurnace.getPos().getX() - (EnumFacing.getFront(blastfurnace.getFacingInt()).getFrontOffsetX() * 2), blastfurnace.getPos().getY() - 1, blastfurnace.getPos().getZ() - (EnumFacing.getFront(blastfurnace.getFacingInt()).getFrontOffsetZ() * 2));
}
button.displayString = "A";
} else {

View file

@ -3,8 +3,16 @@ package techreborn.powerSystem;
import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
import com.mojang.realmsclient.gui.ChatFormatting;
import ic2.api.energy.event.EnergyTileUnloadEvent;
import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergySource;
import ic2.api.energy.tile.IEnergySourceInfo;
import ic2.api.energy.tile.IEnergyTile;
import ic2.api.info.Info;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Optional;
import reborncore.api.IListInfoProvider;
import techreborn.api.power.IEnergyInterfaceTile;
@ -20,9 +28,9 @@ import java.util.List;
})
public abstract class TilePowerAcceptor extends RFProviderTile implements
IEnergyReceiver, IEnergyProvider, //Cofh
IEnergyInterfaceTile, IListInfoProvider //TechReborn
//IEnergyTile, IEnergySink, IEnergySource, //Ic2
// IEnergySourceInfo //IC2 Classic //TODO ic2
IEnergyInterfaceTile, IListInfoProvider, //TechReborn
IEnergyTile, IEnergySink, IEnergySource, //Ic2
IEnergySourceInfo //IC2 Classic //TODO ic2
{
public int tier;
private double energy;
@ -57,67 +65,67 @@ public abstract class TilePowerAcceptor extends RFProviderTile implements
onChunkUnload();
}
// @Override
// public void onChunkUnload() {
// super.onChunkUnload();
// if (PowerSystem.EUPOWENET) {
// if (addedToEnet &&
// Info.isIc2Available()) {
// MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
//
// addedToEnet = false;
// }
// }
// }
//
// @Override
// public double getDemandedEnergy() {
// if (!PowerSystem.EUPOWENET)
// return 0;
// return Math.min(getMaxPower() - getEnergy(), getMaxInput());
// }
//
// @Override
// public int getSinkTier() {
// return tier;
// }
//
// @Override
// public double injectEnergy(EnumFacing directionFrom, double amount, double voltage) {
// setEnergy(getEnergy() + amount);
// return 0;
// }
//
// @Override
// public boolean acceptsEnergyFrom(TileEntity emitter, EnumFacing direction) {
// if (!PowerSystem.EUPOWENET)
// return false;
// return canAcceptEnergy(direction);
// }
//
// @Override
// public boolean emitsEnergyTo(TileEntity receiver, EnumFacing direction) {
// if (!PowerSystem.EUPOWENET)
// return false;
// return canProvideEnergy(direction);
// }
//
// @Override
// public double getOfferedEnergy() {
// if (!PowerSystem.EUPOWENET)
// return 0;
// return Math.min(getEnergy(), getMaxOutput());
// }
//
// @Override
// public void drawEnergy(double amount) {
// useEnergy((int) amount);
// }
//
// @Override
// public int getSourceTier() {
// return tier;
// }
@Override
public void onChunkUnload() {
super.onChunkUnload();
if (PowerSystem.EUPOWENET) {
if (addedToEnet &&
Info.isIc2Available()) {
MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
addedToEnet = false;
}
}
}
@Override
public double getDemandedEnergy() {
if (!PowerSystem.EUPOWENET)
return 0;
return Math.min(getMaxPower() - getEnergy(), getMaxInput());
}
@Override
public int getSinkTier() {
return tier;
}
@Override
public double injectEnergy(EnumFacing directionFrom, double amount, double voltage) {
setEnergy(getEnergy() + amount);
return 0;
}
@Override
public boolean acceptsEnergyFrom(TileEntity emitter, EnumFacing direction) {
if (!PowerSystem.EUPOWENET)
return false;
return canAcceptEnergy(direction);
}
@Override
public boolean emitsEnergyTo(TileEntity receiver, EnumFacing direction) {
if (!PowerSystem.EUPOWENET)
return false;
return canProvideEnergy(direction);
}
@Override
public double getOfferedEnergy() {
if (!PowerSystem.EUPOWENET)
return 0;
return Math.min(getEnergy(), getMaxOutput());
}
@Override
public void drawEnergy(double amount) {
useEnergy((int) amount);
}
@Override
public int getSourceTier() {
return tier;
}
//END IC2
//COFH
@ -289,12 +297,12 @@ public abstract class TilePowerAcceptor extends RFProviderTile implements
}
//IC2 Classic
//
//
// @Override
// public int getMaxEnergyAmount() {
// return (int) getMaxOutput();
// }
@Override
public int getMaxEnergyAmount() {
return (int) getMaxOutput();
}
public void charge(int slot)

View file

@ -1,39 +1,42 @@
package techreborn.powerSystem.traits;
import ic2.api.item.IElectricItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import reborncore.jtraits.JTrait;
import techreborn.api.power.IEnergyInterfaceItem;
//TODO ic2
public class EUItemPowerTrait extends JTrait<IEnergyInterfaceItem> {//implements IElectricItem {
// @Override
// public boolean canProvideEnergy(ItemStack itemStack) {
// return _self.canAcceptEnergy(itemStack);
// }
//
// @Override
// public Item getChargedItem(ItemStack itemStack) {
// return (Item) _self;
// }
//
// @Override
// public Item getEmptyItem(ItemStack itemStack) {
// return (Item) _self;
// }
//
// @Override
// public double getMaxCharge(ItemStack itemStack) {
// return _self.getMaxPower(itemStack);
// }
//
// @Override
// public int getTier(ItemStack itemStack) {
// return _self.getStackTeir(itemStack);
// }
//
// @Override
// public double getTransferLimit(ItemStack itemStack) {
// return _self.getMaxTransfer(itemStack);
// }
public class EUItemPowerTrait extends JTrait<IEnergyInterfaceItem> implements IElectricItem {
@Override
public boolean canProvideEnergy(ItemStack itemStack) {
return _self.canAcceptEnergy(itemStack);
}
@Override
public Item getChargedItem(ItemStack itemStack) {
return (Item) _self;
}
@Override
public Item getEmptyItem(ItemStack itemStack) {
return (Item) _self;
}
@Override
public double getMaxCharge(ItemStack itemStack) {
return _self.getMaxPower(itemStack);
}
@Override
public int getTier(ItemStack itemStack) {
return _self.getStackTeir(itemStack);
}
@Override
public double getTransferLimit(ItemStack itemStack) {
return _self.getMaxTransfer(itemStack);
}
}

View file

@ -44,23 +44,14 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
if (!entityPlayer.isSneaking()) {
return true;
}
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return (short) getFacingInt();
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override
public void setFacing(short facing) {
setFacing(facing);
}
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
if (entityPlayer.isSneaking()) {
@ -144,12 +135,12 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
@Override
public boolean canAcceptEnergy(EnumFacing direction) {
return getFacing() != Functions.getIntDirFromDirection(direction);
return getFacingEnum() != direction;
}
@Override
public boolean canProvideEnergy(EnumFacing direction) {
return getFacing() == Functions.getIntDirFromDirection(direction);
return getFacingEnum() == direction;
}
@Override

View file

@ -9,6 +9,7 @@ import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.*;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import reborncore.common.util.Inventory;
@ -224,17 +225,13 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -45,17 +45,13 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -39,17 +39,13 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -54,21 +54,13 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
Block block = worldObj.getBlockState(pos).getBlock();
if(block instanceof BlockMachineBase){
return (short) ((BlockMachineBase) block).getFacing(worldObj.getBlockState(pos)).getIndex();
}
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -50,17 +50,13 @@ public class TileCentrifuge extends TilePowerAcceptor implements IWrenchable, II
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -43,17 +43,13 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -39,17 +39,13 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -24,17 +24,13 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -32,17 +32,13 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import reborncore.api.IListInfoProvider;
import reborncore.common.util.Inventory;
@ -187,17 +188,13 @@ public class TileDigitalChest extends TileMachineBase implements IInventory,
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -35,17 +35,13 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -45,17 +45,13 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable,
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -48,17 +48,13 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IFlui
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -39,17 +39,13 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -37,17 +37,13 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -42,17 +42,13 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -77,17 +77,13 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -29,17 +29,13 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import reborncore.api.IListInfoProvider;
@ -229,17 +230,13 @@ public class TileQuantumChest extends TileMachineBase implements IInventory,
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -209,17 +209,13 @@ public class TileQuantumTank extends TileMachineBase implements IFluidHandler,
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -135,17 +135,13 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -51,17 +51,13 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -33,17 +33,13 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override

View file

@ -69,17 +69,13 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public short getFacing() {
return 0;
}
@Override
public void setFacing(short facing) {
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override