Fix all errors.

This commit is contained in:
Alexander committed 2014-02-05 10:22:35 -05:00
1 parent ffaea7d4b7
commit a83e9a3b53
17 files changed
+91 -36

No files matched your search

@@ -106,10 +106,4 @@ public class CraftingStationBlock extends InventoryBlock
{
return new CraftingStationLogic();
}
@Override
public TileEntity func_149915_a (World arg0, int arg1)
{
return new CraftingStationLogic();
}
}
@@ -120,7 +120,7 @@ public class SmelteryComponent extends LogicComponent
FluidStack liquid = (FluidStack) alloys.get(al);
multitank.addFluidToTank(liquid, true);
}
master.onInventoryChanged();
master.markDirty();
master.setUpdateFluids();
}
}
@@ -259,11 +259,11 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc
}
@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 class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc
@Override
public String getInventoryName ()
{
// TODO Auto-generated method stub
return getDefaultName();
}
@@ -583,4 +582,12 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc
{
return true;
}
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
}
@@ -182,9 +182,9 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
}
@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;
}
@@ -182,9 +182,9 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
}
@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;
}
@@ -128,7 +128,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic
}
if (updateInventory)
{
onInventoryChanged();
markDirty();
}
}
@@ -312,4 +312,12 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic
else
return true;
}*/
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
}
@@ -130,7 +130,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
}
if (updateInventory)
{
onInventoryChanged();
markDirty();
}
}
@@ -352,4 +352,12 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
{
return false;
}
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
}
@@ -189,4 +189,12 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory
{
return false;
}
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
}
@@ -41,4 +41,12 @@ public class PatternChestLogic extends InventoryLogic
{
return true;
}
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
}
@@ -439,7 +439,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
FluidStack liquid = (FluidStack) alloys.get(al);
addMoltenMetal(liquid, true);
}
onInventoryChanged();
markDirty();
}
}
}
@@ -654,11 +654,11 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
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 class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
{
readFromNBT(packet.func_148857_g());
onInventoryChanged();
markDirty();
worldObj.func_147479_m(xCoord, yCoord, zCoord);
this.needsUpdate = true;
}
@@ -221,9 +221,9 @@ public class TileEntityLandmine extends TileEntity implements IInventory
}
@Override
public void onInventoryChanged ()
public void markDirty ()
{
super.onInventoryChanged();
super.markDirty();
this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
@@ -220,7 +220,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
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);
@@ -928,7 +928,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
/**
* Called when an the contents of an Inventory change, usually
*/
public void onInventoryChanged ()
public void markDirty ()
{
}
@@ -1462,4 +1462,12 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
{
return false;
}
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
}
@@ -476,7 +476,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
{
for (int i = 0; i < 5; ++i)
{
if (living.getCurrentItemOrArmor(i) == null)
if (living.getEquipmentInSlot(i) == null)
{
return i;
}
@@ -505,7 +505,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
{
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 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
}
else
{
ItemStack stack = living.getCurrentItemOrArmor(slotID);
ItemStack stack = living.getEquipmentInSlot(slotID);
if (stack == null)
{
living.setCurrentItemOrArmor(slotID, par1ItemStack);
@@ -575,7 +575,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
{
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))
{
@@ -221,7 +221,7 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData
}
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)
@@ -113,7 +113,7 @@ public class ArmorExtended implements IInventory
}
@Override
public void onInventoryChanged ()
public void markDirty ()
{
EntityPlayer player = parent.get();
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
@@ -284,4 +284,12 @@ public class ArmorExtended implements IInventory
}
}
}
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
}
@@ -94,12 +94,6 @@ public class KnapsackInventory implements IInventory
return false;
}
@Override
public void onInventoryChanged ()
{
}
public ItemStack getStackInSlotOnClosing (int slot)
{
return null;
@@ -195,4 +189,16 @@ public class KnapsackInventory implements IInventory
dropper.worldObj.spawnEntityInWorld(entityitem);
}
@Override
public void markDirty() {
}
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
}