diff --git a/src/main/java/am2/common/blocks/BlockOcculus.java b/src/main/java/am2/common/blocks/BlockOcculus.java index 936cfb15c..74f0f1b85 100644 --- a/src/main/java/am2/common/blocks/BlockOcculus.java +++ b/src/main/java/am2/common/blocks/BlockOcculus.java @@ -59,7 +59,7 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, float hitZ) { if (playerIn.isSneaking()) return false; - if (EntityExtension.For(playerIn).getCurrentLevel() == 0 && !Minecraft.getMinecraft().thePlayer.isCreative()) { + if (EntityExtension.For(playerIn).getCurrentLevel() == 0 && !playerIn.isCreative()) { if (worldIn.isRemote) Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentString("Mythical forces prevent you from using this device!")); return true; diff --git a/src/main/java/am2/common/blocks/tileentity/TileEntityInscriptionTable.java b/src/main/java/am2/common/blocks/tileentity/TileEntityInscriptionTable.java index 6de392802..ffd358749 100644 --- a/src/main/java/am2/common/blocks/tileentity/TileEntityInscriptionTable.java +++ b/src/main/java/am2/common/blocks/tileentity/TileEntityInscriptionTable.java @@ -678,7 +678,8 @@ else if (bookstack.getTagCompound().getBoolean("spellFinalized")) //don't overwr LinkedHashMap materialsList = new LinkedHashMap(); - materialsList.put(ItemDefs.blankRune.getItemStackDisplayName(new ItemStack(ItemDefs.blankRune)), 1); + materialsList.put("Blank rune", 1); // TODO: localize + //materialsList.put(ItemDefs.blankRune.getItemStackDisplayName(new ItemStack(ItemDefs.blankRune)), 1); ArrayList componentRecipeList = new ArrayList(); ArrayList allRecipeItems = new ArrayList(); @@ -712,14 +713,17 @@ else if (bookstack.getTagCompound().getBoolean("spellFinalized")) //don't overwr int qty = 1; ItemStack recipeStack = null; if (o instanceof ItemStack){ - materialkey = ((ItemStack)o).getDisplayName(); + materialkey = ((ItemStack)o).getUnlocalizedName(); // TODO: localize + //materialkey = ((ItemStack)o).getDisplayName(); recipeStack = (ItemStack)o; }else if (o instanceof Item){ recipeStack = new ItemStack((Item)o); - materialkey = ((Item)o).getItemStackDisplayName(new ItemStack((Item)o)); + materialkey = ((Item)o).getUnlocalizedName(new ItemStack((Item)o)); // TODO: localize + //materialkey = ((Item)o).getItemStackDisplayName(new ItemStack((Item)o)); }else if (o instanceof Block){ recipeStack = new ItemStack((Block)o); - materialkey = ((Block)o).getLocalizedName(); + materialkey = ((Block)o).getUnlocalizedName(); + //materialkey = ((Block)o).getLocalizedName(); }else if (o instanceof String){ if (((String)o).startsWith("E:")){ int[] ids = RecipeUtils.ParseEssenceIDs((String)o); @@ -766,7 +770,8 @@ else if (bookstack.getTagCompound().getBoolean("spellFinalized")) //don't overwr } } - materialsList.put(ItemDefs.spellParchment.getItemStackDisplayName(new ItemStack(ItemDefs.spellParchment)), 1); + materialsList.put("Spell parchment", 1); + //materialsList.put(ItemDefs.spellParchment.getItemStackDisplayName(new ItemStack(ItemDefs.spellParchment)), 1); StringBuilder sb = new StringBuilder(); int sgCount = 0; @@ -817,7 +822,8 @@ else if (bookstack.getTagCompound().getBoolean("spellFinalized")) //don't overwr sorted.putAll(affinityData); for (Affinity aff : sorted.keySet()){ float pct = (float)sorted.get(aff) / (float)cpCount * 100f; - sb.append(String.format("%s: %.2f%%", aff.getLocalizedName(), pct)); + sb.append(String.format("%s: %.2f%%", aff.getUnlocalisedName(), pct)); // TODO: lozalize + //sb.append(String.format("%s: %.2f%%", aff.getLocalizedName(), pct)); sb.append("\n"); } pages.addAll(Story.splitStoryPartIntoPages(sb.toString())); @@ -862,7 +868,8 @@ private int[] SpellPartListToStringBuilder(Iterator it, Strin ArrayList outputCombo = new ArrayList(); while (it.hasNext()){ AbstractSpellPart part = it.next(); - String displayName = SpellRegistry.getSkillFromPart(part).getName(); + // TODO: localize + String displayName = SpellRegistry.getSkillFromPart(part).getID(); if (prefix != null){ sb.append(prefix + displayName + "\n"); diff --git a/src/main/java/am2/common/container/slot/SlotInscriptionTable.java b/src/main/java/am2/common/container/slot/SlotInscriptionTable.java index cdf74a909..90fcd9c62 100644 --- a/src/main/java/am2/common/container/slot/SlotInscriptionTable.java +++ b/src/main/java/am2/common/container/slot/SlotInscriptionTable.java @@ -3,7 +3,6 @@ import am2.common.blocks.tileentity.TileEntityInscriptionTable; import am2.common.defs.ItemDefs; import am2.common.items.ItemSpellBase; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Slot; @@ -55,7 +54,8 @@ public void onSlotChanged(){ public void putStack(ItemStack stack){ if (stack != null && stack.getItem() == Items.WRITABLE_BOOK){ stack.setItem(Items.WRITTEN_BOOK); - stack.setStackDisplayName(I18n.format("am2.tooltip.unfinishedSpellRecipe")); + // TODO: localize (am2.tooltip.unfinishedSpellRecipe) + stack.setStackDisplayName("Unfinished Spell Recipe"); } super.putStack(stack); }