diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 9220a9ae4..49bf6dbf7 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -12,6 +12,7 @@ package vazkii.botania.api.subtile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -19,7 +20,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; @@ -211,9 +213,10 @@ public class SubTileFunctional extends SubTileEntity { return linkedPool != null && linkedPool.hasWorldObj() && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); + String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index b01ce3fdd..99841f1de 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -23,8 +24,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; @@ -302,9 +304,10 @@ public class SubTileGenerating extends SubTileEntity { return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); + String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 31bd5b922..a2465c24f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -21,6 +21,7 @@ import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiIngame; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -30,7 +31,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.fml.common.eventhandler.EventPriority; @@ -137,7 +137,7 @@ public final class HUDHandler { if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) { profiler.startSection("multiblockRightClick"); - String s = I18n.translateToLocal("botaniamisc.rightClickToAnchor"); + String s = I18n.format("botaniamisc.rightClickToAnchor"); mc.fontRendererObj.drawStringWithShadow(s, event.getResolution().getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.getResolution().getScaledHeight() / 2 - 30, 0xFFFFFF); profiler.endSection(); } @@ -228,7 +228,7 @@ public final class HUDHandler { if(ticks > 0) { int alpha = Math.min(255, (int) (ticks * 256.0F / 10.0F)); int color = 0x00CC00 + (alpha << 24); - String disp = I18n.translateToLocal(ItemTwigWand.getModeString(stack)); + String disp = I18n.format(ItemTwigWand.getModeString(stack)); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2; int y = res.getScaledHeight() - 70; @@ -350,8 +350,8 @@ public final class HUDHandler { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; - drawStr = I18n.translateToLocal(entry.getUnlocalizedName()); - secondLine = TextFormatting.ITALIC + I18n.translateToLocal(entry.getTagline()); + drawStr = I18n.format(entry.getUnlocalizedName()); + secondLine = TextFormatting.ITALIC + I18n.format(entry.getTagline()); draw = true; } } @@ -397,9 +397,9 @@ public final class HUDHandler { private void renderNearIndexDisplay(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); - String txt0 = I18n.translateToLocal("botaniamisc.nearIndex0"); - String txt1 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex1"); - String txt2 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex2"); + String txt0 = I18n.format("botaniamisc.nearIndex0"); + String txt1 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex1"); + String txt2 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex2"); int l = Math.max(mc.fontRendererObj.getStringWidth(txt0), Math.max(mc.fontRendererObj.getStringWidth(txt1), mc.fontRendererObj.getStringWidth(txt2))) + 20; int x = res.getScaledWidth() - l - 20; @@ -432,7 +432,7 @@ public final class HUDHandler { renderManaBar(x, y, color, mana < 0 ? 0.5F : 1F, mana, maxMana); if(mana < 0) { - String text = I18n.translateToLocal("botaniamisc.statusUnknown"); + String text = I18n.format("botaniamisc.statusUnknown"); x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(text) / 2; y -= 1; mc.fontRendererObj.drawString(text, x, y, color); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 3442f22e5..55b239446 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -8,6 +8,7 @@ import net.minecraft.client.model.ModelBook; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,7 +16,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -164,30 +164,30 @@ public class RenderLexicon { if(stack != null) title = stack.getDisplayName(); if(title.equals(origTitle) && bevo) - title = I18n.translateToLocal("item.botania:lexicon.bevo"); + title = I18n.format("item.botania:lexicon.bevo"); if(title.equals(origTitle) && saice) - title = I18n.translateToLocal("item.botania:lexicon.saice"); + title = I18n.format("item.botania:lexicon.saice"); font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); GlStateManager.translate(0F, 10F, 0F); GlStateManager.scale(0.6F, 0.6F, 0.6F); - font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); + font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + String.format(I18n.format("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); GlStateManager.translate(0F, 15F, 0F); - font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); + font.drawString(I18n.format("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); - font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + font.drawString(I18n.format("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 50F, 0F); - font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); + font.drawString(I18n.format("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); - font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); + font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.format("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); if(bevo || saice) { GlStateManager.translate(0F, 10F, 0F); - font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); + font.drawString(I18n.format("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 2404b7590..068310586 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -17,11 +17,11 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -185,13 +185,13 @@ public final class TooltipAdditionDisplayHandler { Gui.drawRect(mouseX + offx + i, mouseY - offy - height, mouseX + offx + i + 1, mouseY - offy, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F)); Gui.drawRect(mouseX + offx + rainbowWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); - String rank = I18n.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7"); + String rank = I18n.format("botania.rank" + level).replaceAll("&", "\u00a7"); GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING); font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); if(!ss) { - rank = I18n.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); + rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF); } diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 5026af18d..e0011b70d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -10,9 +10,9 @@ */ package vazkii.botania.client.core.handler; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -25,15 +25,15 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public void onTooltipEvent(ItemTooltipEvent event) { if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.DIRT) && event.getItemStack().getItemDamage() == 1) { - event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt0")); - event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt1")); + event.getToolTip().add(I18n.format("botaniamisc.coarseDirt0")); + event.getToolTip().add(I18n.format("botaniamisc.coarseDirt1")); } else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.MOB_SPAWNER) && event.getEntityPlayer().capabilities.isCreativeMode) - event.getToolTip().add(I18n.translateToLocal("botaniamisc.spawnerTip")); + event.getToolTip().add(I18n.format("botaniamisc.spawnerTip")); if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false)) - event.getToolTip().add(I18n.translateToLocal("botaniamisc.hasIvy")); + event.getToolTip().add(I18n.format("botaniamisc.hasIvy")); if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) - event.getToolTip().add(I18n.translateToLocal("botaniamisc.hasKeepIvy")); + event.getToolTip().add(I18n.format("botaniamisc.hasKeepIvy")); } } diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 786cf33a2..d417bef56 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -13,11 +13,11 @@ package vazkii.botania.client.gui.bag; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; @@ -33,9 +33,9 @@ public class GuiFlowerBag extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String s = I18n.translateToLocal("item.botania:flowerBag.name"); + String s = I18n.format("item.botania:flowerBag.name"); fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752); - fontRendererObj.drawString(I18n.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); + fontRendererObj.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 6ce5f3c9f..f282bd211 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -16,12 +16,12 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatAllowedCharacters; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -285,7 +285,7 @@ public class GuiLexicon extends GuiScreen { if(notesEnabled && ClientTickHandler.ticksInGame % 20 < 10) noteDisplay += "&r_"; - fontRendererObj.drawString(I18n.translateToLocal("botaniamisc.notes"), x + 5, y - 7, 0x666666); + fontRendererObj.drawString(I18n.format("botaniamisc.notes"), x + 5, y - 7, 0x666666); boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); @@ -340,7 +340,7 @@ public class GuiLexicon extends GuiScreen { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.drawString(title, left + 18, top + 13, color); fontRendererObj.setUnicodeFlag(true); - fontRendererObj.drawString(String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color); + fontRendererObj.drawString(String.format(I18n.format("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color); String s = TextFormatting.BOLD + categoryHighlight; fontRendererObj.drawString(s, left + guiWidth / 2 - fontRendererObj.getStringWidth(s) / 2, top + 36, 0); @@ -481,9 +481,9 @@ public class GuiLexicon extends GuiScreen { GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i); LexiconCategory category = i_ >= categoryList.size() ? null : categoryList.get(i_); if(category != null) - button.displayString = I18n.translateToLocal(category.getUnlocalizedName()); + button.displayString = I18n.format(category.getUnlocalizedName()); else { - button.displayString = I18n.translateToLocal("botaniamisc.lexiconIndex"); + button.displayString = I18n.format("botaniamisc.lexiconIndex"); break; } } @@ -511,9 +511,9 @@ public class GuiLexicon extends GuiScreen { } if(isMainPage()) - buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.history"), this)); + buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.format("botaniamisc.history"), this)); else if(isChallenge()) - buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.info"), this)); + buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.format("botaniamisc.info"), this)); } public static void startTutorial() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index ed081b42f..6cedd8e17 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -13,9 +13,9 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.ModChallenges; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -44,7 +44,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } public void setTitle() { - title = challenge == null ? "(null)" : I18n.translateToLocal(challenge.unlocalizedName); + title = challenge == null ? "(null)" : I18n.format(challenge.unlocalizedName); } @Override @@ -69,8 +69,8 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); - fontRendererObj.drawString(TextFormatting.BOLD + I18n.translateToLocal(challenge.unlocalizedName), left + 38, top + 13, 0); - fontRendererObj.drawString(I18n.translateToLocal(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.translateToLocal(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); + fontRendererObj.drawString(TextFormatting.BOLD + I18n.format(challenge.unlocalizedName), left + 38, top + 13, 0); + fontRendererObj.drawString(I18n.format(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); int width = guiWidth - 30; int x = left + 16; @@ -116,7 +116,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } void setCompleteButtonTitle() { - completeButton.displayString = I18n.translateToLocal(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted"); + completeButton.displayString = I18n.format(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted"); } void back() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index 4c02437f8..1f97ef595 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -11,8 +11,8 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.EnumChallengeLevel; import vazkii.botania.client.challenge.ModChallenges; @@ -30,13 +30,13 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { public GuiLexiconChallengesList() { parent = new GuiLexicon(); - title = I18n.translateToLocal("botaniamisc.challenges"); + title = I18n.format("botaniamisc.challenges"); } @Override public void onInitGui() { super.onInitGui(); - title = I18n.translateToLocal("botaniamisc.challenges"); + title = I18n.format("botaniamisc.challenges"); buttonList.add(backButton = new GuiButtonBack(12, left + guiWidth / 2 - 8, top + guiHeight + 2)); @@ -67,7 +67,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { if(c.complete) complete++; - fontRendererObj.drawString(TextFormatting.BOLD + I18n.translateToLocal(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0); + fontRendererObj.drawString(TextFormatting.BOLD + I18n.format(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0); } fontRendererObj.setUnicodeFlag(unicode); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index b66d25db9..5a6591152 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -13,11 +13,11 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -66,9 +66,9 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa return; } - title = I18n.translateToLocal(entry.getUnlocalizedName()); + title = I18n.format(entry.getUnlocalizedName()); if(entry instanceof IAddonEntry) - subtitle = I18n.translateToLocal(((IAddonEntry) entry).getSubtitle()); + subtitle = I18n.format(((IAddonEntry) entry).getSubtitle()); else subtitle = null; } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index a244362de..8b1b1d05d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.gui.lexicon; +import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconEntry; @@ -24,7 +24,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex { public GuiLexiconHistory() { super(null); - title = I18n.translateToLocal("botaniamisc.historyLong"); + title = I18n.format("botaniamisc.historyLong"); } @Override @@ -33,7 +33,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex { ILexicon lex = (ILexicon) stackUsed.getItem(); for(int i = history.size() - 1; i >= 0; i--) { LexiconEntry entry = history.get(i); - if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && I18n.translateToLocal(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim())) + if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && I18n.format(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim())) entriesToDisplay.add(entry); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index 19954086c..78e0e9137 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -14,11 +14,11 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; @@ -67,7 +67,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } public void setTitle() { - title = I18n.translateToLocal(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName()); + title = I18n.format(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName()); } @Override @@ -135,7 +135,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { return true; search = search.toLowerCase(); - if(I18n.translateToLocal(e.getUnlocalizedName()).toLowerCase().contains(search)) + if(I18n.format(e.getUnlocalizedName()).toLowerCase().contains(search)) return true; for(ItemStack stack : e.getDisplayedRecipes()) { @@ -155,7 +155,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i - page * 12); LexiconEntry entry = i >= entriesToDisplay.size() ? null : entriesToDisplay.get(i); if(entry != null) { - button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? TextFormatting.ITALIC : "") + I18n.translateToLocal(entry.getUnlocalizedName()); + button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? TextFormatting.ITALIC : "") + I18n.format(entry.getUnlocalizedName()); button.displayStack = entry.getIcon(); if(entry == tutEntry) tutPage = page; @@ -186,14 +186,14 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { if(entriesToDisplay.size() == 1) { boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); - String s = I18n.translateToLocal("botaniamisc.enterToView"); + String s = I18n.format("botaniamisc.enterToView"); mc.fontRendererObj.drawString(s, left + guiWidth / 2 - mc.fontRendererObj.getStringWidth(s) / 2, top + 30, 0x666666); mc.fontRendererObj.setUnicodeFlag(unicode); } } else { boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); - String s = I18n.translateToLocal("botaniamisc.typeToSearch"); + String s = I18n.format("botaniamisc.typeToSearch"); mc.fontRendererObj.drawString(s, left + 120 - mc.fontRendererObj.getStringWidth(s), top + guiHeight - 18, 0x666666); mc.fontRendererObj.setUnicodeFlag(unicode); } @@ -224,7 +224,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { int x = currentButton.xPosition; int y = currentButton.yPosition; - String s = I18n.translateToLocal(currentEntry.getTagline()); + String s = I18n.format(currentEntry.getTagline()); boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); int width = mc.fontRendererObj.getStringWidth(s); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index e2fdc2a62..5961c55d7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -12,8 +12,8 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -37,7 +37,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11); List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.achievements")); + tooltip.add(TextFormatting.YELLOW + I18n.format("botaniamisc.achievements")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 044a45df9..0371c342e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -44,7 +44,7 @@ public class GuiButtonBack extends GuiButtonLexicon { } public List getTooltip() { - return Collections.singletonList(I18n.translateToLocal("botaniamisc.back")); + return Collections.singletonList(I18n.format("botaniamisc.back")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java index 451274db3..291914d20 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java @@ -11,7 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import java.util.Arrays; import java.util.List; @@ -24,7 +24,7 @@ public class GuiButtonBackWithShift extends GuiButtonBack { @Override public List getTooltip() { - return Arrays.asList(I18n.translateToLocal("botaniamisc.back"), TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToIndex")); + return Arrays.asList(I18n.format("botaniamisc.back"), TextFormatting.GRAY + I18n.format("botaniamisc.clickToIndex")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 6ebad086d..d6a308244 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -2,7 +2,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -27,11 +27,11 @@ public class GuiButtonBookmark extends GuiButtonLexicon { List tooltip = new ArrayList<>(); if(displayString.equals("+")) - tooltip.add(I18n.translateToLocal("botaniamisc.clickToAdd")); + tooltip.add(I18n.format("botaniamisc.clickToAdd")); else { - tooltip.add(String.format(I18n.translateToLocal("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1)); - tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToSee")); - tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.shiftToRemove")); + tooltip.add(String.format(I18n.format("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1)); + tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.clickToSee")); + tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.shiftToRemove")); } int tooltipY = (tooltip.size() + 1) * 5; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index 818e1999a..c3719e801 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -15,7 +15,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import org.lwjgl.opengl.ARBMultitexture; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; @@ -122,7 +122,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { GlStateManager.popMatrix(); if(inside) - gui.categoryHighlight = I18n.translateToLocal(getTooltipText()); + gui.categoryHighlight = I18n.format(getTooltipText()); } private String getTooltipText() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index 62bcfdac5..145ebb69a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.challenge.Challenge; import javax.annotation.Nonnull; @@ -50,7 +50,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.AQUA + I18n.translateToLocal(challenge.unlocalizedName)); + tooltip.add(TextFormatting.AQUA + I18n.format(challenge.unlocalizedName)); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 28a8ad0df..ecabe2f4d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -11,7 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -35,7 +35,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { int k = getHoverState(hovered); List tooltip = new ArrayList<>(); - tooltip.add(I18n.translateToLocal("botaniamisc.challengeInfo")); + tooltip.add(I18n.format("botaniamisc.challengeInfo")); int tooltipY = (tooltip.size() + 1) * 5; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 475b77268..d3460f82f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -37,7 +37,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 131 : 120, 180, 11, 11); List tooltip = new ArrayList(); - tooltip.add(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.challenges")); + tooltip.add(TextFormatting.YELLOW + I18n.format("botaniamisc.challenges")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index dd37d744f..7dc3c1972 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -36,8 +36,8 @@ public class GuiButtonHistory extends GuiButtonLexicon { int k = getHoverState(hovered); List tooltip = new ArrayList<>(); - tooltip.add(I18n.translateToLocal("botaniamisc.historyLong")); - tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.historyDesc")); + tooltip.add(I18n.format("botaniamisc.historyLong")); + tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.historyDesc")); int tooltipY = (tooltip.size() + 1) * 5; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index ea4625b21..058404dec 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -41,9 +41,9 @@ public class GuiButtonNotes extends GuiButtonLexicon { List tooltip = new ArrayList<>(); if(GuiLexicon.notesEnabled) - tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("botaniamisc.hideNotes")); + tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.hideNotes")); else { - tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("botaniamisc.showNotes")); + tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.showNotes")); if(parent.note != null && !parent.note.isEmpty()) Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 39c581389..aa712a0fa 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -38,7 +38,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { List tooltip = new ArrayList<>(); for(int i = 0; i < 3; i++) - tooltip.add((i == 0 ? TextFormatting.RED : TextFormatting.GRAY) + I18n.translateToLocal("botaniamisc.lexiconOptions" + i)); + tooltip.add((i == 0 ? TextFormatting.RED : TextFormatting.GRAY) + I18n.format("botaniamisc.lexiconOptions" + i)); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index bf3dcbc3e..2957d2f65 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -39,7 +39,7 @@ public class GuiButtonPage extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); if(k == 2) - RenderHelper.renderTooltip(par2, par3, Collections.singletonList(I18n.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); + RenderHelper.renderTooltip(par2, par3, Collections.singletonList(I18n.format(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index c4ffa9ac6..9f679d365 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -43,6 +43,6 @@ public class GuiButtonShare extends GuiButtonLexicon { } public List getTooltip() { - return Collections.singletonList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.clickToShare")); + return Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.clickToShare")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index d04097e30..1b3e34add 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; @@ -46,7 +46,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { List tooltip = new ArrayList<>(); String version = PersistentVariableHelper.lastBotaniaVersion; for(int i = 0; i < 6; i++) { - tooltip.add(TextFormatting.GRAY + String.format(I18n.translateToLocal("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); + tooltip.add(TextFormatting.GRAY + String.format(I18n.format("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); if(i == 3) tooltip.add(""); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index a26e71bac..5cf07ae21 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -36,7 +36,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 41 : 30, 200, 11, 11); - List tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.viewOnline")); + List tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.viewOnline")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) RenderHelper.renderTooltip(par2, par3 + tooltipY, tooltip); diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 1f2c51032..ec8828dbf 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -17,7 +17,7 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import javax.annotation.Nonnull; import java.util.Collection; @@ -32,7 +32,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { public BreweryRecipeCategory(IGuiHelper guiHelper) { ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png"); background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); - localizedName = I18n.translateToLocal("botania.nei.brewery"); + localizedName = I18n.format("botania.nei.brewery"); } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index a501d0508..c82e17d00 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -22,7 +22,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; @@ -37,7 +37,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { private final IDrawable overlay; public ElvenTradeRecipeCategory(IGuiHelper guiHelper) { - localizedName = I18n.translateToLocal("botania.nei.elvenTrade"); + localizedName = I18n.format("botania.nei.elvenTrade"); background = guiHelper.createBlankDrawable(145, 95); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 239c28efa..eda67238b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -34,7 +34,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { public ManaPoolRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); - localizedName = I18n.translateToLocal("botania.nei.manaPool"); + localizedName = I18n.format("botania.nei.manaPool"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); ItemNBTHelper.setBoolean(renderStack, "RenderFull", true); diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 1d59f1734..198d3957f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -18,7 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -34,7 +34,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(150, 110); - localizedName = I18n.translateToLocal("botania.nei.petalApothecary"); + localizedName = I18n.format("botania.nei.petalApothecary"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), 0, 0, 150, 110); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 4ca2b3156..1e567190e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -33,7 +33,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { public PureDaisyRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); - localizedName = I18n.translateToLocal("botania.nei.pureDaisy"); + localizedName = I18n.format("botania.nei.pureDaisy"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index 6e5695b98..0040afefc 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -15,9 +15,9 @@ import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -33,7 +33,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { public RunicAltarRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(150, 110); - localizedName = I18n.translateToLocal("botania.nei.runicAltar"); + localizedName = I18n.format("botania.nei.runicAltar"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), 0, 0, 150, 110); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 5bc0ba728..a8fac4453 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +25,8 @@ import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import org.lwjgl.opengl.GL11; @@ -234,12 +236,13 @@ public class SubTileHopperhock extends SubTileFunctional { filterType = cmp.getInteger(TAG_FILTER_TYPE); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); int color = getColor(); - String filter = I18n.translateToLocal("botaniamisc.filter" + filterType); + String filter = I18n.format("botaniamisc.filter" + filterType); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(filter) / 2; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index ef1846576..fb569cc31 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -29,6 +29,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFlowerPlaceable; @@ -164,6 +166,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { return true; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 31595a5b7..f9b55b9bd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -21,6 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -103,6 +105,7 @@ public class SubTileSpectrolus extends SubTileGenerating { return LexiconData.spectrolus; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index ff3b21fd6..9ee0d65af 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -24,7 +25,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -314,6 +316,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { return hasLava; } + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { int xc = res.getScaledWidth() / 2; int yc = res.getScaledHeight() / 2; @@ -357,9 +360,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } else if(recipeKeepTicks > 0 && hasWater) { - String s = I18n.translateToLocal("botaniamisc.altarRefill0"); + String s = I18n.format("botaniamisc.altarRefill0"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 10, 0xFFFFFF); - s = I18n.translateToLocal("botaniamisc.altarRefill1"); + s = I18n.format("botaniamisc.altarRefill1"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 20, 0xFFFFFF); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 4f9ae7c87..8d9d9ec32 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -14,12 +14,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StringUtils; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; @@ -141,6 +143,7 @@ public class TileHourglass extends TileSimpleInventory { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } + @SideOnly(Side.CLIENT) public void renderHUD(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); int x = res.getScaledWidth() / 2 + 10; @@ -165,7 +168,7 @@ public class TileHourglass extends TileSimpleInventory { if(!move) status = status.isEmpty() ? "stopped" : "lockedStopped"; if(!status.isEmpty()) - mc.fontRendererObj.drawStringWithShadow(I18n.translateToLocal("botaniamisc." + status), x + 20, y + 12, getColor()); + mc.fontRendererObj.drawStringWithShadow(I18n.format("botaniamisc." + status), x + 20, y + 12, getColor()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index ebe32ba46..143c60b89 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; @@ -383,9 +383,9 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } else if(recipeKeepTicks > 0) { - String s = I18n.translateToLocal("botaniamisc.altarRefill0"); + String s = I18n.format("botaniamisc.altarRefill0"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 10, 0xFFFFFF); - s = I18n.translateToLocal("botaniamisc.altarRefill1"); + s = I18n.format("botaniamisc.altarRefill1"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 20, 0xFFFFFF); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 8491c5d27..5dd4e2e4e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -16,6 +16,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -29,8 +30,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -359,9 +361,10 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); } + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { ItemStack pool = new ItemStack(ModBlocks.pool, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); - String name = I18n.translateToLocal(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.format(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index d9fdffb38..f65d7f0ef 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -16,6 +16,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -31,8 +32,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -559,8 +561,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, return world.rayTraceBlocks(vec3, vec31, par3, !par3, par3); } + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.translateToLocal(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.format(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index a0de3966f..f60d652de 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -11,11 +11,11 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import java.awt.*; import java.io.File; @@ -46,7 +46,7 @@ public class ThreadDownloadMod extends Thread { @Override public void run() { try { - ITextComponent component = ITextComponent.Serializer.jsonToComponent(String.format(I18n.translateToLocal("botania.versioning.startingDownload"), fileName)); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(String.format(I18n.format("botania.versioning.startingDownload"), fileName)); if(Minecraft.getMinecraft().thePlayer != null) Minecraft.getMinecraft().thePlayer.addChatMessage(component); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 3b4f6feaa..abf6f7dfe 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -11,12 +11,12 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; @@ -50,7 +50,7 @@ public final class VersionChecker { player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); - ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); player.addChatComponentMessage(component); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 09b57d765..6faa16fb6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -10,12 +10,14 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; @@ -43,10 +45,11 @@ public class ItemAncientWill extends ItemMod { list.add(new ItemStack(item, 1, i)); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.craftToAddWill"), list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); + addStringToTooltip(I18n.format("botaniamisc.craftToAddWill"), list); + addStringToTooltip(I18n.format("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); } public void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 9a26ae81b..297968760 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -30,7 +31,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -243,12 +243,12 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { Block block = getBlock(par1ItemStack); if(block != null && block != Blocks.AIR) { int count = getBlockCount(par1ItemStack); - par3List.add(count + " " + I18n.translateToLocal(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); + par3List.add(count + " " + I18n.format(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); } if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(I18n.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(I18n.translateToLocal("botaniamisc.inactive"), par3List); + addStringToTooltip(I18n.format("botaniamisc.active"), par3List); + else addStringToTooltip(I18n.format("botaniamisc.inactive"), par3List); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 42b3d4834..df7eddcb7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -10,13 +10,15 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IManaPool; @@ -84,9 +86,10 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { item.playSound(BotaniaSoundEvents.blackLotus, 0.5F, t2 ? 0.1F : 1F); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(I18n.translateToLocal("botaniamisc.lotusDesc")); + list.add(I18n.format("botaniamisc.lotusDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 7e6db88f1..7bab788e6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -29,9 +30,10 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; @@ -201,15 +203,16 @@ public class ItemBottledMana extends ItemMod { return seed; } - long randomSeed(ItemStack stack) { + private long randomSeed(ItemStack stack) { long seed = Math.abs(itemRand.nextLong()); ItemNBTHelper.setLong(stack, TAG_SEED, seed); return seed; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - par3List.add(I18n.translateToLocal("botaniamisc.bottleTooltip")); + par3List.add(I18n.format("botaniamisc.bottleTooltip")); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 7b5ea9be3..b9b40cf9c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -30,9 +31,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; @@ -114,12 +116,13 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { return EnumActionResult.PASS; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(isDOIT(stack)) - list.add(I18n.translateToLocal("botaniamisc.justDoIt")); + list.add(I18n.format("botaniamisc.justDoIt")); else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) - list.add(I18n.translateToLocal(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); + list.add(I18n.format(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 639e60fca..9d72ddba8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -39,7 +40,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; @@ -546,7 +546,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { mc.fontRendererObj.drawStringWithShadow(name, x, y, 0xFFFFFF); } else { ItemStack[] recipe = getCraftingItems(stack, slot); - String label = I18n.translateToLocal("botaniamisc.unsetRecipe"); + String label = I18n.format("botaniamisc.unsetRecipe"); boolean setRecipe = false; if(recipe[9] == null) @@ -595,7 +595,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { int yoff = 110; if(setRecipe && !canCraft(player, recipe, getFakeInv(player))) { - String warning = TextFormatting.RED + I18n.translateToLocal("botaniamisc.cantCraft"); + String warning = TextFormatting.RED + I18n.format("botaniamisc.cantCraft"); mc.fontRendererObj.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF); yoff += 12; } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index b22634cf4..e51595228 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -28,8 +29,9 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILaputaImmobile; @@ -76,9 +78,10 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(String.format(I18n.translateToLocal("botaniamisc.shardLevel"), I18n.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); + list.add(String.format(I18n.format("botaniamisc.shardLevel"), I18n.format("botania.roman" + (stack.getItemDamage() + 1)))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 51804f14b..c513271f2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -29,8 +30,9 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; @@ -101,10 +103,11 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { list.add(creative); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) { - String edition = TextFormatting.GOLD + String.format(I18n.translateToLocal("botaniamisc.edition"), getEdition()); + String edition = TextFormatting.GOLD + String.format(I18n.format("botaniamisc.edition"), getEdition()); if(!edition.isEmpty()) par3List.add(edition); @@ -116,22 +119,23 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } String format = typesKnown.size() == 1 ? "botaniamisc.knowledgeTypesSingular" : "botaniamisc.knowledgeTypesPlural"; - addStringToTooltip(String.format(I18n.translateToLocal(format), typesKnown.size()), par3List); + addStringToTooltip(String.format(I18n.format(format), typesKnown.size()), par3List); for(KnowledgeType type : typesKnown) - addStringToTooltip(" \u2022 " + I18n.translateToLocal(type.getUnlocalizedName()), par3List); + addStringToTooltip(" \u2022 " + I18n.format(type.getUnlocalizedName()), par3List); - } else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); + } else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); } private void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } + @SideOnly(Side.CLIENT) public static String getEdition() { String version = LibMisc.BUILD; int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version); - return build == 0 ? I18n.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); + return build == 0 ? I18n.format("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 8b287880d..058894c8e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +28,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -204,11 +204,12 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return null; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { boolean clip = hasClip(par1ItemStack); if(clip && !GuiScreen.isShiftKeyDown()) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); + addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); return; } @@ -221,13 +222,13 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { if(clip) { int pos = getClipPos(par1ItemStack); - addStringToTooltip(I18n.translateToLocal("botaniamisc.hasClip"), par3List); + addStringToTooltip(I18n.format("botaniamisc.hasClip"), par3List); for(int i = 0; i < CLIP_SLOTS; i++) { String name = ""; TextFormatting formatting = i == pos ? TextFormatting.GREEN : TextFormatting.GRAY; ItemStack lensAt = getLensAtPos(par1ItemStack, i); if(lensAt == null) - name = I18n.translateToLocal("botaniamisc.clipEmpty"); + name = I18n.format("botaniamisc.clipEmpty"); else name = lensAt.getDisplayName(); addStringToTooltip(formatting + " - " + name, par3List); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 067a43db9..8e56943d1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -10,13 +10,15 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.ICreativeManaProvider; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; @@ -75,10 +77,11 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP return 0; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(isStackCreative(par1ItemStack)) - par3List.add(I18n.translateToLocal("botaniamisc.creative")); + par3List.add(I18n.format("botaniamisc.creative")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index e44ba6cf7..60e487881 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -19,8 +20,9 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; @@ -60,9 +62,10 @@ public class ItemPinkinator extends ItemMod { return ActionResult.newResult(EnumActionResult.PASS, stack); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - p_77624_3_.add(I18n.translateToLocal("botaniamisc.pinkinatorDesc")); + p_77624_3_.add(I18n.format("botaniamisc.pinkinatorDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 57a50db3d..96903ce62 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -25,9 +26,10 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; @@ -101,10 +103,11 @@ public class ItemSignalFlare extends ItemMod implements IColorable { par3List.add(forColor(i)); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getColor(par1ItemStack); - par3List.add(String.format(I18n.translateToLocal("botaniamisc.flareColor"), I18n.translateToLocal("botania.color" + storedColor))); + par3List.add(String.format(I18n.format("botaniamisc.flareColor"), I18n.format("botania.color" + storedColor))); } public static ItemStack forColor(int color) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index d9721461d..eb708afc9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -26,8 +27,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; @@ -84,11 +86,12 @@ public class ItemSpawnerMover extends ItemMod { return 0; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { String id = getEntityId(stack); if (id != null) - infoList.add(I18n.translateToLocal("entity." + id + ".name")); + infoList.add(I18n.format("entity." + id + ".name")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 0ccb83993..bb6422e4c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; @@ -18,7 +19,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -48,8 +48,8 @@ public class ItemTemperanceStone extends ItemMod { @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(I18n.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(I18n.translateToLocal("botaniamisc.inactive"), par3List); + addStringToTooltip(I18n.format("botaniamisc.active"), par3List); + else addStringToTooltip(I18n.format("botaniamisc.inactive"), par3List); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index f35e9428d..1b78fcc36 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -31,8 +32,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; @@ -228,9 +230,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return getUnlocalizedNameLazy(par1ItemStack); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { - list.add(I18n.translateToLocal(getModeString(stack))); + list.add(I18n.format(getModeString(stack))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 55ec5e51f..3202f6a34 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -11,9 +11,11 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import java.util.List; @@ -24,11 +26,12 @@ public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { super(par2Block); } + @SideOnly(Side.CLIENT) @Override public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) for(int i = 0; i < 2; i++) - par3List.add(I18n.translateToLocal("botaniamisc.creativePool" + i)); + par3List.add(I18n.format("botaniamisc.creativePool" + i)); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 3b1c5e347..5ac094b37 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,8 +21,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; @@ -75,6 +77,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr return getUnlocalizedNameInefficiently_(par1ItemStack); } + @SideOnly(Side.CLIENT) @Override public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { String type = getType(par1ItemStack); @@ -84,7 +87,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr if(ConfigHandler.referencesEnabled) { String refUnlocalized = sig.getUnlocalizedLoreTextForStack(par1ItemStack); - String refLocalized = I18n.translateToLocal(refUnlocalized); + String refLocalized = I18n.format(refUnlocalized); if(!refLocalized.equals(refUnlocalized)) par3List.add(TextFormatting.ITALIC + refLocalized); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 8223313b1..e7804c02c 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.brew; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -26,8 +27,9 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; @@ -143,15 +145,16 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack stack) { - return String.format(I18n.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), I18n.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), TextFormatting.BOLD + "" + getSwigsLeft(stack) + TextFormatting.RESET); + return String.format(net.minecraft.util.text.translation.I18n.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), net.minecraft.util.text.translation.I18n.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), TextFormatting.BOLD + "" + getSwigsLeft(stack) + TextFormatting.RESET); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; - list.add(format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(effect, 1F) + ")")); + list.add(format + I18n.format(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.format("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(effect, 1F) + ")")); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 117090009..1dce2493b 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.brew; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,7 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -71,19 +73,20 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain return r << 16 | g << 8 | b; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { - addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.translateToLocal("botaniamisc.notInfused"), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.format("botaniamisc.notInfused"), list); return; } - addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; PotionEffect longEffect = new PotionEffect(effect.getPotion(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false, true); - addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(longEffect, 1F) + ")"), list); + addStringToTooltip(" " + format + I18n.format(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.format("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(longEffect, 1F) + ")"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index e5843862c..96a87fafa 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -1,10 +1,10 @@ package vazkii.botania.common.item.equipment.armor.elementium; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -71,15 +71,17 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements return false; } + @SideOnly(Side.CLIENT) @Override public String getArmorSetName() { - return I18n.translateToLocal("botania.armorset.elementium.name"); + return I18n.format("botania.armorset.elementium.name"); } + @SideOnly(Side.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { super.addArmorSetDescription(stack, list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.elementium.desc"), list); + addStringToTooltip(I18n.format("botania.armorset.elementium.desc"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index fb73df1d2..94145f2fc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.armor.manasteel; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -21,7 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.fml.common.Optional; @@ -156,13 +156,15 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return true; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(GuiScreen.isShiftKeyDown()) addInformationAfterShift(stack, player, list, adv); - else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), list); + else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), list); } + @SideOnly(Side.CLIENT) public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { addStringToTooltip(getArmorSetTitle(player), list); addArmorSetDescription(stack, list); @@ -170,7 +172,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan for(int i = 0; i < stacks.length; i++) addStringToTooltip((hasArmorSetItem(player, i) ? TextFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list); if(hasPhantomInk(stack)) - addStringToTooltip(I18n.translateToLocal("botaniamisc.hasPhantomInk"), list); + addStringToTooltip(I18n.format("botaniamisc.hasPhantomInk"), list); } public void addStringToTooltip(String s, List tooltip) { @@ -210,7 +212,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return false; } - public int getSetPiecesEquipped(EntityPlayer player) { + private int getSetPiecesEquipped(EntityPlayer player) { int pieces = 0; for(int i = 0; i < 4; i++) if(hasArmorSetItem(player, i)) @@ -219,16 +221,19 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return pieces; } + @SideOnly(Side.CLIENT) public String getArmorSetName() { - return I18n.translateToLocal("botania.armorset.manasteel.name"); + return I18n.format("botania.armorset.manasteel.name"); } - public String getArmorSetTitle(EntityPlayer player) { - return I18n.translateToLocal("botaniamisc.armorset") + " " + getArmorSetName() + " (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")"; + @SideOnly(Side.CLIENT) + private String getArmorSetTitle(EntityPlayer player) { + return I18n.format("botaniamisc.armorset") + " " + getArmorSetName() + " (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")"; } + @SideOnly(Side.CLIENT) public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(I18n.translateToLocal("botania.armorset.manasteel.desc"), list); + addStringToTooltip(I18n.format("botania.armorset.manasteel.desc"), list); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index e61d367fa..c75ca1414 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -19,7 +20,6 @@ import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -75,7 +75,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } - static ItemStack[] armorset; + private static ItemStack[] armorset; @Override public ItemStack[] getArmorSetStacks() { @@ -106,25 +106,28 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return false; } + @SideOnly(Side.CLIENT) @Override public String getArmorSetName() { - return I18n.translateToLocal("botania.armorset.manaweave.name"); + return I18n.format("botania.armorset.manaweave.name"); } - + + @SideOnly(Side.CLIENT) @Override public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(ClientProxy.jingleTheBells) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.santaweaveInfo"), list); + addStringToTooltip(I18n.format("botaniamisc.santaweaveInfo"), list); addStringToTooltip("", list); } super.addInformationAfterShift(stack, player, list, adv); } - + + @SideOnly(Side.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(I18n.translateToLocal("botania.armorset.manaweave.desc0"), list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.manaweave.desc1"), list); + addStringToTooltip(I18n.format("botania.armorset.manaweave.desc0"), list); + addStringToTooltip(I18n.format("botania.armorset.manaweave.desc1"), list); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 7b8fcf35a..d956cee96 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -12,12 +12,12 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import com.google.common.collect.Multimap; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -65,7 +65,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return multimap; } - static ItemStack[] armorset; + private static ItemStack[] armorset; @Override public ItemStack[] getArmorSetStacks() { @@ -96,16 +96,18 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return false; } + @SideOnly(Side.CLIENT) @Override public String getArmorSetName() { - return I18n.translateToLocal("botania.armorset.terrasteel.name"); + return I18n.format("botania.armorset.terrasteel.name"); } + @SideOnly(Side.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc0"), list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc1"), list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc2"), list); + addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc0"), list); + addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc1"), list); + addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc2"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index ae95c84c8..319a63d23 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -14,13 +14,13 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -86,7 +86,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc super.addArmorSetDescription(stack, list); for(int i = 0; i < 6; i++) if(hasAncientWill(stack, i)) - addStringToTooltip(I18n.translateToLocal("botania.armorset.will" + i + ".desc"), list); + addStringToTooltip(I18n.format("botania.armorset.will" + i + ".desc"), list); } public static boolean hasAnyWill(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 994718538..166780243 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -15,6 +15,7 @@ import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,7 +24,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; @@ -91,24 +91,25 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); + else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); } + @SideOnly(Side.CLIENT) public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { BaubleType type = getBaubleType(par1ItemStack); - addStringToTooltip(I18n.translateToLocal("botania.baubletype." + type.name().toLowerCase()), par3List); + addStringToTooltip(I18n.format("botania.baubletype." + type.name().toLowerCase()), par3List); String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("Baubles Inventory"); if(key != null) - addStringToTooltip(I18n.translateToLocal("botania.baubletooltip").replaceAll("%key%", key), par3List); + addStringToTooltip(I18n.format("botania.baubletooltip").replaceAll("%key%", key), par3List); ItemStack cosmetic = getCosmeticItem(par1ItemStack); if(cosmetic != null) - addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); + addStringToTooltip(String.format(I18n.format("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); if(hasPhantomInk(par1ItemStack)) - addStringToTooltip(I18n.translateToLocal("botaniamisc.hasPhantomInk"), par3List); + addStringToTooltip(I18n.format("botaniamisc.hasPhantomInk"), par3List); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index f96346bf3..78e22c18d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -22,13 +22,15 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import org.lwjgl.opengl.GL11; @@ -68,9 +70,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } + @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.cosmeticBauble"), par3List); + addStringToTooltip(I18n.format("botaniamisc.cosmeticBauble"), par3List); super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 981f070f0..0c4e43d12 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -26,7 +27,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -84,20 +86,21 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre return r << 16 | g << 8 | b; } + @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { super.addHiddenTooltip(stack, player, list, adv); Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { - addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.translateToLocal("botaniamisc.notInfused"), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.format("botaniamisc.notInfused"), list); return; } - addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; - addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), list); + addStringToTooltip(" " + format + I18n.format(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.format("botania.roman" + (effect.getAmplifier() + 1))), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index aea9a6ace..3f9490fa8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +32,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -102,10 +102,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub list.add(new ItemStack(item, 1, i)); } + @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - par3List.add(I18n.translateToLocal("botania.wings" + par1ItemStack.getItemDamage())); + par3List.add(I18n.format("botania.wings" + par1ItemStack.getItemDamage())); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index f158bacfb..0839a410b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.tool.terrasteel; import net.minecraft.block.material.Material; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -30,7 +31,6 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -104,13 +104,14 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - String rankFormat = I18n.translateToLocal("botaniamisc.toolRank"); - String rank = I18n.translateToLocal("botania.rank" + getLevel(par1ItemStack)); + String rankFormat = I18n.format("botaniamisc.toolRank"); + String rank = I18n.format("botania.rank" + getLevel(par1ItemStack)); par3List.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); if(getMana(par1ItemStack) == Integer.MAX_VALUE) - par3List.add(TextFormatting.RED + I18n.translateToLocal("botaniamisc.getALife")); + par3List.add(TextFormatting.RED + I18n.format("botaniamisc.getALife")); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index f8c6c7772..e9bafcf6e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.lens; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -18,8 +19,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.internal.IManaBurst; @@ -162,16 +164,17 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())]; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getStoredColor(par1ItemStack); if(storedColor != -1) - par3List.add(String.format(I18n.translateToLocal("botaniamisc.color"), I18n.translateToLocal("botania.color" + storedColor))); + par3List.add(String.format(I18n.format("botaniamisc.color"), I18n.format("botania.color" + storedColor))); } - public String getItemShortTermName(ItemStack stack) { - return I18n.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); + private String getItemShortTermName(ItemStack stack) { + return net.minecraft.util.text.translation.I18n.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); } @Nonnull @@ -180,7 +183,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens ItemStack compositeLens = getCompositeLens(stack); if(compositeLens == null) return super.getItemStackDisplayName(stack); - return String.format(I18n.translateToLocal("item.botania:compositeLens.name"), getItemShortTermName(stack), getItemShortTermName(compositeLens)); + return String.format(net.minecraft.util.text.translation.I18n.translateToLocal("item.botania:compositeLens.name"), getItemShortTermName(stack), getItemShortTermName(compositeLens)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 043f6d2ee..3afac8280 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -18,9 +19,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.DamageSource; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.UsernameCache; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -49,31 +51,33 @@ public class ItemRelic extends ItemMod implements IRelic { updateRelic(stack, (EntityPlayer) entity); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } + @SideOnly(Side.CLIENT) public void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { if(!hasUUID(stack)) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.relicUnbound"), list); + addStringToTooltip(I18n.format("botaniamisc.relicUnbound"), list); } else { - addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.relicSoulbound"), getSoulbindUsername(stack)), list); + addStringToTooltip(String.format(I18n.format("botaniamisc.relicSoulbound"), getSoulbindUsername(stack)), list); if(!getSoulbindUUID(stack).equals(player.getUniqueID())) - addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.notYourSagittarius"), getSoulbindUsername(stack)), list); + addStringToTooltip(String.format(I18n.format("botaniamisc.notYourSagittarius"), getSoulbindUsername(stack)), list); } if(stack.getItem() == ModItems.aesirRing) - addStringToTooltip(I18n.translateToLocal("botaniamisc.dropIkea"), list); + addStringToTooltip(I18n.format("botaniamisc.dropIkea"), list); if(stack.getItem() == ModItems.dice) { addStringToTooltip("", list); String name = stack.getUnlocalizedName() + ".poem"; for(int i = 0; i < 4; i++) - addStringToTooltip(TextFormatting.ITALIC + I18n.translateToLocal(name + i), list); + addStringToTooltip(TextFormatting.ITALIC + I18n.format(name + i), list); } - } else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), list); + } else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), list); } public boolean shouldDamageWrongPlayer() { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 5239f89a1..1986873ba 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -17,6 +17,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; @@ -56,6 +58,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } } + @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index ee5a9e967..2d826ed8d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -12,9 +12,9 @@ package vazkii.botania.common.lexicon.page; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -53,7 +53,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj; boolean unicode = renderer.getUnicodeFlag(); renderer.setUnicodeFlag(true); - String s = TextFormatting.BOLD + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName())); + String s = TextFormatting.BOLD + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName())); renderer.drawString(s, gui.getLeft() + gui.getWidth() / 2 - renderer.getStringWidth(s) / 2, y, 0x222222); renderer.setUnicodeFlag(unicode); PageText.renderText(x, y + 22, width, height, text); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index dc95e77e3..baec81940 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -14,12 +14,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -87,7 +87,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 0, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.translateToLocal("botaniamisc.shapeless"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.format("botaniamisc.shapeless"))); iconY += 20; } @@ -99,7 +99,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.translateToLocal("botaniamisc.oredict"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.format("botaniamisc.oredict"))); } GlStateManager.disableBlend(); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 68a1da7ff..03b644de1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -16,11 +16,11 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -94,7 +94,7 @@ public class PageManaInfusionRecipe extends PageRecipe { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - String manaUsage = I18n.translateToLocal("botaniamisc.manaUsage"); + String manaUsage = I18n.format("botaniamisc.manaUsage"); font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 105, 0x66000000); int ratio = 10; @@ -106,8 +106,8 @@ public class PageManaInfusionRecipe extends PageRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaToConsume(), TilePool.MAX_MANA / ratio); - String ratioString = String.format(I18n.translateToLocal("botaniamisc.ratio"), ratio); - String dropString = I18n.translateToLocal("botaniamisc.drop") + " " + TextFormatting.BOLD + "(?)"; + String ratioString = String.format(I18n.format("botaniamisc.ratio"), ratio); + String dropString = I18n.format("botaniamisc.drop") + " " + TextFormatting.BOLD + "(?)"; boolean hoveringOverDrop = false; @@ -136,8 +136,8 @@ public class PageManaInfusionRecipe extends PageRecipe { if(hoveringOverDrop) { String key = RenderHelper.getKeyDisplayString("key.drop"); - String tip0 = I18n.translateToLocal("botaniamisc.dropTip0").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); - String tip1 = I18n.translateToLocal("botaniamisc.dropTip1").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); + String tip0 = I18n.format("botaniamisc.dropTip0").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); + String tip1 = I18n.format("botaniamisc.dropTip1").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); RenderHelper.renderTooltip(mx, my, Arrays.asList(tip0, tip1)); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java index 6746678de..50bff1a54 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -17,12 +17,12 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @@ -85,7 +85,7 @@ public class PageMultiblock extends LexiconPage { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); - String s = TextFormatting.BOLD + I18n.translateToLocal(getUnlocalizedName()); + String s = TextFormatting.BOLD + I18n.format(getUnlocalizedName()); font.setUnicodeFlag(true); font.drawString(s, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(s) / 2, gui.getTop() + 16, 0x000000); font.setUnicodeFlag(unicode); @@ -102,7 +102,7 @@ public class PageMultiblock extends LexiconPage { GlStateManager.translate(0F, 0F, 200F); if(mx >= x && mx < x + 16 && my >= y && my < y + 16) { List mats = new ArrayList<>(); - mats.add(I18n.translateToLocal("botaniamisc.materialsRequired")); + mats.add(I18n.format("botaniamisc.materialsRequired")); for(ItemStack stack : mb.materials) { String size = "" + stack.stackSize; if(size.length() < 2) @@ -121,8 +121,9 @@ public class PageMultiblock extends LexiconPage { gui.getButtonList().add(button); } - String getButtonStr() { - return I18n.translateToLocal(MultiblockRenderHandler.currentMultiblock == set ? "botaniamisc.unvisualize" : "botaniamisc.visualize"); + @SideOnly(Side.CLIENT) + private String getButtonStr() { + return I18n.format(MultiblockRenderHandler.currentMultiblock == set ? "botaniamisc.unvisualize" : "botaniamisc.visualize"); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index e984a6a95..8319ed722 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -15,9 +15,9 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -107,7 +107,7 @@ public class PagePetalRecipe extends PageRecipe { boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); - String stopStr = I18n.translateToLocal("botaniamisc.shiftToStopSpin"); + String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); font.setUnicodeFlag(unicode); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 014df8180..5966ea453 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -15,9 +15,9 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Mouse; @@ -79,12 +79,12 @@ public class PageRecipe extends LexiconPage { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.format("botaniamisc.clickToRecipe"))); tooltipY += 18; } if(tooltipContainerStack != null) - vazkii.botania.client.core.helper.RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName())); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(TextFormatting.AQUA + I18n.format("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName())); } tooltipStack = tooltipContainerStack = null; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index d1bf9f1ad..c51d7bf3d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -13,8 +13,8 @@ package vazkii.botania.common.lexicon.page; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @@ -47,7 +47,7 @@ public class PageRuneRecipe extends PagePetalRecipe { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - String manaUsage = I18n.translateToLocal("botaniamisc.manaUsage"); + String manaUsage = I18n.format("botaniamisc.manaUsage"); font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 110, 0x66000000); int ratio = 10; @@ -59,8 +59,8 @@ public class PageRuneRecipe extends PagePetalRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / ratio); - String ratioString = String.format(I18n.translateToLocal("botaniamisc.ratio"), ratio); - String stopStr = I18n.translateToLocal("botaniamisc.shiftToStopSpin"); + String ratioString = String.format(I18n.format("botaniamisc.ratio"), ratio); + String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index b41eb874d..380897e20 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -16,12 +16,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityList; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Mouse; @@ -93,7 +93,7 @@ public class PageShedding extends PageEntity { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.format("botaniamisc.clickToRecipe"))); tooltipY += 18; } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index ccad3c5d8..40b3fc7ee 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -13,7 +13,7 @@ package vazkii.botania.common.lexicon.page; import com.google.common.base.Joiner; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -52,7 +52,7 @@ public class PageText extends LexiconPage { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); - String text = I18n.translateToLocal(unlocalizedText).replaceAll("&", "\u00a7"); + String text = I18n.format(unlocalizedText).replaceAll("&", "\u00a7"); String[] textEntries = text.split("
"); List> lines = new ArrayList<>();