% Updated version of IC2 this was built against.

% Changed some some things regarding fluids and their handling during loading.

3 files changed, 22 insertions, 22 deletions

diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
index 1c943d3546..8d7f73eb08 100644
--- a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
+++ b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
@@ -2,7 +2,7 @@ package miscutil.xmod.ic2.block.RTGGenerator.gui;
 
 import ic2.core.IC2;
 import ic2.core.block.generator.gui.GuiRTGenerator;
-import ic2.core.util.GuiTooltiphelper;
+import ic2.core.util.GuiTooltipHelper;
 import miscutil.xmod.ic2.block.RTGGenerator.TileEntityRTG;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
@@ -32,7 +32,7 @@ protected void drawGuiContainerForegroundLayer(int par1, int par2)
   {
     this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752);
     
-    GuiTooltiphelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] { Double.valueOf(((TileEntityRTG)this.container.base).storage) }), 117, 38, 150, 48);
+    GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] { Double.valueOf(((TileEntityRTG)this.container.base).storage) }), 117, 38, 150, 48);
   }
   
   @Override
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
index 9b816b7f90..f92636f08e 100644
--- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
+++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
@@ -3,7 +3,7 @@ package miscutil.xmod.ic2.block.kieticgenerator.gui;
 import ic2.core.IC2;
 import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
 import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
-import ic2.core.util.GuiTooltiphelper;
+import ic2.core.util.GuiTooltipHelper;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
@@ -48,8 +48,8 @@ public class GuiKineticWindGenerator
         this.fontRendererObj.drawString(((TileEntityWindKineticGenerator)this.container.base).getRotorhealth() + " %", 46, 70, 2157374);
         if (((TileEntityWindKineticGenerator)this.container.base).guiisoverload())
         {
-          GuiTooltiphelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45);
-          GuiTooltiphelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45);
+          GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45);
+          GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45);
         }
       }
     }
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
index 076697956d..3670dcc36e 100644
--- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
+++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
@@ -1,12 +1,13 @@
 package miscutil.xmod.ic2.block.kieticgenerator.tileentity;
 
 import ic2.api.energy.tile.IKineticSource;
-import ic2.api.item.IKineticWindRotor;
+import ic2.api.item.IKineticRotor;
+import ic2.api.item.IKineticRotor.GearboxType;
 import ic2.core.ContainerBase;
 import ic2.core.IC2;
 import ic2.core.IHasGui;
 import ic2.core.WorldData;
-import ic2.core.block.invslot.InvSlotConsumableIKineticWindRotor;
+import ic2.core.block.invslot.InvSlotConsumableKineticRotor;
 import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
 import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
 import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
@@ -31,7 +32,7 @@ public class TileEntityKineticWindGenerator
 extends TileEntityWindKineticGenerator
 implements IKineticSource, IHasGui
 {
-	public final InvSlotConsumableIKineticWindRotor rotorSlot;
+	public final InvSlotConsumableKineticRotor rotorSlot;
 	private double windStrength;
 	private int obstructedCrossSection;
 	private int crossSection;
@@ -43,11 +44,11 @@ implements IKineticSource, IHasGui
 	public TileEntityKineticWindGenerator()
 	{
 		this.updateTicker = IC2.random.nextInt(getTickRate());
-		this.rotorSlot = new InvSlotConsumableIKineticWindRotor(this, "rotorslot", 0, 1);
+		this.rotorSlot = new InvSlotConsumableKineticRotor(this, "rotorslot", 0, null, 1, null, GearboxType.WIND);
 	}
 
-	@Override
-	public void updateEntity()
+	
+	public void update2Entity()
 	{
 		super.updateEntity();
 
@@ -155,7 +156,6 @@ implements IKineticSource, IHasGui
 		super.setFacing(side);
 	}
 
-	@Override
 	public boolean enableUpdateEntity()
 	{
 		return IC2.platform.isSimulating();
@@ -314,8 +314,8 @@ implements IKineticSource, IHasGui
 	public float getefficiency()
 	{
 		ItemStack stack = this.rotorSlot.get();
-		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
-			return (float) (((IKineticWindRotor)stack.getItem()).getEfficiency(stack)*1.5);
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return (float) (((IKineticRotor)stack.getItem()).getEfficiency(stack)*1.5);
 		}
 		return 0.0F;
 	}
@@ -324,8 +324,8 @@ implements IKineticSource, IHasGui
 	public int getMinWindStrength()
 	{
 		ItemStack stack = this.rotorSlot.get();
-		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
-			return ((IKineticWindRotor)stack.getItem()).getMinWindStrength(stack)/2;
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return ((IKineticRotor)stack.getItem()).getMinWindStrength(stack)/2;
 		}
 		return 0;
 	}
@@ -334,8 +334,8 @@ implements IKineticSource, IHasGui
 	public int getMaxWindStrength()
 	{
 		ItemStack stack = this.rotorSlot.get();
-		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
-			return ((IKineticWindRotor)stack.getItem()).getMaxWindStrength(stack)*2;
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return ((IKineticRotor)stack.getItem()).getMaxWindStrength(stack)*2;
 		}
 		return 0;
 	}
@@ -344,8 +344,8 @@ implements IKineticSource, IHasGui
 	public int getRotorDiameter()
 	{
 		ItemStack stack = this.rotorSlot.get();
-		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
-			return ((IKineticWindRotor)stack.getItem()).getDiameter(stack)/2;
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return ((IKineticRotor)stack.getItem()).getDiameter(stack)/2;
 		}
 		return 0;
 	}
@@ -354,8 +354,8 @@ implements IKineticSource, IHasGui
 	public ResourceLocation getRotorRenderTexture()
 	{
 		ItemStack stack = this.rotorSlot.get();
-		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
-			return ((IKineticWindRotor)stack.getItem()).getRotorRenderTexture(stack);
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return ((IKineticRotor)stack.getItem()).getRotorRenderTexture(stack);
 		}
 		return new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorWoodmodel.png");
 	}