Fix all errors.

SlimeKnights · Feb 5, 2014 · a83e9a3 · a83e9a3
1 parent ffaea7d
commit a83e9a3
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 36 deletions.
diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java
@@ -106,10 +106,4 @@ public TileEntity createNewTileEntity (World arg0, int arg1)
     {
         return new CraftingStationLogic();
     }
-
-    @Override
-    public TileEntity func_149915_a (World arg0, int arg1)
-    {
-        return new CraftingStationLogic();
-    }
 }
diff --git a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java
@@ -120,7 +120,7 @@ else if (activeTemps[i] >= meltingTemps[i] && !world.isRemote)
                                     FluidStack liquid = (FluidStack) alloys.get(al);
                                     multitank.addFluidToTank(liquid, true);
                                 }
-                                master.onInventoryChanged();
+                                master.markDirty();
                                 master.setUpdateFluids();
                             }
                         }

diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
@@ -259,11 +259,11 @@ public ItemStack decrStackSize (int slot, int quantity)
     }
 
     @Override
-    public void onInventoryChanged ()
+    public void markDirty ()
     {
         smeltery.updateTemperatures();
         updateAir = true;
-        super.onInventoryChanged();
+        super.markDirty();
     }
 
     void updateWorldBlock (int slot, ItemStack itemstack)
@@ -574,7 +574,6 @@ public Packet getDescriptionPacket ()
     @Override
     public String getInventoryName ()
     {
-        // TODO Auto-generated method stub
         return getDefaultName();
     }
 
@@ -583,4 +582,12 @@ public boolean hasCustomInventoryName ()
     {
         return true;
     }
+
+	@Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
 }
diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java
@@ -182,9 +182,9 @@ else if (resource.isFluidEqual(this.liquid))
     }
 
     @Override
-    public void onInventoryChanged () //Isn't actually called?
+    public void markDirty () //Isn't actually called?
     {
-        super.onInventoryChanged();
+        super.markDirty();
         worldObj.func_147479_m(xCoord, yCoord, zCoord);
         needsUpdate = true;
     }

diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java
@@ -182,9 +182,9 @@ else if (resource.isFluidEqual(this.liquid))
     }
 
     @Override
-    public void onInventoryChanged () //Isn't actually called?
+    public void markDirty () //Isn't actually called?
     {
-        super.onInventoryChanged();
+        super.markDirty();
         getWorld().func_147479_m(xCoord, yCoord, zCoord);
         needsUpdate = true;
     }

diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java
@@ -128,7 +128,7 @@ public void updateEntity ()
         }
         if (updateInventory)
         {
-            onInventoryChanged();
+            markDirty();
         }
     }
 
@@ -312,4 +312,12 @@ public boolean canDropInventorySlot(int slot)
     	else
     		return true;
     }*/
+
+    @Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
 }
diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java
@@ -130,7 +130,7 @@ public void updateEntity ()
         }
         if (updateInventory)
         {
-            onInventoryChanged();
+            markDirty();
         }
     }
 
@@ -352,4 +352,12 @@ public boolean hasCustomInventoryName ()
     {
         return false;
     }
+
+    @Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
 }
diff --git a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java b/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java
@@ -189,4 +189,12 @@ public boolean hasCustomInventoryName ()
     {
         return false;
     }
+
+	@Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
 }
diff --git a/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java b/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java
@@ -41,4 +41,12 @@ public boolean hasCustomInventoryName ()
     {
         return true;
     }
+
+	@Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
 }
diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java
@@ -439,7 +439,7 @@ else if (activeTemps[i] >= meltingTemps[i])
                                         FluidStack liquid = (FluidStack) alloys.get(al);
                                         addMoltenMetal(liquid, true);
                                     }
-                                    onInventoryChanged();
+                                    markDirty();
                                 }
                             }
                         }
@@ -654,11 +654,11 @@ public int getInventoryStackLimit ()
         return 1;
     }
 
-    public void onInventoryChanged ()
+    public void markDirty ()
     {
         updateTemperatures();
         updateEntity();
-        super.onInventoryChanged();
+        super.markDirty();
         needsUpdate = true;
         //worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
         //worldObj.func_147479_m(xCoord, yCoord, zCoord);
@@ -1141,7 +1141,7 @@ public Packet getDescriptionPacket ()
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
         readFromNBT(packet.func_148857_g());
-        onInventoryChanged();
+        markDirty();
         worldObj.func_147479_m(xCoord, yCoord, zCoord);
         this.needsUpdate = true;
     }

diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java
@@ -221,9 +221,9 @@ public void closeInventory ()
     }
 
     @Override
-    public void onInventoryChanged ()
+    public void markDirty ()
     {
-        super.onInventoryChanged();
+        super.markDirty();
         this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
     }
 

diff --git a/src/main/java/tconstruct/entity/BlueSlime.java b/src/main/java/tconstruct/entity/BlueSlime.java
@@ -220,7 +220,7 @@ public void setSlimeSize (int size)
         this.dataWatcher.updateObject(16, new Byte((byte) size));
         this.setSize(0.6F * (float) size, 0.6F * (float) size);
         this.setPosition(this.posX, this.posY, this.posZ);
-        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.getMaxHealth());
+        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.getMaxHealth());
         this.setHealth(this.getMaxHealth());
 
         this.experienceValue = size + 2 ^ (size);

diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java
@@ -928,7 +928,7 @@ public int getInventoryStackLimit ()
     /**
      * Called when an the contents of an Inventory change, usually
      */
-    public void onInventoryChanged ()
+    public void markDirty ()
     {
     }
 
@@ -1462,4 +1462,12 @@ public boolean hasCustomInventoryName ()
     {
         return false;
     }
+
+	@Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
 }
diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java
@@ -476,7 +476,7 @@ public int getFirstEmptyStack (EntityLivingBase living)
     {
         for (int i = 0; i < 5; ++i)
         {
-            if (living.getCurrentItemOrArmor(i) == null)
+            if (living.getEquipmentInSlot(i) == null)
             {
                 return i;
             }
@@ -505,7 +505,7 @@ private int storePartialItemStack (ItemStack par1ItemStack, EntityLivingBase liv
                 {
                     this.mainInventory[k] = par1ItemStack;
                 }*/
-                if (living.getCurrentItemOrArmor(slotID) == null)
+                if (living.getEquipmentInSlot(slotID) == null)
                 {
                     living.setCurrentItemOrArmor(slotID, par1ItemStack);
                     if (living instanceof EntityLiving)
@@ -530,7 +530,7 @@ private int storePartialItemStack (ItemStack par1ItemStack, EntityLivingBase liv
             }
             else
             {
-                ItemStack stack = living.getCurrentItemOrArmor(slotID);
+                ItemStack stack = living.getEquipmentInSlot(slotID);
                 if (stack == null)
                 {
                     living.setCurrentItemOrArmor(slotID, par1ItemStack);
@@ -575,7 +575,7 @@ private int storeItemStack (ItemStack par1ItemStack, EntityLivingBase living)
     {
         for (int slotID = 0; slotID < 5; ++slotID)
         {
-            ItemStack stack = living.getCurrentItemOrArmor(slotID);
+            ItemStack stack = living.getEquipmentInSlot(slotID);
             if (stack != null && stack == par1ItemStack && stack.isStackable() && stack.stackSize < stack.getMaxStackSize() && stack.stackSize < 64
                     && (!stack.getHasSubtypes() || stack.getItemDamage() == par1ItemStack.getItemDamage()) && ItemStack.areItemStackTagsEqual(stack, par1ItemStack))
             {

diff --git a/src/main/java/tconstruct/entity/projectile/RotatingBase.java b/src/main/java/tconstruct/entity/projectile/RotatingBase.java
@@ -221,7 +221,7 @@ public void onUpdate ()
         }
         Vec3 vec3d = Vec3.createVectorHelper(posX, posY, posZ);
         Vec3 vec3d1 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ);
-        MovingObjectPosition movingobjectposition = worldObj.clip(vec3d, vec3d1);
+        MovingObjectPosition movingobjectposition = worldObj.rayTraceBlocks(vec3d, vec3d1);
         vec3d = Vec3.createVectorHelper(posX, posY, posZ);
         vec3d1 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ);
         if (movingobjectposition != null)

diff --git a/src/main/java/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java
@@ -113,7 +113,7 @@ public int getInventoryStackLimit ()
     }
 
     @Override
-    public void onInventoryChanged ()
+    public void markDirty ()
     {
         EntityPlayer player = parent.get();
         TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
@@ -284,4 +284,12 @@ public void dropItems ()
             }
         }
     }
+
+    @Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
 }
diff --git a/src/main/java/tconstruct/util/player/KnapsackInventory.java b/src/main/java/tconstruct/util/player/KnapsackInventory.java
@@ -94,12 +94,6 @@ public boolean hasCustomInventoryName ()
         return false;
     }
 
-    @Override
-    public void onInventoryChanged ()
-    {
-
-    }
-
     public ItemStack getStackInSlotOnClosing (int slot)
     {
         return null;
@@ -195,4 +189,16 @@ void dropItemEntity (Entity dropper, ItemStack dropStack)
         dropper.worldObj.spawnEntityInWorld(entityitem);
     }
 
+	@Override
+	public void markDirty() {
+	}
+
+	@Override
+	public void openInventory() {
+	}
+
+	@Override
+	public void closeInventory() {
+	}
+
 }