lots o fixes

SlimeKnights · Jan 18, 2014 · af3f99a · af3f99a
1 parent d914004
commit af3f99a
Show file tree

Hide file tree

Showing 66 changed files with 245 additions and 233 deletions.
diff --git 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 int compare(ItemStack stack, ItemStack stack2) {
                 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
@@ -108,7 +108,7 @@ public void preInit (FMLPreInitializationEvent event)
         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 void init (FMLInitializationEvent event)
         }
 
         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
@@ -124,7 +124,7 @@ public void onBlockClicked (World par1World, int par2, int par3, int par4, Entit
     }
 
     @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
@@ -94,7 +94,7 @@ public int getRenderType ()
     }
 
     @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
@@ -136,7 +136,7 @@ public int getRenderType ()
     }
 
     @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
@@ -7,6 +7,7 @@
 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
@@ -97,7 +97,7 @@ public int getTextureIndex (int side)
     }
 
     @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
@@ -64,7 +64,7 @@ public float getExplosionResistance (Entity entity, World world, int x, int y, i
 
     @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
@@ -611,7 +611,7 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool (World par1World, int par2,
     }
 
     @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
@@ -65,7 +65,7 @@ public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List)
     }
 
     @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
@@ -39,7 +39,7 @@ public boolean  func_149646_a (IBlockAccess world, int x, int y, int z, int side
 
     @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
@@ -672,9 +672,9 @@ public final boolean canThisPaneConnectToThisBlock (Block b)
         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
@@ -25,7 +25,7 @@ public GlueFluid(int id, Fluid fluid, Material material)
 
     @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
@@ -83,7 +83,7 @@ public boolean isOpaqueCube ()
     }
 
     @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
@@ -33,7 +33,7 @@ public int getRenderBlockPass ()
     }
 
     @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
@@ -58,7 +58,7 @@ public IIcon getIcon (int side, int metadata)
 
     @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
@@ -142,7 +142,7 @@ public int func_149709_b (IBlockAccess world, int x, int y, int z, int side)
 
     @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
@@ -156,7 +156,7 @@ public int func_149709_b (IBlockAccess world, int x, int y, int z, int side)
 
     @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
@@ -56,7 +56,7 @@ public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes)
 
     @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
@@ -46,7 +46,7 @@ public IIcon getSideTextureIndex (int meta)
 
     @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
@@ -230,7 +230,7 @@ public int getTextureIndex (int side)
     }
 
     @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
@@ -26,7 +26,7 @@ public SearedSlab()
 
     @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
@@ -80,7 +80,7 @@ public boolean renderAsNormalBlock ()
 
     @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
@@ -101,7 +101,7 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase
     }
 
     @Override
-    public boolean renderAsNormalBlock ()
+    public boolean func_149686_d ()
     {
         return false;
     }
@@ -125,7 +125,7 @@ public int getRenderType ()
     }
 
     @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
@@ -27,7 +27,7 @@ public SoilSlab()
 
     @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
@@ -27,7 +27,7 @@ public SpeedSlab()
 
     @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
@@ -23,7 +23,7 @@ public StoneLadder()
     }
 
     @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
@@ -52,7 +52,7 @@ public boolean isOpaqueCube ()
     }
 
     @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
@@ -46,9 +46,9 @@ public String[] getTextureNames ()
     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 IIcon getIcon (int side, int meta)
     }
 
     @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
@@ -149,16 +149,16 @@ else if (pitch < -45)
         }
     }
 
-    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 void func_145839_a (NBTTagCompound tags)
     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
@@ -527,14 +527,14 @@ public int getFillState ()
     /* 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 void readNetworkNBT (NBTTagCompound 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);
         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)