From 78dc1708d081b15468fade3031d13bc6c8fe6d74 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 21 Sep 2012 23:00:28 -0400 Subject: [PATCH] More MCP updates --- common/buildcraft/builders/ItemBptBase.java | 8 ++++---- common/buildcraft/builders/TilePathMarker.java | 4 ++-- common/buildcraft/core/gui/GuiAdvancedInterface.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/buildcraft/builders/ItemBptBase.java b/common/buildcraft/builders/ItemBptBase.java index b487a34c..19bed9b8 100644 --- a/common/buildcraft/builders/ItemBptBase.java +++ b/common/buildcraft/builders/ItemBptBase.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011-2012 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -27,7 +27,7 @@ public abstract class ItemBptBase extends ItemBuildCraft { maxStackSize = 1; iconIndex = 5 * 16 + 0; - this.setTabToDisplayOn(CreativeTabs.tabMisc); + this.setCreativeTab(CreativeTabs.tabMisc); } @SuppressWarnings({ "all" }) diff --git a/common/buildcraft/builders/TilePathMarker.java b/common/buildcraft/builders/TilePathMarker.java index f3d7671a..a9c65647 100644 --- a/common/buildcraft/builders/TilePathMarker.java +++ b/common/buildcraft/builders/TilePathMarker.java @@ -76,7 +76,7 @@ public class TilePathMarker extends TileMarker { double nearestDistance = 0, distance; //The initialization of nearestDistance is only to make the compiler shut up for (TilePathMarker t : availableMarkers) { - if (t == this || t == this.links[0] || t == this.links[1] || t.worldObj.provider.worldType != this.worldObj.provider.worldType) + if (t == this || t == this.links[0] || t == this.links[1] || t.worldObj.provider.dimensionId != this.worldObj.provider.dimensionId) continue; distance = Math.sqrt(Math.pow(this.xCoord - t.xCoord, 2) + Math.pow(this.yCoord - t.yCoord, 2) + Math.pow(this.zCoord - t.zCoord, 2)); @@ -257,7 +257,7 @@ public class TilePathMarker extends TileMarker { public static void clearAvailableMarkersList(World w) { for (Iterator it = availableMarkers.iterator(); it.hasNext();) { TilePathMarker t = it.next(); - if (t.worldObj.provider.worldType != w.provider.worldType) { + if (t.worldObj.provider.dimensionId != w.provider.dimensionId) { it.remove(); } } diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/gui/GuiAdvancedInterface.java index 20ce187a..1d7bb86c 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/gui/GuiAdvancedInterface.java @@ -57,7 +57,7 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft { drawTexturedModalRect(cornerX + x, cornerY + y, 16 * textureJ, 16 * textureI, 16, 16); } - + } public void drawStack(ItemStack item) { @@ -165,7 +165,7 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft { if (s.length() > 0) { int i2 = (lastX - cornerX); int k2 = lastY - cornerY; - func_74190_a(s, i2, k2); + drawCreativeTabHoveringText(s, i2, k2); } }