more fixes

This commit is contained in:
Progwml6 committed 2014-02-01 14:18:17 -05:00
1 parent 48402e1a7e
commit ffd383dc41
44 files changed
+224 -205

No files matched your search

@@ -36,7 +36,7 @@ public class ConveyorBase extends MantleBlock
}
@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
public AxisAlignedBB func_149668_a (World world, int x, int y, int z)
{
return null;
}
@@ -118,19 +118,19 @@ public class ConveyorBase extends MantleBlock
}
@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}
@Override
public int getRenderBlockPass ()
public int func_149701_w ()
{
return 1;
}
@Override
public int getRenderType ()
public int func_149645_b ()
{
return SlimeChannelRender.model;
}
@@ -149,7 +149,7 @@ public class ConveyorBase extends MantleBlock
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
if (meta >= 8)
return icons[0];
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
@@ -40,7 +41,7 @@ public class CraftingStationBlock extends InventoryBlock
}
@Override
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
return icons[meta * 3 + getTextureIndex(side)];
}
@@ -62,13 +63,13 @@ public class CraftingStationBlock extends InventoryBlock
}
@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}
@Override
public int getRenderType ()
public int func_149645_b ()
{
return TableRender.tabelModelID;
}
@@ -104,11 +105,23 @@ public class CraftingStationBlock extends InventoryBlock
}
@Override
public void getSubBlocks (Block b, CreativeTabs tab, List list)
public void func_149666_a (Item b, CreativeTabs tab, List list)
{
for (int iter = 0; iter < 1; iter++)
{
list.add(new ItemStack(b, 1, iter));
}
}
@Override
public TileEntity func_149915_a (World var1, int metadata)
{
switch (metadata)
{
case 0:
return new CraftingStationLogic();
default:
return null;
}
}
}
@@ -8,7 +8,6 @@ import tconstruct.client.block.DryingRackRender;
import tconstruct.library.TConstructRegistry;
import mantle.blocks.abstracts.InventoryBlock;
import tconstruct.library.tools.AbilityHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
@@ -40,7 +39,7 @@ public class DryingRack extends InventoryBlock
}
@Override
public int getRenderBlockPass ()
public int func_149701_w ()
{
return 1;
}
@@ -78,7 +77,7 @@ public class DryingRack extends InventoryBlock
/* Activation */
@Override
public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
{
return activateDryingRack(world, x, y, z, player);
}
@@ -203,12 +202,12 @@ public class DryingRack extends InventoryBlock
public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity)
{
this.setBlockBoundsBasedOnState(world, x, y, z);
super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
super.func_149743_a(world, x, y, z, aabb, list, entity);
}
/* Rendering */
@Override
public int getRenderType ()
public int func_149645_b ()
{
return DryingRackRender.model;
}
@@ -222,9 +221,9 @@ public class DryingRack extends InventoryBlock
}
@Override
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
return Blocks.planks.getIcon(side, 0);
return Blocks.planks.func_149691_a(side, 0);
}
public int getTextureIndex (int side)
@@ -244,7 +243,7 @@ public class DryingRack extends InventoryBlock
}
@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}
@@ -58,13 +58,13 @@ public class EquipBlock extends InventoryBlock
}
@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}
@Override
public int getRenderType ()
public int func_149645_b ()
{
return FrypanRender.frypanModelID;
}
@@ -122,7 +122,7 @@ public class EquipBlock extends InventoryBlock
@Override
public void func_149749_a (World par1World, int x, int y, int z, int par5, int meta)
{
TileEntity te = par1World.getBlockTileEntity(x, y, z);
TileEntity te = par1World.func_147438_o(x, y, z);
if (te != null && te instanceof EquipLogic)
{
@@ -34,7 +34,7 @@ public class GlassPaneStained extends PaneBase
}
@Override
public int damageDropped (int par1)
public int func_149692_a (int par1)
{
return par1;
}
@@ -37,7 +37,7 @@ public class GravelOre extends BlockSand
}
@Override
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
return icons[meta];
}
@@ -52,7 +52,7 @@ public class GravelOre extends BlockSand
}
@Override
public int damageDropped (int meta)
public int func_149692_a (int meta)
{
/*if (meta == 1)
return 0;*/
@@ -11,6 +11,7 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -157,13 +158,13 @@ public class LavaTankBlock extends BlockContainer
}
@Override
public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
{
ItemStack heldItem = player.inventory.getCurrentItem();
if (heldItem != null)
{
FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(player.getCurrentEquippedItem());
LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z);
if (liquid != null)
{
int amount = logic.fill(ForgeDirection.UNKNOWN, liquid, false);
@@ -237,11 +238,11 @@ public class LavaTankBlock extends BlockContainer
}
@Override
public void getSubBlocks (int id, CreativeTabs tab, List list)
public void getSubBlocks (Item i, CreativeTabs tab, List list)
{
for (int iter = 0; iter < 3; iter++)
{
list.add(new ItemStack(id, 1, iter));
list.add(new ItemStack(i, 1, iter));
}
}
@@ -254,7 +255,7 @@ public class LavaTankBlock extends BlockContainer
/* Updates */
public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockID)
{
TileEntity logic = world.getBlockTileEntity(x, y, z);
TileEntity logic = world.func_147438_o(x, y, z);
if (logic instanceof IServantLogic)
{
((IServantLogic) logic).notifyMasterOfChange();
@@ -267,7 +268,7 @@ public class LavaTankBlock extends BlockContainer
player.addExhaustion(0.025F);
int meta = world.getBlockMetadata(x, y, z);
ItemStack stack = new ItemStack(this, 1, meta);
LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z);
FluidStack liquid = logic.tank.getFluid();
if (liquid != null)
{
@@ -311,7 +312,7 @@ public class LavaTankBlock extends BlockContainer
if (liquidTag != null)
{
FluidStack liquid = FluidStack.loadFluidStackFromNBT(liquidTag);
LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z);
logic.tank.setFluid(liquid);
}
}
@@ -130,15 +130,14 @@ public class SmelteryScan extends TankLayerScan
{
super.readNetworkNBT(tags);
NBTTagList tanks = tags.getTagList("Tanks");
NBTTagList tanks = tags.func_150295_c("Tanks",11);
if (tanks != null)
{
lavaTanks.clear();
for (int i = 0; i < tanks.tagCount(); ++i)
{
NBTTagIntArray tag = (NBTTagIntArray) tanks.tagAt(i);
int[] coord = tag.intArray;
int[] coord = tanks.func_150306_c(i);
layerAirCoords.add(new CoordTuple(coord[0], coord[1], coord[2]));
}
}
@@ -152,7 +151,7 @@ public class SmelteryScan extends TankLayerScan
NBTTagList tanks = new NBTTagList();
for (CoordTuple coord : lavaTanks)
{
tanks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z }));
tanks.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z }));
}
tags.setTag("Tanks", tanks);
}
@@ -517,9 +517,9 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc
super.func_145839_a(tags);
readNetworkNBT(tags);
structure.func_145839_a(tags);
multitank.func_145839_a(tags);
smeltery.func_145839_a(tags);
structure.readFromNBT(tags);
multitank.readFromNBT(tags);
smeltery.readFromNBT(tags);
}
public void readNetworkNBT (NBTTagCompound tags)
@@ -539,9 +539,9 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc
super.func_145841_b(tags);
writeNetworkNBT(tags);
structure.func_145841_b(tags);
multitank.func_145841_b(tags);
smeltery.func_145841_b(tags);
structure.writeToNBT(tags);
multitank.writeToNBT(tags);
smeltery.writeToNBT(tags);
}
public void writeNetworkNBT (NBTTagCompound tags)
@@ -293,7 +293,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
/* Updating */
@Override
public void updateEntity ()
public void func_145845_h ()
{
if (castingDelay > 0)
{
@@ -370,7 +370,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
if (liquid != null)
{
NBTTagCompound nbt = new NBTTagCompound();
liquid.func_145841_b(nbt);
liquid.writeToNBT(nbt);
tags.setTag("Fluid", nbt);
}
tags.setBoolean("Initialized", init);
@@ -547,7 +547,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui
if (liquid != null)
{
NBTTagCompound nbt = new NBTTagCompound();
liquid.func_145841_b(nbt);
liquid.writeToNBT(nbt);
tags.setTag("Fluid", nbt);
}
tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider));
@@ -367,7 +367,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
if (liquid != null)
{
NBTTagCompound nbt = new NBTTagCompound();
liquid.func_145841_b(nbt);
liquid.writeToNBT(nbt);
tags.setTag("Fluid", nbt);
}
tags.setBoolean("Initialized", init);
@@ -35,7 +35,7 @@ public class DryingRackLogic extends InventoryLogic
}
@Override
public void updateEntity ()
public void func_145845_h ()
{
if (!field_145850_b.isRemote && maxTime > 0 && currentTime < maxTime)
{
@@ -66,7 +66,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi
}
@Override
public void updateEntity ()
public void func_145845_h ()
{
if (liquid != null)
{
@@ -157,7 +157,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi
if (liquid != null)
{
NBTTagCompound nbt = new NBTTagCompound();
liquid.func_145841_b(nbt);
liquid.writeToNBT(nbt);
tags.setTag("Fluid", nbt);
}
}
@@ -1078,12 +1078,12 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
meltingTemps = tags.getIntArray("MeltingTemps");
activeTemps = tags.getIntArray("ActiveTemps");
NBTTagList liquidTag = tags.getTagList("Liquids");
NBTTagList liquidTag = tags.func_150295_c("Liquids", 9);
moltenMetal.clear();
for (int iter = 0; iter < liquidTag.tagCount(); iter++)
{
NBTTagCompound nbt = (NBTTagCompound) liquidTag.tagAt(iter);
NBTTagCompound nbt = (NBTTagCompound) liquidTag.func_150305_b(iter);
FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt);
if (fluid != null)
moltenMetal.add(fluid);
@@ -1120,7 +1120,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
for (FluidStack liquid : moltenMetal)
{
NBTTagCompound nbt = new NBTTagCompound();
liquid.func_145841_b(nbt);
liquid.writeToNBT(nbt);
taglist.appendTag(nbt);
}
@@ -147,7 +147,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
{
super.func_145839_a(tags);
readNetworkNBT(tags);
multitank.func_145839_a(tags);
multitank.readFromNBT(tags);
}
public void readNetworkNBT (NBTTagCompound tags)
@@ -161,7 +161,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
{
super.func_145839_a(tags);
writeNetworkNBT(tags);
multitank.func_145841_b(tags);
multitank.writeToNBT(tags);
}
public void writeNetworkNBT (NBTTagCompound tags)
@@ -74,7 +74,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
for (int i = 0; i < nbttaglist.tagCount(); ++i)
{
NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.tagAt(i);
NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.func_150305_b(i);
byte b0 = nbttagcompound1.getByte("Slot");
if (b0 >= 0 && b0 < this.inventory.length)
@@ -31,12 +31,12 @@ public class SlimeGrass extends MantleBlock
{
super(Material.field_151577_b);
func_149711_c(0.6f);
this.setTickRandomly(true);
this.func_149675_a(true);
this.func_149647_a(TConstructRegistry.blockTab);
}
@Override
public int damageDropped (int meta)
public int func_149692_a (int meta)
{
if (meta == 1) //dirt
return 0;
@@ -137,11 +137,11 @@ public class SlimeGrass extends MantleBlock
}
}
public int idDropped (int metadata, Random random, int fortune)
public Block blockDropped (int metadata, Random random, int fortune)
{
if (metadata == 1)
return Blocks.dirt.blockID;
return Blocks.dirt;
else
return TRepo.craftedSoil.blockID;
return TRepo.craftedSoil;
}
}
@@ -82,7 +82,7 @@ public class BarricadeBlock extends MantleBlock
}
@Override
public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9)
public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9)
{
ItemStack stack = player.getCurrentEquippedItem();
if ((stack != null) && (ComparisonHelper.areEquivalent(stack.getItem(), this)) && (!player.isSneaking()))
@@ -31,24 +31,24 @@ public class Landmine extends MantleBlock
super(par4Material);
this.triggerMobType = EnumCreatureType.monster;
this.func_149647_a(TConstructRegistry.blockTab);
this.setTickRandomly(true);
this.func_149675_a(true);
float var5 = 0.0625F;
this.func_149676_a(var5, 0.0F, var5, 1.0F - var5, 0.03125F, 1.0F - var5);
}
public IIcon getBlockTexture (IBlockAccess world, int x, int y, int z, int side)
{
Block block = world.getBlock(x, y - 1, z);
Block block = world.func_147439_a(x, y - 1, z);
if (block != null)
{
return block.getBlockTexture(world, x, y - 1, z, side);
}
return Blocks.sponge.getIcon(side, world.getBlockMetadata(x, y, z));
return Blocks.sponge.func_149691_a(side, world.getBlockMetadata(x, y, z));
}
public IIcon getIcon (int side, int meta)
{
return Blocks.sponge.getIcon(1, meta);
return Blocks.sponge.func_149691_a(1, meta);
}
public void registerIcons (IIconRegister par1IconRegister)
@@ -193,7 +193,7 @@ public class Landmine extends MantleBlock
{
Entity var10 = (Entity) var9.next();
if (!var10.doesEntityNotTriggerPressurePlate())
if (!var10.func_145773_az())
{
var6 = true;
break;
@@ -48,7 +48,7 @@ public class Punji extends MantleBlock
/* Right-click adds sticks */
@Override
public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ)
public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ)
{
/*if (world.isRemote)
return false;*/