more 1.7 work, attempts at figuring out log4j2

src/main/java/tconstruct/TConstruct.java

@@ -11,8 +11,11 @@
 
 import java.util.UUID;
 
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.BaseConfiguration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
 
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraftforge.common.MinecraftForge;
@@ -60,15 +63,19 @@ public class TConstruct
 
     public TConstruct()
     {
+        LoggerConfig fml = new LoggerConfig("FML", Level.ALL, true);
+        LoggerConfig tcon = new LoggerConfig("TConstruct", Level.ALL, true);
+        tcon.setParent(fml);
+
         //logger.setParent(FMLCommonHandler.instance().getFMLLogger());
         if (Loader.isModLoaded("Natura"))
         {
-            System.out.println("[TConstruct] Natura, what are we going to do tomorrow night?");
-            System.out.println("[Natura] TConstruct, we're going to take over the world!");
+            logger.info("Natura, what are we going to do tomorrow night?");
+            LogManager.getLogger("Natura").info("TConstruct, we're going to take over the world!");
         }
         else
         {
-            System.out.println("[TConstruct] Preparing to take over the world");
+            logger.info("Preparing to take over the world");
         }
 
         EnvironmentChecks.verifyEnvironmentSanity();
@@ -105,7 +112,7 @@ public void preInit (FMLPreInitializationEvent event)
         MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler());
         GameRegistry.registerFuelHandler(content);
         GameRegistry.registerCraftingHandler(new TCraftingHandler());
-        NetworkRegistry.instance().registerGuiHandler(instance, proxy);
+        NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
 
         if (PHConstruct.addToVillages)
         {

src/main/java/tconstruct/blocks/GlassBlock.java

@@ -30,7 +30,7 @@ public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, in
     }
 
     @Override
-    public float getBlockHardness (World world, int x, int y, int z)
+    public float func_149712_f (World world, int x, int y, int z)
     {
         int meta = world.getBlockMetadata(x, y, z);
         switch (meta)
@@ -42,7 +42,7 @@ public float getBlockHardness (World world, int x, int y, int z)
         case 2:
             return 50.0F;
         default:
-            return blockHardness;
+            return field_149782_v;
         }
     }
 
@@ -58,7 +58,7 @@ public float getExplosionResistance (Entity entity, World world, int x, int y, i
         case 2:
             return 2000F;
         default:
-            return getExplosionResistance(entity);
+            return func_149638_a(entity);
         }
     }
 

src/main/java/tconstruct/blocks/StoneTorch.java

@@ -23,7 +23,7 @@ public class StoneTorch extends MantleBlock
 {
     public StoneTorch(int id)
     {
-        super(Material.circuits);
+        super(Material.field_151594_q);
         this.setCreativeTab(CreativeTabs.tabDecorations);
         setLightValue(0.9375F);
     }

src/main/java/tconstruct/blocks/WoodRail.java

@@ -7,6 +7,7 @@
 import net.minecraft.block.BlockRailBase;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
@@ -40,9 +41,9 @@ public void registerIcons (IIconRegister par1IconRegister)
         this.theIcon = par1IconRegister.registerIcon("tinker:woodrail_turn");
     }
 
-    protected void func_94358_a (World par1World, int par2, int par3, int par4, int par5, int par6, int par7)
+    protected void func_94358_a (World par1World, int par2, int par3, int par4, int par5, int par6, Block par7)
     {
-        if (par7 > 0 && Block.blocksList[par7].canProvidePower() && (new BlockBaseRailLogic(this, par1World, par2, par3, par4)).getNumberOfAdjacentTracks() == 3)
+        if (par7 != Blocks.air && par7.canProvidePower() && (new BlockBaseRailLogic(this, par1World, par2, par3, par4)).getNumberOfAdjacentTracks() == 3)
         {
             this.refreshTrackShape(par1World, par2, par3, par4, false);
         }

src/main/java/tconstruct/blocks/component/SmelteryScan.java

@@ -43,7 +43,7 @@ protected boolean checkAir (int x, int y, int z)
     @Override
     protected boolean checkServant (int x, int y, int z)
     {
-        Block block = world.func_147439_a(x, y, z)];
+        Block block = world.func_147439_a(x, y, z);
         if (block == null || world.func_147439_a( x, y, z)  == Blocks.air || !isValidBlock(x, y, z))
             return false;
 

src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java

@@ -41,7 +41,7 @@ public CastingChannelLogic()
     }
 
     @Override
-    public void updateEntity ()
+    public void func_145845_h ()
     {
         if (this.field_145850_b.isRemote)
             return;
@@ -556,7 +556,7 @@ public void writeCustomNBT (NBTTagCompound tags)
         {
             NBTTagCompound nbt = new NBTTagCompound();
             liquid.writeToNBT(nbt);
-            tags.setCompoundTag("Fluid", nbt);
+            tags.setTag("Fluid", nbt);
         }
         tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider));
         tags.setInteger("recentlyFilledDelay", this.recentlyFilledDelay);

src/main/java/tconstruct/blocks/logic/CastingTableLogic.java

@@ -300,7 +300,7 @@ public int getLiquidAmount ()
 
     /* Updating */
     @Override
-    public void updateEntity ()
+    public void func_145845_h ()
     {
         if (castingDelay > 0)
         {

src/main/java/tconstruct/blocks/logic/LavaTankLogic.java

@@ -169,7 +169,7 @@ public boolean canUpdate ()
     }
 
     @Override
-    public void updateEntity ()
+    public void func_145845_h ()
     {
         if (renderOffset > 0)
         {

src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java

@@ -255,7 +255,7 @@ public void setSoundPlayed ()
     }
 
     @Override
-    public void updateEntity ()
+    public void func_145845_h ()
     {
         if (shouldUpdateLogic)
         {

src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java

@@ -13,6 +13,7 @@ public class BlockSkinRenderHelper
 {
     public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
     {
+        //TODO CHECK THESE!!!!
         int var5 = block.colorMultiplier(world, x, y, z);
         float var6 = (float) (var5 >> 16 & 255) / 255.0F;
         float var7 = (float) (var5 >> 8 & 255) / 255.0F;

src/main/java/tconstruct/client/block/BreakingFX.java

@@ -22,7 +22,7 @@ public BreakingFX(World par1World, double par2, double par4, double par6, Item p
         super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D);
         this.setParticleIcon(par8Item.getIconFromDamage(par9));
         this.particleRed = this.particleGreen = this.particleBlue = 1.0F;
-        this.particleGravity = Blocks.snow.blockParticleGravity;
+        this.particleGravity = Blocks.snow.field_149763_I;
         this.particleScale /= 2.0F;
     }
 

src/main/java/tconstruct/client/block/RenderLiquid.java

@@ -14,7 +14,7 @@
  */
 
 public class RenderLiquid
-{
+{//TODO CHECK THIS!!!!
     public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
     {
         int var5 = block.colorMultiplier(world, x, y, z);
@@ -32,7 +32,7 @@ public static boolean renderMetadataBlock (Block block, int metadata, int x, int
             var8 = var11;
         }
 
-        return (Minecraft.isAmbientOcclusionEnabled()) && (Block.lightValue[block.blockID] == 0) ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world)
+        return (Minecraft.isAmbientOcclusionEnabled()) && (block.lightValue == 0) ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world)
                 : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world);
     }
 

src/main/java/tconstruct/common/TContent.java

@@ -140,7 +140,7 @@ void registerBlocks ()
         TRepo.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).func_149663_c("trap.barricade.spruce");
         TRepo.barricadeBirch = new BarricadeBlock(Blocks.log, 2).func_149663_c("trap.barricade.birch");
         TRepo.barricadeJungle = new BarricadeBlock(Blocks.log, 3).func_149663_c("trap.barricade.jungle");
-        TRepo.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.soundGrassFootstep).func_149663_c("explosive.slime");
+        TRepo.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.field_149779_h).func_149663_c("explosive.slime");
 
         TRepo.dryingRack = new DryingRack().func_149663_c("Armor.DryingRack");
 
@@ -383,8 +383,8 @@ void registerBlocks ()
                 TRepo.moltenNickel, TRepo.moltenLead, TRepo.moltenSilver, TRepo.moltenShiny, TRepo.moltenInvar, TRepo.moltenElectrum, TRepo.moltenEnder, TRepo.slimePool, TRepo.glueFluidBlock };
         //Slime Islands
         TRepo.slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(TRepo.slimeStep).setLightOpacity(0).func_149663_c("slime.gel");
-        TRepo.slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.soundGrassFootstep).setLightOpacity(0).func_149663_c("slime.grass");
-        TRepo.slimeTallGrass = new SlimeTallGrass(PHConstruct.slimeTallGrass).setStepSound(Block.soundGrassFootstep).func_149663_c("slime.grass.tall");
+        TRepo.slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.field_149779_h).setLightOpacity(0).func_149663_c("slime.grass");
+        TRepo.slimeTallGrass = new SlimeTallGrass(PHConstruct.slimeTallGrass).setStepSound(Block.field_149779_h).func_149663_c("slime.grass.tall");
         TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves(PHConstruct.slimeLeaves).setStepSound(TRepo.slimeStep).setLightOpacity(0).func_149663_c("slime.leaves");
         TRepo.slimeSapling = (SlimeSapling) new SlimeSapling(PHConstruct.slimeSapling).setStepSound(TRepo.slimeStep).func_149663_c("slime.sapling");
         TRepo.slimeChannel = new ConveyorBase(PHConstruct.slimeChannel, Material.water, "greencurrent").setHardness(0.3f).setStepSound(TRepo.slimeStep).func_149663_c("slime.channel");
@@ -715,28 +715,28 @@ void registerMaterials ()
             pb.registerMaterialSet("Wood", new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0);
         if (PHConstruct.enableTStone)
         {
-            pb.registerFullMaterial(Block.stone, 2, "Stone", new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 1);
-            pb.registerMaterial(Block.cobblestone, 2, "Stone");
+            pb.registerFullMaterial(Blocks.stone, 2, "Stone", new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 1);
+            pb.registerMaterial(Blocks.cobblestone, 2, "Stone");
         }
         else
             pb.registerMaterialSet("Stone", new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 0);
-        pb.registerFullMaterial(Item.ingotIron, 2, "Iron", new ItemStack(TRepo.toolShard, 1, 2), new ItemStack(TRepo.toolRod, 1, 2), 2);
+        pb.registerFullMaterial(Items.iron_ingot, 2, "Iron", new ItemStack(TRepo.toolShard, 1, 2), new ItemStack(TRepo.toolRod, 1, 2), 2);
         if (PHConstruct.enableTFlint)
-            pb.registerFullMaterial(Item.flint, 2, "Flint", new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3);
+            pb.registerFullMaterial(Items.flint, 2, "Flint", new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3);
         else
             pb.registerMaterialSet("Flint", new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3);
         if (PHConstruct.enableTCactus)
-            pb.registerFullMaterial(Block.cactus, 2, "Cactus", new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4);
+            pb.registerFullMaterial(Blocks.cactus, 2, "Cactus", new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4);
         else
             pb.registerMaterialSet("Cactus", new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4);
         if (PHConstruct.enableTBone)
-            pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
+            pb.registerFullMaterial(Items.bone, 2, "Bone", new ItemStack(Items.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
         else
-            pb.registerMaterialSet("Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
-        pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", new ItemStack(TRepo.toolShard, 1, 6), new ItemStack(TRepo.toolRod, 1, 6), 6);
+            pb.registerMaterialSet("Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Items.bone), 5);
+        pb.registerFullMaterial(Blocks.obsidian, 2, "Obsidian", new ItemStack(TRepo.toolShard, 1, 6), new ItemStack(TRepo.toolRod, 1, 6), 6);
         pb.registerMaterial(new ItemStack(TRepo.materials, 1, 18), 2, "Obsidian");
         if (PHConstruct.enableTNetherrack)
-            pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7);
+            pb.registerFullMaterial(Blocks.netherrack, 2, "Netherrack", new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7);
         else
             pb.registerMaterialSet("Netherrack", new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7);
         if (PHConstruct.enableTSlime)

src/main/java/tconstruct/common/TRecipes.java

@@ -1285,7 +1285,7 @@ public void modIntegration ()
         }
         else
         {
-            TConstruct.logger.warning("Thaumcraft not detected.");
+            TConstruct.logger.warn("Thaumcraft not detected.");
         }
 
         if (Loader.isModLoaded("Natura"))
@@ -1402,7 +1402,7 @@ public Object getStaticItem (String name, String classPackage)
         }
         catch (Exception e)
         {
-            TConstruct.logger.warning("Could not find " + name + "from " + classPackage);
+            TConstruct.logger.warn("Could not find " + name + "from " + classPackage);
             return null;
         }
     }

src/main/java/tconstruct/entity/CartEntity.java

@@ -1,5 +1,7 @@
 package tconstruct.entity;
 
+import io.netty.buffer.ByteBuf;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -1428,14 +1430,14 @@ public void setDragAir (double value)
     }
 
     @Override
-    public void writeSpawnData (ByteArrayDataOutput data)
+    public void writeSpawnData (ByteBuf data)
     {
         data.writeInt(pullcartType);
 
     }
 
     @Override
-    public void readSpawnData (ByteArrayDataInput data)
+    public void readSpawnData (ByteBuf data)
     {
         pullcartType = data.readInt();
 

src/main/java/tconstruct/entity/FakeBlockEntity.java

@@ -1,5 +1,6 @@
 package tconstruct.entity;
 
+import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
@@ -25,27 +26,27 @@ protected void entityInit ()
     }
 
     @Override
-    public void writeSpawnData (ByteArrayDataOutput data)
+    protected void readEntityFromNBT (NBTTagCompound var1)
     {
 
     }
 
     @Override
-    public void readSpawnData (ByteArrayDataInput data)
+    protected void writeEntityToNBT (NBTTagCompound var1)
     {
 
     }
 
     @Override
-    protected void readEntityFromNBT (NBTTagCompound var1)
+    public void writeSpawnData (ByteBuf buffer)
     {
-
+        
     }
 
     @Override
-    protected void writeEntityToNBT (NBTTagCompound var1)
+    public void readSpawnData (ByteBuf additionalData)
     {
-
+        
     }
 
 }

src/main/java/tconstruct/entity/projectile/ArrowEntity.java

@@ -1,5 +1,7 @@
 package tconstruct.entity.projectile;
 
+import io.netty.buffer.ByteBuf;
+
 import java.util.List;
 import java.util.Random;
 
@@ -594,7 +596,7 @@ public void readEntityFromNBT (NBTTagCompound tags)
     }
 
     @Override
-    public void writeSpawnData (ByteArrayDataOutput data)
+    public void writeSpawnData (ByteBuf data)
     {
         if (!returnStack.hasTagCompound())
             this.kill();
@@ -639,7 +641,7 @@ public void writeSpawnData (ByteArrayDataOutput data)
     }
 
     @Override
-    public void readSpawnData (ByteArrayDataInput data)
+    public void readSpawnData (ByteBuf data)
     {
         returnStack = new ItemStack(data.readShort(), 1, 0);
         rotationYaw = data.readFloat();