diff --git a/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java b/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java index 0e1bbf13..3a163605 100644 --- a/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java +++ b/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java @@ -29,7 +29,7 @@ public class QuiverArrowRegistry { return 0; }else{ - int idDiff = stack.itemID - stack2.itemID; + int idDiff =0;//COMMENTED TO SHUT UP IDE= stack.itemID - stack2.itemID; if(idDiff != 0){ return idDiff; }else diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index be13efdc..bd72be4a 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -108,7 +108,7 @@ public class TConstruct proxy.registerKeys(); proxy.registerTickHandler(); - GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); + GameRegistry.registerWorldGenerator(new TBaseWorldGenerator(), 0); MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler()); GameRegistry.registerFuelHandler(content); GameRegistry.registerCraftingHandler(new TCraftingHandler()); @@ -152,7 +152,7 @@ public class TConstruct } DimensionBlacklist.getBadBimensions(); - GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool, 0)); + GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool), 2); PluginController.getController().init(); diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java index 9f9bfba1..b43a0a2f 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/blocks/BlockLandmine.java @@ -124,7 +124,7 @@ public class BlockLandmine extends BlockContainer } @Override - public void registerIcons (IIconRegister par1IconRegister) + public void func_149651_a (IIconRegister par1IconRegister) { this.field_149761_L = par1IconRegister.registerIcon("tinker:Landmine"); } diff --git a/src/main/java/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/blocks/CastingChannelBlock.java index 637daf34..c1472495 100644 --- a/src/main/java/tconstruct/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/blocks/CastingChannelBlock.java @@ -94,7 +94,7 @@ public class CastingChannelBlock extends BlockContainer } @Override - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.field_149761_L = iconRegister.registerIcon("tinker:searedstone"); } diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java index e67a0b0c..3eb5b4a1 100644 --- a/src/main/java/tconstruct/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/blocks/ConveyorBase.java @@ -136,7 +136,7 @@ public class ConveyorBase extends MantleBlock } @Override - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { String[] textureNames = new String[] { texturename, texturename + "_flow" }; this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index 96d9c76e..e9af0733 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -7,6 +7,7 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; 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.AxisAlignedBB; diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index ee8d092a..1ba96bae 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -97,7 +97,7 @@ public class FurnaceSlab extends InventorySlab } @Override - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { String[] textureNames = getTextureNames(); this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java index 44a0fb45..29011cf1 100644 --- a/src/main/java/tconstruct/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/blocks/GlassBlock.java @@ -64,7 +64,7 @@ public class GlassBlock extends TConstructBlock @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index 0dc0b4c3..8fe0bfc0 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -611,7 +611,7 @@ public class GlassBlockConnected extends MantleBlock } @Override - public void registerIcons (IIconRegister par1IconRegister) + public void func_149651_a (IIconRegister par1IconRegister) { icons[0] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass"); icons[1] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_1_d"); diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java index a641ce93..e0d483a8 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java @@ -65,7 +65,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected } @Override - public void registerIcons (IIconRegister par1IconRegister) + public void func_149651_a (IIconRegister par1IconRegister) { for (int i = 0; i < textures.length; i++) { diff --git a/src/main/java/tconstruct/blocks/GlassBlockStained.java b/src/main/java/tconstruct/blocks/GlassBlockStained.java index ee4b1cba..05681dc9 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/blocks/GlassBlockStained.java @@ -39,7 +39,7 @@ public class GlassBlockStained extends TConstructBlock @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index c0055488..ed560778 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/blocks/GlassPaneConnected.java @@ -672,9 +672,9 @@ public class GlassPaneConnected extends GlassBlockConnected return Block.opaqueCubeLookup[b] || b == (Block) this || b == Blocks.glass; } - public void registerIcons (IIconRegister par1IconRegister) + public void func_149651_a (IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); + super.func_149651_a(par1IconRegister); this.theIcon = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_side"); } diff --git a/src/main/java/tconstruct/blocks/GlueFluid.java b/src/main/java/tconstruct/blocks/GlueFluid.java index f95bf7cf..160a9849 100644 --- a/src/main/java/tconstruct/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/blocks/GlueFluid.java @@ -25,7 +25,7 @@ public class GlueFluid extends BlockFluidFinite { @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:liquid_glue"); flowIcon = iconRegister.registerIcon("tinker:liquid_glue_flow"); diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index 725c86e0..0745e5d5 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -83,7 +83,7 @@ public class LavaTankBlock extends BlockContainer } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java index f4be97fb..76a73441 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java @@ -33,7 +33,7 @@ public class LiquidMetalFinite extends BlockFluidFinite } @Override - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:" + texture); flowIcon = iconRegister.registerIcon("tinker:" + texture + "_flow"); diff --git a/src/main/java/tconstruct/blocks/MeatBlock.java b/src/main/java/tconstruct/blocks/MeatBlock.java index 7b194ea2..92b9429d 100644 --- a/src/main/java/tconstruct/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/blocks/MeatBlock.java @@ -58,7 +58,7 @@ public class MeatBlock extends Block @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/MultiBrick.java b/src/main/java/tconstruct/blocks/MultiBrick.java index 8bde671d..28f2df02 100644 --- a/src/main/java/tconstruct/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/blocks/MultiBrick.java @@ -142,7 +142,7 @@ public class MultiBrick extends TConstructBlock @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/blocks/MultiBrickFancy.java index 95ad58fe..c3b623be 100644 --- a/src/main/java/tconstruct/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/blocks/MultiBrickFancy.java @@ -156,7 +156,7 @@ public class MultiBrickFancy extends TConstructBlock @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/blocks/OreberryBush.java index f9abbb6f..0e07f74c 100644 --- a/src/main/java/tconstruct/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/blocks/OreberryBush.java @@ -56,7 +56,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.fastIcons = new IIcon[textureNames.length]; this.fancyIcons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/PaneBase.java b/src/main/java/tconstruct/blocks/PaneBase.java index 7298cd7c..978c338a 100644 --- a/src/main/java/tconstruct/blocks/PaneBase.java +++ b/src/main/java/tconstruct/blocks/PaneBase.java @@ -46,7 +46,7 @@ public class PaneBase extends Block @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; this.sideIcons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java index c083e0ee..d5ccaa58 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/blocks/SearedBlock.java @@ -230,7 +230,7 @@ public class SearedBlock extends InventoryBlock } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } diff --git a/src/main/java/tconstruct/blocks/SearedSlab.java b/src/main/java/tconstruct/blocks/SearedSlab.java index e7da7864..30d777be 100644 --- a/src/main/java/tconstruct/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/blocks/SearedSlab.java @@ -26,7 +26,7 @@ public class SearedSlab extends SlabBase @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { } diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index b572f106..e27fed03 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -80,7 +80,7 @@ public class SlabBase extends MantleBlock @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { } diff --git a/src/main/java/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/blocks/SlimePad.java index e715d7bb..28a8db53 100644 --- a/src/main/java/tconstruct/blocks/SlimePad.java +++ b/src/main/java/tconstruct/blocks/SlimePad.java @@ -101,7 +101,7 @@ public class SlimePad extends MantleBlock } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } @@ -125,7 +125,7 @@ public class SlimePad extends MantleBlock } @Override - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { } diff --git a/src/main/java/tconstruct/blocks/SoilSlab.java b/src/main/java/tconstruct/blocks/SoilSlab.java index 729ccbbd..c4a698b2 100644 --- a/src/main/java/tconstruct/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/blocks/SoilSlab.java @@ -27,7 +27,7 @@ public class SoilSlab extends SlabBase @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.field_149761_L = iconRegister.registerIcon("tinker:grass_top"); } diff --git a/src/main/java/tconstruct/blocks/SpeedSlab.java b/src/main/java/tconstruct/blocks/SpeedSlab.java index 817acc84..d44d448a 100644 --- a/src/main/java/tconstruct/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/blocks/SpeedSlab.java @@ -27,7 +27,7 @@ public class SpeedSlab extends SlabBase @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { } diff --git a/src/main/java/tconstruct/blocks/StoneLadder.java b/src/main/java/tconstruct/blocks/StoneLadder.java index 378200cb..5d9a3cef 100644 --- a/src/main/java/tconstruct/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/blocks/StoneLadder.java @@ -23,7 +23,7 @@ public class StoneLadder extends BlockLadder } @Override - public void registerIcons (IIconRegister register) + public void func_149651_a (IIconRegister register) { icon = register.registerIcon("tinker:ladder_stone"); } diff --git a/src/main/java/tconstruct/blocks/TankAirBlock.java b/src/main/java/tconstruct/blocks/TankAirBlock.java index c9a1730d..e7e09c6e 100644 --- a/src/main/java/tconstruct/blocks/TankAirBlock.java +++ b/src/main/java/tconstruct/blocks/TankAirBlock.java @@ -52,7 +52,7 @@ public class TankAirBlock extends BlockContainer } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java index d9941eef..885d9e72 100644 --- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/blocks/ToolForgeBlock.java @@ -46,9 +46,9 @@ public class ToolForgeBlock extends InventoryBlock IIcon textureTop; @Override - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { - super.registerIcons(iconRegister); + super.func_149651_a(iconRegister); textureTop = iconRegister.registerIcon("tinker:toolforge_top"); } @@ -80,7 +80,7 @@ public class ToolForgeBlock extends InventoryBlock } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java index 1ce4b17d..7912f38d 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -149,16 +149,16 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl } } - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); direction = tags.getByte("Direction"); } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); tags.setByte("Direction", direction); } @@ -167,14 +167,14 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - func_145839_a(tag); + func_145841_b(tag); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag); } @Override public void onDataPacket (NetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.data); + func_145839_a(packet.data); field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e); } } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 84af8cb9..29e94548 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -527,14 +527,14 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readNetworkNBT(tags); - structure.readFromNBT(tags); - multitank.readFromNBT(tags); - smeltery.readFromNBT(tags); + structure.func_145839_a(tags); + multitank.func_145839_a(tags); + smeltery.func_145839_a(tags); } public void readNetworkNBT (NBTTagCompound tags) @@ -549,14 +549,14 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); writeNetworkNBT(tags); - structure.func_145839_a(tags); - multitank.func_145839_a(tags); - smeltery.func_145839_a(tags); + structure.func_145841_b(tags); + multitank.func_145841_b(tags); + smeltery.func_145841_b(tags); } public void writeNetworkNBT (NBTTagCompound tags) diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java index 99df39e0..541d1100 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java @@ -340,9 +340,9 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readCustomNBT(tags); } @@ -365,9 +365,9 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); writeCustomNBT(tags); } @@ -377,7 +377,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145839_a(nbt); + liquid.func_145841_b(nbt); tags.setTag("Fluid", nbt); } tags.setBoolean("Initialized", init); @@ -390,14 +390,14 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - func_145839_a(tag); + func_145841_b(tag); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag); } @Override public void onDataPacket (NetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.data); + func_145839_a(packet.data); field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e); } diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java index edc4f9b7..f3de0744 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java @@ -522,9 +522,9 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui } @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readCustomNBT(tags); pullingLiquids = tags.getBoolean("PullingLiquids"); } @@ -542,9 +542,9 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); writeCustomNBT(tags); tags.setBoolean("PullingLiquids", pullingLiquids); } @@ -555,7 +555,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145839_a(nbt); + liquid.func_145841_b(nbt); tags.setTag("Fluid", nbt); } tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider)); diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java index 0d3b0447..829a371d 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java @@ -264,7 +264,6 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl @Override public boolean canDrain (ForgeDirection from, Fluid fluid) { - // TODO Auto-generated method stub return false; } @@ -340,9 +339,9 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readCustomNBT(tags); } @@ -363,9 +362,9 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); writeCustomNBT(tags); } @@ -375,7 +374,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145839_a(nbt); + liquid.func_145841_b(nbt); tags.setTag("Fluid", nbt); } tags.setBoolean("Initialized", init); @@ -395,7 +394,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl @Override public void onDataPacket (NetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.data); + func_145839_a(packet.data); getWorld().markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e); } diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 4f955554..d5ec255e 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -77,7 +77,7 @@ public class DryingRackLogic extends InventoryLogic } @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { currentTime = tags.getInteger("Time"); maxTime = tags.getInteger("MaxTime"); @@ -85,7 +85,7 @@ public class DryingRackLogic extends InventoryLogic } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { tags.setInteger("Time", currentTime); tags.setInteger("MaxTime", maxTime); @@ -94,12 +94,12 @@ public class DryingRackLogic extends InventoryLogic public void readCustomNBT (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); } public void writeCustomNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); } /* Packets */ diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java index e0b6b391..64fbfbc7 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java @@ -131,9 +131,9 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi } @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readCustomNBT(tags); } @@ -149,9 +149,9 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); writeCustomNBT(tags); } @@ -162,7 +162,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145839_a(nbt); + liquid.func_145841_b(nbt); tags.setTag("Fluid", nbt); } } diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java index 86fce7f4..f8981d6a 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java @@ -270,17 +270,17 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic } /* NBT */ - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); active = tags.getBoolean("Active"); fuel = tags.getInteger("Fuel"); fuelGague = tags.getInteger("FuelGague"); } - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); tags.setBoolean("Active", active); tags.setInteger("Fuel", fuel); tags.setInteger("FuelGague", fuelGague); diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index 0458a338..d2252874 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -255,18 +255,18 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin } /* NBT */ - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); active = tags.getBoolean("Active"); fuel = tags.getInteger("Fuel"); fuelGague = tags.getInteger("FuelGague"); readNetworkNBT(tags); } - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); tags.setBoolean("Active", active); tags.setInteger("Fuel", fuel); tags.setInteger("FuelGague", fuelGague); diff --git a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java index 9a11e9e0..e4b30c43 100644 --- a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java @@ -114,16 +114,16 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler } @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readCustomNBT(tags); } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); writeCustomNBT(tags); } diff --git a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java index 58f00478..5e8b9c15 100644 --- a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java @@ -26,9 +26,9 @@ public class LiquidTextureLogic extends TileEntity return texturePos; } - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readCustomNBT(tags); } @@ -37,9 +37,9 @@ public class LiquidTextureLogic extends TileEntity texturePos = tags.getInteger("Texture"); } - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); writeCustomNBT(tags); } diff --git a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java b/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java index 50254d09..dc447cbb 100644 --- a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java @@ -146,16 +146,16 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory } /* NBT */ - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); craftedTop = tags.getBoolean("CraftedTop"); craftedBottom = tags.getBoolean("CraftedBottom"); } - public void writeToNBT (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145841_b(tags); tags.setBoolean("CraftedTop", craftedTop); tags.setBoolean("CraftedBottom", craftedBottom); } @@ -177,4 +177,16 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { return false; } + + @Override + public String func_145825_b () + { + return getDefaultName(); + } + + @Override + public boolean func_145818_k_ () + { + return false; + } } diff --git a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java index 991a2d25..32365036 100644 --- a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java +++ b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java @@ -41,16 +41,16 @@ public class RedwireLogic extends TileEntity } @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readCustomNBT(tags); } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); writeCustomNBT(tags); } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java index fcb41435..eb9ee8d3 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -155,16 +155,16 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl } } - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); direction = tags.getByte("Direction"); } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); tags.setByte("Direction", direction); } @@ -173,14 +173,14 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - func_145839_a(tag); + func_145841_b(tag); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag); } @Override public void onDataPacket (NetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.data); + func_145839_a(packet.data); field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e); } } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index e03b2940..69133ee9 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -1070,11 +1070,11 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { layers = tags.getInteger("Layers"); inventory = new ItemStack[layers * 9]; - super.readFromNBT(tags); + super.func_145839_a(tags); //validStructure = tags.getBoolean("ValidStructure"); internalTemp = tags.getInteger("InternalTemp"); @@ -1108,9 +1108,9 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { - super.func_145839_a(tags); + super.func_145841_b(tags); //tags.setBoolean("ValidStructure", validStructure); tags.setInteger("InternalTemp", internalTemp); @@ -1135,7 +1135,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci for (FluidStack liquid : moltenMetal) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145839_a(nbt); + liquid.func_145841_b(nbt); taglist.appendTag(nbt); } @@ -1154,7 +1154,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci @Override public void onDataPacket (NetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.data); + func_145839_a(packet.data); onInventoryChanged(); field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e); this.needsUpdate = true; diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java index e8e23f30..fd58e6c9 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java @@ -150,11 +150,11 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.readFromNBT(tags); + super.func_145839_a(tags); readNetworkNBT(tags); - multitank.readFromNBT(tags); + multitank.func_145839_a(tags); } public void readNetworkNBT (NBTTagCompound tags) @@ -164,11 +164,11 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide } @Override - public void func_145839_a (NBTTagCompound tags) + public void func_145841_b (NBTTagCompound tags) { super.func_145839_a(tags); writeNetworkNBT(tags); - multitank.func_145839_a(tags); + multitank.func_145841_b(tags); } public void writeNetworkNBT (NBTTagCompound tags) diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java index 78789d7b..e02142e6 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -44,9 +44,9 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public void func_145839_a (NBTTagCompound par1NBTTagCompound) + public void func_145841_b (NBTTagCompound par1NBTTagCompound) { - super.func_145839_a(par1NBTTagCompound); + super.func_145841_b(par1NBTTagCompound); NBTTagList nbttaglist = new NBTTagList(); for (int i = 0; i < this.inventory.length; ++i) @@ -55,7 +55,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); nbttagcompound1.setByte("Slot", (byte) i); - this.inventory[i].func_145839_a(nbttagcompound1); + this.inventory[i].writeToNBT(nbttagcompound1); nbttaglist.appendTag(nbttagcompound1); } } @@ -71,9 +71,9 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public void readFromNBT (NBTTagCompound par1NBTTagCompound) + public void func_145839_a (NBTTagCompound par1NBTTagCompound) { - super.readFromNBT(par1NBTTagCompound); + super.func_145839_a(par1NBTTagCompound); NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items"); this.inventory = new ItemStack[this.getSizeInventory()]; @@ -100,14 +100,14 @@ public class TileEntityLandmine extends TileEntity implements IInventory public Packet getDescriptionPacket () { NBTTagCompound nbt = new NBTTagCompound(); - func_145839_a(nbt); + func_145841_b(nbt); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 0, nbt); } @Override public void onDataPacket (NetworkManager net, Packet132TileEntityData packet) { - readFromNBT(packet.data); + func_145839_a(packet.data); } @Override diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index 7e750812..531ddecf 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -27,7 +27,7 @@ public class SlimeFluid extends BlockFluidClassic @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:slime_blue"); flowIcon = iconRegister.registerIcon("tinker:slime_blue_flow"); diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index f9e33156..4e4edc45 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -48,7 +48,7 @@ public class SlimeGrass extends MantleBlock @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 13a4da3f..39e49df7 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -55,7 +55,7 @@ public class SlimeLeaves extends BlockLeaves @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.fastIcons = new IIcon[fastLeaves.length]; this.fancyIcons = new IIcon[fancyLeaves.length]; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 6c7de095..77de3f02 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -38,7 +38,7 @@ public class SlimeSapling extends BlockSapling @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 1c8e87e0..6a793b11 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -38,7 +38,7 @@ public class BarricadeBlock extends MantleBlock } @Override - public void registerIcons (IIconRegister par1IconRegister) + public void func_149651_a (IIconRegister par1IconRegister) { } diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 3b2d059e..4723b6f9 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -104,7 +104,7 @@ public class Punji extends MantleBlock @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { this.field_149761_L = iconRegister.registerIcon("tinker:punji"); } diff --git a/src/main/java/tconstruct/client/TControls.java b/src/main/java/tconstruct/client/TControls.java index c3694a42..4af87911 100644 --- a/src/main/java/tconstruct/client/TControls.java +++ b/src/main/java/tconstruct/client/TControls.java @@ -45,7 +45,7 @@ public class TControls extends TKeyHandler { mc = Minecraft.getMinecraft(); jumpKey = mc.gameSettings.keyBindJump; - invKey = mc.gameSettings.keyBindInventory; + invKey = mc.gameSettings.field_151445_Q; return new KeyBinding[] { jumpKey, invKey }; } diff --git a/src/main/java/tconstruct/client/entity/CartRender.java b/src/main/java/tconstruct/client/entity/CartRender.java index e8941ea7..a34c0a5f 100644 --- a/src/main/java/tconstruct/client/entity/CartRender.java +++ b/src/main/java/tconstruct/client/entity/CartRender.java @@ -98,7 +98,7 @@ public class CartRender extends Render if (cart.getCartType() == 1) { GL11.glTranslatef(0.0F, 0.5F, 0.0F); - renderblocks.renderBlockAsItem(Blocks.chest, 0, cart.getBrightness(par9)); + renderblocks.func_147800_a(Blocks.chest, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.5F, 0.0F, -0.5F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -106,7 +106,7 @@ public class CartRender extends Render else if (cart.getCartType() == 2) { GL11.glTranslatef(0.0F, 0.3125F, 0.0F); - renderblocks.renderBlockAsItem(Blocks.furnace, 0, cart.getBrightness(par9)); + renderblocks.func_147800_a(Blocks.furnace, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.3125F, 0.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/tconstruct/client/entity/FancyItemRender.java b/src/main/java/tconstruct/client/entity/FancyItemRender.java index da1dbcac..f05cecb8 100644 --- a/src/main/java/tconstruct/client/entity/FancyItemRender.java +++ b/src/main/java/tconstruct/client/entity/FancyItemRender.java @@ -74,7 +74,7 @@ public class FancyItemRender extends Render block = BlockUtils.getBlockFromItem(itemstack.getItem()); - if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c)) + if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c,1)) { ; } @@ -112,7 +112,7 @@ public class FancyItemRender extends Render } f5 = 1.0F; - this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); + this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } } @@ -344,7 +344,7 @@ public class FancyItemRender extends Render GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); this.itemRenderBlocks.field_147844_c = this.renderWithColor; - this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); + this.itemRenderBlocks.func_147800_a(block, l, 1.0F); this.itemRenderBlocks.field_147844_c = true; GL11.glPopMatrix(); } diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index d5d1177b..96f6fdff 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -54,7 +54,7 @@ public class ExplosiveRender extends Render f2 = (1.0F - ((float) par1EntityTNTPrimed.fuse - par9 + 1.0F) / 100.0F) * 0.8F; this.bindEntityTexture(par1EntityTNTPrimed); - this.blockRenderer.renderBlockAsItem(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); + this.blockRenderer.func_147800_a(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); if (par1EntityTNTPrimed.fuse / 5 % 2 == 0) { @@ -63,7 +63,7 @@ public class ExplosiveRender extends Render GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); GL11.glColor4f(1.0F, 1.0F, 1.0F, f2); - this.blockRenderer.renderBlockAsItem(Blocks.tnt, 0, 1.0F); + this.blockRenderer.func_147800_a(Blocks.tnt, 0, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index c2273140..eef18515 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -100,7 +100,7 @@ public class ArrowRender extends Render } f5 = 1.0F; - this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); + this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } } diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java index 9e8eba05..263d7e8e 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -47,7 +47,7 @@ public class ArrowRenderCustom extends Render GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); float scale = 1.35f; GL11.glScalef(scale, scale, scale); - ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c); + ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c, 1); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); } diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index 42aa27ca..bc69173f 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -106,7 +106,7 @@ public class DaggerRender extends Render } f5 = 1.0F; - this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); + this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } } @@ -333,7 +333,7 @@ public class DaggerRender extends Render GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); this.itemRenderBlocks.field_147844_c = this.renderWithColor; - this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); + this.itemRenderBlocks.func_147800_a(block, l, 1.0F); this.itemRenderBlocks.field_147844_c = true; GL11.glPopMatrix(); } diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java index fa57b194..535b93ed 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -54,7 +54,7 @@ public class DaggerRenderCustom extends Render GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); float scale = 1.35f; GL11.glScalef(scale, scale, scale); - ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c); + ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c,1); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); } diff --git a/src/main/java/tconstruct/client/gui/NewContainerGui.java b/src/main/java/tconstruct/client/gui/NewContainerGui.java index 39b93aa1..e916a09e 100644 --- a/src/main/java/tconstruct/client/gui/NewContainerGui.java +++ b/src/main/java/tconstruct/client/gui/NewContainerGui.java @@ -830,7 +830,7 @@ public abstract class NewContainerGui extends GuiScreen */ protected void keyTyped (char par1, int par2) { - if (par2 == 1 || par2 == this.field_146297_k.gameSettings.keyBindInventory.keyCode) + if (par2 == 1 || par2 == this.field_146297_k.gameSettings.field_151445_Q.keyCode) { this.field_146297_k.thePlayer.closeScreen(); } diff --git a/src/main/java/tconstruct/client/gui/ToolStationGui.java b/src/main/java/tconstruct/client/gui/ToolStationGui.java index e655aebd..cedbe846 100644 --- a/src/main/java/tconstruct/client/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/client/gui/ToolStationGui.java @@ -464,7 +464,7 @@ public class ToolStationGui extends NewContainerGui protected void keyTyped (char par1, int keyCode) { - if (keyCode == 1 || (!active && keyCode == this.field_146297_k.gameSettings.keyBindInventory.keyCode)) + if (keyCode == 1 || (!active && keyCode == this.field_146297_k.gameSettings.field_151445_Q.keyCode)) { logic.setToolname(""); updateServer(""); diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index e4329230..b896e63a 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -152,7 +152,7 @@ public class TContent implements IFuelHandler TRepo.moltenIronFluid = FluidRegistry.getFluid("iron.molten"); TRepo.moltenIron = new TConstructFluid(PHConstruct.moltenIron, TRepo.moltenIronFluid, Material.field_151587_i, "liquid_iron").func_149663_c("fluid.molten.iron"); GameRegistry.registerBlock(TRepo.moltenIron, "fluid.molten.iron"); - TRepo.moltenIronFluid.setBlockID(TRepo.moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenIronFluid.setBlock(TRepo.moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenIronFluid, 1000), new ItemStack(TRepo.buckets, 1, 0), new ItemStack(Items.bucket))); TRepo.moltenGoldFluid = new Fluid("gold.molten"); @@ -160,7 +160,7 @@ public class TContent implements IFuelHandler TRepo.moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); TRepo.moltenGold = new TConstructFluid(PHConstruct.moltenGold, TRepo.moltenGoldFluid, Material.field_151587_i, "liquid_gold").func_149663_c("fluid.molten.gold"); GameRegistry.registerBlock(TRepo.moltenGold, "fluid.molten.gold"); - TRepo.moltenGoldFluid.setBlockID(TRepo.moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenGoldFluid.setBlock(TRepo.moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGoldFluid, 1000), new ItemStack(TRepo.buckets, 1, 1), new ItemStack(Items.bucket))); TRepo.moltenCopperFluid = new Fluid("copper.molten"); @@ -168,7 +168,7 @@ public class TContent implements IFuelHandler TRepo.moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); TRepo.moltenCopper = new TConstructFluid(PHConstruct.moltenCopper, TRepo.moltenCopperFluid, Material.field_151587_i, "liquid_copper").func_149663_c("fluid.molten.copper"); GameRegistry.registerBlock(TRepo.moltenCopper, "fluid.molten.copper"); - TRepo.moltenCopperFluid.setBlockID(TRepo.moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenCopperFluid.setBlock(TRepo.moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCopperFluid, 1000), new ItemStack(TRepo.buckets, 1, 2), new ItemStack(Items.bucket))); TRepo.moltenTinFluid = new Fluid("tin.molten"); @@ -176,7 +176,7 @@ public class TContent implements IFuelHandler TRepo.moltenTinFluid = FluidRegistry.getFluid("tin.molten"); TRepo.moltenTin = new TConstructFluid(PHConstruct.moltenTin, TRepo.moltenTinFluid, Material.field_151587_i, "liquid_tin").func_149663_c("fluid.molten.tin"); GameRegistry.registerBlock(TRepo.moltenTin, "fluid.molten.tin"); - TRepo.moltenTinFluid.setBlockID(TRepo.moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenTinFluid.setBlock(TRepo.moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenTinFluid, 1000), new ItemStack(TRepo.buckets, 1, 3), new ItemStack(Items.bucket))); TRepo.moltenAluminumFluid = new Fluid("aluminum.molten"); @@ -184,7 +184,7 @@ public class TContent implements IFuelHandler TRepo.moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); TRepo.moltenAluminum = new TConstructFluid(PHConstruct.moltenAluminum, TRepo.moltenAluminumFluid, Material.field_151587_i, "liquid_aluminum").func_149663_c("fluid.molten.aluminum"); GameRegistry.registerBlock(TRepo.moltenAluminum, "fluid.molten.aluminum"); - TRepo.moltenAluminumFluid.setBlockID(TRepo.moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenAluminumFluid.setBlock(TRepo.moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAluminumFluid, 1000), new ItemStack(TRepo.buckets, 1, 4), new ItemStack(Items.bucket))); TRepo.moltenCobaltFluid = new Fluid("cobalt.molten"); @@ -192,7 +192,7 @@ public class TContent implements IFuelHandler TRepo.moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); TRepo.moltenCobalt = new TConstructFluid(PHConstruct.moltenCobalt, TRepo.moltenCobaltFluid, Material.field_151587_i, "liquid_cobalt").func_149663_c("fluid.molten.cobalt"); GameRegistry.registerBlock(TRepo.moltenCobalt, "fluid.molten.cobalt"); - TRepo.moltenCobaltFluid.setBlockID(TRepo.moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenCobaltFluid.setBlock(TRepo.moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCobaltFluid, 1000), new ItemStack(TRepo.buckets, 1, 5), new ItemStack(Items.bucket))); TRepo.moltenArditeFluid = new Fluid("ardite.molten"); @@ -200,7 +200,7 @@ public class TContent implements IFuelHandler TRepo.moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); TRepo.moltenArdite = new TConstructFluid(PHConstruct.moltenArdite, TRepo.moltenArditeFluid, Material.field_151587_i, "liquid_ardite").func_149663_c("fluid.molten.ardite"); GameRegistry.registerBlock(TRepo.moltenArdite, "fluid.molten.ardite"); - TRepo.moltenArditeFluid.setBlockID(TRepo.moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenArditeFluid.setBlock(TRepo.moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenArditeFluid, 1000), new ItemStack(TRepo.buckets, 1, 6), new ItemStack(Items.bucket))); TRepo.moltenBronzeFluid = new Fluid("bronze.molten"); @@ -208,7 +208,7 @@ public class TContent implements IFuelHandler TRepo.moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); TRepo.moltenBronze = new TConstructFluid(PHConstruct.moltenBronze, TRepo.moltenBronzeFluid, Material.field_151587_i, "liquid_bronze").func_149663_c("fluid.molten.bronze"); GameRegistry.registerBlock(TRepo.moltenBronze, "fluid.molten.bronze"); - TRepo.moltenBronzeFluid.setBlockID(TRepo.moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenBronzeFluid.setBlock(TRepo.moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenBronzeFluid, 1000), new ItemStack(TRepo.buckets, 1, 7), new ItemStack(Items.bucket))); TRepo.moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); @@ -216,7 +216,7 @@ public class TContent implements IFuelHandler TRepo.moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); TRepo.moltenAlubrass = new TConstructFluid(PHConstruct.moltenAlubrass, TRepo.moltenAlubrassFluid, Material.field_151587_i, "liquid_alubrass").func_149663_c("fluid.molten.alubrass"); GameRegistry.registerBlock(TRepo.moltenAlubrass, "fluid.molten.alubrass"); - TRepo.moltenAlubrassFluid.setBlockID(TRepo.moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenAlubrassFluid.setBlock(TRepo.moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAlubrassFluid, 1000), new ItemStack(TRepo.buckets, 1, 8), new ItemStack(Items.bucket))); TRepo.moltenManyullynFluid = new Fluid("manyullyn.molten"); @@ -224,7 +224,7 @@ public class TContent implements IFuelHandler TRepo.moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); TRepo.moltenManyullyn = new TConstructFluid(PHConstruct.moltenManyullyn, TRepo.moltenManyullynFluid, Material.field_151587_i, "liquid_manyullyn").func_149663_c("fluid.molten.manyullyn"); GameRegistry.registerBlock(TRepo.moltenManyullyn, "fluid.molten.manyullyn"); - TRepo.moltenManyullynFluid.setBlockID(TRepo.moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenManyullynFluid.setBlock(TRepo.moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenManyullynFluid, 1000), new ItemStack(TRepo.buckets, 1, 9), new ItemStack(Items.bucket))); TRepo.moltenAlumiteFluid = new Fluid("alumite.molten"); @@ -232,7 +232,7 @@ public class TContent implements IFuelHandler TRepo.moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); TRepo.moltenAlumite = new TConstructFluid(PHConstruct.moltenAlumite, TRepo.moltenAlumiteFluid, Material.field_151587_i, "liquid_alumite").func_149663_c("fluid.molten.alumite"); GameRegistry.registerBlock(TRepo.moltenAlumite, "fluid.molten.alumite"); - TRepo.moltenAlumiteFluid.setBlockID(TRepo.moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenAlumiteFluid.setBlock(TRepo.moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAlumiteFluid, 1000), new ItemStack(TRepo.buckets, 1, 10), new ItemStack(Items.bucket))); TRepo.moltenObsidianFluid = new Fluid("obsidian.molten"); @@ -240,7 +240,7 @@ public class TContent implements IFuelHandler TRepo.moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); TRepo.moltenObsidian = new TConstructFluid(PHConstruct.moltenObsidian, TRepo.moltenObsidianFluid, Material.field_151587_i, "liquid_obsidian").func_149663_c("fluid.molten.obsidian"); GameRegistry.registerBlock(TRepo.moltenObsidian, "fluid.molten.obsidian"); - TRepo.moltenObsidianFluid.setBlockID(TRepo.moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenObsidianFluid.setBlock(TRepo.moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenObsidianFluid, 1000), new ItemStack(TRepo.buckets, 1, 11), new ItemStack(Items.bucket))); TRepo.moltenSteelFluid = new Fluid("steel.molten"); @@ -248,7 +248,7 @@ public class TContent implements IFuelHandler TRepo.moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); TRepo.moltenSteel = new TConstructFluid(PHConstruct.moltenSteel, TRepo.moltenSteelFluid, Material.field_151587_i, "liquid_steel").func_149663_c("fluid.molten.steel"); GameRegistry.registerBlock(TRepo.moltenSteel, "fluid.molten.steel"); - TRepo.moltenSteelFluid.setBlockID(TRepo.moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenSteelFluid.setBlock(TRepo.moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenSteelFluid, 1000), new ItemStack(TRepo.buckets, 1, 12), new ItemStack(Items.bucket))); TRepo.moltenGlassFluid = new Fluid("glass.molten"); @@ -256,7 +256,7 @@ public class TContent implements IFuelHandler TRepo.moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); TRepo.moltenGlass = new TConstructFluid(PHConstruct.moltenGlass, TRepo.moltenGlassFluid, Material.field_151587_i, "liquid_glass", true).func_149663_c("fluid.molten.glass"); GameRegistry.registerBlock(TRepo.moltenGlass, "fluid.molten.glass"); - TRepo.moltenGlassFluid.setBlockID(TRepo.moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenGlassFluid.setBlock(TRepo.moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGlassFluid, 1000), new ItemStack(TRepo.buckets, 1, 13), new ItemStack(Items.bucket))); TRepo.moltenStoneFluid = new Fluid("stone.seared"); @@ -264,7 +264,7 @@ public class TContent implements IFuelHandler TRepo.moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); TRepo.moltenStone = new TConstructFluid(PHConstruct.moltenStone, TRepo.moltenStoneFluid, Material.field_151587_i, "liquid_stone").func_149663_c("molten.stone"); GameRegistry.registerBlock(TRepo.moltenStone, "molten.stone"); - TRepo.moltenStoneFluid.setBlockID(TRepo.moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenStoneFluid.setBlock(TRepo.moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenStoneFluid, 1000), new ItemStack(TRepo.buckets, 1, 14), new ItemStack(Items.bucket))); TRepo.moltenEmeraldFluid = new Fluid("emerald.liquid"); @@ -272,7 +272,7 @@ public class TContent implements IFuelHandler TRepo.moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid"); TRepo.moltenEmerald = new TConstructFluid(PHConstruct.moltenEmerald, TRepo.moltenEmeraldFluid, Material.field_151586_h, "liquid_villager").func_149663_c("molten.emerald"); GameRegistry.registerBlock(TRepo.moltenEmerald, "molten.emerald"); - TRepo.moltenEmeraldFluid.setBlockID(TRepo.moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenEmeraldFluid.setBlock(TRepo.moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEmeraldFluid, 1000), new ItemStack(TRepo.buckets, 1, 15), new ItemStack(Items.bucket))); TRepo.bloodFluid = new Fluid("blood"); @@ -280,7 +280,7 @@ public class TContent implements IFuelHandler TRepo.bloodFluid = FluidRegistry.getFluid("blood"); TRepo.blood = new BloodBlock(PHConstruct.blood, TRepo.bloodFluid, Material.field_151586_h, "liquid_cow").func_149663_c("liquid.blood"); GameRegistry.registerBlock(TRepo.blood, "liquid.blood"); - TRepo.bloodFluid.setBlockID(TRepo.blood).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.bloodFluid.setBlock(TRepo.blood).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.bloodFluid, 1000), new ItemStack(TRepo.buckets, 1, 16), new ItemStack(Items.bucket))); TRepo.moltenNickelFluid = new Fluid("nickel.molten"); @@ -288,7 +288,7 @@ public class TContent implements IFuelHandler TRepo.moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); TRepo.moltenNickel = new TConstructFluid(PHConstruct.moltenNickel, TRepo.moltenNickelFluid, Material.field_151587_i, "liquid_ferrous").func_149663_c("fluid.molten.nickel"); GameRegistry.registerBlock(TRepo.moltenNickel, "fluid.molten.nickel"); - TRepo.moltenNickelFluid.setBlockID(TRepo.moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenNickelFluid.setBlock(TRepo.moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenNickelFluid, 1000), new ItemStack(TRepo.buckets, 1, 17), new ItemStack(Items.bucket))); TRepo.moltenLeadFluid = new Fluid("lead.molten"); @@ -296,7 +296,7 @@ public class TContent implements IFuelHandler TRepo.moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); TRepo.moltenLead = new TConstructFluid(PHConstruct.moltenLead, TRepo.moltenLeadFluid, Material.field_151587_i, "liquid_lead").func_149663_c("fluid.molten.lead"); GameRegistry.registerBlock(TRepo.moltenLead, "fluid.molten.lead"); - TRepo.moltenLeadFluid.setBlockID(TRepo.moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenLeadFluid.setBlock(TRepo.moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenLeadFluid, 1000), new ItemStack(TRepo.buckets, 1, 18), new ItemStack(Items.bucket))); TRepo.moltenSilverFluid = new Fluid("silver.molten"); @@ -304,7 +304,7 @@ public class TContent implements IFuelHandler TRepo.moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); TRepo.moltenSilver = new TConstructFluid(PHConstruct.moltenSilver, TRepo.moltenSilverFluid, Material.field_151587_i, "liquid_silver").func_149663_c("fluid.molten.silver"); GameRegistry.registerBlock(TRepo.moltenSilver, "fluid.molten.silver"); - TRepo.moltenSilverFluid.setBlockID(TRepo.moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenSilverFluid.setBlock(TRepo.moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenSilverFluid, 1000), new ItemStack(TRepo.buckets, 1, 19), new ItemStack(Items.bucket))); TRepo.moltenShinyFluid = new Fluid("platinum.molten"); @@ -312,7 +312,7 @@ public class TContent implements IFuelHandler TRepo.moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); TRepo.moltenShiny = new TConstructFluid(PHConstruct.moltenShiny, TRepo.moltenShinyFluid, Material.field_151587_i, "liquid_shiny").func_149663_c("fluid.molten.shiny"); GameRegistry.registerBlock(TRepo.moltenShiny, "fluid.molten.shiny"); - TRepo.moltenShinyFluid.setBlockID(TRepo.moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenShinyFluid.setBlock(TRepo.moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenShinyFluid, 1000), new ItemStack(TRepo.buckets, 1, 20), new ItemStack(Items.bucket))); TRepo.moltenInvarFluid = new Fluid("invar.molten"); @@ -320,7 +320,7 @@ public class TContent implements IFuelHandler TRepo.moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); TRepo.moltenInvar = new TConstructFluid(PHConstruct.moltenInvar, TRepo.moltenInvarFluid, Material.field_151587_i, "liquid_invar").func_149663_c("fluid.molten.invar"); GameRegistry.registerBlock(TRepo.moltenInvar, "fluid.molten.invar"); - TRepo.moltenInvarFluid.setBlockID(TRepo.moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenInvarFluid.setBlock(TRepo.moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenInvarFluid, 1000), new ItemStack(TRepo.buckets, 1, 21), new ItemStack(Items.bucket))); TRepo.moltenElectrumFluid = new Fluid("electrum.molten"); @@ -328,7 +328,7 @@ public class TContent implements IFuelHandler TRepo.moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); TRepo.moltenElectrum = new TConstructFluid(PHConstruct.moltenElectrum, TRepo.moltenElectrumFluid, Material.field_151587_i, "liquid_electrum").func_149663_c("fluid.molten.electrum"); GameRegistry.registerBlock(TRepo.moltenElectrum, "fluid.molten.electrum"); - TRepo.moltenElectrumFluid.setBlockID(TRepo.moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.moltenElectrumFluid.setBlock(TRepo.moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenElectrumFluid, 1000), new ItemStack(TRepo.buckets, 1, 22), new ItemStack(Items.bucket))); TRepo.moltenEnderFluid = new Fluid("ender"); @@ -343,7 +343,7 @@ public class TContent implements IFuelHandler { TRepo.moltenEnder = new TConstructFluid(PHConstruct.moltenEnder, TRepo.moltenEnderFluid, Material.field_151586_h, "liquid_ender").func_149663_c("fluid.ender"); GameRegistry.registerBlock(TRepo.moltenEnder, "fluid.ender"); - TRepo.moltenEnderFluid.setBlockID(TRepo.moltenEnder).setDensity(3000).setViscosity(6000); + TRepo.moltenEnderFluid.setBlock(TRepo.moltenEnder).setDensity(3000).setViscosity(6000); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEnderFluid, 1000), new ItemStack(TRepo.buckets, 1, 23), new ItemStack(Items.bucket))); } @@ -356,7 +356,7 @@ public class TContent implements IFuelHandler TRepo.slimePool = new SlimeFluid(PHConstruct.slimePoolBlue, TRepo.blueSlimeFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep) .func_149663_c("liquid.slime"); GameRegistry.registerBlock(TRepo.slimePool, "liquid.slime"); - TRepo.blueSlimeFluid.setBlockID(TRepo.slimePool); + TRepo.blueSlimeFluid.setBlock(TRepo.slimePool); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.blueSlimeFluid, 1000), new ItemStack(TRepo.buckets, 1, 24), new ItemStack(Items.bucket))); //Glue @@ -366,7 +366,7 @@ public class TContent implements IFuelHandler TRepo.glueFluidBlock = new GlueFluid(PHConstruct.glueFluidBlock, TRepo.glueFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep) .func_149663_c("liquid.glue"); GameRegistry.registerBlock(TRepo.glueFluidBlock, "liquid.glue"); - TRepo.glueFluid.setBlockID(TRepo.glueFluidBlock); + TRepo.glueFluid.setBlock(TRepo.glueFluidBlock); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.glueFluid, 1000), new ItemStack(TRepo.buckets, 1, 26), new ItemStack(Items.bucket))); TRepo.pigIronFluid = new Fluid("pigiron.molten"); @@ -432,24 +432,24 @@ public class TContent implements IFuelHandler TRepo.stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); //Rail - TRepo.woodenRail = new WoodRail().func_149672_a(Block.soundWoodFootstep).func_149647_a(TConstructRegistry.blockTab).func_149663_c("rail.wood"); + TRepo.woodenRail = new WoodRail().func_149672_a(Block.soundWoodFootstep).func_149647_a(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood"); } void registerItems () { - TRepo.titleIcon = new TitleIcon().func_149663_c("tconstruct.titleicon"); + TRepo.titleIcon = new TitleIcon().setUnlocalizedName("tconstruct.titleicon"); GameRegistry.registerItem(TRepo.titleIcon, "titleIcon"); String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; - TRepo.blankPattern = new CraftingItem(blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab).func_149663_c("tconstruct.Pattern"); + TRepo.blankPattern = new CraftingItem(blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab).setUnlocalizedName("tconstruct.Pattern"); GameRegistry.registerItem(TRepo.blankPattern, "blankPattern"); - TRepo.materials = new MaterialItem().func_149663_c("tconstruct.Materials"); - TRepo.toolRod = new ToolPart("_rod", "ToolRod").func_149663_c("tconstruct.ToolRod"); - TRepo.toolShard = new ToolShard("_chunk").func_149663_c("tconstruct.ToolShard"); - TRepo.woodPattern = new Pattern("pattern_", "materials/").func_149663_c("tconstruct.Pattern"); - TRepo.metalPattern = new MetalPattern("cast_", "materials/").func_149663_c("tconstruct.MetalPattern"); - //armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").func_149663_c("tconstruct.ArmorPattern"); + TRepo.materials = new MaterialItem().setUnlocalizedName("tconstruct.Materials"); + TRepo.toolRod = new ToolPart("_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); + TRepo.toolShard = new ToolShard("_chunk").setUnlocalizedName("tconstruct.ToolShard"); + TRepo.woodPattern = new Pattern("pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); + TRepo.metalPattern = new MetalPattern("cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); + //armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); GameRegistry.registerItem(TRepo.materials, "materials"); GameRegistry.registerItem(TRepo.woodPattern, "woodPattern"); GameRegistry.registerItem(TRepo.metalPattern, "metalPattern"); @@ -517,37 +517,37 @@ public class TContent implements IFuelHandler TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]); } - TRepo.potionLauncher = new PotionLauncher().func_149663_c("tconstruct.PotionLauncher"); + TRepo.potionLauncher = new PotionLauncher().setUnlocalizedName("tconstruct.PotionLauncher"); GameRegistry.registerItem(TRepo.potionLauncher, "potionLauncher"); - TRepo.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").func_149663_c("tconstruct.PickaxeHead"); - TRepo.shovelHead = new ToolPart("_shovel_head", "ShovelHead").func_149663_c("tconstruct.ShovelHead"); - TRepo.hatchetHead = new ToolPart("_axe_head", "AxeHead").func_149663_c("tconstruct.AxeHead"); - TRepo.binding = new ToolPart("_binding", "Binding").func_149663_c("tconstruct.Binding"); - TRepo.toughBinding = new ToolPart("_toughbind", "ToughBind").func_149663_c("tconstruct.ThickBinding"); - TRepo.toughRod = new ToolPart("_toughrod", "ToughRod").func_149663_c("tconstruct.ThickRod"); - TRepo.largePlate = new ToolPart("_largeplate", "LargePlate").func_149663_c("tconstruct.LargePlate"); + TRepo.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); + TRepo.shovelHead = new ToolPart("_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead"); + TRepo.hatchetHead = new ToolPart("_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead"); + TRepo.binding = new ToolPart("_binding", "Binding").setUnlocalizedName("tconstruct.Binding"); + TRepo.toughBinding = new ToolPart("_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding"); + TRepo.toughRod = new ToolPart("_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod"); + TRepo.largePlate = new ToolPart("_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate"); - TRepo.swordBlade = new ToolPart("_sword_blade", "SwordBlade").func_149663_c("tconstruct.SwordBlade"); - TRepo.wideGuard = new ToolPart(PHConstruct.largeGuard, "_large_guard", "LargeGuard").func_149663_c("tconstruct.LargeGuard"); - TRepo.handGuard = new ToolPart(PHConstruct.medGuard, "_medium_guard", "MediumGuard").func_149663_c("tconstruct.MediumGuard"); - TRepo.crossbar = new ToolPart(PHConstruct.crossbar, "_crossbar", "Crossbar").func_149663_c("tconstruct.Crossbar"); - TRepo.knifeBlade = new ToolPart(PHConstruct.knifeBlade, "_knife_blade", "KnifeBlade").func_149663_c("tconstruct.KnifeBlade"); - TRepo.fullGuard = new ToolPartHidden(PHConstruct.fullGuard, "_full_guard", "FullGuard").func_149663_c("tconstruct.FullGuard"); + TRepo.swordBlade = new ToolPart("_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade"); + TRepo.wideGuard = new ToolPart("_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard"); + TRepo.handGuard = new ToolPart("_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard"); + TRepo.crossbar = new ToolPart("_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar"); + TRepo.knifeBlade = new ToolPart("_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade"); + TRepo.fullGuard = new ToolPartHidden("_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard"); - TRepo.frypanHead = new ToolPart(PHConstruct.frypanHead, "_frypan_head", "FrypanHead").func_149663_c("tconstruct.FrypanHead"); - TRepo.signHead = new ToolPart(PHConstruct.signHead, "_battlesign_head", "SignHead").func_149663_c("tconstruct.SignHead"); - TRepo.chiselHead = new ToolPart(PHConstruct.chiselHead, "_chisel_head", "ChiselHead").func_149663_c("tconstruct.ChiselHead"); + TRepo.frypanHead = new ToolPart("_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead"); + TRepo.signHead = new ToolPart("_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead"); + TRepo.chiselHead = new ToolPart("_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead"); - TRepo.scytheBlade = new ToolPart(PHConstruct.scytheBlade, "_scythe_head", "ScytheHead").func_149663_c("tconstruct.ScytheBlade"); - TRepo.broadAxeHead = new ToolPart(PHConstruct.lumberHead, "_lumberaxe_head", "LumberHead").func_149663_c("tconstruct.LumberHead"); - TRepo.excavatorHead = new ToolPart(PHConstruct.excavatorHead, "_excavator_head", "ExcavatorHead").func_149663_c("tconstruct.ExcavatorHead"); - TRepo.largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "_large_sword_blade", "LargeSwordBlade").func_149663_c("tconstruct.LargeSwordBlade"); - TRepo.hammerHead = new ToolPart(PHConstruct.hammerHead, "_hammer_head", "HammerHead").func_149663_c("tconstruct.HammerHead"); + TRepo.scytheBlade = new ToolPart("_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade"); + TRepo.broadAxeHead = new ToolPart("_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead"); + TRepo.excavatorHead = new ToolPart("_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead"); + TRepo.largeSwordBlade = new ToolPart("_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade"); + TRepo.hammerHead = new ToolPart("_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead"); - TRepo.bowstring = new Bowstring(PHConstruct.bowstring).func_149663_c("tconstruct.Bowstring"); - TRepo.arrowhead = new ToolPart(PHConstruct.arrowhead, "_arrowhead", "ArrowHead").func_149663_c("tconstruct.Arrowhead"); - TRepo.fletching = new Fletching(PHConstruct.fletching).func_149663_c("tconstruct.Fletching"); + TRepo.bowstring = new Bowstring().setUnlocalizedName("tconstruct.Bowstring"); + TRepo.arrowhead = new ToolPart("_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead"); + TRepo.fletching = new Fletching().setUnlocalizedName("tconstruct.Fletching"); Item[] toolParts = { TRepo.toolRod, TRepo.toolShard, TRepo.pickaxeHead, TRepo.shovelHead, TRepo.hatchetHead, TRepo.binding, TRepo.toughBinding, TRepo.toughRod, TRepo.largePlate, TRepo.swordBlade, TRepo.wideGuard, TRepo.handGuard, TRepo.crossbar, TRepo.knifeBlade, TRepo.fullGuard, TRepo.frypanHead, TRepo.signHead, TRepo.chiselHead, TRepo.scytheBlade, @@ -562,23 +562,23 @@ public class TContent implements IFuelHandler TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]); } - TRepo.diamondApple = new DiamondApple(PHConstruct.diamondApple).func_149663_c("tconstruct.apple.diamond"); - TRepo.strangeFood = new StrangeFood(PHConstruct.slimefood).func_149663_c("tconstruct.strangefood"); - TRepo.oreBerries = new OreBerries(PHConstruct.oreChunks).func_149663_c("oreberry"); + TRepo.diamondApple = new DiamondApple().setUnlocalizedName("tconstruct.apple.diamond"); + TRepo.strangeFood = new StrangeFood().setUnlocalizedName("tconstruct.strangefood"); + TRepo.oreBerries = new OreBerries().setUnlocalizedName("oreberry"); GameRegistry.registerItem(TRepo.diamondApple, "diamondApple"); GameRegistry.registerItem(TRepo.strangeFood, "strangeFood"); GameRegistry.registerItem(TRepo.oreBerries, "oreBerries"); - TRepo.jerky = new Jerky(PHConstruct.jerky, Loader.isModLoaded("HungerOverhaul")).func_149663_c("tconstruct.jerky"); + TRepo.jerky = new Jerky(Loader.isModLoaded("HungerOverhaul")).setUnlocalizedName("tconstruct.jerky"); GameRegistry.registerItem(TRepo.jerky, "jerky"); //Wearables - //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).func_149663_c("tconstruct.HeavyHelmet"); - TRepo.heartCanister = new HeartCanister(PHConstruct.heartCanister).func_149663_c("tconstruct.canister"); - //heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).func_149663_c("tconstruct.HeavyBoots"); - //glove = new Glove(PHConstruct.glove).func_149663_c("tconstruct.Glove"); - TRepo.knapsack = new Knapsack(PHConstruct.knapsack).func_149663_c("tconstruct.storage"); - TRepo.goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).func_149663_c("goldenhead"); + //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); + TRepo.heartCanister = new HeartCanister().setUnlocalizedName("tconstruct.canister"); + //heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); + //glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); + TRepo.knapsack = new Knapsack().setUnlocalizedName("tconstruct.storage"); + TRepo.goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); //GameRegistry.registerItem(TRepo.heavyHelmet, "heavyHelmet"); GameRegistry.registerItem(TRepo.heartCanister, "heartCanister"); //GameRegistry.registerItem(TRepo.heavyBoots, "heavyBoots"); @@ -588,19 +588,19 @@ public class TContent implements IFuelHandler LiquidCasting basinCasting = TConstruct.getBasinCasting(); TRepo.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); - TRepo.helmetWood = new ArmorBasic(PHConstruct.woodHelmet, TRepo.materialWood, 0, "wood").func_149663_c("tconstruct.helmetWood"); - TRepo.chestplateWood = new ArmorBasic(PHConstruct.woodChestplate, TRepo.materialWood, 1, "wood").func_149663_c("tconstruct.chestplateWood"); - TRepo.leggingsWood = new ArmorBasic(PHConstruct.woodPants, TRepo.materialWood, 2, "wood").func_149663_c("tconstruct.leggingsWood"); - TRepo.bootsWood = new ArmorBasic(PHConstruct.woodBoots, TRepo.materialWood, 3, "wood").func_149663_c("tconstruct.bootsWood"); + TRepo.helmetWood = new ArmorBasic(TRepo.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); + TRepo.chestplateWood = new ArmorBasic(TRepo.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); + TRepo.leggingsWood = new ArmorBasic(TRepo.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); + TRepo.bootsWood = new ArmorBasic(TRepo.materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); GameRegistry.registerItem(TRepo.helmetWood, "helmetWood"); GameRegistry.registerItem(TRepo.chestplateWood, "chestplateWood"); GameRegistry.registerItem(TRepo.leggingsWood, "leggingsWood"); GameRegistry.registerItem(TRepo.bootsWood, "bootsWood"); - TRepo.exoGoggles = new ExoArmor(PHConstruct.exoGoggles, EnumArmorPart.HELMET, "exosuit").func_149663_c("tconstruct.exoGoggles"); - TRepo.exoChest = new ExoArmor(PHConstruct.exoChest, EnumArmorPart.CHEST, "exosuit").func_149663_c("tconstruct.exoChest"); - TRepo.exoPants = new ExoArmor(PHConstruct.exoPants, EnumArmorPart.PANTS, "exosuit").func_149663_c("tconstruct.exoPants"); - TRepo.exoShoes = new ExoArmor(PHConstruct.exoShoes, EnumArmorPart.SHOES, "exosuit").func_149663_c("tconstruct.exoShoes"); + TRepo.exoGoggles = new ExoArmor(EnumArmorPart.HELMET, "exosuit").setUnlocalizedName("tconstruct.exoGoggles"); + TRepo.exoChest = new ExoArmor(EnumArmorPart.CHEST, "exosuit").setUnlocalizedName("tconstruct.exoChest"); + TRepo.exoPants = new ExoArmor(EnumArmorPart.PANTS, "exosuit").setUnlocalizedName("tconstruct.exoPants"); + TRepo.exoShoes = new ExoArmor(EnumArmorPart.SHOES, "exosuit").setUnlocalizedName("tconstruct.exoShoes"); String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", diff --git a/src/main/java/tconstruct/inventory/ContainerLandmine.java b/src/main/java/tconstruct/inventory/ContainerLandmine.java index 08b1ce1a..39c07dbd 100644 --- a/src/main/java/tconstruct/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/inventory/ContainerLandmine.java @@ -5,12 +5,12 @@ import java.util.Iterator; import java.util.Set; import tconstruct.blocks.logic.TileEntityLandmine; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; @@ -250,7 +250,7 @@ public class ContainerLandmine extends Container l = itemstack1.getItem(); itemstack = itemstack1.copy(); - if (slot2 != null && slot2.getStack() != null && slot2.getStack().itemID == l) + if (slot2 != null && slot2.getStack() != null && slot2.getStack().getItem() == l) { this.retrySlotClick(par1, par2, true, par4EntityPlayer); } @@ -304,7 +304,7 @@ public class ContainerLandmine extends Container inventoryplayer.setItemStack((ItemStack) null); } } - else if (shouldDoStuff && slot2 instanceof SlotBehavedOnly && itemstack4 != null && slot2.isItemValid(new ItemStack(itemstack4.itemID, 1, itemstack4.getItemDamage()))) + else if (shouldDoStuff && slot2 instanceof SlotBehavedOnly && itemstack4 != null && slot2.isItemValid(new ItemStack(itemstack4.getItem(), 1, itemstack4.getItemDamage()))) { k1 = par2 == 0 ? 1 : 1; diff --git a/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java b/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java index 09a9fc5c..ace81359 100644 --- a/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java +++ b/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java @@ -23,7 +23,7 @@ public class SlotOpaqueBlocksOnly extends SlotBlocksOnly if (super.isItemValid(par1ItemStack)) { Block b = BlockUtils.getBlockFromItemStack(par1ItemStack); - return b.isOpaqueCube() && b.renderAsNormalBlock(); + return b.isOpaqueCube() && b.func_149686_d(); } return false; diff --git a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java index 2b14eb43..6e12460c 100644 --- a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java @@ -27,7 +27,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator Block top = TRepo.slimeGrass; SlimeTreeGen trees = new SlimeTreeGen(false, 5, 4, 1, 0); - public SlimeIslandGen(Block slimePool, int meta) + public SlimeIslandGen(Block slimePool) { this.liquidBlock = slimePool; this.gelMeta = meta;