From eb1fe81b4eac90dec894e0b89e1f18e2f179bcc9 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 23 Dec 2013 20:16:17 +0800 Subject: [PATCH] Updated UE API --- Calclavia-Library | 2 +- src/resonantinduction/api/ICapacitor.java | 4 ++-- src/resonantinduction/battery/BatteryManager.java | 4 ++-- .../battery/SynchronizedBatteryData.java | 4 ++-- src/resonantinduction/battery/TileEntityBattery.java | 8 ++------ src/resonantinduction/gui/GuiMultimeter.java | 4 ---- src/resonantinduction/multimeter/PartMultimeter.java | 3 +-- src/resonantinduction/wire/ItemWire.java | 1 - src/resonantinduction/wire/render/RenderFlatWire.java | 1 - 9 files changed, 10 insertions(+), 21 deletions(-) diff --git a/Calclavia-Library b/Calclavia-Library index c263c191..fb0750ad 160000 --- a/Calclavia-Library +++ b/Calclavia-Library @@ -1 +1 @@ -Subproject commit c263c191ede3ada3d5f1d0c76231398df60d5b9a +Subproject commit fb0750ad43578556f3f058527ecfb830128c125e diff --git a/src/resonantinduction/api/ICapacitor.java b/src/resonantinduction/api/ICapacitor.java index b155aa27..6dbfb56b 100644 --- a/src/resonantinduction/api/ICapacitor.java +++ b/src/resonantinduction/api/ICapacitor.java @@ -1,12 +1,12 @@ package resonantinduction.api; -import universalelectricity.api.item.IElectricalItem; +import universalelectricity.api.item.IEnergyItem; /** * @author Calclavia * */ -public interface ICapacitor extends IElectricalItem +public interface ICapacitor extends IEnergyItem { } diff --git a/src/resonantinduction/battery/BatteryManager.java b/src/resonantinduction/battery/BatteryManager.java index 2fa1644e..4db090b7 100644 --- a/src/resonantinduction/battery/BatteryManager.java +++ b/src/resonantinduction/battery/BatteryManager.java @@ -3,7 +3,7 @@ package resonantinduction.battery; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import universalelectricity.api.item.IElectricalItem; +import universalelectricity.api.item.IEnergyItem; public class BatteryManager { @@ -33,7 +33,7 @@ public class BatteryManager @Override public boolean isItemValid(ItemStack itemstack) { - return itemstack.getItem() instanceof IElectricalItem; + return itemstack.getItem() instanceof IEnergyItem; } } } diff --git a/src/resonantinduction/battery/SynchronizedBatteryData.java b/src/resonantinduction/battery/SynchronizedBatteryData.java index 96c89ad3..8874cdd3 100644 --- a/src/resonantinduction/battery/SynchronizedBatteryData.java +++ b/src/resonantinduction/battery/SynchronizedBatteryData.java @@ -7,7 +7,7 @@ import java.util.Set; import net.minecraft.item.ItemStack; import resonantinduction.base.ListUtil; -import universalelectricity.api.item.IElectricalItem; +import universalelectricity.api.item.IEnergyItem; import universalelectricity.api.vector.Vector3; public class SynchronizedBatteryData @@ -77,7 +77,7 @@ public class SynchronizedBatteryData for (int i = 0; i < toSort.length - 1; i++) { - if (((IElectricalItem) toSort[i].getItem()).getElectricityStored(toSort[i]) < ((IElectricalItem) toSort[i + 1].getItem()).getElectricityStored(toSort[i + 1])) + if (((IEnergyItem) toSort[i].getItem()).getEnergy(toSort[i]) < ((IEnergyItem) toSort[i + 1].getItem()).getEnergy(toSort[i + 1])) { temp = toSort[i]; toSort[i] = toSort[i + 1]; diff --git a/src/resonantinduction/battery/TileEntityBattery.java b/src/resonantinduction/battery/TileEntityBattery.java index 5820eca9..10c4c87f 100644 --- a/src/resonantinduction/battery/TileEntityBattery.java +++ b/src/resonantinduction/battery/TileEntityBattery.java @@ -7,22 +7,18 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Set; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import resonantinduction.ResonantInduction; import resonantinduction.api.ICapacitor; import resonantinduction.base.ListUtil; -import universalelectricity.api.item.IElectricalItem; +import universalelectricity.api.item.IEnergyItem; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.IPacketReceiver; import calclavia.lib.network.IPacketSender; @@ -515,7 +511,7 @@ public class TileEntityBattery extends TileEntityElectrical implements IPacketSe @Override public boolean isItemValidForSlot(int i, ItemStack itemsSack) { - return itemsSack.getItem() instanceof IElectricalItem; + return itemsSack.getItem() instanceof IEnergyItem; } @Override diff --git a/src/resonantinduction/gui/GuiMultimeter.java b/src/resonantinduction/gui/GuiMultimeter.java index 3afa9c44..5e099cf5 100644 --- a/src/resonantinduction/gui/GuiMultimeter.java +++ b/src/resonantinduction/gui/GuiMultimeter.java @@ -7,15 +7,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import resonantinduction.ResonantInduction; import resonantinduction.multimeter.ContainerMultimeter; import resonantinduction.multimeter.PartMultimeter; import calclavia.lib.gui.GuiContainerBase; import calclavia.lib.prefab.TranslationHelper; -import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/resonantinduction/multimeter/PartMultimeter.java b/src/resonantinduction/multimeter/PartMultimeter.java index 00e872da..b5ef0590 100644 --- a/src/resonantinduction/multimeter/PartMultimeter.java +++ b/src/resonantinduction/multimeter/PartMultimeter.java @@ -21,8 +21,7 @@ import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; import resonantinduction.base.PartAdvanced; import resonantinduction.render.RenderMultimeter; -import scala.reflect.ClassTag; -import universalelectricity.api.Compatibility.CompatibilityType; +import universalelectricity.api.CompatibilityType; import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IEnergyContainer; import universalelectricity.api.energy.IEnergyNetwork; diff --git a/src/resonantinduction/wire/ItemWire.java b/src/resonantinduction/wire/ItemWire.java index 4033d198..e16afc15 100644 --- a/src/resonantinduction/wire/ItemWire.java +++ b/src/resonantinduction/wire/ItemWire.java @@ -22,7 +22,6 @@ import codechicken.lib.vec.Vector3; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.TMultiPart; -import codechicken.multipart.TileMultipart; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/resonantinduction/wire/render/RenderFlatWire.java b/src/resonantinduction/wire/render/RenderFlatWire.java index cbc22e7b..f51834a7 100644 --- a/src/resonantinduction/wire/render/RenderFlatWire.java +++ b/src/resonantinduction/wire/render/RenderFlatWire.java @@ -3,7 +3,6 @@ package resonantinduction.wire.render; import java.util.Arrays; import java.util.LinkedList; -import net.minecraft.block.Block; import net.minecraft.util.Icon; import resonantinduction.wire.part.PartFlatWire; import codechicken.lib.lighting.LightModel;