mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
more fixes
This commit is contained in:
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;*/
|
||||
|
||||
@@ -32,7 +32,7 @@ public class CartRender extends Render
|
||||
public void renderPullcart (CartEntity cart, double posX, double posY, double posZ, float par8, float par9)
|
||||
{
|
||||
GL11.glPushMatrix();
|
||||
long var10 = (long) cart.entityId * 493286711L;
|
||||
long var10 = (long) cart.field_145783_c * 493286711L;
|
||||
var10 = var10 * var10 * 4392167121L + var10 * 98761L;
|
||||
float var12 = (((float) (var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
|
||||
float var13 = (((float) (var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
|
||||
|
||||
@@ -21,8 +21,8 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
public InventoryPlayer inv;
|
||||
public ArmorExtended stats;
|
||||
|
||||
private float xSize_lo;
|
||||
private float ySize_lo;
|
||||
private float field_146999_f_lo;
|
||||
private float field_147000_g_lo;
|
||||
|
||||
public ArmorExtendedGui(InventoryPlayer inventoryplayer, ArmorExtended holder)
|
||||
{
|
||||
@@ -35,8 +35,8 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
{
|
||||
super.initGui();
|
||||
|
||||
int cornerX = guiLeft;
|
||||
int cornerY = (this.field_146294_l - this.ySize) / 2;
|
||||
int cornerX = field_147003_i;
|
||||
int cornerY = (this.field_146294_l - this.field_147000_g) / 2;
|
||||
this.field_146292_n.clear();
|
||||
|
||||
// InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0);
|
||||
@@ -52,20 +52,20 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
protected void drawGuiContainerForegroundLayer (int par1, int par2)
|
||||
{
|
||||
//fontRenderer.drawString(StatCollector.translateToLocal("inventory.armorextended"), 60, 6, 0x404040);
|
||||
//fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040);
|
||||
//fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (field_147000_g - 96) + 2, 0x404040);
|
||||
}
|
||||
|
||||
public void drawScreen (int par1, int par2, float par3)
|
||||
{
|
||||
super.drawScreen(par1, par2, par3);
|
||||
this.xSize_lo = (float) par1;
|
||||
this.ySize_lo = (float) par2;
|
||||
this.field_146999_f_lo = (float) par1;
|
||||
this.field_147000_g_lo = (float) par2;
|
||||
// if (stats.inventory[2] != null && stats.inventory[2].getItem() == TContent.knapsack)
|
||||
// {
|
||||
// if (this.field_146292_n.size() < 3)
|
||||
// {
|
||||
// int cornerX = guiLeft;
|
||||
// int cornerY = (this.height - this.ySize) / 2;
|
||||
// int cornerX = field_147003_i;
|
||||
// int cornerY = (this.height - this.field_147000_g) / 2;
|
||||
// InventoryTab tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1);
|
||||
// this.field_146292_n.add(tab);
|
||||
// }
|
||||
@@ -81,14 +81,14 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
|
||||
private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/armorextended.png");
|
||||
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
protected void func_146976_a (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
//mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png");
|
||||
this.field_146297_k.getTextureManager().bindTexture(background);
|
||||
int cornerX = guiLeft;
|
||||
int cornerY = (field_146294_l - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
int cornerX = field_147003_i;
|
||||
int cornerY = (field_146294_l - field_147000_g) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g);
|
||||
|
||||
if (!stats.isStackInSlot(0))
|
||||
drawTexturedModalRect(cornerX + 79, cornerY + 16, 176, 9, 18, 18);
|
||||
@@ -105,9 +105,9 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
if (!stats.isStackInSlot(6))
|
||||
drawTexturedModalRect(cornerX + 151, cornerY + 52, 230, 36, 18, 18);
|
||||
|
||||
cornerX = this.guiLeft;
|
||||
cornerY = this.guiTop;
|
||||
drawPlayerOnGui(this.field_146297_k, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.xSize_lo, (float) (cornerY + 75 - 50) - this.ySize_lo);
|
||||
cornerX = this.field_147003_i;
|
||||
cornerY = this.field_147009_r;
|
||||
drawPlayerOnGui(this.field_146297_k, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.field_146999_f_lo, (float) (cornerY + 75 - 50) - this.field_147000_g_lo);
|
||||
}
|
||||
|
||||
public static void drawPlayerOnGui (Minecraft par0Minecraft, int par1, int par2, int par3, float par4, float par5)
|
||||
@@ -143,6 +143,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
}
|
||||
|
||||
|
||||
/*protected void keyTyped(char par1, int par2)
|
||||
{
|
||||
if (par2 == TControls.armorKey.keyCode)
|
||||
|
||||
@@ -32,7 +32,7 @@ public class CraftingStationGui extends GuiContainer
|
||||
{
|
||||
super(logic.getGuiContainer(inventory, world, x, y, z));
|
||||
this.logic = logic;
|
||||
//text = new GuiTextField(this.field_146289_q, this.xSize / 2 - 5, 8, 30, 12);
|
||||
//text = new GuiTextField(this.field_146289_q, this.field_146999_f / 2 - 5, 8, 30, 12);
|
||||
//this.text.setText("");
|
||||
title = "\u00A7nRepair and Modification";
|
||||
body = "The main way to repair or change your tools or armor.\n\nPlace an item and a material on the left to get started.";
|
||||
@@ -40,13 +40,13 @@ public class CraftingStationGui extends GuiContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerForegroundLayer (int par1, int par2)
|
||||
protected void func_146979_b (int par1, int par2)
|
||||
{
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), 8, 6, 0x202020);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x202020);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.field_147000_g - 96 + 2, 0x202020);
|
||||
if (logic.chest != null)
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal(logic.chest.get().func_145825_b()), -108, this.ySize - 160, 0x202020);
|
||||
//this.field_146289_q.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal(logic.chest.get().func_145825_b()), -108, this.field_147000_g - 160, 0x202020);
|
||||
//this.field_146289_q.drawString(toolName + "_", this.field_146999_f / 2 - 18, 8, 0xffffff);
|
||||
|
||||
if (logic.tinkerTable)
|
||||
{
|
||||
@@ -64,7 +64,7 @@ public class CraftingStationGui extends GuiContainer
|
||||
{
|
||||
ToolCore tool = (ToolCore) stack.getItem();
|
||||
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
|
||||
this.drawCenteredString(field_146289_q, "\u00A7n" + tool.getToolName(), xSize + 63, 8, 0xffffff);
|
||||
this.drawCenteredString(field_146289_q, "\u00A7n" + tool.getToolName(), field_146999_f + 63, 8, 0xffffff);
|
||||
|
||||
drawModularToolStats(stack, tool, tags);
|
||||
}
|
||||
@@ -72,7 +72,7 @@ public class CraftingStationGui extends GuiContainer
|
||||
{
|
||||
ArmorCore armor = (ArmorCore) stack.getItem();
|
||||
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("TinkerArmor");
|
||||
this.drawCenteredString(field_146289_q, "\u00A7n" + armor.getClass().getSimpleName(), xSize + 63, 8, 0xffffff);
|
||||
this.drawCenteredString(field_146289_q, "\u00A7n" + armor.getClass().getSimpleName(), field_146999_f + 63, 8, 0xffffff);
|
||||
|
||||
drawModularArmorStats(stack, armor, tags);
|
||||
}
|
||||
@@ -85,7 +85,7 @@ public class CraftingStationGui extends GuiContainer
|
||||
int offset = 0;
|
||||
if (modifiers > 0)
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
}
|
||||
}
|
||||
@@ -104,14 +104,14 @@ public class CraftingStationGui extends GuiContainer
|
||||
{
|
||||
if (maxDur >= 10000)
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation1"), field_146999_f + 8, base + offset * 11, 0xffffff);
|
||||
offset++;
|
||||
field_146289_q.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString("- " + availableDurability + "/" + maxDur, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
}
|
||||
else
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
}
|
||||
}
|
||||
@@ -129,16 +129,16 @@ public class CraftingStationGui extends GuiContainer
|
||||
|
||||
String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10");
|
||||
if (attack % 2 == 0)
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
else
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
|
||||
if (stoneboundDamage != 0)
|
||||
{
|
||||
heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10");
|
||||
String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5");
|
||||
this.field_146289_q.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(bloss + (int) stoneboundDamage / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
}
|
||||
offset++;
|
||||
@@ -151,9 +151,9 @@ public class CraftingStationGui extends GuiContainer
|
||||
int drawSpeed = tags.getInteger("DrawSpeed");
|
||||
float flightSpeed = tags.getFloat("FlightSpeed");
|
||||
float trueDraw = drawSpeed / 20f * flightSpeed;
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
offset++;
|
||||
}
|
||||
@@ -167,28 +167,28 @@ public class CraftingStationGui extends GuiContainer
|
||||
float shatter = tags.getFloat("BreakChance");
|
||||
float accuracy = tags.getFloat("Accuracy");
|
||||
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation10"), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10");
|
||||
if (attack % 2 == 0)
|
||||
this.field_146289_q.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString("- " + attack / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
else
|
||||
this.field_146289_q.drawString("- " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString("- " + attack / 2f + heart, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
int minAttack = attack;
|
||||
int maxAttack = attack * 2;
|
||||
heart = StatCollector.translateToLocal("gui.partcrafter10");
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation11"), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
this.field_146289_q.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
offset++;
|
||||
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff);
|
||||
this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
/*this.field_146289_q.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff);
|
||||
/*this.field_146289_q.drawString("Chance to break: " + df.format(shatter)+"%", field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;*/
|
||||
offset++;
|
||||
}
|
||||
@@ -204,21 +204,21 @@ public class CraftingStationGui extends GuiContainer
|
||||
float trueSpeed = mineSpeed + stoneboundSpeed;
|
||||
float trueSpeed2 = mineSpeed + stoneboundSpeed;
|
||||
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation12"), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
field_146289_q.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
if (stoneboundSpeed != 0)
|
||||
{
|
||||
String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5");
|
||||
field_146289_q.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(bloss + df.format(stoneboundSpeed), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
}
|
||||
offset++;
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation13"), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
field_146289_q
|
||||
.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff);
|
||||
.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
offset++;
|
||||
}
|
||||
@@ -253,15 +253,15 @@ public class CraftingStationGui extends GuiContainer
|
||||
trueSpeed += stoneboundSpeed;
|
||||
if (trueSpeed < 0)
|
||||
trueSpeed = 0;
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
if (stoneboundSpeed != 0)
|
||||
{
|
||||
String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5");
|
||||
field_146289_q.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(bloss + df.format(stoneboundSpeed), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
}
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
offset++;
|
||||
}
|
||||
@@ -269,7 +269,7 @@ public class CraftingStationGui extends GuiContainer
|
||||
{
|
||||
float mineSpeed = tags.getInteger("MiningSpeed");
|
||||
float trueSpeed = mineSpeed / (100f);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
offset++;
|
||||
}
|
||||
@@ -277,12 +277,12 @@ public class CraftingStationGui extends GuiContainer
|
||||
int modifiers = tags.getInteger("Modifiers");
|
||||
if (modifiers > 0)
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
offset++;
|
||||
}
|
||||
if (tags.hasKey("Tooltip1"))
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation17"), field_146999_f + 8, base + offset * 10, 0xffffff);
|
||||
}
|
||||
|
||||
boolean displayToolTips = true;
|
||||
@@ -294,7 +294,7 @@ public class CraftingStationGui extends GuiContainer
|
||||
if (tags.hasKey(tooltip))
|
||||
{
|
||||
String tipName = tags.getString(tooltip);
|
||||
field_146289_q.drawString("- " + tipName, xSize + 8, base + (offset + tipNum) * 10, 0xffffff);
|
||||
field_146289_q.drawString("- " + tipName, field_146999_f + 8, base + (offset + tipNum) * 10, 0xffffff);
|
||||
}
|
||||
else
|
||||
displayToolTips = false;
|
||||
@@ -324,8 +324,8 @@ public class CraftingStationGui extends GuiContainer
|
||||
|
||||
void drawToolInformation ()
|
||||
{
|
||||
this.drawCenteredString(field_146289_q, title, xSize + 63, 8, 0xffffff);
|
||||
field_146289_q.drawSplitString(body, xSize + 8, 24, 115, 0xffffff);
|
||||
this.drawCenteredString(field_146289_q, title, field_146999_f + 63, 8, 0xffffff);
|
||||
field_146289_q.drawSplitString(body, field_146999_f + 8, 24, 115, 0xffffff);
|
||||
}
|
||||
|
||||
private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/tinkertable.png");
|
||||
@@ -334,18 +334,18 @@ public class CraftingStationGui extends GuiContainer
|
||||
private static final ResourceLocation chest = new ResourceLocation("tinker", "textures/gui/chestside.png");
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3)
|
||||
protected void func_146976_a (float par1, int par2, int par3)
|
||||
{
|
||||
// Draw the background
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.field_146297_k.getTextureManager().bindTexture(background);
|
||||
int cornerX = (this.field_146294_l - this.xSize) / 2;
|
||||
int cornerY = (this.field_146295_m - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
|
||||
int cornerX = (this.field_146294_l - this.field_146999_f) / 2;
|
||||
int cornerY = (this.field_146295_m - this.field_147000_g) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.field_146999_f, this.field_147000_g);
|
||||
|
||||
if (active)
|
||||
{
|
||||
this.drawTexturedModalRect(cornerX + 62, cornerY, 0, this.ySize, 112, 22);
|
||||
this.drawTexturedModalRect(cornerX + 62, cornerY, 0, this.field_147000_g, 112, 22);
|
||||
}
|
||||
|
||||
this.field_146297_k.getTextureManager().bindTexture(icons);
|
||||
@@ -363,9 +363,9 @@ public class CraftingStationGui extends GuiContainer
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.field_146297_k.getTextureManager().bindTexture(chest);
|
||||
if (logic.doubleChest == null)
|
||||
this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.ySize);
|
||||
this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.field_147000_g);
|
||||
else
|
||||
this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 122, this.ySize + 21);
|
||||
this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 122, this.field_147000_g + 21);
|
||||
}
|
||||
|
||||
// Draw description
|
||||
@@ -373,9 +373,9 @@ public class CraftingStationGui extends GuiContainer
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.field_146297_k.getTextureManager().bindTexture(description);
|
||||
cornerX = (this.field_146294_l + this.xSize) / 2;
|
||||
cornerY = (this.field_146295_m - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30);
|
||||
cornerX = (this.field_146294_l + this.field_146999_f) / 2;
|
||||
cornerY = (this.field_146295_m - this.field_147000_g) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.field_147000_g + 30);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -23,18 +23,18 @@ public class FrypanGui extends GuiContainer
|
||||
protected void drawGuiContainerForegroundLayer (int par1, int par2)
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 2, 0x404040);
|
||||
}
|
||||
|
||||
private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/frypan.png");
|
||||
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
protected void func_146976_a (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.field_146297_k.getTextureManager().bindTexture(background);
|
||||
int cornerX = (field_146294_l - xSize) / 2;
|
||||
int cornerY = (field_146295_m - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
int cornerX = (field_146294_l - field_146999_f) / 2;
|
||||
int cornerY = (field_146295_m - field_147000_g) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g);
|
||||
if (logic.fuel > 0)
|
||||
{
|
||||
int fuel = logic.gaugeFuelScaled(12);
|
||||
|
||||
@@ -30,20 +30,20 @@ public class FurnaceGui extends GuiContainer
|
||||
protected void drawGuiContainerForegroundLayer (int par1, int par2)
|
||||
{
|
||||
String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.getStringParams(this.logic.getInvName());
|
||||
this.field_146289_q.drawString(s, this.xSize / 2 - this.field_146289_q.getStringWidth(s) / 2, 6, 4210752);
|
||||
this.field_146289_q.drawString(I18n.getStringParams("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
|
||||
this.field_146289_q.drawString(s, this.field_146999_f / 2 - this.field_146289_q.getStringWidth(s) / 2, 6, 4210752);
|
||||
this.field_146289_q.drawString(I18n.getStringParams("container.inventory"), 8, this.field_147000_g - 96 + 2, 4210752);
|
||||
}
|
||||
|
||||
/**
|
||||
* Draw the background layer for the GuiContainer (everything behind the items)
|
||||
*/
|
||||
protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3)
|
||||
protected void func_146976_a (float par1, int par2, int par3)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.field_146297_k.getTextureManager().bindTexture(furnaceGuiTextures);
|
||||
int k = (this.field_146294_l - this.xSize) / 2;
|
||||
int l = (this.field_146295_m - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
|
||||
int k = (this.field_146294_l - this.field_146999_f) / 2;
|
||||
int l = (this.field_146295_m - this.field_147000_g) / 2;
|
||||
this.drawTexturedModalRect(k, l, 0, 0, this.field_146999_f, this.field_147000_g);
|
||||
int i1;
|
||||
|
||||
if (this.logic.isBurning())
|
||||
|
||||
@@ -60,7 +60,7 @@ public class GuiLandmine extends GuiContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerForegroundLayer (int i, int j)
|
||||
protected void func_146979_b (int i, int j)
|
||||
{
|
||||
if (container.te != null)
|
||||
{
|
||||
@@ -70,17 +70,17 @@ public class GuiLandmine extends GuiContainer
|
||||
{
|
||||
field_146289_q.drawString("Landmine", 8, 5, 4210752);
|
||||
}
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, field_147000_g - 96 + 3, 4210752);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
protected void func_146976_a (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
field_146297_k.renderEngine.bindTexture(background);
|
||||
int x = (field_146294_l - xSize) / 2;
|
||||
int y = (field_146295_m - ySize) / 2;
|
||||
this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
|
||||
int x = (field_146294_l - field_146999_f) / 2;
|
||||
int y = (field_146295_m - field_147000_g) / 2;
|
||||
this.drawTexturedModalRect(x, y, 0, 0, field_146999_f, field_147000_g);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -26,8 +26,8 @@ public class KnapsackGui extends GuiContainer
|
||||
{
|
||||
super.initGui();
|
||||
|
||||
int cornerX = guiLeft;
|
||||
int cornerY = (this.field_146294_l - this.ySize) / 2;
|
||||
int cornerX = field_147003_i;
|
||||
int cornerY = (this.field_146294_l - this.field_147000_g) / 2;
|
||||
this.field_146292_n.clear();
|
||||
|
||||
TabRegistry.updateTabValues(cornerX, cornerY, InventoryTabKnapsack.class);
|
||||
@@ -45,18 +45,18 @@ public class KnapsackGui extends GuiContainer
|
||||
protected void drawGuiContainerForegroundLayer (int par1, int par2)
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 4, 0x404040);
|
||||
}
|
||||
|
||||
private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png");
|
||||
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
protected void func_146976_a (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.field_146297_k.getTextureManager().bindTexture(background);
|
||||
int cornerX = guiLeft;
|
||||
int cornerY = (field_146294_l - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
int cornerX = field_147003_i;
|
||||
int cornerY = (field_146294_l - field_147000_g) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g);
|
||||
}
|
||||
|
||||
/*protected void keyTyped(char par1, int par2)
|
||||
|
||||
@@ -18,24 +18,24 @@ public class PatternChestGui extends GuiContainer
|
||||
{
|
||||
super(holder.getGuiContainer(inventoryplayer, world, x, y, z));
|
||||
logic = holder;
|
||||
xSize = 194;
|
||||
ySize = 168;
|
||||
field_146999_f = 194;
|
||||
field_147000_g = 168;
|
||||
}
|
||||
|
||||
protected void drawGuiContainerForegroundLayer (int par1, int par2)
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 17, (field_147000_g - 96) + 2, 0x404040);
|
||||
}
|
||||
|
||||
private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternchest.png");
|
||||
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
protected void func_146976_a (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.field_146297_k.getTextureManager().bindTexture(background);
|
||||
int cornerX = (field_146294_l - xSize) / 2;
|
||||
int cornerY = (field_146295_m - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
int cornerX = (field_146294_l - field_146999_f) / 2;
|
||||
int cornerY = (field_146295_m - field_147000_g) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g);
|
||||
}
|
||||
}
|
||||
@@ -31,21 +31,21 @@ public class StencilTableGui extends GuiContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerForegroundLayer (int par1, int par2)
|
||||
protected void func_146979_b (int par1, int par2)
|
||||
{
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
|
||||
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 2, 0x404040);
|
||||
}
|
||||
|
||||
private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternshaper.png");
|
||||
|
||||
protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3)
|
||||
protected void func_146976_a (float par1, int par2, int par3)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.field_146297_k.getTextureManager().bindTexture(background);
|
||||
int cornerX = (this.field_146294_l - this.xSize) / 2;
|
||||
int cornerY = (this.field_146295_m - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
|
||||
int cornerX = (this.field_146294_l - this.field_146999_f) / 2;
|
||||
int cornerY = (this.field_146295_m - this.field_147000_g) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.field_146999_f, this.field_147000_g);
|
||||
if (!logic.isStackInSlot(0))
|
||||
{
|
||||
this.drawTexturedModalRect(cornerX + 47, cornerY + 34, 176, 0, 18, 18);
|
||||
@@ -55,8 +55,8 @@ public class StencilTableGui extends GuiContainer
|
||||
public void initGui ()
|
||||
{
|
||||
super.initGui();
|
||||
int cornerX = (this.field_146294_l - this.xSize) / 2;
|
||||
int cornerY = (this.field_146295_m - this.ySize) / 2;
|
||||
int cornerX = (this.field_146294_l - this.field_146999_f) / 2;
|
||||
int cornerY = (this.field_146295_m - this.field_147000_g) / 2;
|
||||
|
||||
this.field_146292_n.clear();
|
||||
/*ToolGuiElement repair = TConstruct.toolButtons.get(0);
|
||||
|
||||
@@ -28,8 +28,8 @@ public class TabRegistry
|
||||
if (gui.getClass() == GuiInventory.class)
|
||||
{
|
||||
//Values are public at runtime.
|
||||
int cornerX = gui.guiLeft;
|
||||
int cornerY = gui.guiTop;
|
||||
int cornerX = gui.field_146999_f;
|
||||
int cornerY = gui.field_147009_r;
|
||||
gui.field_146292_n.clear();
|
||||
|
||||
updateTabValues(cornerX, cornerY, InventoryTabVanilla.class);
|
||||
|
||||
@@ -714,7 +714,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
|
||||
|
||||
for (int var3 = 0; var3 < var2.tagCount(); ++var3)
|
||||
{
|
||||
NBTTagCompound var4 = (NBTTagCompound) var2.tagAt(var3);
|
||||
NBTTagCompound var4 = (NBTTagCompound) var2.func_150305_b(var3);
|
||||
int var5 = var4.getByte("Slot") & 255;
|
||||
|
||||
if (var5 >= 0 && var5 < this.cargoItems.length)
|
||||
|
||||
@@ -68,14 +68,14 @@ public class ItemBlockLandmine extends ItemBlock
|
||||
{
|
||||
TRepo.landmine.func_149689_a(world, x, y, z, player, stack);
|
||||
|
||||
TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z);
|
||||
TileEntityLandmine te = (TileEntityLandmine) world.func_147438_o(x, y, z);
|
||||
if (te == null)
|
||||
{
|
||||
te = (TileEntityLandmine) TRepo.landmine.createTileEntity(world, metadata);
|
||||
}
|
||||
|
||||
te.triggerType = stack.getItemDamage();
|
||||
world.setBlockTileEntity(x, y, z, te);
|
||||
world.func_147455_a(x, y, z, te);
|
||||
|
||||
TRepo.landmine.func_149714_e(world, x, y, z, metadata);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.util.List;
|
||||
|
||||
import tconstruct.common.TRepo;
|
||||
import mantle.blocks.abstracts.MultiItemBlock;
|
||||
import mantle.world.WorldHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -41,9 +42,9 @@ public class OreberryBushItem extends MultiItemBlock
|
||||
|
||||
else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack))
|
||||
{
|
||||
Block block = world.getBlock(x, y, z);
|
||||
Block block = world.func_147439_a(x, y, z);
|
||||
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && world.isAirBlock(x, y + 1, z))
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && WorldHelper.isAirBlock(world, x, y + 1, z))
|
||||
{
|
||||
world.func_147465_d(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3);
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.util.List;
|
||||
|
||||
import tconstruct.common.TRepo;
|
||||
import mantle.blocks.abstracts.MultiItemBlock;
|
||||
import mantle.world.WorldHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
@@ -47,9 +48,9 @@ public class OreberryBushSecondItem extends MultiItemBlock
|
||||
|
||||
else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack))
|
||||
{
|
||||
Block block = world.getBlock(x, y, z);
|
||||
Block block = world.func_147439_a(x, y, z);
|
||||
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && world.isAirBlock(x, y + 1, z))
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && WorldHelper.isAirBlock(world, x, y + 1, z))
|
||||
{
|
||||
world.func_147465_d(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3);
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
|
||||
@@ -24,12 +24,12 @@ public class WoolSlab1Item extends MultiItemBlock
|
||||
@Override
|
||||
public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
|
||||
{
|
||||
int id = world.getBlock(x, y, z);
|
||||
Block b = world.func_147439_a(x, y, z);
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
int trueMeta = meta % 8;
|
||||
boolean flag = (id & 8) != 0;
|
||||
|
||||
if ((side == 1 && flag || side == 0 && !flag) && id == this && trueMeta == stack.getItemDamage())
|
||||
if ((side == 1 && flag || side == 0 && !flag) && b == this.block && trueMeta == stack.getItemDamage())
|
||||
{
|
||||
if (world.func_147465_d(x, y, z, Blocks.wool, trueMeta, 3))
|
||||
{
|
||||
|
||||
@@ -185,7 +185,7 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank
|
||||
|
||||
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)
|
||||
fluidlist.add(fluid);
|
||||
|
||||
@@ -497,41 +497,38 @@ public class TankLayerScan extends LogicComponent
|
||||
public void readFromNBT (NBTTagCompound tags)
|
||||
{
|
||||
super.readFromNBT(tags);
|
||||
NBTTagList layerAir = tags.getTagList("AirLayer");
|
||||
NBTTagList layerAir = tags.func_150295_c("AirLayer",11);
|
||||
if (layerAir != null)
|
||||
{
|
||||
layerAirCoords.clear();
|
||||
|
||||
for (int i = 0; i < layerAir.tagCount(); ++i)
|
||||
{
|
||||
NBTTagIntArray tag = (NBTTagIntArray) layerAir.tagAt(i);
|
||||
int[] coord = tag.func_150302_c();
|
||||
int[] coord = layerAir.func_150306_c(i);
|
||||
layerAirCoords.add(new CoordTuple(coord[0], coord[1], coord[2]));
|
||||
}
|
||||
}
|
||||
|
||||
NBTTagList blocks = tags.getTagList("Blocks");
|
||||
NBTTagList blocks = tags.func_150295_c("Blocks", 11);
|
||||
if (blocks != null)
|
||||
{
|
||||
blockCoords.clear();
|
||||
|
||||
for (int i = 0; i < blocks.tagCount(); ++i)
|
||||
{
|
||||
NBTTagIntArray tag = (NBTTagIntArray) blocks.tagAt(i);
|
||||
int[] coord = tag.func_150302_c();
|
||||
int[] coord = blocks.func_150306_c(i);
|
||||
blockCoords.add(new CoordTuple(coord[0], coord[1], coord[2]));
|
||||
}
|
||||
}
|
||||
|
||||
NBTTagList air = tags.getTagList("Air");
|
||||
NBTTagList air = tags.func_150295_c("Air", 11);
|
||||
if (air != null)
|
||||
{
|
||||
airCoords.clear();
|
||||
|
||||
for (int i = 0; i < air.tagCount(); ++i)
|
||||
{
|
||||
NBTTagIntArray tag = (NBTTagIntArray) air.tagAt(i);
|
||||
int[] coord = tag.func_150302_c();
|
||||
int[] coord = air.func_150306_c(i);
|
||||
airCoords.add(new CoordTuple(coord[0], coord[1], coord[2]));
|
||||
}
|
||||
}
|
||||
@@ -550,21 +547,21 @@ public class TankLayerScan extends LogicComponent
|
||||
NBTTagList layerAir = new NBTTagList();
|
||||
for (CoordTuple coord : layerAirCoords)
|
||||
{
|
||||
layerAir.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z }));
|
||||
layerAir.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z }));
|
||||
}
|
||||
tags.setTag("AirLayer", layerAir);
|
||||
|
||||
NBTTagList blocks = new NBTTagList();
|
||||
for (CoordTuple coord : blockCoords)
|
||||
{
|
||||
blocks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z }));
|
||||
blocks.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z }));
|
||||
}
|
||||
tags.setTag("Blocks", blocks);
|
||||
|
||||
NBTTagList air = new NBTTagList();
|
||||
for (CoordTuple coord : airCoords)
|
||||
{
|
||||
air.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z }));
|
||||
air.appendTag(new NBTTagIntArray( new int[] { coord.x, coord.y, coord.z }));
|
||||
}
|
||||
tags.setTag("Air", air);
|
||||
tags.setInteger("structureTop", structureTop);
|
||||
|
||||
@@ -50,7 +50,7 @@ public class AModMoveSpeed extends ArmorModTypeFilter
|
||||
attributes = baseTag.getTagList("AttributeModifiers");
|
||||
for (int iter = 0; iter < attributes.tagCount(); iter++)
|
||||
{
|
||||
NBTTagCompound tag = (NBTTagCompound) attributes.tagAt(iter);
|
||||
NBTTagCompound tag = (NBTTagCompound) attributes.func_150305_b(iter);
|
||||
if (tag.getString("AttributeName").equals(key))
|
||||
attributes.removeTag(iter);
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ public class TActiveOmniMod extends ActiveToolMod
|
||||
|
||||
if (tags.getBoolean("Lava") && block.quantityDropped(meta, 0, random) != 0)
|
||||
{
|
||||
ItemStack smeltStack = new ItemStack(block.IDropped(meta, random, 0), block.quantityDropped(meta, 0, random), block.damageDropped(meta));
|
||||
ItemStack smeltStack = new ItemStack(block.IDropped(meta, random, 0), block.quantityDropped(meta, 0, random), block.func_149692_a(meta));
|
||||
if (smeltStack.getItem() == null)
|
||||
return false;
|
||||
ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(smeltStack);
|
||||
|
||||
@@ -261,7 +261,7 @@ public class ArmorExtended implements IInventory
|
||||
NBTTagList tagList = tags.getTagList("TConstruct.Inventory");
|
||||
for (int i = 0; i < tagList.tagCount(); ++i)
|
||||
{
|
||||
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.tagAt(i);
|
||||
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.func_150305_b(i);
|
||||
int j = nbttagcompound.getByte("Slot") & 255;
|
||||
ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound);
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ public class KnapsackInventory implements IInventory
|
||||
NBTTagList tagList = tags.getTagList("TConstruct.Knapsack");
|
||||
for (int i = 0; i < tagList.tagCount(); ++i)
|
||||
{
|
||||
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.tagAt(i);
|
||||
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.func_150305_b(i);
|
||||
int j = nbttagcompound.getByte("Slot") & 255;
|
||||
ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound);
|
||||
|
||||
|
||||
@@ -77,8 +77,8 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
compound.setTag("display", new NBTTagCompound());
|
||||
compound.getCompoundTag("display").setString("Name", "\u00A7f" + "Fudgy_Fetus' Full Guard Pattern");
|
||||
NBTTagList list = new NBTTagList();
|
||||
list.appendTag(new NBTTagString("Lore", "\u00A72\u00A7o" + "The creator and the creation"));
|
||||
list.appendTag(new NBTTagString("Lore", "\u00A72\u00A7o" + "are united at last!"));
|
||||
list.appendTag(new NBTTagString("\u00A72\u00A7o" + "The creator and the creation"));
|
||||
list.appendTag(new NBTTagString("\u00A72\u00A7o" + "are united at last!"));
|
||||
compound.getCompoundTag("display").setTag("Lore", list);
|
||||
pattern.setTagCompound(compound);
|
||||
|
||||
@@ -93,7 +93,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
compound.setTag("display", new NBTTagCompound());
|
||||
compound.getCompoundTag("display").setString("Name", "\u00A78" + "Cheaty Inventory");
|
||||
NBTTagList list = new NBTTagList();
|
||||
list.appendTag(new NBTTagString("Lore", "\u00A72\u00A7o" + "Nyaa~"));
|
||||
list.appendTag(new NBTTagString("\u00A72\u00A7o" + "Nyaa~"));
|
||||
compound.getCompoundTag("display").setTag("Lore", list);
|
||||
pattern.setTagCompound(compound);
|
||||
|
||||
|
||||
Reference in new issue
Block a user