fix all the things!

SlimeKnights · Jan 30, 2014 · 5076fc0 · 5076fc0
1 parent 2a932bc
commit 5076fc0
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java
@@ -178,7 +178,7 @@ protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY)
         this.field_146297_k.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
         if (scomp.fuelGague > 0)
         {
-            IIcon lavaIcon = Blocks.lava.getIcon(0, 0);
+            IIcon lavaIcon = Blocks.lava.func_149691_a(0, 0);
             int fuel = scomp.getScaledFuelGague(52);
             int count = 0;
             while (fuel > 0)
@@ -359,7 +359,7 @@ protected void drawToolTip (List par1List, int par2, int par3)
             while (iterator.hasNext())
             {
                 String s = (String) iterator.next();
-                int l = this.field_146289_q.getStringfield_146294_l(s);
+                int l = this.field_146289_q.getStringWidth(s);
 
                 if (l > k)
                 {

diff --git a/src/main/java/tconstruct/client/gui/CraftingStationGui.java b/src/main/java/tconstruct/client/gui/CraftingStationGui.java
@@ -45,7 +45,7 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2)
         this.field_146289_q.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), 8, 6, 0x202020);
         this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x202020);
         if (logic.chest != null)
-            this.field_146289_q.drawString(StatCollector.translateToLocal(logic.chest.get().getInvName()), -108, this.ySize - 160, 0x202020);
+            this.field_146289_q.drawString(StatCollector.translateToLocal(logic.chest.get().func_145825_b()), -108, this.ySize - 160, 0x202020);
         //this.field_146289_q.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff);
 
         if (logic.tinkerTable)

diff --git a/src/main/java/tconstruct/client/gui/FurnaceGui.java b/src/main/java/tconstruct/client/gui/FurnaceGui.java
@@ -30,7 +30,7 @@ public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace)
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
         String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.getStringParams(this.logic.getInvName());
-        this.field_146289_q.drawString(s, this.xSize / 2 - this.field_146289_q.getStringfield_146294_l(s) / 2, 6, 4210752);
+        this.field_146289_q.drawString(s, this.xSize / 2 - this.field_146289_q.getStringWidth(s) / 2, 6, 4210752);
         this.field_146289_q.drawString(I18n.getStringParams("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
     }
 

diff --git a/src/main/java/tconstruct/client/gui/GuiLandmine.java b/src/main/java/tconstruct/client/gui/GuiLandmine.java
@@ -47,7 +47,7 @@ protected void drawItemStackTooltip (ItemStack par1ItemStack, int par2, int par3
         {
             if (k == 0)
             {
-                list.set(k, "\u00a7" + Integer.toHexString(par1ItemStack.getRarity().rarityColor) + (String) list.get(k));
+                list.set(k, "\u00a7" + Integer.toHexString(par1ItemStack.getRarity().rarityColor.func_96298_a()) + (String) list.get(k));
             }
             else
             {

diff --git a/src/main/java/tconstruct/client/gui/NewContainerGui.java b/src/main/java/tconstruct/client/gui/NewContainerGui.java
@@ -99,7 +99,7 @@ public void initGui ()
      */
     public void drawScreen (int mouseX, int mouseY, float par3)
     {
-        this.drawDefaultBackground();
+        this.func_146276_q_();
         int gLeft = this.guiLeft;
         int gTop = this.guiTop;
         this.drawGuiContainerBackgroundLayer(par3, mouseX, mouseY);

diff --git a/src/main/java/tconstruct/client/gui/PartCrafterGui.java b/src/main/java/tconstruct/client/gui/PartCrafterGui.java
@@ -226,7 +226,7 @@ protected void mouseClicked (int mouseX, int mouseY, int clickNum)
 
             if (this.field_146297_k.gameSettings.touchscreen && flag1 && this.field_146297_k.thePlayer.inventory.getItemStack() == null)
             {
-                this.field_146297_k.displayGuiScreen((GuiScreen) null);
+                this.field_146297_k.func_147108_a((GuiScreen) null);
                 return;
             }
 

diff --git a/src/main/java/tconstruct/client/gui/SmelteryGui.java b/src/main/java/tconstruct/client/gui/SmelteryGui.java
@@ -167,7 +167,7 @@ protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY)
         this.field_146297_k.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
         if (logic.fuelGague > 0)
         {
-            IIcon lavaIcon = Blocks.lava.getIcon(0, 0);
+            IIcon lavaIcon = Blocks.lava.func_149691_a(0, 0);
             int fuel = logic.getScaledFuelGague(52);
             int count = 0;
             while (fuel > 0)
@@ -344,7 +344,7 @@ protected void drawToolTip (List par1List, int par2, int par3)
             while (iterator.hasNext())
             {
                 String s = (String) iterator.next();
-                int l = this.field_146289_q.getStringfield_146294_l(s);
+                int l = this.field_146289_q.getStringWidth(s);
 
                 if (l > k)
                 {

diff --git a/src/main/java/tconstruct/client/gui/ToolForgeGui.java b/src/main/java/tconstruct/client/gui/ToolForgeGui.java
@@ -80,7 +80,7 @@ protected void actionPerformed (GuiButton button)
     @Override
     void resetGui ()
     {
-        this.text.setText("");
+        this.text.func_146180_a("");
         selectedButton = 0;
         setSlotType(0);
         iconX = new int[] { 0, 1, 2, 13 };

diff --git a/src/main/java/tconstruct/client/gui/ToolStationGui.java b/src/main/java/tconstruct/client/gui/ToolStationGui.java
@@ -75,7 +75,7 @@ protected void mouseClicked (int mouseX, int mouseY, int mouseButton)
 
     void resetGui ()
     {
-        this.text.setText("");
+        this.text.func_146180_a("");
         guiType = 0;
         setSlotType(0);
         iconX = new int[] { 0, 1, 2 };

diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java
@@ -42,7 +42,7 @@ public static void addTabsToInventory (GuiContainer gui)
     public static void openInventoryGui ()
     {
         GuiInventory inventory = new GuiInventory(mc.thePlayer);
-        mc.displayGuiScreen(inventory);
+        mc.func_147108_a(inventory);
         TabRegistry.addTabsToInventory(inventory);
     }
 

diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java
@@ -837,22 +837,22 @@ public void addAchievements ()
     {
         HashMap<String, Achievement> achievements = TAchievements.achievements;
 
-        achievements.put("tconstruct.beginner", new Achievement("" + 2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null).setIndependent().registerAchievement());
-        achievements.put("tconstruct.pattern", new Achievement("" + 2742, "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct.beginner")).registerAchievement());
+        achievements.put("tconstruct.beginner", new Achievement("" + 2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null).setIndependent() );
+        achievements.put("tconstruct.pattern", new Achievement("" + 2742, "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct.beginner")) );
         achievements.put("tconstruct.tinkerer",
-                new Achievement("" + 2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement());
+                new Achievement("" + 2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")) );
         achievements.put("tconstruct.preparedFight",
-                new Achievement("" + 2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement());
+                new Achievement("" + 2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")));
         achievements.put("tconstruct.proTinkerer", new Achievement("" + 2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial()
-                .registerAchievement());
-        achievements.put("tconstruct.smelteryMaker", new Achievement("" + 2746, "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct.beginner")).registerAchievement());
+                 );
+        achievements.put("tconstruct.smelteryMaker", new Achievement("" + 2746, "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct.beginner")) );
         achievements.put("tconstruct.enemySlayer",
-                new Achievement("" + 2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement());
+                new Achievement("" + 2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")) );
         achievements.put("tconstruct.dualConvenience", new Achievement("" + 2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer"))
-                .setSpecial().registerAchievement());
+                .setSpecial() );
         achievements.put("tconstruct.doingItWrong",
-                new Achievement("" + 2749, "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct.smelteryMaker")).registerAchievement());
+                new Achievement("" + 2749, "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct.smelteryMaker")) );
         achievements.put("tconstruct.betterCrafting",
-                new Achievement("" + 2750, "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct.beginner")).registerAchievement());
+                new Achievement("" + 2750, "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct.beginner")) );
     }
 }
diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java
@@ -402,7 +402,7 @@ public void onUpdate ()
             var2 = MathHelper.floor_double(this.posY);
             int var47 = MathHelper.floor_double(this.posZ);
 
-            if (BlockRail.isRailBlockAt(this.worldObj, var45, var2 - 1, var47))
+            if (BlockRail.func_150049_b_(this.worldObj, var45, var2 - 1, var47))
             {
                 --var2;
             }
@@ -567,7 +567,7 @@ public Vec3 func_70495_a (double par1, double par3, double par5, double par7)
         int var10 = MathHelper.floor_double(par3);
         int var11 = MathHelper.floor_double(par5);
 
-        if (BlockRail.isRailBlockAt(this.worldObj, var9, var10 - 1, var11))
+        if (BlockRail.func_150049_b_(this.worldObj, var9, var10 - 1, var11))
         {
             --var10;
         }
@@ -583,14 +583,14 @@ public Vec3 func_70489_a (double par1, double par3, double par5)
         int var8 = MathHelper.floor_double(par3);
         int var9 = MathHelper.floor_double(par5);
 
-        if (BlockRail.isRailBlockAt(this.worldObj, var7, var8 - 1, var9))
+        if (BlockRail.func_150049_b_(this.worldObj, var7, var8 - 1, var9))
         {
             --var8;
         }
 
         Block var10 = this.worldObj.func_147439_a(var7, var8, var9);
 
-        if (BlockRail.isRailBlock(var10))
+        if (BlockRail.func_150051_a(var10))
         {
             int var11 = 0;
             par3 = (double) var8;