Merge pull request Aleksey-Terzi#4 from AnodeCathode/master

Updates for 79.23 renamed method names
nuckable · Sep 12, 2015 · 9d6533d · 9d6533d
2 parents 594ca86 + d81f94b
commit 9d6533d
Show file tree

Hide file tree

Showing 15 changed files with 144 additions and 144 deletions.
diff --git a/src/com/aleksey/decorations/Blocks/BlockAlabaster.java b/src/com/aleksey/decorations/Blocks/BlockAlabaster.java
@@ -16,12 +16,12 @@ public BlockAlabaster()
         super(Material.rock);
         this.setHardness(12f);
         this.setResistance(10.0f);
-        this.setCreativeTab(TFCTabs.TFCBuilding);
+        this.setCreativeTab(TFCTabs.TFC_BUILDING);
 
         this.names = new String[16];
         for(int i = 0; i < this.names.length; i++)
         {
-            String dyeName = ItemDyeCustom.dyeColorNames[FluidList.LiquidDyes[i].TFCDyeIndex];
+            String dyeName = ItemDyeCustom.DYE_COLOR_NAMES[FluidList.LiquidDyes[i].TFCDyeIndex];
 
             this.names[i] = "Alabaster" + dyeName.substring(0, 1).toUpperCase() + dyeName.substring(1);
         }

diff --git a/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java b/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java
@@ -38,7 +38,7 @@ public BlockCustomLantern(LanternInfo info)
         setBlockBounds(0.25F, 0.125F, 0.25F, 0.75F, 0.75F, 0.75F);
         setLightLevel((float)_info.LightLevel / 15.0F);
         setStepSound(Block.soundTypeMetal);
-        setCreativeTab(TFCTabs.TFCMisc);
+        setCreativeTab(TFCTabs.TFC_MISC);
     }
 
     @Override

diff --git a/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java b/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java
@@ -46,7 +46,7 @@ public BlockMudBrickRaw(int stoneIndex)
 
         this.setHardness(0.3f);
         this.setResistance(10.0f);
-        this.setCreativeTab(TFCTabs.TFCMaterials);
+        this.setCreativeTab(TFCTabs.TFC_MATERIALS);
         this.setBlockBounds((float)RenderMudBrickRaw.VoxelSizeScaled, 0, (float)RenderMudBrickRaw.VoxelSizeScaled, 1 - (float)RenderMudBrickRaw.VoxelSizeScaled, 8 * (float)RenderMudBrickRaw.VoxelSizeScaled, 1 - (float)RenderMudBrickRaw.VoxelSizeScaled);
 
         _stoneIndex = stoneIndex;

diff --git a/src/com/aleksey/decorations/Blocks/BlockMudBricks.java b/src/com/aleksey/decorations/Blocks/BlockMudBricks.java
@@ -25,7 +25,7 @@ public BlockMudBricks(int startIndex)
         this.setHardness(3f);
         this.setResistance(10.0f);
         this.setHarvestLevel("pickaxe", 0);
-        this.setCreativeTab(TFCTabs.TFCBuilding);
+        this.setCreativeTab(TFCTabs.TFC_BUILDING);
 
         _startIndex = startIndex;
 

diff --git a/src/com/aleksey/decorations/Core/FluidList.java b/src/com/aleksey/decorations/Core/FluidList.java
@@ -37,7 +37,7 @@ public static void register()
 
         FluidRegistry.registerFluid(Plaster);
 
-        LiquidDyes = new DyeFluid[ItemDyeCustom.dyeColorNames.length];
+        LiquidDyes = new DyeFluid[ItemDyeCustom.DYE_COLOR_NAMES.length];
 
         for(int i = 0; i < LiquidDyes.length; i++)
         {
@@ -50,7 +50,7 @@ else if(i == LiquidDyes.length - 1)
             else
                 dyeIndex = i;
 
-            String fluidName = "liquid_dye." + ItemDyeCustom.dyeColorNames[dyeIndex];
+            String fluidName = "liquid_dye." + ItemDyeCustom.DYE_COLOR_NAMES[dyeIndex];
             int color = Constants.DyeColors[dyeIndex];
             DyeFluid fluid = new DyeFluid(fluidName, dyeIndex);
 
@@ -79,9 +79,9 @@ public static void registerFluidContainers()
             }
         }
 
-        FluidContainerRegistry.registerFluidContainer(new FluidStack(Plaster, 1000), new ItemStack(ItemList.Plaster), new ItemStack(TFCItems.WoodenBucketEmpty));
+        FluidContainerRegistry.registerFluidContainer(new FluidStack(Plaster, 1000), new ItemStack(ItemList.Plaster), new ItemStack(TFCItems.woodenBucketEmpty));
 
         for(int i = 0; i < LiquidDyes.length; i++)
-            FluidContainerRegistry.registerFluidContainer(new FluidStack(LiquidDyes[i], 1000), new ItemStack(ItemList.LiquidDye, 1, i), new ItemStack(TFCItems.WoodenBucketEmpty));
+            FluidContainerRegistry.registerFluidContainer(new FluidStack(LiquidDyes[i], 1000), new ItemStack(ItemList.LiquidDye, 1, i), new ItemStack(TFCItems.woodenBucketEmpty));
     }
 }
diff --git a/src/com/aleksey/decorations/Core/ItemList.java b/src/com/aleksey/decorations/Core/ItemList.java
diff --git a/src/com/aleksey/decorations/Core/Player/PlayerTracker.java b/src/com/aleksey/decorations/Core/Player/PlayerTracker.java
@@ -20,7 +20,7 @@ public class PlayerTracker
     public void onPlayerLoggedIn(PlayerLoggedInEvent event)
     {
         AbstractPacket pkt = new InitClientWorldPacket();
-        TerraFirmaCraft.packetPipeline.sendTo(pkt, (EntityPlayerMP) event.player);
+        TerraFirmaCraft.PACKET_PIPELINE.sendTo(pkt, (EntityPlayerMP) event.player);
     }
 
     @SubscribeEvent

diff --git a/src/com/aleksey/decorations/Core/Recipes.java b/src/com/aleksey/decorations/Core/Recipes.java
@@ -40,38 +40,38 @@ public static void registerRecipes()
         {
             if (TFCCrafting.diamondConversion == true)
             {
-                GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 1), new Object[] {new ItemStack(TFCItems.GemDiamond,1,2)});
-                GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 2), new Object[] {new ItemStack(TFCItems.GemDiamond,1,3)});
-                GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 3), new Object[] {new ItemStack(TFCItems.GemDiamond,1,4)});
-                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemDiamond,1,2), new Object[] {new ItemStack(Items.diamond)});
-                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemDiamond,1,3), new Object[] {new ItemStack(Items.diamond), new ItemStack(Items.diamond)});
-                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemDiamond,1,4), new Object[] {new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond)});
+                GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 1), new Object[] {new ItemStack(TFCItems.gemDiamond,1,2)});
+                GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 2), new Object[] {new ItemStack(TFCItems.gemDiamond,1,3)});
+                GameRegistry.addShapelessRecipe(new ItemStack(Items.diamond, 3), new Object[] {new ItemStack(TFCItems.gemDiamond,1,4)});
+                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemDiamond,1,2), new Object[] {new ItemStack(Items.diamond)});
+                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemDiamond,1,3), new Object[] {new ItemStack(Items.diamond), new ItemStack(Items.diamond)});
+                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemDiamond,1,4), new Object[] {new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond)});
             }
 
             if (TFCCrafting.emeraldConversion == true)
             {
-                GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 1), new Object[] {new ItemStack(TFCItems.GemEmerald,1,2)});
-                GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 2), new Object[] {new ItemStack(TFCItems.GemEmerald,1,3)});
-                GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 3), new Object[] {new ItemStack(TFCItems.GemEmerald,1,4)});
-                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemEmerald,1,2), new Object[] {new ItemStack(Items.emerald)});
-                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemEmerald,1,3), new Object[] {new ItemStack(Items.emerald), new ItemStack(Items.emerald)});
-                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.GemEmerald,1,4), new Object[] {new ItemStack(Items.emerald), new ItemStack(Items.emerald), new ItemStack(Items.emerald)});
+                GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 1), new Object[] {new ItemStack(TFCItems.gemEmerald,1,2)});
+                GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 2), new Object[] {new ItemStack(TFCItems.gemEmerald,1,3)});
+                GameRegistry.addShapelessRecipe(new ItemStack(Items.emerald, 3), new Object[] {new ItemStack(TFCItems.gemEmerald,1,4)});
+                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemEmerald,1,2), new Object[] {new ItemStack(Items.emerald)});
+                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemEmerald,1,3), new Object[] {new ItemStack(Items.emerald), new ItemStack(Items.emerald)});
+                GameRegistry.addShapelessRecipe(new ItemStack(TFCItems.gemEmerald,1,4), new Object[] {new ItemStack(Items.emerald), new ItemStack(Items.emerald), new ItemStack(Items.emerald)});
             }
         }
 
         //Gypsum Powder
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ItemList.Powder, 6, 0), new Object[] { new ItemStack(TFCItems.OreChunk, 1, 17), "itemHammer" }));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ItemList.Powder, 6, 0), new Object[] { new ItemStack(TFCItems.oreChunk, 1, 17), "itemHammer" }));
 
-        GameRegistry.addRecipe(new ItemStack(ItemList.Brush), new Object[] { "w", "r", "t", Character.valueOf('w'), new ItemStack(TFCItems.Wool), Character.valueOf('r'), new ItemStack(TFCItems.Rope), Character.valueOf('t'), new ItemStack(TFCItems.Stick) });
+        GameRegistry.addRecipe(new ItemStack(ItemList.Brush), new Object[] { "w", "r", "t", Character.valueOf('w'), new ItemStack(TFCItems.wool), Character.valueOf('r'), new ItemStack(TFCItems.rope), Character.valueOf('t'), new ItemStack(TFCItems.stick) });
 
         registerMudBrickRecipes();
         registerBarrelRecipes();
     }
 
     private static void registerLanternRecipes()
     {
-        ItemStack stick = new ItemStack(TFCItems.Stick, 1);
-        ItemStack yarn = new ItemStack(TFCItems.WoolYarn, 1);
+        ItemStack stick = new ItemStack(TFCItems.stick, 1);
+        ItemStack yarn = new ItemStack(TFCItems.woolYarn, 1);
         ItemStack glassPane = new ItemStack(Blocks.glass_pane, 1);        
 
         for(int i = 0; i < Constants.Lanterns.length; i++)
@@ -93,14 +93,14 @@ private static void registerMudBrickRecipes()
     {
         for(int i = 0; i < 16; i++)
         {
-            GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[i], 1, 0), new Object[] { new ItemStack(TFCBlocks.Dirt, 1, i), new ItemStack(TFCItems.ClayBall, 1, 0), new ItemStack(TFCItems.Straw) });
-            GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[i], 1, 0), new Object[] { new ItemStack(TFCBlocks.Sand, 1, i), new ItemStack(TFCItems.ClayBall, 1, 0), new ItemStack(TFCItems.Straw) });
+            GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[i], 1, 0), new Object[] { new ItemStack(TFCBlocks.dirt, 1, i), new ItemStack(TFCItems.clayBall, 1, 0), new ItemStack(TFCItems.straw) });
+            GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[i], 1, 0), new Object[] { new ItemStack(TFCBlocks.sand, 1, i), new ItemStack(TFCItems.clayBall, 1, 0), new ItemStack(TFCItems.straw) });
         }
 
         for(int i = 0; i < Global.STONE_ALL.length - 16; i++)
         {
-            GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[16 + i], 1, 0), new Object[] { new ItemStack(TFCBlocks.Dirt2, 1, i), new ItemStack(TFCItems.ClayBall, 1, 0), new ItemStack(TFCItems.Straw) });
-            GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[16 + i], 1, 0), new Object[] { new ItemStack(TFCBlocks.Sand2, 1, i), new ItemStack(TFCItems.ClayBall, 1, 0), new ItemStack(TFCItems.Straw) });
+            GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[16 + i], 1, 0), new Object[] { new ItemStack(TFCBlocks.dirt2, 1, i), new ItemStack(TFCItems.clayBall, 1, 0), new ItemStack(TFCItems.straw) });
+            GameRegistry.addShapelessRecipe(new ItemStack(BlockList.MudBrickRaws[16 + i], 1, 0), new Object[] { new ItemStack(TFCBlocks.sand2, 1, i), new ItemStack(TFCItems.clayBall, 1, 0), new ItemStack(TFCItems.straw) });
         }
 
         for(int i = 0; i < 16; i++)
@@ -113,15 +113,15 @@ private static void registerMudBrickRecipes()
     private static void registerBarrelRecipes()
     {
         BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(ItemList.Powder, 1, 0), new FluidStack(TFCFluids.FRESHWATER, 500), null, new FluidStack(FluidList.Plaster, 500), 0).setMinTechLevel(0).setSealedRecipe(false).setRemovesLiquid(false).setAllowAnyStack(false));
-        BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCBlocks.Sand, 1, 32767), new FluidStack(FluidList.Plaster, 100), new ItemStack(TFCItems.Mortar, 16), new FluidStack(FluidList.Plaster, 100)).setMinTechLevel(0));
-        BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCBlocks.Sand2, 1, 32767), new FluidStack(FluidList.Plaster, 100), new ItemStack(TFCItems.Mortar, 16), new FluidStack(FluidList.Plaster, 100)).setMinTechLevel(0));
+        BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCBlocks.sand, 1, 32767), new FluidStack(FluidList.Plaster, 100), new ItemStack(TFCItems.mortar, 16), new FluidStack(FluidList.Plaster, 100)).setMinTechLevel(0));
+        BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCBlocks.sand2, 1, 32767), new FluidStack(FluidList.Plaster, 100), new ItemStack(TFCItems.mortar, 16), new FluidStack(FluidList.Plaster, 100)).setMinTechLevel(0));
         BarrelManager.getInstance().addRecipe(new BarrelPlasterRecipe(new ItemStack(ItemList.Powder, 1, 0), new FluidStack(FluidList.Plaster, 50), new ItemStack(BlockList.Alabaster, 1), new FluidStack(FluidList.Plaster, 50)).setMinTechLevel(0));
 
         for(int i = 0; i < FluidList.LiquidDyes.length; i++)
         {
             DyeFluid dye = FluidList.LiquidDyes[i];
 
-            BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCItems.Dye, 1, dye.TFCDyeIndex), new FluidStack(TFCFluids.FRESHWATER, 400), null, new FluidStack(dye, 400), 0).setMinTechLevel(0).setSealedRecipe(false).setRemovesLiquid(false).setAllowAnyStack(false));
+            BarrelManager.getInstance().addRecipe(new BarrelRecipe(new ItemStack(TFCItems.dye, 1, dye.TFCDyeIndex), new FluidStack(TFCFluids.FRESHWATER, 400), null, new FluidStack(dye, 400), 0).setMinTechLevel(0).setSealedRecipe(false).setRemovesLiquid(false).setAllowAnyStack(false));
         }
     }
 

diff --git a/src/com/aleksey/decorations/DecorationsMod.java b/src/com/aleksey/decorations/DecorationsMod.java
@@ -60,7 +60,7 @@ public void preInit(FMLPreInitializationEvent event) throws ExistingSubstitution
     @EventHandler
     public void initialize(FMLInitializationEvent event)
     {
-        TerraFirmaCraft.packetPipeline.registerPacket(InitClientWorldPacket.class);
+        TerraFirmaCraft.PACKET_PIPELINE.registerPacket(InitClientWorldPacket.class);
 
         FMLCommonHandler.instance().bus().register(new PlayerTracker());
 

diff --git a/src/com/aleksey/decorations/Handlers/CraftingHandler.java b/src/com/aleksey/decorations/Handlers/CraftingHandler.java
@@ -23,7 +23,7 @@ public void onCrafting(ItemCraftedEvent e)
         if(iinventory != null)
         {
             if(item == ItemList.Powder && isDmg == 0)
-                com.bioxx.tfc.Handlers.CraftingHandler.HandleItem(e.player, e.craftMatrix, Recipes.Hammers);
+                com.bioxx.tfc.Handlers.CraftingHandler.handleItem(e.player, e.craftMatrix, Recipes.hammers);
         }
     }
 }
diff --git a/src/com/aleksey/decorations/Items/ItemBrush.java b/src/com/aleksey/decorations/Items/ItemBrush.java
@@ -32,7 +32,7 @@ public ItemBrush()
         super();
 
         setMaxDamage(Constants.Brush_Capacity);
-        setCreativeTab(TFCTabs.TFCMisc);
+        setCreativeTab(TFCTabs.TFC_MISC);
     }
 
     @Override

diff --git a/src/com/aleksey/decorations/Items/ItemGypsumPowder.java b/src/com/aleksey/decorations/Items/ItemGypsumPowder.java
@@ -14,7 +14,7 @@ public ItemGypsumPowder()
     {
         super();
 
-        setCreativeTab(TFCTabs.TFCMaterials);
+        setCreativeTab(TFCTabs.TFC_MATERIALS);
     }
 
     @Override

diff --git a/src/com/aleksey/decorations/Items/ItemLanternCore.java b/src/com/aleksey/decorations/Items/ItemLanternCore.java
@@ -33,7 +33,7 @@ public ItemLanternCore(LanternInfo info)
         _info = info;
 
         setMaxDamage(0);
-        setCreativeTab(TFCTabs.TFCMisc);
+        setCreativeTab(TFCTabs.TFC_MISC);
     }
 
     @Override

diff --git a/src/com/aleksey/decorations/Items/ItemLiquidDye.java b/src/com/aleksey/decorations/Items/ItemLiquidDye.java
@@ -116,7 +116,7 @@ public ItemStack onItemRightClick(ItemStack is, World world, EntityPlayer player
             if (!world.canMineBlock(player, x, y, z))
                 return is;
 
-            return new ItemStack(TFCItems.WoodenBucketEmpty);
+            return new ItemStack(TFCItems.woodenBucketEmpty);
         }
 
         return is;

diff --git a/src/com/aleksey/decorations/Items/ItemPlaster.java b/src/com/aleksey/decorations/Items/ItemPlaster.java
@@ -85,7 +85,7 @@ public ItemStack onItemRightClick(ItemStack is, World world, EntityPlayer player
             if (!world.canMineBlock(player, x, y, z))
                 return is;
 
-            return new ItemStack(TFCItems.WoodenBucketEmpty);
+            return new ItemStack(TFCItems.woodenBucketEmpty);
         }
 
         return is;