Eagler-Lambda
/
hoosiertransfer-mod
mirror of https://github.com/HoosierTransfer/hoosiertransfer-mod.git
2
0
Fork 0
Code Issues 1 Packages Projects Releases 4 Wiki Activity

reformat

This commit is contained in:
HoosierTransfer 2024-07-09 15:20:09 -04:00
parent ec2dc742aa
commit aa4d4e3494
42 changed files with 133 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java
View File

@ -25,7 +25,7 @@ import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkMana
import net.minecraft.client.Minecraft;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IProgressUpdate;
import net.minecraft.util.StringTranslate;
import net.minecraft.util.text.translation.LanguageMap;
import net.minecraft.world.WorldSettings;
import net.minecraft.world.storage.ISaveFormat;
import net.minecraft.world.storage.ISaveHandler;
@ -300,7 +300,7 @@ public class SingleplayerServerController implements ISaveFormat {
switch (pkt.ack) {
case 0xFF:
logger.info("Integrated server signaled a successful boot");
sendIPCPacket(new IPCPacket14StringList(IPCPacket14StringList.LOCALE, StringTranslate.dump()));
sendIPCPacket(new IPCPacket14StringList(IPCPacket14StringList.LOCALE, LanguageMap.dump()));
statusState = IntegratedServerState.WORLD_NONE;
break;
case IPCPacket00StartServer.ID:

4
src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java
View File

@ -21,8 +21,8 @@ import net.lax1dude.eaglercraft.v1_8.sp.ipc.*;
import net.minecraft.network.EnumConnectionState;
import net.minecraft.server.network.NetHandlerLoginServer;
import net.minecraft.util.ReportedException;
import net.minecraft.util.StringTranslate;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.translation.LanguageMap;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.WorldSettings;
import net.minecraft.world.WorldSettings.GameType;
@ -363,7 +363,7 @@ public class EaglerIntegratedServerWorker {
IPCPacket14StringList pkt = (IPCPacket14StringList) ipc;
switch (pkt.opCode) {
case IPCPacket14StringList.LOCALE:
StringTranslate.initServer(pkt.stringList);
LanguageMap.initServer(pkt.stringList);
break;
// case IPCPacket14StringList.STAT_GUID:
// AchievementMap.init(pkt.stringList);

4
src/main/java/net/minecraft/block/Block.java
View File

@ -33,12 +33,12 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.util.ObjectIntIdentityMap;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.RegistryNamespacedDefaultedByKey;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockAccess;
@ -1031,7 +1031,7 @@ public class Block implements ILitBlock {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal(this.getUnlocalizedName() + ".name");
return I18n.translateToLocal(this.getUnlocalizedName() + ".name");
}
/**

4
src/main/java/net/minecraft/block/BlockBanner.java
View File

@ -16,9 +16,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityBanner;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -68,7 +68,7 @@ public class BlockBanner extends BlockContainer {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal("item.banner.white.name");
return I18n.translateToLocal("item.banner.white.name");
}
public AxisAlignedBB getCollisionBoundingBox(World var1, BlockPos var2, IBlockState var3) {

4
src/main/java/net/minecraft/block/BlockBrewingStand.java
View File

@ -24,9 +24,9 @@ import net.minecraft.tileentity.TileEntityBrewingStand;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -75,7 +75,7 @@ public class BlockBrewingStand extends BlockContainer {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal("item.brewingStand.name");
return I18n.translateToLocal("item.brewingStand.name");
}
/**

4
src/main/java/net/minecraft/block/BlockDoor.java
View File

@ -16,11 +16,11 @@ import net.minecraft.item.Item;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -78,7 +78,7 @@ public class BlockDoor extends Block {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal((this.getUnlocalizedName() + ".name").replaceAll("tile", "item"));
return I18n.translateToLocal((this.getUnlocalizedName() + ".name").replaceAll("tile", "item"));
}
/**

4
src/main/java/net/minecraft/block/BlockFlowerPot.java
View File

@ -20,8 +20,8 @@ import net.minecraft.tileentity.TileEntityFlowerPot;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -75,7 +75,7 @@ public class BlockFlowerPot extends BlockContainer {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal("item.flowerPot.name");
return I18n.translateToLocal("item.flowerPot.name");
}
/**

4
src/main/java/net/minecraft/block/BlockPrismarine.java
View File

@ -12,7 +12,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
/**
* +
@ -65,7 +65,7 @@ public class BlockPrismarine extends Block {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal(
return I18n.translateToLocal(
this.getUnlocalizedName() + "." + BlockPrismarine.EnumType.ROUGH.getUnlocalizedName() + ".name");
}

4
src/main/java/net/minecraft/block/BlockRedstoneComparator.java
View File

@ -22,9 +22,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityComparator;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -79,7 +79,7 @@ public class BlockRedstoneComparator extends BlockRedstoneDiode implements ITile
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal("item.comparator.name");
return I18n.translateToLocal("item.comparator.name");
}
/**

4
src/main/java/net/minecraft/block/BlockRedstoneRepeater.java
View File

@ -13,8 +13,8 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -63,7 +63,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal("item.diode.name");
return I18n.translateToLocal("item.diode.name");
}
/**

4
src/main/java/net/minecraft/block/BlockSapling.java
View File

@ -12,8 +12,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenBigTree;
import net.minecraft.world.gen.feature.WorldGenCanopyTree;
@ -76,7 +76,7 @@ public class BlockSapling extends BlockBush implements IGrowable {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal(
return I18n.translateToLocal(
this.getUnlocalizedName() + "." + BlockPlanks.EnumType.OAK.getUnlocalizedName() + ".name");
}

4
src/main/java/net/minecraft/block/BlockSkull.java
View File

@ -30,9 +30,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntitySkull;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -92,7 +92,7 @@ public class BlockSkull extends BlockContainer {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal("tile.skull.skeleton.name");
return I18n.translateToLocal("tile.skull.skeleton.name");
}
/**

4
src/main/java/net/minecraft/block/BlockSponge.java
View File

@ -18,9 +18,9 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.StatCollector;
import net.minecraft.util.Tuple;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -67,7 +67,7 @@ public class BlockSponge extends Block {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal(this.getUnlocalizedName() + ".dry.name");
return I18n.translateToLocal(this.getUnlocalizedName() + ".dry.name");
}
/**

4
src/main/java/net/minecraft/block/BlockStone.java
View File

@ -14,7 +14,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
/**
* +
@ -64,7 +64,7 @@ public class BlockStone extends Block {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal(
return I18n.translateToLocal(
this.getUnlocalizedName() + "." + BlockStone.EnumType.STONE.getUnlocalizedName() + ".name");
}

4
src/main/java/net/minecraft/block/BlockStoneSlabNew.java
View File

@ -15,8 +15,8 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -75,7 +75,7 @@ public abstract class BlockStoneSlabNew extends BlockSlab {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal(this.getUnlocalizedName() + ".red_sandstone.name");
return I18n.translateToLocal(this.getUnlocalizedName() + ".red_sandstone.name");
}
/**

4
src/main/java/net/minecraft/block/BlockWall.java
View File

@ -14,9 +14,9 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -79,7 +79,7 @@ public class BlockWall extends Block {
* statistics page.
*/
public String getLocalizedName() {
return StatCollector.translateToLocal(
return I18n.translateToLocal(
this.getUnlocalizedName() + "." + BlockWall.EnumType.NORMAL.getUnlocalizedName() + ".name");
}

4
src/main/java/net/minecraft/client/Minecraft.java
View File

@ -170,7 +170,6 @@ import net.minecraft.util.ReportedException;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.ScreenShotHelper;
import net.minecraft.util.Session;
import net.minecraft.util.StringTranslate;
import net.minecraft.util.Timer;
import net.minecraft.util.Util;
import net.minecraft.util.math.BlockPos;
@ -179,6 +178,7 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.event.ClickEvent;
import net.minecraft.util.text.translation.LanguageMap;
import net.minecraft.util.text.Style;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.WorldProviderEnd;
@ -335,7 +335,7 @@ public class Minecraft implements IThreadListener {
public Minecraft(GameConfiguration gameConfig) {
theMinecraft = this;
StringTranslate.initClient();
LanguageMap.initClient();
this.launchedVersion = gameConfig.gameInfo.version;
this.mcDefaultResourcePack = new DefaultResourcePack();
this.session = gameConfig.userInfo.session;

3
src/main/java/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java
View File

@ -14,7 +14,6 @@ import net.minecraft.command.server.CommandBlockBaseLogic;
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.play.client.C17PacketCustomPayload;
import net.minecraft.util.ITabCompleter;
import net.minecraft.util.StatCollector;
import net.minecraft.util.TabCompleter;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
@ -49,7 +48,7 @@ public class GuiEditCommandBlockMinecart extends GuiScreen implements ITabComple
Keyboard.enableRepeatEvents(true);
this.buttonList.clear();
this.buttonList.add(this.doneButton = new GuiButton(0, this.width / 2 - 4 - 150, this.height / 4 + 120 + 12,
150, 20, StatCollector.translateToLocalFormatted("gui.done", new Object[0])));
150, 20, I18n.format("gui.done", new Object[0])));
this.buttonList.add(this.cancelButton = new GuiButton(1, this.width / 2 + 4, this.height / 4 + 120 + 12, 150,
20, I18n.format("gui.cancel", new Object[0])));
this.buttonList.add(this.outputButton = new GuiButton(4, this.width / 2 + 150 - 20, 150, 20, 20, "O"));

4
src/main/java/net/minecraft/client/resources/LanguageManager.java
View File

@ -14,7 +14,7 @@ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
import net.minecraft.client.resources.data.IMetadataSerializer;
import net.minecraft.client.resources.data.LanguageMetadataSection;
import net.minecraft.util.StringTranslate;
import net.minecraft.util.text.translation.LanguageMap;
/**
* +
@ -91,7 +91,7 @@ public class LanguageManager implements IResourceManagerReloadListener {
}
currentLocale.loadLocaleDataFiles(iresourcemanager, arraylist);
StringTranslate.replaceWith(currentLocale.properties);
LanguageMap.replaceWith(currentLocale.properties);
}
public boolean isCurrentLocaleUnicode() {

6
src/main/java/net/minecraft/enchantment/Enchantment.java
View File

@ -16,7 +16,7 @@ import net.minecraft.entity.EnumCreatureAttribute;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
/**
* +
@ -300,8 +300,8 @@ public abstract class Enchantment {
* level in roman numbers.
*/
public String getTranslatedName(int level) {
String s = StatCollector.translateToLocal(this.getName());
return s + " " + StatCollector.translateToLocal("enchantment.level." + level);
String s = I18n.translateToLocal(this.getName());
return s + " " + I18n.translateToLocal("enchantment.level." + level);
}
/**

4
src/main/java/net/minecraft/entity/Entity.java
View File

@ -42,7 +42,6 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.ReportedException;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
@ -50,6 +49,7 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.event.HoverEvent;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
@ -2141,7 +2141,7 @@ public abstract class Entity implements ICommandSender {
s = "generic";
}
return StatCollector.translateToLocal("entity." + s + ".name");
return I18n.translateToLocal("entity." + s + ".name");
}
}

4
src/main/java/net/minecraft/entity/item/EntityItem.java
View File

@ -15,9 +15,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.stats.AchievementList;
import net.minecraft.util.DamageSource;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -390,7 +390,7 @@ public class EntityItem extends Entity {
*/
public String getName() {
return this.hasCustomName() ? this.getCustomNameTag()
: StatCollector.translateToLocal("item." + this.getEntityItem().getUnlocalizedName());
: I18n.translateToLocal("item." + this.getEntityItem().getUnlocalizedName());
}
/**

12
src/main/java/net/minecraft/entity/passive/EntityHorse.java
View File

@ -38,9 +38,9 @@ import net.minecraft.pathfinding.PathNavigateGround;
import net.minecraft.potion.Potion;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.World;
@ -181,15 +181,15 @@ public class EntityHorse extends EntityAnimal implements IInvBasic {
switch (i) {
case 0:
default:
return StatCollector.translateToLocal("entity.horse.name");
return I18n.translateToLocal("entity.horse.name");
case 1:
return StatCollector.translateToLocal("entity.donkey.name");
return I18n.translateToLocal("entity.donkey.name");
case 2:
return StatCollector.translateToLocal("entity.mule.name");
return I18n.translateToLocal("entity.mule.name");
case 3:
return StatCollector.translateToLocal("entity.zombiehorse.name");
return I18n.translateToLocal("entity.zombiehorse.name");
case 4:
return StatCollector.translateToLocal("entity.skeletonhorse.name");
return I18n.translateToLocal("entity.skeletonhorse.name");
}
}
}

4
src/main/java/net/minecraft/entity/passive/EntityOcelot.java
View File

@ -26,8 +26,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathNavigateGround;
import net.minecraft.util.DamageSource;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.World;
@ -333,7 +333,7 @@ public class EntityOcelot extends EntityTameable {
*/
public String getName() {
return this.hasCustomName() ? this.getCustomNameTag()
: (this.isTamed() ? StatCollector.translateToLocal("entity.Cat.name") : super.getName());
: (this.isTamed() ? I18n.translateToLocal("entity.Cat.name") : super.getName());
}
public void setTamed(boolean flag) {

4
src/main/java/net/minecraft/entity/passive/EntityRabbit.java
View File

@ -31,10 +31,10 @@ import net.minecraft.pathfinding.PathEntity;
import net.minecraft.pathfinding.PathNavigateGround;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.World;
@ -396,7 +396,7 @@ public class EntityRabbit extends EntityAnimal {
this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityWolf.class, true));
if (!this.hasCustomName()) {
this.setCustomNameTag(StatCollector.translateToLocal("entity.KillerBunny.name"));
this.setCustomNameTag(I18n.translateToLocal("entity.KillerBunny.name"));
}
}

6
src/main/java/net/minecraft/item/Item.java
View File

@ -44,7 +44,6 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionHelper;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
@ -52,6 +51,7 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.IRegistry;
import net.minecraft.util.registry.RegistryNamespaced;
import net.minecraft.util.registry.RegistrySimple;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -359,7 +359,7 @@ public class Item {
*/
public String getUnlocalizedNameInefficiently(ItemStack stack) {
String s = this.getUnlocalizedName(stack);
return s == null ? "" : StatCollector.translateToLocal(s);
return s == null ? "" : I18n.translateToLocal(s);
}
/**
@ -486,7 +486,7 @@ public class Item {
}
public String getItemStackDisplayName(ItemStack itemstack) {
return ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(itemstack) + ".name")).trim();
return ("" + I18n.translateToLocal(this.getUnlocalizedNameInefficiently(itemstack) + ".name")).trim();
}
public boolean hasEffect(ItemStack itemstack) {

6
src/main/java/net/minecraft/item/ItemBanner.java
View File

@ -11,9 +11,9 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityBanner;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -98,7 +98,7 @@ public class ItemBanner extends ItemBlock {
String s = "item.banner.";
EnumDyeColor enumdyecolor = this.getBaseColor(itemstack);
s = s + enumdyecolor.getUnlocalizedName() + ".name";
return StatCollector.translateToLocal(s);
return I18n.translateToLocal(s);
}
/**
@ -117,7 +117,7 @@ public class ItemBanner extends ItemBlock {
TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern = TileEntityBanner.EnumBannerPattern
.getPatternByID(nbttagcompound1.getString("Pattern"));
if (tileentitybanner$enumbannerpattern != null) {
list.add(StatCollector
list.add(I18n
.translateToLocal("item.banner." + tileentitybanner$enumbannerpattern.getPatternName() + "."
+ enumdyecolor.getUnlocalizedName()));
}

6
src/main/java/net/minecraft/item/ItemEditableBook.java
View File

@ -11,9 +11,9 @@ import net.minecraft.nbt.NBTTagString;
import net.minecraft.network.play.server.S2FPacketSetSlot;
import net.minecraft.stats.StatList;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.util.StringUtils;
import net.minecraft.util.text.TextComponentUtils;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
@ -95,11 +95,11 @@ public class ItemEditableBook extends Item {
String s = nbttagcompound.getString("author");
if (!StringUtils.isNullOrEmpty(s)) {
list.add(EnumChatFormatting.GRAY
+ StatCollector.translateToLocalFormatted("book.byAuthor", new Object[] { s }));
+ I18n.translateToLocalFormatted("book.byAuthor", new Object[] { s }));
}
list.add(EnumChatFormatting.GRAY
+ StatCollector.translateToLocal("book.generation." + nbttagcompound.getInteger("generation")));
+ I18n.translateToLocal("book.generation." + nbttagcompound.getInteger("generation")));
}
}

4
src/main/java/net/minecraft/item/ItemFirework.java
View File

@ -8,8 +8,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -87,7 +87,7 @@ public class ItemFirework extends Item {
NBTTagCompound nbttagcompound = itemstack.getTagCompound().getCompoundTag("Fireworks");
if (nbttagcompound != null) {
if (nbttagcompound.hasKey("Flight", 99)) {
list.add(StatCollector.translateToLocal("item.fireworks.flight") + " "
list.add(I18n.translateToLocal("item.fireworks.flight") + " "
+ nbttagcompound.getByte("Flight"));
}

20
src/main/java/net/minecraft/item/ItemFireworkCharge.java
View File

@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagIntArray;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
/**
* +
@ -100,9 +100,9 @@ public class ItemFireworkCharge extends Item {
public static void addExplosionInfo(NBTTagCompound nbt, List<String> tooltip) {
byte b0 = nbt.getByte("Type");
if (b0 >= 0 && b0 <= 4) {
tooltip.add(StatCollector.translateToLocal("item.fireworksCharge.type." + b0).trim());
tooltip.add(I18n.translateToLocal("item.fireworksCharge.type." + b0).trim());
} else {
tooltip.add(StatCollector.translateToLocal("item.fireworksCharge.type").trim());
tooltip.add(I18n.translateToLocal("item.fireworksCharge.type").trim());
}
int[] aint = nbt.getIntArray("Colors");
@ -122,14 +122,14 @@ public class ItemFireworkCharge extends Item {
for (int j = 0; j < ItemDye.dyeColors.length; ++j) {
if (i == ItemDye.dyeColors[j]) {
flag1 = true;
s = s + StatCollector.translateToLocal(
s = s + I18n.translateToLocal(
"item.fireworksCharge." + EnumDyeColor.byDyeDamage(j).getUnlocalizedName());
break;
}
}
if (!flag1) {
s = s + StatCollector.translateToLocal("item.fireworksCharge.customColor");
s = s + I18n.translateToLocal("item.fireworksCharge.customColor");
}
}
@ -139,7 +139,7 @@ public class ItemFireworkCharge extends Item {
int[] aint1 = nbt.getIntArray("FadeColors");
if (aint1.length > 0) {
boolean flag2 = true;
String s1 = StatCollector.translateToLocal("item.fireworksCharge.fadeTo") + " ";
String s1 = I18n.translateToLocal("item.fireworksCharge.fadeTo") + " ";
for (int m = 0; m < aint1.length; ++m) {
int l = aint1[m];
@ -153,14 +153,14 @@ public class ItemFireworkCharge extends Item {
for (int k = 0; k < 16; ++k) {
if (l == ItemDye.dyeColors[k]) {
flag5 = true;
s1 = s1 + StatCollector.translateToLocal(
s1 = s1 + I18n.translateToLocal(
"item.fireworksCharge." + EnumDyeColor.byDyeDamage(k).getUnlocalizedName());
break;
}
}
if (!flag5) {
s1 = s1 + StatCollector.translateToLocal("item.fireworksCharge.customColor");
s1 = s1 + I18n.translateToLocal("item.fireworksCharge.customColor");
}
}
@ -169,12 +169,12 @@ public class ItemFireworkCharge extends Item {
boolean flag3 = nbt.getBoolean("Trail");
if (flag3) {
tooltip.add(StatCollector.translateToLocal("item.fireworksCharge.trail"));
tooltip.add(I18n.translateToLocal("item.fireworksCharge.trail"));
}
boolean flag4 = nbt.getBoolean("Flicker");
if (flag4) {
tooltip.add(StatCollector.translateToLocal("item.fireworksCharge.flicker"));
tooltip.add(I18n.translateToLocal("item.fireworksCharge.flicker"));
}
}

6
src/main/java/net/minecraft/item/ItemMonsterPlacer.java
View File

@ -17,10 +17,10 @@ import net.minecraft.tileentity.MobSpawnerBaseLogic;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityMobSpawner;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -59,10 +59,10 @@ public class ItemMonsterPlacer extends Item {
}
public String getItemStackDisplayName(ItemStack itemstack) {
String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim();
String s = ("" + I18n.translateToLocal(this.getUnlocalizedName() + ".name")).trim();
String s1 = EntityList.getStringFromID(itemstack.getMetadata());
if (s1 != null) {
s = s + " " + StatCollector.translateToLocal("entity." + s1 + ".name");
s = s + " " + I18n.translateToLocal("entity." + s1 + ".name");
}
return s;

26
src/main/java/net/minecraft/item/ItemPotion.java
View File

@ -24,7 +24,7 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.potion.PotionHelper;
import net.minecraft.stats.StatList;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -219,21 +219,21 @@ public class ItemPotion extends Item {
public String getItemStackDisplayName(ItemStack stack) {
if (stack.getMetadata() == 0) {
return StatCollector.translateToLocal("item.emptyPotion.name").trim();
return I18n.translateToLocal("item.emptyPotion.name").trim();
} else {
String s = "";
if (isSplash(stack.getMetadata())) {
s = StatCollector.translateToLocal("potion.prefix.grenade").trim() + " ";
s = I18n.translateToLocal("potion.prefix.grenade").trim() + " ";
}
List list = Items.potionitem.getEffects(stack);
if (list != null && !list.isEmpty()) {
String s2 = ((PotionEffect) list.get(0)).getEffectName();
s2 = s2 + ".postfix";
return s + StatCollector.translateToLocal(s2).trim();
return s + I18n.translateToLocal(s2).trim();
} else {
String s1 = PotionHelper.getPotionPrefix(stack.getMetadata());
return StatCollector.translateToLocal(s1).trim() + " " + super.getItemStackDisplayName(stack);
return I18n.translateToLocal(s1).trim() + " " + super.getItemStackDisplayName(stack);
}
}
}
@ -250,7 +250,7 @@ public class ItemPotion extends Item {
if (list1 != null && !list1.isEmpty()) {
for (int i = 0, l = list1.size(); i < l; ++i) {
PotionEffect potioneffect = list1.get(i);
String s1 = StatCollector.translateToLocal(potioneffect.getEffectName()).trim();
String s1 = I18n.translateToLocal(potioneffect.getEffectName()).trim();
Potion potion = Potion.potionTypes[potioneffect.getPotionID()];
Map map = potion.getAttributeModifierMap();
if (map != null && map.size() > 0) {
@ -265,7 +265,7 @@ public class ItemPotion extends Item {
}
if (potioneffect.getAmplifier() > 0) {
s1 = s1 + " " + StatCollector.translateToLocal("potion.potency." + potioneffect.getAmplifier())
s1 = s1 + " " + I18n.translateToLocal("potion.potency." + potioneffect.getAmplifier())
.trim();
}
@ -280,13 +280,13 @@ public class ItemPotion extends Item {
}
}
} else {
String s = StatCollector.translateToLocal("potion.empty").trim();
String s = I18n.translateToLocal("potion.empty").trim();
list.add(EnumChatFormatting.GRAY + s);
}
if (!hashmultimap.isEmpty()) {
list.add("");
list.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("potion.effects.whenDrank"));
list.add(EnumChatFormatting.DARK_PURPLE + I18n.translateToLocal("potion.effects.whenDrank"));
for (Entry entry1 : (Set<Entry<Object, Object>>) hashmultimap.entries()) {
AttributeModifier attributemodifier2 = (AttributeModifier) entry1.getValue();
@ -299,15 +299,15 @@ public class ItemPotion extends Item {
}
if (d0 > 0.0D) {
list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocalFormatted(
list.add(EnumChatFormatting.BLUE + I18n.translateToLocalFormatted(
"attribute.modifier.plus." + attributemodifier2.getOperation(),
new Object[] { ItemStack.DECIMALFORMAT.format(d1), StatCollector
new Object[] { ItemStack.DECIMALFORMAT.format(d1), I18n
.translateToLocal("attribute.name." + (String) entry1.getKey()) }));
} else if (d0 < 0.0D) {
d1 = d1 * -1.0D;
list.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted(
list.add(EnumChatFormatting.RED + I18n.translateToLocalFormatted(
"attribute.modifier.take." + attributemodifier2.getOperation(),
new Object[] { ItemStack.DECIMALFORMAT.format(d1), StatCollector
new Object[] { ItemStack.DECIMALFORMAT.format(d1), I18n
.translateToLocal("attribute.name." + (String) entry1.getKey()) }));
}
}

4
src/main/java/net/minecraft/item/ItemRecord.java
View File

@ -12,8 +12,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.stats.StatList;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -89,7 +89,7 @@ public class ItemRecord extends Item {
}
public String getRecordNameLocal() {
return StatCollector.translateToLocal("item.record." + this.recordName + ".desc");
return I18n.translateToLocal("item.record." + this.recordName + ".desc");
}
/**

6
src/main/java/net/minecraft/item/ItemSkull.java
View File

@ -14,9 +14,9 @@ import net.minecraft.nbt.NBTUtil;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntitySkull;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
/**
@ -165,14 +165,14 @@ public class ItemSkull extends Item {
public String getItemStackDisplayName(ItemStack itemstack) {
if (itemstack.getMetadata() == 3 && itemstack.hasTagCompound()) {
if (itemstack.getTagCompound().hasKey("SkullOwner", 8)) {
return StatCollector.translateToLocalFormatted("item.skull.player.name",
return I18n.translateToLocalFormatted("item.skull.player.name",
new Object[] { itemstack.getTagCompound().getString("SkullOwner") });
}
if (itemstack.getTagCompound().hasKey("SkullOwner", 10)) {
NBTTagCompound nbttagcompound = itemstack.getTagCompound().getCompoundTag("SkullOwner");
if (nbttagcompound.hasKey("Name", 8)) {
return StatCollector.translateToLocalFormatted("item.skull.player.name",
return I18n.translateToLocalFormatted("item.skull.player.name",
new Object[] { nbttagcompound.getString("Name") });
}
}

27
src/main/java/net/minecraft/item/ItemStack.java
View File

@ -15,7 +15,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import net.minecraft.block.Block;
import net.minecraft.client.resources.I18n;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentDurability;
import net.minecraft.enchantment.EnchantmentHelper;
@ -35,10 +34,10 @@ import net.minecraft.stats.StatList;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.event.HoverEvent;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
@ -714,7 +713,7 @@ public final class ItemStack {
list.add("Color: #" + String.format("%06X",
new Object[] { Integer.valueOf(nbttagcompound.getInteger("color")) }));
} else {
list.add(EnumChatFormatting.ITALIC + StatCollector.translateToLocal("item.dyed"));
list.add(EnumChatFormatting.ITALIC + I18n.translateToLocal("item.dyed"));
}
}
@ -738,10 +737,10 @@ public final class ItemStack {
if (!multimap.isEmpty() && (i1 & 2) == 0) {
if (isArmor) {
list.add("");
list.add(StatCollector.translateToLocal("item.modifiers." + entityequipmentslot.getName()));
list.add(I18n.translateToLocal("item.modifiers." + entityequipmentslot.getName()));
} else if (isSword) {
list.add("");
list.add(StatCollector.translateToLocal("item.modifiers.mainhand"));
list.add(I18n.translateToLocal("item.modifiers.mainhand"));
}
for (Entry<String, AttributeModifier> entry : multimap.entries()) {
@ -767,21 +766,21 @@ public final class ItemStack {
}
if (flag) {
list.add(" " + StatCollector.translateToLocalFormatted(
list.add(" " + I18n.translateToLocalFormatted(
"attribute.modifier.equals." + attributemodifier.getOperation(),
new Object[] { DECIMALFORMAT.format(d1),
StatCollector.translateToLocal("attribute.name." + (String) entry.getKey()) }));
I18n.translateToLocal("attribute.name." + (String) entry.getKey()) }));
} else if (d0 > 0.0D) {
list.add(EnumChatFormatting.BLUE + " " + StatCollector.translateToLocalFormatted(
list.add(EnumChatFormatting.BLUE + " " + I18n.translateToLocalFormatted(
"attribute.modifier.plus." + attributemodifier.getOperation(),
new Object[] { DECIMALFORMAT.format(d1),
StatCollector.translateToLocal("attribute.name." + (String) entry.getKey()) }));
I18n.translateToLocal("attribute.name." + (String) entry.getKey()) }));
} else if (d0 < 0.0D) {
d1 = d1 * -1.0D;
list.add(EnumChatFormatting.RED + " " + StatCollector.translateToLocalFormatted(
list.add(EnumChatFormatting.RED + " " + I18n.translateToLocalFormatted(
"attribute.modifier.take." + attributemodifier.getOperation(),
new Object[] { DECIMALFORMAT.format(d1),
StatCollector.translateToLocal("attribute.name." + (String) entry.getKey()) }));
I18n.translateToLocal("attribute.name." + (String) entry.getKey()) }));
}
}
}
@ -792,7 +791,7 @@ public final class ItemStack {
}
if (this.hasTagCompound() && this.getTagCompound().getBoolean("Unbreakable") && (i1 & 4) == 0) {
list.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("item.unbreakable"));
list.add(EnumChatFormatting.BLUE + I18n.translateToLocal("item.unbreakable"));
}
if (this.hasTagCompound() && this.stackTagCompound.hasKey("CanDestroy", 9) && (i1 & 8) == 0) {
@ -800,7 +799,7 @@ public final class ItemStack {
if (!nbttaglist1.hasNoTags()) {
list.add("");
list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.canBreak"));
list.add(EnumChatFormatting.GRAY + I18n.translateToLocal("item.canBreak"));
for (int j1 = 0; j1 < nbttaglist1.tagCount(); ++j1) {
Block block = Block.getBlockFromName(nbttaglist1.getStringTagAt(j1));
@ -819,7 +818,7 @@ public final class ItemStack {
if (!nbttaglist2.hasNoTags()) {
list.add("");
list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.canPlace"));
list.add(EnumChatFormatting.GRAY + I18n.translateToLocal("item.canPlace"));
for (int k1 = 0; k1 < nbttaglist2.tagCount(); ++k1) {
Block block1 = Block.getBlockFromName(nbttaglist2.getStringTagAt(k1));

6
src/main/java/net/minecraft/stats/Achievement.java
View File

@ -5,8 +5,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IJsonSerializable;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.util.text.ITextComponent;
/**
@ -139,8 +139,8 @@ public class Achievement extends StatBase {
*/
public String getDescription() {
return this.statStringFormatter != null
? this.statStringFormatter.formatString(StatCollector.translateToLocal(this.achievementDescription))
: StatCollector.translateToLocal(this.achievementDescription);
? this.statStringFormatter.formatString(I18n.translateToLocal(this.achievementDescription))
: I18n.translateToLocal(this.achievementDescription);
}
/**

3
src/main/java/net/minecraft/util/DamageSource.java
View File

@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.entity.projectile.EntityFireball;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.Explosion;
@ -226,7 +227,7 @@ public class DamageSource {
EntityLivingBase entitylivingbase = parEntityLivingBase.func_94060_bK();
String s = "death.attack." + this.damageType;
String s1 = s + ".player";
return entitylivingbase != null && StatCollector.canTranslate(s1)
return entitylivingbase != null && I18n.canTranslate(s1)
? new TextComponentTranslation(s1,
new Object[] { parEntityLivingBase.getDisplayName(), entitylivingbase.getDisplayName() })
: new TextComponentTranslation(s, new Object[] { parEntityLivingBase.getDisplayName() });

3
src/main/java/net/minecraft/util/EntityDamageSource.java
View File

@ -5,6 +5,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.util.text.ITextComponent;
/**
@ -77,7 +78,7 @@ public class EntityDamageSource extends DamageSource {
: null;
String s = "death.attack." + this.damageType;
String s1 = s + ".item";
return itemstack != null && itemstack.hasDisplayName() && StatCollector.canTranslate(s1)
return itemstack != null && itemstack.hasDisplayName() && I18n.canTranslate(s1)
? new TextComponentTranslation(s1,
new Object[] { entitylivingbase.getDisplayName(), this.damageSourceEntity.getDisplayName(),
itemstack.getChatComponent() })

3
src/main/java/net/minecraft/util/EntityDamageSourceIndirect.java
View File

@ -4,6 +4,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.util.text.ITextComponent;
/**
@ -63,7 +64,7 @@ public class EntityDamageSourceIndirect extends EntityDamageSource {
: null;
String s = "death.attack." + this.damageType;
String s1 = s + ".item";
return itemstack != null && itemstack.hasDisplayName() && StatCollector.canTranslate(s1)
return itemstack != null && itemstack.hasDisplayName() && I18n.canTranslate(s1)
? new TextComponentTranslation(s1,
new Object[] { entitylivingbase.getDisplayName(), ichatcomponent,
itemstack.getChatComponent() })

8
src/main/java/net/minecraft/util/text/TextComponentTranslation.java
View File

@ -11,7 +11,7 @@ import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import net.lax1dude.eaglercraft.v1_8.HString;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
/**
* +
@ -70,7 +70,7 @@ public class TextComponentTranslation extends TextComponentBase {
*/
synchronized void ensureInitialized() {
synchronized (this.syncLock) {
long i = StatCollector.getLastTranslationUpdateTimeInMilliseconds();
long i = I18n.getLastTranslationUpdateTimeInMilliseconds();
if (i == this.lastTranslationUpdateTimeInMilliseconds) {
return;
}
@ -80,12 +80,12 @@ public class TextComponentTranslation extends TextComponentBase {
}
try {
this.initializeFromFormat(StatCollector.translateToLocal(this.key));
this.initializeFromFormat(I18n.translateToLocal(this.key));
} catch (TextComponentTranslationFormatException chatcomponenttranslationformatexception) {
this.children.clear();
try {
this.initializeFromFormat(StatCollector.translateToFallback(this.key));
this.initializeFromFormat(I18n.translateToFallback(this.key));
} catch (TextComponentTranslationFormatException var5) {
throw chatcomponenttranslationformatexception;
}

8
src/main/java/net/minecraft/util/StatCollector.java → src/main/java/net/minecraft/util/text/translation/I18n.java
View File

@ -1,4 +1,4 @@
package net.minecraft.util;
package net.minecraft.util.text.translation;
/**
* +
@ -29,8 +29,8 @@ package net.minecraft.util;
* POSSIBILITY OF SUCH DAMAGE.
*
*/
public class StatCollector {
private static StringTranslate localizedName = StringTranslate.getInstance();
public class I18n {
private static LanguageMap localizedName = LanguageMap.getInstance();
/**
* +
@ -55,7 +55,7 @@ public class StatCollector {
* translateToLocal fails.
*/
public static String translateToFallback(String key) {
return StringTranslate.fallbackInstance != null ? StringTranslate.fallbackInstance.translateKey(key)
return LanguageMap.fallbackInstance != null ? LanguageMap.fallbackInstance.translateKey(key)
: localizedName.translateKey(key);
}

14
src/main/java/net/minecraft/util/StringTranslate.java → src/main/java/net/minecraft/util/text/translation/LanguageMap.java
View File

@ -1,4 +1,4 @@
package net.minecraft.util;
package net.minecraft.util.text.translation;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
@ -48,7 +48,7 @@ import java.util.regex.Pattern;
* POSSIBILITY OF SUCH DAMAGE.
*
*/
public class StringTranslate {
public class LanguageMap {
/**
* +
* Pattern that matches numeric variable placeholders in a
@ -65,18 +65,18 @@ public class StringTranslate {
* +
* Is the private singleton instance of StringTranslate.
*/
private static StringTranslate instance = new StringTranslate();
static StringTranslate fallbackInstance = null;
private static LanguageMap instance = new LanguageMap();
static LanguageMap fallbackInstance = null;
private final Map<String, String> languageList = Maps.newHashMap();
private long lastUpdateTimeInMilliseconds;
private StringTranslate() {
private LanguageMap() {
}
public static void initClient() {
try (InputStream inputstream = EagRuntime.getResourceStream("/assets/minecraft/lang/en_US.lang")) {
initServer(IOUtils.readLines(inputstream, StandardCharsets.UTF_8));
fallbackInstance = new StringTranslate();
fallbackInstance = new LanguageMap();
fallbackInstance.replaceWith(instance.languageList);
SingleplayerServerController.updateLocale(dump());
} catch (IOException e) {
@ -108,7 +108,7 @@ public class StringTranslate {
* +
* Return the StringTranslate singleton instance
*/
static StringTranslate getInstance() {
static LanguageMap getInstance() {
return instance;
}