diff --git a/src/main/java/forestry/core/entities/EntityMinecartForestry.java b/src/main/java/forestry/core/entities/EntityMinecartForestry.java index 5d8d8431b..35cef5451 100644 --- a/src/main/java/forestry/core/entities/EntityMinecartForestry.java +++ b/src/main/java/forestry/core/entities/EntityMinecartForestry.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartInteractEvent; @@ -29,6 +28,7 @@ import forestry.core.gui.GuiHandler; import forestry.core.gui.IGuiHandlerEntity; import forestry.core.gui.IHintSource; import forestry.core.tiles.ITitled; +import forestry.core.utils.StringUtil; public abstract class EntityMinecartForestry extends EntityMinecart implements ITitled, IRestrictedAccess, IHintSource, IGuiHandlerEntity { @@ -111,7 +111,7 @@ public abstract class EntityMinecartForestry extends EntityMinecart @Override public String getCommandSenderName() { - return StatCollector.translateToLocal(getUnlocalizedTitle()); + return StringUtil.localizeGuiTitle(getUnlocalizedTitle()); } /* ITitled */ diff --git a/src/main/java/forestry/core/gui/GuiForestryTitled.java b/src/main/java/forestry/core/gui/GuiForestryTitled.java index b6dffd746..a8fd9486c 100644 --- a/src/main/java/forestry/core/gui/GuiForestryTitled.java +++ b/src/main/java/forestry/core/gui/GuiForestryTitled.java @@ -10,9 +10,9 @@ package forestry.core.gui; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.util.StatCollector; import forestry.core.tiles.ITitled; +import forestry.core.utils.StringUtil; public abstract class GuiForestryTitled extends GuiForestry { @@ -24,7 +24,7 @@ public abstract class GuiForestryTitled { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - String name = StatCollector.translateToLocal(inventory.getUnlocalizedTitle()); + String name = StringUtil.localizeGuiTitle(inventory.getUnlocalizedTitle()); this.fontRendererObj.drawString(name, textLayout.getCenteredOffset(name), 6, fontColor.get("gui.mail.text")); String receive = StringUtil.localize("gui.mail.receive"); diff --git a/src/main/resources/config/forestry/colour.properties b/src/main/resources/assets/forestry/config/colour.properties old mode 100755 new mode 100644 similarity index 81% rename from src/main/resources/config/forestry/colour.properties rename to src/main/resources/assets/forestry/config/colour.properties index b0cbd9a2e..fd125f7b8 --- a/src/main/resources/config/forestry/colour.properties +++ b/src/main/resources/assets/forestry/config/colour.properties @@ -1,6 +1,6 @@ -# Add a file of this format in your texture packs zip as -# /config/forestry/colour.properties to configure font colours. -# A file at that location inside the zip of the active texture pack +# Add a file of this format in your resource pack zip as +# /assets/forestry/config/colour.properties to configure font colours. +# A file at that location inside the zip of the active resource pack # will take precedence over the default. # # Hex format without leading 0x @@ -48,4 +48,4 @@ ledger.farm.text=000000 ledger.search_ingredients.background=ffffff ledger.search_ingredients.header=587b96 -ledger.search_ingredients.text=000000 \ No newline at end of file +ledger.search_ingredients.text=000000