tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Updated UE API

Browse source
This commit is contained in:
Calclavia 2013-12-23 20:16:17 +08:00
parent 1818682c0a
commit eb1fe81b4e
9 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Calclavia-Library

@ -1 +1 @@
Subproject commit c263c191ede3ada3d5f1d0c76231398df60d5b9a Subproject commit fb0750ad43578556f3f058527ecfb830128c125e

4
src/resonantinduction/api/ICapacitor.java
View file

@ -1,12 +1,12 @@
package resonantinduction.api; package resonantinduction.api;
import universalelectricity.api.item.IElectricalItem; import universalelectricity.api.item.IEnergyItem;
/** /**
* @author Calclavia * @author Calclavia
* *
*/ */
public interface ICapacitor extends IElectricalItem public interface ICapacitor extends IEnergyItem
{ {
} }

4
src/resonantinduction/battery/BatteryManager.java
View file

@ -3,7 +3,7 @@ package resonantinduction.battery;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import universalelectricity.api.item.IElectricalItem; import universalelectricity.api.item.IEnergyItem;
public class BatteryManager public class BatteryManager
{ {
@ -33,7 +33,7 @@ public class BatteryManager
@Override @Override
public boolean isItemValid(ItemStack itemstack) public boolean isItemValid(ItemStack itemstack)
{ {
return itemstack.getItem() instanceof IElectricalItem; return itemstack.getItem() instanceof IEnergyItem;
} }
} }
} }

4
src/resonantinduction/battery/SynchronizedBatteryData.java
View file

@ -7,7 +7,7 @@ import java.util.Set;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import resonantinduction.base.ListUtil; import resonantinduction.base.ListUtil;
import universalelectricity.api.item.IElectricalItem; import universalelectricity.api.item.IEnergyItem;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
public class SynchronizedBatteryData public class SynchronizedBatteryData
@ -77,7 +77,7 @@ public class SynchronizedBatteryData
for (int i = 0; i < toSort.length - 1; i++) 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]; temp = toSort[i];
toSort[i] = toSort[i + 1]; toSort[i] = toSort[i + 1];

8
src/resonantinduction/battery/TileEntityBattery.java
View file

@ -7,22 +7,18 @@ import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Set; import java.util.Set;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import resonantinduction.ResonantInduction; import resonantinduction.ResonantInduction;
import resonantinduction.api.ICapacitor; import resonantinduction.api.ICapacitor;
import resonantinduction.base.ListUtil; import resonantinduction.base.ListUtil;
import universalelectricity.api.item.IElectricalItem; import universalelectricity.api.item.IEnergyItem;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import calclavia.lib.network.IPacketReceiver; import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.IPacketSender; import calclavia.lib.network.IPacketSender;
@ -515,7 +511,7 @@ public class TileEntityBattery extends TileEntityElectrical implements IPacketSe
@Override @Override
public boolean isItemValidForSlot(int i, ItemStack itemsSack) public boolean isItemValidForSlot(int i, ItemStack itemsSack)
{ {
return itemsSack.getItem() instanceof IElectricalItem; return itemsSack.getItem() instanceof IEnergyItem;
} }
@Override @Override

4
src/resonantinduction/gui/GuiMultimeter.java
View file

@ -7,15 +7,11 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import resonantinduction.ResonantInduction; import resonantinduction.ResonantInduction;
import resonantinduction.multimeter.ContainerMultimeter; import resonantinduction.multimeter.ContainerMultimeter;
import resonantinduction.multimeter.PartMultimeter; import resonantinduction.multimeter.PartMultimeter;
import calclavia.lib.gui.GuiContainerBase; import calclavia.lib.gui.GuiContainerBase;
import calclavia.lib.prefab.TranslationHelper; import calclavia.lib.prefab.TranslationHelper;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

3
src/resonantinduction/multimeter/PartMultimeter.java
View file

@ -21,8 +21,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.ResonantInduction; import resonantinduction.ResonantInduction;
import resonantinduction.base.PartAdvanced; import resonantinduction.base.PartAdvanced;
import resonantinduction.render.RenderMultimeter; import resonantinduction.render.RenderMultimeter;
import scala.reflect.ClassTag; import universalelectricity.api.CompatibilityType;
import universalelectricity.api.Compatibility.CompatibilityType;
import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IConductor;
import universalelectricity.api.energy.IEnergyContainer; import universalelectricity.api.energy.IEnergyContainer;
import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.energy.IEnergyNetwork;

1
src/resonantinduction/wire/ItemWire.java
View file

@ -22,7 +22,6 @@ import codechicken.lib.vec.Vector3;
import codechicken.multipart.JItemMultiPart; import codechicken.multipart.JItemMultiPart;
import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry;
import codechicken.multipart.TMultiPart; import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

1
src/resonantinduction/wire/render/RenderFlatWire.java
View file

@ -3,7 +3,6 @@ package resonantinduction.wire.render;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
import net.minecraft.block.Block;
import net.minecraft.util.Icon; import net.minecraft.util.Icon;
import resonantinduction.wire.part.PartFlatWire; import resonantinduction.wire.part.PartFlatWire;
import codechicken.lib.lighting.LightModel; import codechicken.lib.lighting.LightModel;