diff options
Diffstat (limited to 'src/Java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java (renamed from src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustSpecialUse.java) | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/item/UtilsItems.java | 8 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java index 9f1b775fb0..cd7b141bd4 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java +++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java @@ -14,8 +14,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.sun.org.apache.xml.internal.security.utils.I18n; - public class GuiBaseBackpack extends GuiContainer { /** x and y size of the inventory window in pixels. Defined as float, passed as int @@ -60,7 +58,7 @@ public class GuiBaseBackpack extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - String s = this.inventory.hasCustomInventoryName() ? this.inventory.getInventoryName() : I18n.translate(this.inventory.getInventoryName()); + String s = this.inventory.hasCustomInventoryName() ? this.inventory.getInventoryName() : this.inventory.getInventoryName(); //this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 0, 4210752); //this.fontRenderer.drawString(I18n.translate("container.inventory"), 26, this.ySize - 96 + 4, 4210752); } diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustSpecialUse.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index 46f6066a22..78067e48c7 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustSpecialUse.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -17,14 +17,14 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -public class BaseItemDustSpecialUse extends Item{ +public class BaseItemDustUnique extends Item{ protected int colour; protected String materialName; protected String pileType; String name = ""; - public BaseItemDustSpecialUse(String unlocalizedName, String materialName, int colour, String pileSize) { + public BaseItemDustUnique(String unlocalizedName, String materialName, int colour, String pileSize) { setUnlocalizedName(unlocalizedName); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 8076728de4..d774c0a4d2 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.lib; -import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.gregtech.recipehandlers.GregtechRecipe; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; @@ -20,7 +19,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.4.6.1-release"; + public static final String VERSION = "1.4.6.3-release"; public static boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; @@ -35,7 +34,6 @@ public class CORE { @SideOnly(Side.CLIENT) public static IIconRegister GT_BlockIcons, GT_ItemIcons; public static List<Runnable> GT_BlockIconload = new ArrayList<Runnable>(); - public static final Class<AddToCreativeTab> TAB = AddToCreativeTab.class; public static Configuration Config; public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]"; public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."; diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java index ef8f0f0f8b..d6d4a85b23 100644 --- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java +++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BasicSpawnEgg; import gtPlusPlus.core.item.base.bolts.BaseItemBolt; import gtPlusPlus.core.item.base.dusts.BaseItemDust; -import gtPlusPlus.core.item.base.dusts.BaseItemDustSpecialUse; +import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique; import gtPlusPlus.core.item.base.gears.BaseItemGear; import gtPlusPlus.core.item.base.ingots.BaseItemIngot; import gtPlusPlus.core.item.base.ingots.BaseItemIngotHot; @@ -339,9 +339,9 @@ public class UtilsItems { public static Item[] generateSpecialUseDusts(String unlocalizedName, String materialName, int Colour){ Item[] output = { - new BaseItemDustSpecialUse("itemDust"+unlocalizedName, materialName, Colour, "Dust"), - new BaseItemDustSpecialUse("itemDustSmall"+unlocalizedName, materialName, Colour, "Small"), - new BaseItemDustSpecialUse("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny")}; + new BaseItemDustUnique("itemDust"+unlocalizedName, materialName, Colour, "Dust"), + new BaseItemDustUnique("itemDustSmall"+unlocalizedName, materialName, Colour, "Small"), + new BaseItemDustUnique("itemDustTiny"+unlocalizedName, materialName, Colour, "Tiny")}; return output; } |