diff --git a/.idea/misc.xml b/.idea/misc.xml index 8bddb52..18ad7e3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index faaac96..e708858 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/lwjgl-rundir/gson-2.2.2.jar b/lwjgl-rundir/gson-2.2.2.jar deleted file mode 100644 index 9adc66f..0000000 Binary files a/lwjgl-rundir/gson-2.2.2.jar and /dev/null differ diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 492542e..4a815d4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -15,7 +15,6 @@ import net.minecraft.src.AxisAlignedBB; import net.minecraft.src.CallableIsServerModded; import net.minecraft.src.CallableServerMemoryStats; import net.minecraft.src.CallableServerProfiler; -import net.minecraft.src.ChatMessageComponent; import net.minecraft.src.ChunkCoordinates; import net.minecraft.src.CommandBase; import net.minecraft.src.ConvertingProgressUpdate; @@ -905,9 +904,9 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay return "Server"; } - public void sendChatToPlayer(ChatMessageComponent par1ChatMessageComponent) + public void sendChatToPlayer(String par1ChatMessageComponent) { - this.getLogAgent().logInfo(par1ChatMessageComponent.toString()); + this.getLogAgent().logInfo(par1ChatMessageComponent); } /** diff --git a/src/main/java/net/minecraft/src/AbstractResourcePack.java b/src/main/java/net/minecraft/src/AbstractResourcePack.java deleted file mode 100644 index 418e4b8..0000000 --- a/src/main/java/net/minecraft/src/AbstractResourcePack.java +++ /dev/null @@ -1,84 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - -import net.lax1dude.eaglercraft.EaglerImage; -import net.lax1dude.eaglercraft.TextureLocation; - -public abstract class AbstractResourcePack implements ResourcePack -{ - protected final File resourcePackFile; - - public AbstractResourcePack(File par1File) - { - this.resourcePackFile = par1File; - } - - private static String locationToName(TextureLocation par0TextureLocation) - { - return String.format("%s/%s/%s", new Object[] {"assets", par0TextureLocation, par0TextureLocation}); - } - - protected static String getRelativeName(File par0File, File par1File) - { - return par0File.toURI().relativize(par1File.toURI()).getPath(); - } - - public InputStream getInputStream(TextureLocation par1TextureLocation) throws IOException - { - return this.getInputStreamByName(locationToName(par1TextureLocation)); - } - - public boolean resourceExists(TextureLocation par1TextureLocation) - { - return this.hasResourceName(locationToName(par1TextureLocation)); - } - - protected abstract InputStream getInputStreamByName(String var1) throws IOException; - - protected abstract boolean hasResourceName(String var1); - - protected void logNameNotLowercase(String par1Str) - { - System.err.printf("ResourcePack: ignored non-lowercase namespace: %s in %s", new Object[] {par1Str, this.resourcePackFile}); - } - - public MetadataSection getPackMetadata(MetadataSerializer par1MetadataSerializer, String par2Str) throws IOException - { - return readMetadata(par1MetadataSerializer, this.getInputStreamByName("pack.mcmeta"), par2Str); - } - - static MetadataSection readMetadata(MetadataSerializer par0MetadataSerializer, InputStream par1InputStream, String par2Str) - { - JsonObject var3 = null; - BufferedReader var4 = null; - - try - { - var4 = new BufferedReader(new InputStreamReader(par1InputStream)); - var3 = (new JsonParser()).parse(var4).getAsJsonObject(); - } - finally - { - } - - return par0MetadataSerializer.parseMetadataSection(par2Str, var3); - } - - public EaglerImage getPackImage() throws IOException - { - return null; //new EaglerImage("pack.png"); // FIX THIS SHIT - } - - public String getPackName() - { - return this.resourcePackFile.getName(); - } -} diff --git a/src/main/java/net/minecraft/src/AnimationMetadataSection.java b/src/main/java/net/minecraft/src/AnimationMetadataSection.java index b4e94ae..cce5162 100644 --- a/src/main/java/net/minecraft/src/AnimationMetadataSection.java +++ b/src/main/java/net/minecraft/src/AnimationMetadataSection.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -public class AnimationMetadataSection implements MetadataSection +public class AnimationMetadataSection { private final List animationFrames; private final int frameWidth; diff --git a/src/main/java/net/minecraft/src/AnimationMetadataSectionSerializer.java b/src/main/java/net/minecraft/src/AnimationMetadataSectionSerializer.java deleted file mode 100644 index 9b9af5e..0000000 --- a/src/main/java/net/minecraft/src/AnimationMetadataSectionSerializer.java +++ /dev/null @@ -1,134 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonArray; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import java.lang.reflect.Type; -import java.util.ArrayList; - -public class AnimationMetadataSectionSerializer extends BaseMetadataSectionSerializer implements JsonSerializer -{ - public AnimationMetadataSection func_110493_a(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - ArrayList var4 = new ArrayList<>(); - JsonObject var5 = (JsonObject)par1JsonElement; - int var6 = this.func_110485_a(var5.get("frametime"), "frametime", Integer.valueOf(1), 1, Integer.MAX_VALUE); - int var8; - - if (var5.has("frames")) - { - try - { - JsonArray var7 = var5.getAsJsonArray("frames"); - - for (var8 = 0; var8 < var7.size(); ++var8) - { - JsonElement var9 = var7.get(var8); - AnimationFrame var10 = this.parseAnimationFrame(var8, var9); - - if (var10 != null) - { - var4.add(var10); - } - } - } - catch (ClassCastException var11) - { - throw new JsonParseException("Invalid animation->frames: expected array, was " + var5.get("frames"), var11); - } - } - - int var12 = this.func_110485_a(var5.get("width"), "width", Integer.valueOf(-1), 1, Integer.MAX_VALUE); - var8 = this.func_110485_a(var5.get("height"), "height", Integer.valueOf(-1), 1, Integer.MAX_VALUE); - return new AnimationMetadataSection(var4, var12, var8, var6); - } - - private AnimationFrame parseAnimationFrame(int par1, JsonElement par2JsonElement) - { - if (par2JsonElement.isJsonPrimitive()) - { - try - { - return new AnimationFrame(par2JsonElement.getAsInt()); - } - catch (NumberFormatException var6) - { - throw new JsonParseException("Invalid animation->frames->" + par1 + ": expected number, was " + par2JsonElement, var6); - } - } - else if (par2JsonElement.isJsonObject()) - { - JsonObject var3 = par2JsonElement.getAsJsonObject(); - int var4 = this.func_110485_a(var3.get("time"), "frames->" + par1 + "->time", Integer.valueOf(-1), 1, Integer.MAX_VALUE); - int var5 = this.func_110485_a(var3.get("index"), "frames->" + par1 + "->index", (Integer)null, 0, Integer.MAX_VALUE); - return new AnimationFrame(var5, var4); - } - else - { - return null; - } - } - - public JsonElement func_110491_a(AnimationMetadataSection par1AnimationMetadataSection, Type par2Type, JsonSerializationContext par3JsonSerializationContext) - { - JsonObject var4 = new JsonObject(); - var4.addProperty("frametime", Integer.valueOf(par1AnimationMetadataSection.getFrameTime())); - - if (par1AnimationMetadataSection.getFrameWidth() != -1) - { - var4.addProperty("width", Integer.valueOf(par1AnimationMetadataSection.getFrameWidth())); - } - - if (par1AnimationMetadataSection.getFrameHeight() != -1) - { - var4.addProperty("height", Integer.valueOf(par1AnimationMetadataSection.getFrameHeight())); - } - - if (par1AnimationMetadataSection.getFrameCount() > 0) - { - JsonArray var5 = new JsonArray(); - - for (int var6 = 0; var6 < par1AnimationMetadataSection.getFrameCount(); ++var6) - { - if (par1AnimationMetadataSection.frameHasTime(var6)) - { - JsonObject var7 = new JsonObject(); - var7.addProperty("index", Integer.valueOf(par1AnimationMetadataSection.getFrameIndex(var6))); - var7.addProperty("time", Integer.valueOf(par1AnimationMetadataSection.getFrameTimeSingle(var6))); - var5.add(var7); - } - else - { - var5.add(new JsonPrimitive(Integer.valueOf(par1AnimationMetadataSection.getFrameIndex(var6)))); - } - } - - var4.add("frames", var5); - } - - return var4; - } - - /** - * The name of this section type as it appears in JSON. - */ - public String getSectionName() - { - return "animation"; - } - - public Object deserialize(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - return this.func_110493_a(par1JsonElement, par2Type, par3JsonDeserializationContext); - } - - public JsonElement serialize(Object par1Obj, Type par2Type, JsonSerializationContext par3JsonSerializationContext) - { - return this.func_110491_a((AnimationMetadataSection)par1Obj, par2Type, par3JsonSerializationContext); - } -} diff --git a/src/main/java/net/minecraft/src/BaseMetadataSectionSerializer.java b/src/main/java/net/minecraft/src/BaseMetadataSectionSerializer.java deleted file mode 100644 index 260d451..0000000 --- a/src/main/java/net/minecraft/src/BaseMetadataSectionSerializer.java +++ /dev/null @@ -1,161 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; - -public abstract class BaseMetadataSectionSerializer implements MetadataSectionSerializer -{ - protected float func_110487_a(JsonElement par1JsonElement, String par2Str, Float par3, float par4, float par5) - { - par2Str = this.getSectionName() + "->" + par2Str; - - if (par1JsonElement == null) - { - if (par3 == null) - { - throw new JsonParseException("Missing " + par2Str + ": expected float"); - } - else - { - return par3.floatValue(); - } - } - else if (!par1JsonElement.isJsonPrimitive()) - { - throw new JsonParseException("Invalid " + par2Str + ": expected float, was " + par1JsonElement); - } - else - { - try - { - float var6 = par1JsonElement.getAsFloat(); - - if (var6 < par4) - { - throw new JsonParseException("Invalid " + par2Str + ": expected float >= " + par4 + ", was " + var6); - } - else if (var6 > par5) - { - throw new JsonParseException("Invalid " + par2Str + ": expected float <= " + par5 + ", was " + var6); - } - else - { - return var6; - } - } - catch (NumberFormatException var7) - { - throw new JsonParseException("Invalid " + par2Str + ": expected float, was " + par1JsonElement, var7); - } - } - } - - protected int func_110485_a(JsonElement par1JsonElement, String par2Str, Integer par3, int par4, int par5) - { - par2Str = this.getSectionName() + "->" + par2Str; - - if (par1JsonElement == null) - { - if (par3 == null) - { - throw new JsonParseException("Missing " + par2Str + ": expected int"); - } - else - { - return par3.intValue(); - } - } - else if (!par1JsonElement.isJsonPrimitive()) - { - throw new JsonParseException("Invalid " + par2Str + ": expected int, was " + par1JsonElement); - } - else - { - try - { - int var6 = par1JsonElement.getAsInt(); - - if (var6 < par4) - { - throw new JsonParseException("Invalid " + par2Str + ": expected int >= " + par4 + ", was " + var6); - } - else if (var6 > par5) - { - throw new JsonParseException("Invalid " + par2Str + ": expected int <= " + par5 + ", was " + var6); - } - else - { - return var6; - } - } - catch (NumberFormatException var7) - { - throw new JsonParseException("Invalid " + par2Str + ": expected int, was " + par1JsonElement, var7); - } - } - } - - protected String func_110486_a(JsonElement par1JsonElement, String par2Str, String par3Str, int par4, int par5) - { - par2Str = this.getSectionName() + "->" + par2Str; - - if (par1JsonElement == null) - { - if (par3Str == null) - { - throw new JsonParseException("Missing " + par2Str + ": expected string"); - } - else - { - return par3Str; - } - } - else if (!par1JsonElement.isJsonPrimitive()) - { - throw new JsonParseException("Invalid " + par2Str + ": expected string, was " + par1JsonElement); - } - else - { - String var6 = par1JsonElement.getAsString(); - - if (var6.length() < par4) - { - throw new JsonParseException("Invalid " + par2Str + ": expected string length >= " + par4 + ", was " + var6); - } - else if (var6.length() > par5) - { - throw new JsonParseException("Invalid " + par2Str + ": expected string length <= " + par5 + ", was " + var6); - } - else - { - return var6; - } - } - } - - protected boolean func_110484_a(JsonElement par1JsonElement, String par2Str, Boolean par3) - { - par2Str = this.getSectionName() + "->" + par2Str; - - if (par1JsonElement == null) - { - if (par3 == null) - { - throw new JsonParseException("Missing " + par2Str + ": expected boolean"); - } - else - { - return par3.booleanValue(); - } - } - else if (!par1JsonElement.isJsonPrimitive()) - { - throw new JsonParseException("Invalid " + par2Str + ": expected boolean, was " + par1JsonElement); - } - else - { - boolean var4 = par1JsonElement.getAsBoolean(); - return var4; - } - } -} diff --git a/src/main/java/net/minecraft/src/ChatMessageComponent.java b/src/main/java/net/minecraft/src/ChatMessageComponent.java deleted file mode 100644 index 986c073..0000000 --- a/src/main/java/net/minecraft/src/ChatMessageComponent.java +++ /dev/null @@ -1,376 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class ChatMessageComponent -{ - private static final Gson field_111089_a = (new GsonBuilder()).registerTypeAdapter(ChatMessageComponent.class, new MessageComponentSerializer()).create(); - private EnumChatFormatting color; - private Boolean bold; - private Boolean italic; - private Boolean underline; - private Boolean obfuscated; - private String text; - private String translationKey; - private List field_111091_i; - - public ChatMessageComponent() {} - - public ChatMessageComponent(ChatMessageComponent par1ChatMessageComponent) - { - this.color = par1ChatMessageComponent.color; - this.bold = par1ChatMessageComponent.bold; - this.italic = par1ChatMessageComponent.italic; - this.underline = par1ChatMessageComponent.underline; - this.obfuscated = par1ChatMessageComponent.obfuscated; - this.text = par1ChatMessageComponent.text; - this.translationKey = par1ChatMessageComponent.translationKey; - this.field_111091_i = par1ChatMessageComponent.field_111091_i == null ? null : new ArrayList<>(par1ChatMessageComponent.field_111091_i); - } - - public ChatMessageComponent setColor(EnumChatFormatting par1EnumChatFormatting) - { - if (par1EnumChatFormatting != null && !par1EnumChatFormatting.isColor()) - { - throw new IllegalArgumentException("Argument is not a valid color!"); - } - else - { - this.color = par1EnumChatFormatting; - return this; - } - } - - public EnumChatFormatting getColor() - { - return this.color; - } - - public ChatMessageComponent setBold(Boolean par1) - { - this.bold = par1; - return this; - } - - public Boolean isBold() - { - return this.bold; - } - - public ChatMessageComponent setItalic(Boolean par1) - { - this.italic = par1; - return this; - } - - public Boolean isItalic() - { - return this.italic; - } - - public ChatMessageComponent setUnderline(Boolean par1) - { - this.underline = par1; - return this; - } - - public Boolean isUnderline() - { - return this.underline; - } - - public ChatMessageComponent setObfuscated(Boolean par1) - { - this.obfuscated = par1; - return this; - } - - public Boolean isObfuscated() - { - return this.obfuscated; - } - - protected String getText() - { - return this.text; - } - - protected String getTranslationKey() - { - return this.translationKey; - } - - protected List getSubComponents() - { - return this.field_111091_i; - } - - public ChatMessageComponent appendComponent(ChatMessageComponent par1ChatMessageComponent) - { - if (this.text == null && this.translationKey == null) - { - if (this.field_111091_i != null) - { - this.field_111091_i.add(par1ChatMessageComponent); - } - else - { - this.field_111091_i = new ArrayList<>(List.of(new ChatMessageComponent[]{par1ChatMessageComponent})); - } - } - else - { - this.field_111091_i = new ArrayList<>(List.of(new ChatMessageComponent[]{new ChatMessageComponent(this), par1ChatMessageComponent})); - this.text = null; - this.translationKey = null; - } - - return this; - } - - public ChatMessageComponent addText(String par1Str) - { - if (this.text == null && this.translationKey == null) - { - if (this.field_111091_i != null) - { - this.field_111091_i.add(createFromText(par1Str)); - } - else - { - this.text = par1Str; - } - } - else - { - this.field_111091_i = new ArrayList(List.of(new ChatMessageComponent[]{new ChatMessageComponent(this), createFromText(par1Str)})); - this.text = null; - this.translationKey = null; - } - - return this; - } - - /** - * Appends a translated string. - */ - public ChatMessageComponent addKey(String par1Str) - { - if (this.text == null && this.translationKey == null) - { - if (this.field_111091_i != null) - { - this.field_111091_i.add(createFromTranslationKey(par1Str)); - } - else - { - this.translationKey = par1Str; - } - } - else - { - this.field_111091_i = new ArrayList<>(List.of(new ChatMessageComponent[]{new ChatMessageComponent(this), createFromTranslationKey(par1Str)})); - this.text = null; - this.translationKey = null; - } - - return this; - } - - /** - * Appends a formatted translation key. Args: key, params. The text ultimately displayed is - * String.format(translate(key), params) - */ - public ChatMessageComponent addFormatted(String par1Str, Object ... par2ArrayOfObj) - { - if (this.text == null && this.translationKey == null) - { - if (this.field_111091_i != null) - { - this.field_111091_i.add(createFromTranslationWithSubstitutions(par1Str, par2ArrayOfObj)); - } - else - { - this.translationKey = par1Str; - this.field_111091_i = new ArrayList<>(); - Object[] var3 = par2ArrayOfObj; - int var4 = par2ArrayOfObj.length; - - for (int var5 = 0; var5 < var4; ++var5) - { - Object var6 = var3[var5]; - - if (var6 instanceof ChatMessageComponent) - { - this.field_111091_i.add((ChatMessageComponent)var6); - } - else - { - this.field_111091_i.add(createFromText(var6.toString())); - } - } - } - } - else - { - this.field_111091_i = new ArrayList<>(List.of(new ChatMessageComponent[]{new ChatMessageComponent(this), createFromTranslationWithSubstitutions(par1Str, par2ArrayOfObj)})); - this.text = null; - this.translationKey = null; - } - - return this; - } - - public String toString() - { - return this.toStringWithFormatting(false); - } - - public String toStringWithFormatting(boolean par1) - { - return this.toStringWithDefaultFormatting(par1, (EnumChatFormatting)null, false, false, false, false); - } - - /** - * args: enableFormat, defaultColor, defaultBold, defaultItalic, defaultUnderline, defaultObfuscated - */ - public String toStringWithDefaultFormatting(boolean par1, EnumChatFormatting par2EnumChatFormatting, boolean par3, boolean par4, boolean par5, boolean par6) - { - StringBuilder var7 = new StringBuilder(); - EnumChatFormatting var8 = this.color == null ? par2EnumChatFormatting : this.color; - boolean var9 = this.bold == null ? par3 : this.bold.booleanValue(); - boolean var10 = this.italic == null ? par4 : this.italic.booleanValue(); - boolean var11 = this.underline == null ? par5 : this.underline.booleanValue(); - boolean var12 = this.obfuscated == null ? par6 : this.obfuscated.booleanValue(); - - if (this.translationKey != null) - { - if (par1) - { - appendFormattingToString(var7, var8, var9, var10, var11, var12); - } - - if (this.field_111091_i != null) - { - String[] var13 = new String[this.field_111091_i.size()]; - - for (int var14 = 0; var14 < this.field_111091_i.size(); ++var14) - { - var13[var14] = ((ChatMessageComponent)this.field_111091_i.get(var14)).toStringWithDefaultFormatting(par1, var8, var9, var10, var11, var12); - } - - var7.append(StatCollector.translateToLocalFormatted(this.translationKey, var13)); - } - else - { - var7.append(StatCollector.translateToLocal(this.translationKey)); - } - } - else if (this.text != null) - { - if (par1) - { - appendFormattingToString(var7, var8, var9, var10, var11, var12); - } - - var7.append(this.text); - } - else - { - ChatMessageComponent var16; - - if (this.field_111091_i != null) - { - for (Iterator var15 = this.field_111091_i.iterator(); var15.hasNext(); var7.append(var16.toStringWithDefaultFormatting(par1, var8, var9, var10, var11, var12))) - { - var16 = (ChatMessageComponent)var15.next(); - - if (par1) - { - appendFormattingToString(var7, var8, var9, var10, var11, var12); - } - } - } - } - - return var7.toString(); - } - - private static void appendFormattingToString(StringBuilder par0StringBuilder, EnumChatFormatting par1EnumChatFormatting, boolean par2, boolean par3, boolean par4, boolean par5) - { - if (par1EnumChatFormatting != null) - { - par0StringBuilder.append(par1EnumChatFormatting); - } - else if (par2 || par3 || par4 || par5) - { - par0StringBuilder.append(EnumChatFormatting.RESET); - } - - if (par2) - { - par0StringBuilder.append(EnumChatFormatting.BOLD); - } - - if (par3) - { - par0StringBuilder.append(EnumChatFormatting.ITALIC); - } - - if (par4) - { - par0StringBuilder.append(EnumChatFormatting.UNDERLINE); - } - - if (par5) - { - par0StringBuilder.append(EnumChatFormatting.OBFUSCATED); - } - } - - public static ChatMessageComponent createFromJson(String par0Str) - { - try - { - return (ChatMessageComponent)field_111089_a.fromJson(par0Str, ChatMessageComponent.class); - } - catch (Throwable var4) - { - CrashReport var2 = CrashReport.makeCrashReport(var4, "Deserializing Message"); - CrashReportCategory var3 = var2.makeCategory("Serialized Message"); - var3.addCrashSection("JSON string", par0Str); - throw new ReportedException(var2); - } - } - - public static ChatMessageComponent createFromText(String par0Str) - { - ChatMessageComponent var1 = new ChatMessageComponent(); - var1.addText(par0Str); - return var1; - } - - public static ChatMessageComponent createFromTranslationKey(String par0Str) - { - ChatMessageComponent var1 = new ChatMessageComponent(); - var1.addKey(par0Str); - return var1; - } - - public static ChatMessageComponent createFromTranslationWithSubstitutions(String par0Str, Object ... par1ArrayOfObj) - { - ChatMessageComponent var2 = new ChatMessageComponent(); - var2.addFormatted(par0Str, par1ArrayOfObj); - return var2; - } - - public String toJson() - { - return field_111089_a.toJson(this); - } -} diff --git a/src/main/java/net/minecraft/src/CombatTracker.java b/src/main/java/net/minecraft/src/CombatTracker.java index 4cc3549..e847ebf 100644 --- a/src/main/java/net/minecraft/src/CombatTracker.java +++ b/src/main/java/net/minecraft/src/CombatTracker.java @@ -54,65 +54,44 @@ public class CombatTracker this.field_94552_d |= var4.func_94559_f(); } - public ChatMessageComponent func_94546_b() - { - if (this.field_94556_a.size() == 0) - { - return ChatMessageComponent.createFromTranslationWithSubstitutions("death.attack.generic", new Object[] {this.fighter.getTranslatedEntityName()}); - } - else - { + public String func_94546_b() { + if (this.field_94556_a.size() == 0) { + return this.fighter.getTranslatedEntityName() + " died"; + } else { CombatEntry var1 = this.func_94544_f(); - CombatEntry var2 = (CombatEntry)this.field_94556_a.get(this.field_94556_a.size() - 1); + CombatEntry var2 = (CombatEntry) this.field_94556_a.get(this.field_94556_a.size() - 1); + String var3 = ""; String var4 = var2.func_94558_h(); Entity var5 = var2.getDamageSrc().getEntity(); - ChatMessageComponent var3; - if (var1 != null && var2.getDamageSrc() == DamageSource.fall) - { + if (var1 != null && var2.getDamageSrc() == DamageSource.fall) { String var6 = var1.func_94558_h(); - if (var1.getDamageSrc() != DamageSource.fall && var1.getDamageSrc() != DamageSource.outOfWorld) - { - if (var6 != null && (var4 == null || !var6.equals(var4))) - { + if (var1.getDamageSrc() != DamageSource.fall && var1.getDamageSrc() != DamageSource.outOfWorld) { + if (var6 != null && (var4 == null || !var6.equals(var4))) { Entity var9 = var1.getDamageSrc().getEntity(); - ItemStack var8 = var9 instanceof EntityLivingBase ? ((EntityLivingBase)var9).getHeldItem() : null; + ItemStack var8 = var9 instanceof EntityLiving ? ((EntityLiving) var9).getHeldItem() : null; - if (var8 != null && var8.hasDisplayName()) - { - var3 = ChatMessageComponent.createFromTranslationWithSubstitutions("death.fell.assist.item", new Object[] {this.fighter.getTranslatedEntityName(), var6, var8.getDisplayName()}); + if (var8 != null && var8.hasDisplayName()) { + var3 = StatCollector.translateToLocalFormatted("death.fell.assist.item", new Object[] { this.fighter.getTranslatedEntityName(), var4, var8.getDisplayName() }); + } else { + var3 = StatCollector.translateToLocalFormatted("death.fell.assist", new Object[] { this.fighter.getTranslatedEntityName(), var6 }); } - else - { - var3 = ChatMessageComponent.createFromTranslationWithSubstitutions("death.fell.assist", new Object[] {this.fighter.getTranslatedEntityName(), var6}); - } - } - else if (var4 != null) - { - ItemStack var7 = var5 instanceof EntityLivingBase ? ((EntityLivingBase)var5).getHeldItem() : null; + } else if (var4 != null) { + ItemStack var7 = var5 instanceof EntityLiving ? ((EntityLiving) var5).getHeldItem() : null; - if (var7 != null && var7.hasDisplayName()) - { - var3 = ChatMessageComponent.createFromTranslationWithSubstitutions("death.fell.finish.item", new Object[] {this.fighter.getTranslatedEntityName(), var4, var7.getDisplayName()}); - } - else - { - var3 = ChatMessageComponent.createFromTranslationWithSubstitutions("death.fell.finish", new Object[] {this.fighter.getTranslatedEntityName(), var4}); + if (var7 != null && var7.hasDisplayName()) { + var3 = StatCollector.translateToLocalFormatted("death.fell.finish.item", new Object[] { this.fighter.getTranslatedEntityName(), var4, var7.getDisplayName() }); + } else { + var3 = StatCollector.translateToLocalFormatted("death.fell.finish", new Object[] { this.fighter.getTranslatedEntityName(), var4 }); } + } else { + var3 = StatCollector.translateToLocalFormatted("death.fell.killer", new Object[] { this.fighter.getTranslatedEntityName() }); } - else - { - var3 = ChatMessageComponent.createFromTranslationWithSubstitutions("death.fell.killer", new Object[] {this.fighter.getTranslatedEntityName()}); - } + } else { + var3 = StatCollector.translateToLocalFormatted("death.fell.accident." + this.func_94548_b(var1), new Object[] { this.fighter.getTranslatedEntityName() }); } - else - { - var3 = ChatMessageComponent.createFromTranslationWithSubstitutions("death.fell.accident." + this.func_94548_b(var1), new Object[] {this.fighter.getTranslatedEntityName()}); - } - } - else - { + } else { var3 = var2.getDamageSrc().getDeathMessage(this.fighter); } diff --git a/src/main/java/net/minecraft/src/CommandDefaultGameMode.java b/src/main/java/net/minecraft/src/CommandDefaultGameMode.java index dde10b2..5d104c3 100644 --- a/src/main/java/net/minecraft/src/CommandDefaultGameMode.java +++ b/src/main/java/net/minecraft/src/CommandDefaultGameMode.java @@ -21,7 +21,7 @@ public class CommandDefaultGameMode extends CommandGameMode { EnumGameType var3 = this.getGameModeFromCommand(par1ICommandSender, par2ArrayOfStr[0]); this.setGameType(var3); - notifyAdmins(par1ICommandSender, "commands.defaultgamemode.success", new Object[] {ChatMessageComponent.createFromTranslationKey("gameMode." + var3.getName())}); + notifyAdmins(par1ICommandSender, "commands.defaultgamemode.success", new Object[] {StatCollector.translateToLocal("gameMode." + var3.getName())}); } else { diff --git a/src/main/java/net/minecraft/src/CommandDifficulty.java b/src/main/java/net/minecraft/src/CommandDifficulty.java index 6bb92fb..cad2d0f 100644 --- a/src/main/java/net/minecraft/src/CommandDifficulty.java +++ b/src/main/java/net/minecraft/src/CommandDifficulty.java @@ -31,7 +31,7 @@ public class CommandDifficulty extends CommandBase { int var3 = this.getDifficultyForName(par1ICommandSender, par2ArrayOfStr[0]); MinecraftServer.getServer().setDifficultyForAllWorlds(var3); - notifyAdmins(par1ICommandSender, "commands.difficulty.success", new Object[] {ChatMessageComponent.createFromTranslationKey(difficulties[var3])}); + notifyAdmins(par1ICommandSender, "commands.difficulty.success", new Object[] {StatCollector.translateToLocalFormatted(difficulties[var3])}); } else { diff --git a/src/main/java/net/minecraft/src/CommandEffect.java b/src/main/java/net/minecraft/src/CommandEffect.java index d41167d..20dc94c 100644 --- a/src/main/java/net/minecraft/src/CommandEffect.java +++ b/src/main/java/net/minecraft/src/CommandEffect.java @@ -82,17 +82,17 @@ public class CommandEffect extends CommandBase { if (!var3.isPotionActive(var4)) { - throw new CommandException("commands.effect.failure.notActive", new Object[] {ChatMessageComponent.createFromTranslationKey(Potion.potionTypes[var4].getName()), var3.getEntityName()}); + throw new CommandException("commands.effect.failure.notActive", new Object[] {StatCollector.translateToLocal(Potion.potionTypes[var4].getName()), var3.getEntityName()}); } var3.removePotionEffect(var4); - notifyAdmins(par1ICommandSender, "commands.effect.success.removed", new Object[] {ChatMessageComponent.createFromTranslationKey(Potion.potionTypes[var4].getName()), var3.getEntityName()}); + notifyAdmins(par1ICommandSender, "commands.effect.success.removed", new Object[] {StatCollector.translateToLocal(Potion.potionTypes[var4].getName()), var3.getEntityName()}); } else { PotionEffect var8 = new PotionEffect(var4, var5, var7); var3.addPotionEffect(var8); - notifyAdmins(par1ICommandSender, "commands.effect.success", new Object[] {ChatMessageComponent.createFromTranslationKey(var8.getEffectName()), Integer.valueOf(var4), Integer.valueOf(var7), var3.getEntityName(), Integer.valueOf(var6)}); + notifyAdmins(par1ICommandSender, "commands.effect.success", new Object[] {StatCollector.translateToLocal(var8.getEffectName()), Integer.valueOf(var4), Integer.valueOf(var7), var3.getEntityName(), Integer.valueOf(var6)}); } } } diff --git a/src/main/java/net/minecraft/src/CommandGameMode.java b/src/main/java/net/minecraft/src/CommandGameMode.java index fe28a24..6d4ba60 100644 --- a/src/main/java/net/minecraft/src/CommandGameMode.java +++ b/src/main/java/net/minecraft/src/CommandGameMode.java @@ -31,7 +31,7 @@ public class CommandGameMode extends CommandBase EntityPlayerMP var4 = par2ArrayOfStr.length >= 2 ? getPlayer(par1ICommandSender, par2ArrayOfStr[1]) : getCommandSenderAsPlayer(par1ICommandSender); var4.setGameType(var3); var4.fallDistance = 0.0F; - ChatMessageComponent var5 = ChatMessageComponent.createFromTranslationKey("gameMode." + var3.getName()); + String var5 = StatCollector.translateToLocal("gameMode." + var3.getName()); if (var4 != par1ICommandSender) { diff --git a/src/main/java/net/minecraft/src/CommandGameRule.java b/src/main/java/net/minecraft/src/CommandGameRule.java index 21c6a08..db12077 100644 --- a/src/main/java/net/minecraft/src/CommandGameRule.java +++ b/src/main/java/net/minecraft/src/CommandGameRule.java @@ -51,7 +51,7 @@ public class CommandGameRule extends CommandBase if (var4.hasRule(var6)) { String var5 = var4.getGameRuleStringValue(var6); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromText(var6).addText(" = ").addText(var5)); + par1ICommandSender.sendChatToPlayer(var6 + " = " + var5); } else { @@ -61,7 +61,7 @@ public class CommandGameRule extends CommandBase else if (par2ArrayOfStr.length == 0) { GameRules var3 = this.getGameRules(); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromText(joinNiceString(var3.getRules()))); + par1ICommandSender.sendChatToPlayer(String.join(",", var3.getRules())); } else { diff --git a/src/main/java/net/minecraft/src/CommandHandler.java b/src/main/java/net/minecraft/src/CommandHandler.java index 504be13..ebab00e 100644 --- a/src/main/java/net/minecraft/src/CommandHandler.java +++ b/src/main/java/net/minecraft/src/CommandHandler.java @@ -61,7 +61,7 @@ public class CommandHandler implements ICommandManager } catch (CommandException var15) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions(var15.getMessage(), var15.getErrorOjbects()).setColor(EnumChatFormatting.RED)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.RED + var15.getMessage(), var15.getErrorOjbects())); } } @@ -75,20 +75,20 @@ public class CommandHandler implements ICommandManager } else { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("commands.generic.permission").setColor(EnumChatFormatting.RED)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocal(EnumChatFormatting.RED + "commands.generic.permission")); } } catch (WrongUsageException var16) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.generic.usage", new Object[] {ChatMessageComponent.createFromTranslationWithSubstitutions(var16.getMessage(), var16.getErrorOjbects())}).setColor(EnumChatFormatting.RED)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.RED + "commands.generic.usage", new Object[] {StatCollector.translateToLocalFormatted(var16.getMessage(), var16.getErrorOjbects())})); } catch (CommandException var17) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions(var17.getMessage(), var17.getErrorOjbects()).setColor(EnumChatFormatting.RED)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.RED + var17.getMessage(), var17.getErrorOjbects())); } catch (Throwable var18) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("commands.generic.exception").setColor(EnumChatFormatting.RED)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocal(EnumChatFormatting.RED + "commands.generic.exception")); var18.printStackTrace(); } diff --git a/src/main/java/net/minecraft/src/CommandHelp.java b/src/main/java/net/minecraft/src/CommandHelp.java index c752697..7bc2cae 100644 --- a/src/main/java/net/minecraft/src/CommandHelp.java +++ b/src/main/java/net/minecraft/src/CommandHelp.java @@ -58,17 +58,17 @@ public class CommandHelp extends CommandBase } int var7 = Math.min((var11 + 1) * var4, var3.size()); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.help.header", new Object[] {Integer.valueOf(var11 + 1), Integer.valueOf(var5 + 1)}).setColor(EnumChatFormatting.DARK_GREEN)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.DARK_GREEN + "commands.help.header", new Object[] {Integer.valueOf(var11 + 1), Integer.valueOf(var5 + 1)})); for (int var12 = var11 * var4; var12 < var7; ++var12) { var9 = (ICommand)var3.get(var12); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(var9.getCommandUsage(par1ICommandSender))); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocal(var9.getCommandUsage(par1ICommandSender))); } if (var11 == 0 && par1ICommandSender instanceof EntityPlayer) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("commands.help.footer").setColor(EnumChatFormatting.GREEN)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocal(EnumChatFormatting.GREEN + "commands.help.footer")); } } diff --git a/src/main/java/net/minecraft/src/CommandKill.java b/src/main/java/net/minecraft/src/CommandKill.java index 31cdae6..20bd6d9 100644 --- a/src/main/java/net/minecraft/src/CommandKill.java +++ b/src/main/java/net/minecraft/src/CommandKill.java @@ -24,6 +24,6 @@ public class CommandKill extends CommandBase { EntityPlayerMP var3 = getCommandSenderAsPlayer(par1ICommandSender); var3.attackEntityFrom(DamageSource.outOfWorld, Float.MAX_VALUE); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("commands.kill.success")); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocal("commands.kill.success")); } } diff --git a/src/main/java/net/minecraft/src/CommandServerBanlist.java b/src/main/java/net/minecraft/src/CommandServerBanlist.java index c868ba6..b77ef73 100644 --- a/src/main/java/net/minecraft/src/CommandServerBanlist.java +++ b/src/main/java/net/minecraft/src/CommandServerBanlist.java @@ -35,13 +35,13 @@ public class CommandServerBanlist extends CommandBase { if (par2ArrayOfStr.length >= 1 && par2ArrayOfStr[0].equalsIgnoreCase("ips")) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.banlist.ips", new Object[] {Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getBannedIPs().getBannedList().size())})); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromText(joinNiceString(MinecraftServer.getServer().getConfigurationManager().getBannedIPs().getBannedList().keySet().toArray()))); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.banlist.ips", new Object[] {Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getBannedIPs().getBannedList().size())})); + par1ICommandSender.sendChatToPlayer(joinNiceString(MinecraftServer.getServer().getConfigurationManager().getBannedIPs().getBannedList().keySet().toArray())); } else { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.banlist.players", new Object[] {Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().getBannedList().size())})); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromText(joinNiceString(MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().getBannedList().keySet().toArray()))); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.banlist.players", new Object[] {Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().getBannedList().size())})); + par1ICommandSender.sendChatToPlayer(joinNiceString(MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().getBannedList().keySet().toArray())); } } diff --git a/src/main/java/net/minecraft/src/CommandServerEmote.java b/src/main/java/net/minecraft/src/CommandServerEmote.java index e35a60c..82d528a 100644 --- a/src/main/java/net/minecraft/src/CommandServerEmote.java +++ b/src/main/java/net/minecraft/src/CommandServerEmote.java @@ -28,7 +28,7 @@ public class CommandServerEmote extends CommandBase if (par2ArrayOfStr.length > 0) { String var3 = func_82361_a(par1ICommandSender, par2ArrayOfStr, 0, par1ICommandSender.canCommandSenderUseCommand(1, "me")); - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.emote", new Object[] {par1ICommandSender.getCommandSenderName(), var3})); + MinecraftServer.getServer().getConfigurationManager().sendChatMsg(StatCollector.translateToLocalFormatted("chat.type.emote", new Object[] {par1ICommandSender.getCommandSenderName(), var3})); } else { diff --git a/src/main/java/net/minecraft/src/CommandServerList.java b/src/main/java/net/minecraft/src/CommandServerList.java index 4a34787..519f8ea 100644 --- a/src/main/java/net/minecraft/src/CommandServerList.java +++ b/src/main/java/net/minecraft/src/CommandServerList.java @@ -24,7 +24,7 @@ public class CommandServerList extends CommandBase public void processCommand(ICommandSender par1ICommandSender, String[] par2ArrayOfStr) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.players.list", new Object[] {Integer.valueOf(MinecraftServer.getServer().getCurrentPlayerCount()), Integer.valueOf(MinecraftServer.getServer().getMaxPlayers())})); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromText(MinecraftServer.getServer().getConfigurationManager().getPlayerListAsString())); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.players.list", new Object[] {Integer.valueOf(MinecraftServer.getServer().getCurrentPlayerCount()), Integer.valueOf(MinecraftServer.getServer().getMaxPlayers())})); + par1ICommandSender.sendChatToPlayer(MinecraftServer.getServer().getConfigurationManager().getPlayerListAsString()); } } diff --git a/src/main/java/net/minecraft/src/CommandServerMessage.java b/src/main/java/net/minecraft/src/CommandServerMessage.java index 5527954..f76314e 100644 --- a/src/main/java/net/minecraft/src/CommandServerMessage.java +++ b/src/main/java/net/minecraft/src/CommandServerMessage.java @@ -50,8 +50,8 @@ public class CommandServerMessage extends CommandBase else { String var4 = func_82361_a(par1ICommandSender, par2ArrayOfStr, 1, !(par1ICommandSender instanceof EntityPlayer)); - var3.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.message.display.incoming", new Object[] {par1ICommandSender.getCommandSenderName(), var4}).setColor(EnumChatFormatting.GRAY).setItalic(Boolean.valueOf(true))); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.message.display.outgoing", new Object[] {var3.getCommandSenderName(), var4}).setColor(EnumChatFormatting.GRAY).setItalic(Boolean.valueOf(true))); + var3.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.GRAY + "commands.message.display.incoming", new Object[] {par1ICommandSender.getCommandSenderName(), var4})); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.GRAY + "commands.message.display.outgoing", new Object[] {var3.getCommandSenderName(), var4})); } } } diff --git a/src/main/java/net/minecraft/src/CommandServerSaveAll.java b/src/main/java/net/minecraft/src/CommandServerSaveAll.java index 943503e..4cf378a 100644 --- a/src/main/java/net/minecraft/src/CommandServerSaveAll.java +++ b/src/main/java/net/minecraft/src/CommandServerSaveAll.java @@ -25,7 +25,7 @@ public class CommandServerSaveAll extends CommandBase public void processCommand(ICommandSender par1ICommandSender, String[] par2ArrayOfStr) { MinecraftServer var3 = MinecraftServer.getServer(); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("commands.save.start")); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocal("commands.save.start")); if (var3.getConfigurationManager() != null) { @@ -52,7 +52,7 @@ public class CommandServerSaveAll extends CommandBase if (par2ArrayOfStr.length > 0 && "flush".equals(par2ArrayOfStr[0])) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("commands.save.flushStart")); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocal("commands.save.flushStart")); for (var4 = 0; var4 < var3.worldServers.length; ++var4) { @@ -66,7 +66,7 @@ public class CommandServerSaveAll extends CommandBase } } - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("commands.save.flushEnd")); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocal("commands.save.flushEnd")); } } catch (MinecraftException var7) diff --git a/src/main/java/net/minecraft/src/CommandServerSay.java b/src/main/java/net/minecraft/src/CommandServerSay.java index c666d23..5bd5c20 100644 --- a/src/main/java/net/minecraft/src/CommandServerSay.java +++ b/src/main/java/net/minecraft/src/CommandServerSay.java @@ -28,7 +28,7 @@ public class CommandServerSay extends CommandBase if (par2ArrayOfStr.length > 0 && par2ArrayOfStr[0].length() > 0) { String var3 = func_82361_a(par1ICommandSender, par2ArrayOfStr, 0, true); - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.announcement", new Object[] {par1ICommandSender.getCommandSenderName(), var3})); + MinecraftServer.getServer().getConfigurationManager().sendChatMsg(StatCollector.translateToLocalFormatted("chat.type.announcement", new Object[] {par1ICommandSender.getCommandSenderName(), var3})); } else { diff --git a/src/main/java/net/minecraft/src/CommandServerWhitelist.java b/src/main/java/net/minecraft/src/CommandServerWhitelist.java index 39c6279..378f1d6 100644 --- a/src/main/java/net/minecraft/src/CommandServerWhitelist.java +++ b/src/main/java/net/minecraft/src/CommandServerWhitelist.java @@ -45,9 +45,9 @@ public class CommandServerWhitelist extends CommandBase if (par2ArrayOfStr[0].equals("list")) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.whitelist.list", new Object[] {Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getWhiteListedPlayers().size()), Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getAvailablePlayerDat().length)})); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.whitelist.list", new Object[] {Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getWhiteListedPlayers().size()), Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getAvailablePlayerDat().length)})); Set var3 = MinecraftServer.getServer().getConfigurationManager().getWhiteListedPlayers(); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromText(joinNiceString(var3.toArray(new String[var3.size()])))); + par1ICommandSender.sendChatToPlayer(joinNiceString(var3.toArray(new String[var3.size()]))); return; } diff --git a/src/main/java/net/minecraft/src/CommandShowSeed.java b/src/main/java/net/minecraft/src/CommandShowSeed.java index f383fbf..195ff6b 100644 --- a/src/main/java/net/minecraft/src/CommandShowSeed.java +++ b/src/main/java/net/minecraft/src/CommandShowSeed.java @@ -33,6 +33,6 @@ public class CommandShowSeed extends CommandBase public void processCommand(ICommandSender par1ICommandSender, String[] par2ArrayOfStr) { Object var3 = par1ICommandSender instanceof EntityPlayer ? ((EntityPlayer)par1ICommandSender).worldObj : MinecraftServer.getServer().worldServerForDimension(0); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.seed.success", new Object[] {Long.valueOf(((World)var3).getSeed())})); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.seed.success", new Object[] {Long.valueOf(((World)var3).getSeed())})); } } diff --git a/src/main/java/net/minecraft/src/CommandSpreadPlayers.java b/src/main/java/net/minecraft/src/CommandSpreadPlayers.java index 9825af7..67721a4 100644 --- a/src/main/java/net/minecraft/src/CommandSpreadPlayers.java +++ b/src/main/java/net/minecraft/src/CommandSpreadPlayers.java @@ -81,7 +81,7 @@ public class CommandSpreadPlayers extends CommandBase throw new PlayerNotFoundException(); } - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.spreadplayers.spreading." + (var12 ? "teams" : "players"), new Object[] {func_110663_b(var13), Double.valueOf(var4), Double.valueOf(var6), Double.valueOf(var8), Double.valueOf(var10)})); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.spreadplayers.spreading." + (var12 ? "teams" : "players"), new Object[] {func_110663_b(var13), Double.valueOf(var4), Double.valueOf(var6), Double.valueOf(var8), Double.valueOf(var10)})); this.func_110669_a(par1ICommandSender, var13, new CommandSpreadPlayersPosition(var4, var6), var8, var10, ((EntityLivingBase)var13.get(0)).worldObj, var12); return; } @@ -102,7 +102,7 @@ public class CommandSpreadPlayers extends CommandBase if (var19.length > 1) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.spreadplayers.info." + (par9 ? "teams" : "players"), new Object[] {String.format("%.2f", new Object[]{Double.valueOf(var21)}), Integer.valueOf(var20)})); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.spreadplayers.info." + (par9 ? "teams" : "players"), new Object[] {String.format("%.2f", new Object[]{Double.valueOf(var21)}), Integer.valueOf(var20)})); } } diff --git a/src/main/java/net/minecraft/src/DamageSource.java b/src/main/java/net/minecraft/src/DamageSource.java index 1710957..6e11051 100644 --- a/src/main/java/net/minecraft/src/DamageSource.java +++ b/src/main/java/net/minecraft/src/DamageSource.java @@ -174,12 +174,12 @@ public class DamageSource /** * Returns the message to be displayed on player death. */ - public ChatMessageComponent getDeathMessage(EntityLivingBase par1EntityLivingBase) + public String getDeathMessage(EntityLivingBase par1EntityLivingBase) { EntityLivingBase var2 = par1EntityLivingBase.func_94060_bK(); String var3 = "death.attack." + this.damageType; String var4 = var3 + ".player"; - return var2 != null && StatCollector.func_94522_b(var4) ? ChatMessageComponent.createFromTranslationWithSubstitutions(var4, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), var2.getTranslatedEntityName()}): ChatMessageComponent.createFromTranslationWithSubstitutions(var3, new Object[] {par1EntityLivingBase.getTranslatedEntityName()}); + return var2 != null && StatCollector.func_94522_b(var4) ? StatCollector.translateToLocalFormatted(var4, new Object[] { par1EntityLivingBase.getTranslatedEntityName(), var2.getTranslatedEntityName() }) : StatCollector.translateToLocalFormatted(var3, new Object[] { par1EntityLivingBase.getTranslatedEntityName() }); } /** diff --git a/src/main/java/net/minecraft/src/DefaultResourcePack.java b/src/main/java/net/minecraft/src/DefaultResourcePack.java index 0e8a0e8..f7dea3d 100644 --- a/src/main/java/net/minecraft/src/DefaultResourcePack.java +++ b/src/main/java/net/minecraft/src/DefaultResourcePack.java @@ -82,14 +82,10 @@ public class DefaultResourcePack implements ResourcePack } else { - this.addResourceFile(AbstractResourcePack.getRelativeName(this.fileAssets, par1File), par1File); + //this.addResourceFile(AbstractResourcePack.getRelativeName(this.fileAssets, par1File), par1File); } } - public MetadataSection getPackMetadata(MetadataSerializer par1MetadataSerializer, String par2Str) throws IOException - { - return AbstractResourcePack.readMetadata(par1MetadataSerializer, DefaultResourcePack.class.getResourceAsStream("/" + (new TextureLocation("pack.mcmeta"))), par2Str); - } public EaglerImage getPackImage() throws IOException { diff --git a/src/main/java/net/minecraft/src/EntityDamageSource.java b/src/main/java/net/minecraft/src/EntityDamageSource.java index f5990bd..45e1aaa 100644 --- a/src/main/java/net/minecraft/src/EntityDamageSource.java +++ b/src/main/java/net/minecraft/src/EntityDamageSource.java @@ -18,12 +18,12 @@ public class EntityDamageSource extends DamageSource /** * Returns the message to be displayed on player death. */ - public ChatMessageComponent getDeathMessage(EntityLivingBase par1EntityLivingBase) + public String getDeathMessage(EntityLivingBase par1EntityLivingBase) { ItemStack var2 = this.damageSourceEntity instanceof EntityLivingBase ? ((EntityLivingBase)this.damageSourceEntity).getHeldItem() : null; String var3 = "death.attack." + this.damageType; String var4 = var3 + ".item"; - return var2 != null && var2.hasDisplayName() && StatCollector.func_94522_b(var4) ? ChatMessageComponent.createFromTranslationWithSubstitutions(var4, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), this.damageSourceEntity.getTranslatedEntityName(), var2.getDisplayName()}): ChatMessageComponent.createFromTranslationWithSubstitutions(var3, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), this.damageSourceEntity.getTranslatedEntityName()}); + return var2 != null && var2.hasDisplayName() && StatCollector.func_94522_b(var4) ? StatCollector.translateToLocalFormatted(var4, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), this.damageSourceEntity.getTranslatedEntityName(), var2.getDisplayName()}): StatCollector.translateToLocalFormatted(var3, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), this.damageSourceEntity.getTranslatedEntityName()}); } /** diff --git a/src/main/java/net/minecraft/src/EntityDamageSourceIndirect.java b/src/main/java/net/minecraft/src/EntityDamageSourceIndirect.java index 18babe3..1d85ddf 100644 --- a/src/main/java/net/minecraft/src/EntityDamageSourceIndirect.java +++ b/src/main/java/net/minecraft/src/EntityDamageSourceIndirect.java @@ -23,12 +23,12 @@ public class EntityDamageSourceIndirect extends EntityDamageSource /** * Returns the message to be displayed on player death. */ - public ChatMessageComponent getDeathMessage(EntityLivingBase par1EntityLivingBase) + public String getDeathMessage(EntityLivingBase par1EntityLivingBase) { String var2 = this.indirectEntity == null ? this.damageSourceEntity.getTranslatedEntityName() : this.indirectEntity.getTranslatedEntityName(); ItemStack var3 = this.indirectEntity instanceof EntityLivingBase ? ((EntityLivingBase)this.indirectEntity).getHeldItem() : null; String var4 = "death.attack." + this.damageType; String var5 = var4 + ".item"; - return var3 != null && var3.hasDisplayName() && StatCollector.func_94522_b(var5) ? ChatMessageComponent.createFromTranslationWithSubstitutions(var5, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), var2, var3.getDisplayName()}): ChatMessageComponent.createFromTranslationWithSubstitutions(var4, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), var2}); + return var3 != null && var3.hasDisplayName() && StatCollector.func_94522_b(var5) ? StatCollector.translateToLocalFormatted(var5, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), var2, var3.getDisplayName()}): StatCollector.translateToLocalFormatted(var4, new Object[] {par1EntityLivingBase.getTranslatedEntityName(), var2}); } } diff --git a/src/main/java/net/minecraft/src/EntityOtherPlayerMP.java b/src/main/java/net/minecraft/src/EntityOtherPlayerMP.java index 9fc1ff7..10af810 100644 --- a/src/main/java/net/minecraft/src/EntityOtherPlayerMP.java +++ b/src/main/java/net/minecraft/src/EntityOtherPlayerMP.java @@ -165,9 +165,9 @@ public class EntityOtherPlayerMP extends EntityPlayer return 1.82F; } - public void sendChatToPlayer(ChatMessageComponent par1ChatMessageComponent) + public void sendChatToPlayer(String par1ChatMessageComponent) { - Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(par1ChatMessageComponent.toStringWithFormatting(true)); + Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(par1ChatMessageComponent); } /** diff --git a/src/main/java/net/minecraft/src/EntityPlayerMP.java b/src/main/java/net/minecraft/src/EntityPlayerMP.java index 2a27959..9a23aa6 100644 --- a/src/main/java/net/minecraft/src/EntityPlayerMP.java +++ b/src/main/java/net/minecraft/src/EntityPlayerMP.java @@ -800,7 +800,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting */ public void addChatMessage(String par1Str) { - this.playerNetServerHandler.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromTranslationKey(par1Str))); + this.playerNetServerHandler.sendPacketToPlayer(new Packet3Chat(StatCollector.translateToLocal(par1Str))); } /** @@ -902,7 +902,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting this.playerNetServerHandler.sendPacketToPlayer(new Packet70GameEvent(3, par1EnumGameType.getID())); } - public void sendChatToPlayer(ChatMessageComponent par1ChatMessageComponent) + public void sendChatToPlayer(String par1ChatMessageComponent) { this.playerNetServerHandler.sendPacketToPlayer(new Packet3Chat(par1ChatMessageComponent)); } diff --git a/src/main/java/net/minecraft/src/EntityPlayerSP.java b/src/main/java/net/minecraft/src/EntityPlayerSP.java index 9f6a789..69217ae 100644 --- a/src/main/java/net/minecraft/src/EntityPlayerSP.java +++ b/src/main/java/net/minecraft/src/EntityPlayerSP.java @@ -607,9 +607,9 @@ public class EntityPlayerSP extends EntityPlayer this.experienceLevel = par3; } - public void sendChatToPlayer(ChatMessageComponent par1ChatMessageComponent) + public void sendChatToPlayer(String par1ChatMessageComponent) { - this.mc.ingameGUI.getChatGUI().printChatMessage(par1ChatMessageComponent.toStringWithFormatting(true)); + this.mc.ingameGUI.getChatGUI().printChatMessage(par1ChatMessageComponent); } /** diff --git a/src/main/java/net/minecraft/src/FileResourcePack.java b/src/main/java/net/minecraft/src/FileResourcePack.java deleted file mode 100644 index 8c08362..0000000 --- a/src/main/java/net/minecraft/src/FileResourcePack.java +++ /dev/null @@ -1,129 +0,0 @@ -package net.minecraft.src; - -import java.io.Closeable; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.*; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -public class FileResourcePack extends AbstractResourcePack implements Closeable -{ - private ZipFile resourcePackZipFile; - - public FileResourcePack(File par1File) - { - super(par1File); - } - - private ZipFile getResourcePackZipFile() throws IOException - { - if (this.resourcePackZipFile == null) - { - this.resourcePackZipFile = new ZipFile(this.resourcePackFile); - } - - return this.resourcePackZipFile; - } - - protected InputStream getInputStreamByName(String par1Str) throws IOException - { - ZipFile var2 = this.getResourcePackZipFile(); - ZipEntry var3 = var2.getEntry(par1Str); - - if (var3 == null) - { - throw new ResourcePackFileNotFoundException(this.resourcePackFile, par1Str); - } - else - { - return var2.getInputStream(var3); - } - } - - public boolean hasResourceName(String par1Str) - { - try - { - return this.getResourcePackZipFile().getEntry(par1Str) != null; - } - catch (IOException var3) - { - return false; - } - } - - public Set getResourceDomains() - { - ZipFile var1; - - try - { - var1 = this.getResourcePackZipFile(); - } - catch (IOException var8) - { - return Collections.emptySet(); - } - - Enumeration var2 = var1.entries(); - HashSet var3 = new HashSet<>(); - - while (var2.hasMoreElements()) - { - ZipEntry var4 = (ZipEntry)var2.nextElement(); - String var5 = var4.getName(); - - if (var5.startsWith("assets/")) - { - ArrayList var6 = new ArrayList<>(List.of(var5.split("/"))); - - if (var6.size() > 1) - { - String var7 = (String)var6.get(1); - - if (!var7.equals(var7.toLowerCase())) - { - this.logNameNotLowercase(var7); - } - else - { - var3.add(var7); - } - } - } - } - - return var3; - } - - protected void finalize() - { - this.close(); - - try - { - super.finalize(); - } - catch (Throwable t) - { - } - } - - public void close() - { - if (this.resourcePackZipFile != null) - { - try - { - this.resourcePackZipFile.close(); - } - catch (Exception ex) - { - } - - this.resourcePackZipFile = null; - } - } -} diff --git a/src/main/java/net/minecraft/src/FolderResourcePack.java b/src/main/java/net/minecraft/src/FolderResourcePack.java deleted file mode 100644 index 85027cd..0000000 --- a/src/main/java/net/minecraft/src/FolderResourcePack.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.minecraft.src; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashSet; -import java.util.Set; - -public class FolderResourcePack extends AbstractResourcePack -{ - public FolderResourcePack(File par1File) - { - super(par1File); - } - - protected InputStream getInputStreamByName(String par1Str) throws IOException - { - return new BufferedInputStream(new FileInputStream(new File(this.resourcePackFile, par1Str))); - } - - protected boolean hasResourceName(String par1Str) - { - return (new File(this.resourcePackFile, par1Str)).isFile(); - } - - public Set getResourceDomains() - { - HashSet var1 = new HashSet<>(); - File var2 = new File(this.resourcePackFile, "assets/"); - - if (var2.isDirectory()) - { - File[] var3 = var2.listFiles(); - int var4 = var3.length; - - for (int var5 = 0; var5 < var4; ++var5) - { - File var6 = var3[var5]; - String var7 = getRelativeName(var2, var6); - - if (!var7.equals(var7.toLowerCase())) - { - this.logNameNotLowercase(var7); - } - else - { - var1.add(var7.substring(0, var7.length() - 1)); - } - } - } - - return var1; - } -} diff --git a/src/main/java/net/minecraft/src/FontMetadataSection.java b/src/main/java/net/minecraft/src/FontMetadataSection.java deleted file mode 100644 index 01789e0..0000000 --- a/src/main/java/net/minecraft/src/FontMetadataSection.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.minecraft.src; - -public class FontMetadataSection implements MetadataSection -{ - private final float[] charWidths; - private final float[] charLefts; - private final float[] charSpacings; - - public FontMetadataSection(float[] par1ArrayOfFloat, float[] par2ArrayOfFloat, float[] par3ArrayOfFloat) - { - this.charWidths = par1ArrayOfFloat; - this.charLefts = par2ArrayOfFloat; - this.charSpacings = par3ArrayOfFloat; - } -} diff --git a/src/main/java/net/minecraft/src/FontMetadataSectionSerializer.java b/src/main/java/net/minecraft/src/FontMetadataSectionSerializer.java deleted file mode 100644 index ab93a10..0000000 --- a/src/main/java/net/minecraft/src/FontMetadataSectionSerializer.java +++ /dev/null @@ -1,84 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import java.lang.reflect.Type; - -public class FontMetadataSectionSerializer extends BaseMetadataSectionSerializer -{ - public FontMetadataSection func_110490_a(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - JsonObject var4 = par1JsonElement.getAsJsonObject(); - float[] var5 = new float[256]; - float[] var6 = new float[256]; - float[] var7 = new float[256]; - float var8 = 1.0F; - float var9 = 0.0F; - float var10 = 0.0F; - - if (var4.has("characters")) - { - if (!var4.get("characters").isJsonObject()) - { - throw new JsonParseException("Invalid font->characters: expected object, was " + var4.get("characters")); - } - - JsonObject var11 = var4.getAsJsonObject("characters"); - - if (var11.has("default")) - { - if (!var11.get("default").isJsonObject()) - { - throw new JsonParseException("Invalid font->characters->default: expected object, was " + var11.get("default")); - } - - JsonObject var12 = var11.getAsJsonObject("default"); - var8 = this.func_110487_a(var12.get("width"), "characters->default->width", Float.valueOf(var8), 0.0F, 2.14748365E9F); - var9 = this.func_110487_a(var12.get("spacing"), "characters->default->spacing", Float.valueOf(var9), 0.0F, 2.14748365E9F); - var10 = this.func_110487_a(var12.get("left"), "characters->default->left", Float.valueOf(var10), 0.0F, 2.14748365E9F); - } - - for (int var18 = 0; var18 < 256; ++var18) - { - JsonElement var13 = var11.get(Integer.toString(var18)); - float var14 = var8; - float var15 = var9; - float var16 = var10; - - if (var13 != null) - { - if (!var13.isJsonObject()) - { - throw new JsonParseException("Invalid font->characters->" + var18 + ": expected object, was " + var13); - } - - JsonObject var17 = var13.getAsJsonObject(); - var14 = this.func_110487_a(var17.get("width"), "characters->" + var18 + "->width", Float.valueOf(var8), 0.0F, 2.14748365E9F); - var15 = this.func_110487_a(var17.get("spacing"), "characters->" + var18 + "->spacing", Float.valueOf(var9), 0.0F, 2.14748365E9F); - var16 = this.func_110487_a(var17.get("left"), "characters->" + var18 + "->left", Float.valueOf(var10), 0.0F, 2.14748365E9F); - } - - var5[var18] = var14; - var6[var18] = var15; - var7[var18] = var16; - } - } - - return new FontMetadataSection(var5, var7, var6); - } - - /** - * The name of this section type as it appears in JSON. - */ - public String getSectionName() - { - return "font"; - } - - public Object deserialize(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - return this.func_110490_a(par1JsonElement, par2Type, par3JsonDeserializationContext); - } -} diff --git a/src/main/java/net/minecraft/src/GuiShareToLan.java b/src/main/java/net/minecraft/src/GuiShareToLan.java index c5765a9..9818477 100644 --- a/src/main/java/net/minecraft/src/GuiShareToLan.java +++ b/src/main/java/net/minecraft/src/GuiShareToLan.java @@ -85,18 +85,18 @@ public class GuiShareToLan extends GuiScreen { this.mc.displayGuiScreen((GuiScreen)null); String var2 = null; // this.mc.getIntegratedServer().shareToLAN(EnumGameType.getByName(this.gameMode), this.allowCommands); - ChatMessageComponent var3; + String var3; if (var2 != null) { - var3 = ChatMessageComponent.createFromTranslationWithSubstitutions("commands.publish.started", new Object[] {var2}); + var3 = StatCollector.translateToLocalFormatted("commands.publish.started", new Object[] {var2}); } else { - var3 = ChatMessageComponent.createFromText("commands.publish.failed"); + var3 = "commands.publish.failed"; } - this.mc.ingameGUI.getChatGUI().printChatMessage(var3.toStringWithFormatting(true)); + this.mc.ingameGUI.getChatGUI().printChatMessage(var3); } } diff --git a/src/main/java/net/minecraft/src/ICommandSender.java b/src/main/java/net/minecraft/src/ICommandSender.java index c9f422d..70953fe 100644 --- a/src/main/java/net/minecraft/src/ICommandSender.java +++ b/src/main/java/net/minecraft/src/ICommandSender.java @@ -7,7 +7,7 @@ public interface ICommandSender */ String getCommandSenderName(); - void sendChatToPlayer(ChatMessageComponent var1); + void sendChatToPlayer(String var1); /** * Returns true if the command sender is allowed to use the given command. diff --git a/src/main/java/net/minecraft/src/LanguageMetadataSection.java b/src/main/java/net/minecraft/src/LanguageMetadataSection.java deleted file mode 100644 index 1d37df7..0000000 --- a/src/main/java/net/minecraft/src/LanguageMetadataSection.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.minecraft.src; - -import java.util.Collection; - -public class LanguageMetadataSection implements MetadataSection -{ - private final Collection languages; - - public LanguageMetadataSection(Collection par1Collection) - { - this.languages = par1Collection; - } - - public Collection getLanguages() - { - return this.languages; - } -} diff --git a/src/main/java/net/minecraft/src/LanguageMetadataSectionSerializer.java b/src/main/java/net/minecraft/src/LanguageMetadataSectionSerializer.java deleted file mode 100644 index fee73aa..0000000 --- a/src/main/java/net/minecraft/src/LanguageMetadataSectionSerializer.java +++ /dev/null @@ -1,72 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import java.lang.reflect.Type; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map.Entry; - -public class LanguageMetadataSectionSerializer extends BaseMetadataSectionSerializer -{ - public LanguageMetadataSection func_135020_a(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - JsonObject var4 = par1JsonElement.getAsJsonObject(); - HashSet var5 = new HashSet<>(); - Iterator var6 = var4.entrySet().iterator(); - String var8; - String var11; - String var12; - boolean var13; - - do - { - if (!var6.hasNext()) - { - return new LanguageMetadataSection(var5); - } - - Entry var7 = (Entry)var6.next(); - var8 = (String)var7.getKey(); - JsonElement var9 = (JsonElement)var7.getValue(); - - if (!var9.isJsonObject()) - { - throw new JsonParseException("Invalid language->\'" + var8 + "\': expected object, was " + var9); - } - - JsonObject var10 = var9.getAsJsonObject(); - var11 = this.func_110486_a(var10.get("region"), "region", "", 0, Integer.MAX_VALUE); - var12 = this.func_110486_a(var10.get("name"), "name", "", 0, Integer.MAX_VALUE); - var13 = this.func_110484_a(var10.get("bidirectional"), "bidirectional", Boolean.valueOf(false)); - - if (var11.isEmpty()) - { - throw new JsonParseException("Invalid language->\'" + var8 + "\'->region: empty value"); - } - - if (var12.isEmpty()) - { - throw new JsonParseException("Invalid language->\'" + var8 + "\'->name: empty value"); - } - } - while (var5.add(new Language(var8, var11, var12, var13))); - - throw new JsonParseException("Duplicate language->\'" + var8 + "\' defined"); - } - - /** - * The name of this section type as it appears in JSON. - */ - public String getSectionName() - { - return "language"; - } - - public Object deserialize(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - return this.func_135020_a(par1JsonElement, par2Type, par3JsonDeserializationContext); - } -} diff --git a/src/main/java/net/minecraft/src/MessageComponentSerializer.java b/src/main/java/net/minecraft/src/MessageComponentSerializer.java deleted file mode 100644 index 1bc7b8e..0000000 --- a/src/main/java/net/minecraft/src/MessageComponentSerializer.java +++ /dev/null @@ -1,210 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonArray; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Iterator; - -public class MessageComponentSerializer implements JsonDeserializer, JsonSerializer -{ - public ChatMessageComponent deserializeComponent(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - ChatMessageComponent var4 = new ChatMessageComponent(); - JsonObject var5 = (JsonObject)par1JsonElement; - JsonElement var6 = var5.get("text"); - JsonElement var7 = var5.get("translate"); - JsonElement var8 = var5.get("color"); - JsonElement var9 = var5.get("bold"); - JsonElement var10 = var5.get("italic"); - JsonElement var11 = var5.get("underlined"); - JsonElement var12 = var5.get("obfuscated"); - - if (var8 != null && var8.isJsonPrimitive()) - { - EnumChatFormatting var13 = EnumChatFormatting.func_96300_b(var8.getAsString()); - - if (var13 == null || !var13.isColor()) - { - throw new JsonParseException("Given color (" + var8.getAsString() + ") is not a valid selection"); - } - - var4.setColor(var13); - } - - if (var9 != null && var9.isJsonPrimitive()) - { - var4.setBold(Boolean.valueOf(var9.getAsBoolean())); - } - - if (var10 != null && var10.isJsonPrimitive()) - { - var4.setItalic(Boolean.valueOf(var10.getAsBoolean())); - } - - if (var11 != null && var11.isJsonPrimitive()) - { - var4.setUnderline(Boolean.valueOf(var11.getAsBoolean())); - } - - if (var12 != null && var12.isJsonPrimitive()) - { - var4.setObfuscated(Boolean.valueOf(var12.getAsBoolean())); - } - - if (var6 != null) - { - if (var6.isJsonArray()) - { - JsonArray var17 = var6.getAsJsonArray(); - Iterator var14 = var17.iterator(); - - while (var14.hasNext()) - { - JsonElement var15 = (JsonElement)var14.next(); - - if (var15.isJsonPrimitive()) - { - var4.addText(var15.getAsString()); - } - else if (var15.isJsonObject()) - { - var4.appendComponent(this.deserializeComponent(var15, par2Type, par3JsonDeserializationContext)); - } - } - } - else if (var6.isJsonPrimitive()) - { - var4.addText(var6.getAsString()); - } - } - else if (var7 != null && var7.isJsonPrimitive()) - { - JsonElement var18 = var5.get("using"); - - if (var18 != null) - { - if (var18.isJsonArray()) - { - ArrayList var19 = new ArrayList<>(); - Iterator var20 = var18.getAsJsonArray().iterator(); - - while (var20.hasNext()) - { - JsonElement var16 = (JsonElement)var20.next(); - - if (var16.isJsonPrimitive()) - { - var19.add(var16.getAsString()); - } - else if (var16.isJsonObject()) - { - var19.add(this.deserializeComponent(var16, par2Type, par3JsonDeserializationContext)); - } - } - - var4.addFormatted(var7.getAsString(), var19.toArray()); - } - else if (var18.isJsonPrimitive()) - { - var4.addFormatted(var7.getAsString(), new Object[] {var18.getAsString()}); - } - } - else - { - var4.addKey(var7.getAsString()); - } - } - - return var4; - } - - public JsonElement serializeComponent(ChatMessageComponent par1ChatMessageComponent, Type par2Type, JsonSerializationContext par3JsonSerializationContext) - { - JsonObject var4 = new JsonObject(); - - if (par1ChatMessageComponent.getColor() != null) - { - var4.addProperty("color", par1ChatMessageComponent.getColor().func_96297_d()); - } - - if (par1ChatMessageComponent.isBold() != null) - { - var4.addProperty("bold", par1ChatMessageComponent.isBold()); - } - - if (par1ChatMessageComponent.isItalic() != null) - { - var4.addProperty("italic", par1ChatMessageComponent.isItalic()); - } - - if (par1ChatMessageComponent.isUnderline() != null) - { - var4.addProperty("underlined", par1ChatMessageComponent.isUnderline()); - } - - if (par1ChatMessageComponent.isObfuscated() != null) - { - var4.addProperty("obfuscated", par1ChatMessageComponent.isObfuscated()); - } - - if (par1ChatMessageComponent.getText() != null) - { - var4.addProperty("text", par1ChatMessageComponent.getText()); - } - else if (par1ChatMessageComponent.getTranslationKey() != null) - { - var4.addProperty("translate", par1ChatMessageComponent.getTranslationKey()); - - if (par1ChatMessageComponent.getSubComponents() != null && !par1ChatMessageComponent.getSubComponents().isEmpty()) - { - var4.add("using", this.serializeComponentChildren(par1ChatMessageComponent, par2Type, par3JsonSerializationContext)); - } - } - else if (par1ChatMessageComponent.getSubComponents() != null && !par1ChatMessageComponent.getSubComponents().isEmpty()) - { - var4.add("text", this.serializeComponentChildren(par1ChatMessageComponent, par2Type, par3JsonSerializationContext)); - } - - return var4; - } - - private JsonArray serializeComponentChildren(ChatMessageComponent par1ChatMessageComponent, Type par2Type, JsonSerializationContext par3JsonSerializationContext) - { - JsonArray var4 = new JsonArray(); - Iterator var5 = par1ChatMessageComponent.getSubComponents().iterator(); - - while (var5.hasNext()) - { - ChatMessageComponent var6 = (ChatMessageComponent)var5.next(); - - if (var6.getText() != null) - { - var4.add(new JsonPrimitive(var6.getText())); - } - else - { - var4.add(this.serializeComponent(var6, par2Type, par3JsonSerializationContext)); - } - } - - return var4; - } - - public Object deserialize(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - return this.deserializeComponent(par1JsonElement, par2Type, par3JsonDeserializationContext); - } - - public JsonElement serialize(Object par1Obj, Type par2Type, JsonSerializationContext par3JsonSerializationContext) - { - return this.serializeComponent((ChatMessageComponent)par1Obj, par2Type, par3JsonSerializationContext); - } -} diff --git a/src/main/java/net/minecraft/src/MetadataSection.java b/src/main/java/net/minecraft/src/MetadataSection.java deleted file mode 100644 index 4246481..0000000 --- a/src/main/java/net/minecraft/src/MetadataSection.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.minecraft.src; - -public interface MetadataSection -{ -} diff --git a/src/main/java/net/minecraft/src/MetadataSectionSerializer.java b/src/main/java/net/minecraft/src/MetadataSectionSerializer.java deleted file mode 100644 index 10569ff..0000000 --- a/src/main/java/net/minecraft/src/MetadataSectionSerializer.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonDeserializer; - -public interface MetadataSectionSerializer extends JsonDeserializer -{ - /** - * The name of this section type as it appears in JSON. - */ - String getSectionName(); -} diff --git a/src/main/java/net/minecraft/src/MetadataSerializer.java b/src/main/java/net/minecraft/src/MetadataSerializer.java deleted file mode 100644 index abfcd1d..0000000 --- a/src/main/java/net/minecraft/src/MetadataSerializer.java +++ /dev/null @@ -1,65 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonObject; - -public class MetadataSerializer -{ - private final IRegistry metadataSectionSerializerRegistry = new RegistrySimple(); - private final GsonBuilder gsonBuilder = new GsonBuilder(); - - /** - * Cached Gson instance. Set to null when more sections are registered, and then re-created from the builder. - */ - private Gson gson; - - public void registerMetadataSectionType(MetadataSectionSerializer par1MetadataSectionSerializer, Class par2Class) - { - this.metadataSectionSerializerRegistry.putObject(par1MetadataSectionSerializer.getSectionName(), new MetadataSerializerRegistration(this, par1MetadataSectionSerializer, par2Class, (MetadataSerializerEmptyAnon)null)); - this.gsonBuilder.registerTypeAdapter(par2Class, par1MetadataSectionSerializer); - this.gson = null; - } - - public MetadataSection parseMetadataSection(String par1Str, JsonObject par2JsonObject) - { - if (par1Str == null) - { - throw new IllegalArgumentException("Metadata section name cannot be null"); - } - else if (!par2JsonObject.has(par1Str)) - { - return null; - } - else if (!par2JsonObject.get(par1Str).isJsonObject()) - { - throw new IllegalArgumentException("Invalid metadata for \'" + par1Str + "\' - expected object, found " + par2JsonObject.get(par1Str)); - } - else - { - MetadataSerializerRegistration var3 = (MetadataSerializerRegistration)this.metadataSectionSerializerRegistry.getObject(par1Str); - - if (var3 == null) - { - throw new IllegalArgumentException("Don\'t know how to handle metadata section \'" + par1Str + "\'"); - } - else - { - return (MetadataSection)this.getGson().fromJson(par2JsonObject.getAsJsonObject(par1Str), var3.field_110500_b); - } - } - } - - /** - * Returns a Gson instance with type adapters registered for metadata sections. - */ - private Gson getGson() - { - if (this.gson == null) - { - this.gson = this.gsonBuilder.create(); - } - - return this.gson; - } -} diff --git a/src/main/java/net/minecraft/src/MetadataSerializerEmptyAnon.java b/src/main/java/net/minecraft/src/MetadataSerializerEmptyAnon.java deleted file mode 100644 index 5f8966c..0000000 --- a/src/main/java/net/minecraft/src/MetadataSerializerEmptyAnon.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.minecraft.src; - -class MetadataSerializerEmptyAnon -{ -} diff --git a/src/main/java/net/minecraft/src/MetadataSerializerRegistration.java b/src/main/java/net/minecraft/src/MetadataSerializerRegistration.java deleted file mode 100644 index a8fd20c..0000000 --- a/src/main/java/net/minecraft/src/MetadataSerializerRegistration.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.minecraft.src; - -class MetadataSerializerRegistration -{ - final MetadataSectionSerializer field_110502_a; - final Class field_110500_b; - - final MetadataSerializer field_110501_c; - - private MetadataSerializerRegistration(MetadataSerializer par1MetadataSerializer, MetadataSectionSerializer par2MetadataSectionSerializer, Class par3Class) - { - this.field_110501_c = par1MetadataSerializer; - this.field_110502_a = par2MetadataSectionSerializer; - this.field_110500_b = par3Class; - } - - MetadataSerializerRegistration(MetadataSerializer par1MetadataSerializer, MetadataSectionSerializer par2MetadataSectionSerializer, Class par3Class, MetadataSerializerEmptyAnon par4MetadataSerializerEmptyAnon) - { - this(par1MetadataSerializer, par2MetadataSectionSerializer, par3Class); - } -} diff --git a/src/main/java/net/minecraft/src/Minecraft.java b/src/main/java/net/minecraft/src/Minecraft.java index f386770..f1bb11a 100644 --- a/src/main/java/net/minecraft/src/Minecraft.java +++ b/src/main/java/net/minecraft/src/Minecraft.java @@ -134,7 +134,6 @@ public class Minecraft public final Profiler mcProfiler = new Profiler(); private long field_83002_am = -1L; private ReloadableResourceManager mcResourceManager; - private final MetadataSerializer metadataSerializer_ = new MetadataSerializer(); private List defaultResourcePacks = new ArrayList<>(); private DefaultResourcePack mcDefaultResourcePack; private ResourcePackRepository mcResourcePackRepository; @@ -1153,7 +1152,7 @@ public class Minecraft public void displayEaglercraftText(String s) { if(this.thePlayer != null && shownPlayerMessages.add(s)) { - this.thePlayer.sendChatToPlayer(new ChatMessageComponent().addText(s)); + this.thePlayer.sendChatToPlayer(s); } } @@ -1178,10 +1177,7 @@ public class Minecraft if(lanState && !IntegratedServerLAN.isLANOpen()) { lanState = false; if(thePlayer != null) { - ChatMessageComponent message = new ChatMessageComponent(); - message.setColor(EnumChatFormatting.RED); - message.addText(StatCollector.translateToLocal("lanServer.relayDisconnected")); - thePlayer.sendChatToPlayer(message); + thePlayer.sendChatToPlayer(EnumChatFormatting.RED + StatCollector.translateToLocal("lanServer.relayDisconnected")); } } @@ -1920,29 +1916,6 @@ public class Minecraft } } - /** - * adds core server Info (GL version , Texture pack, isModded, type), and the worldInfo to the crash report - */ - public CrashReport addGraphicsAndWorldToCrashReport(CrashReport par1CrashReport) - { - par1CrashReport.getCategory().addCrashSectionCallable("Launched Version", new CallableLaunchedVersion(this)); - par1CrashReport.getCategory().addCrashSectionCallable("LWJGL", new CallableLWJGLVersion(this)); - par1CrashReport.getCategory().addCrashSectionCallable("OpenGL", new CallableGLInfo(this)); - par1CrashReport.getCategory().addCrashSectionCallable("Is Modded", new CallableModded(this)); - par1CrashReport.getCategory().addCrashSectionCallable("Type", new CallableType2(this)); - par1CrashReport.getCategory().addCrashSectionCallable("Resource Pack", new CallableTexturePack(this)); - par1CrashReport.getCategory().addCrashSectionCallable("Current Language", new CallableClientProfiler(this)); - par1CrashReport.getCategory().addCrashSectionCallable("Profiler Position", new CallableClientMemoryStats(this)); - par1CrashReport.getCategory().addCrashSectionCallable("Vec3 Pool Size", new MinecraftINNER13(this)); - - if (this.theWorld != null) - { - this.theWorld.addWorldInfoToCrashReport(par1CrashReport); - } - - return par1CrashReport; - } - /** * Return the singleton Minecraft instance for the game */ diff --git a/src/main/java/net/minecraft/src/MinecraftINNER13.java b/src/main/java/net/minecraft/src/MinecraftINNER13.java deleted file mode 100644 index a28a4ac..0000000 --- a/src/main/java/net/minecraft/src/MinecraftINNER13.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.minecraft.src; - -import java.util.concurrent.Callable; - -class MinecraftINNER13 implements Callable -{ - final Minecraft field_142056_a; - - MinecraftINNER13(Minecraft par1Minecraft) - { - this.field_142056_a = par1Minecraft; - } - - public String func_142055_a() - { - int var1 = this.field_142056_a.theWorld.getWorldVec3Pool().getPoolSize(); - int var2 = 56 * var1; - int var3 = var2 / 1024 / 1024; - int var4 = this.field_142056_a.theWorld.getWorldVec3Pool().func_82590_d(); - int var5 = 56 * var4; - int var6 = var5 / 1024 / 1024; - return var1 + " (" + var2 + " bytes; " + var3 + " MB) allocated, " + var4 + " (" + var5 + " bytes; " + var6 + " MB) used"; - } - - public Object call() - { - return this.func_142055_a(); - } -} diff --git a/src/main/java/net/minecraft/src/NetClientHandler.java b/src/main/java/net/minecraft/src/NetClientHandler.java index ec27abe..58da4ce 100644 --- a/src/main/java/net/minecraft/src/NetClientHandler.java +++ b/src/main/java/net/minecraft/src/NetClientHandler.java @@ -644,7 +644,7 @@ public class NetClientHandler extends NetHandler { public void handleChat(Packet3Chat par1Packet3Chat) { - this.mc.ingameGUI.getChatGUI().printChatMessage(ChatMessageComponent.createFromJson(par1Packet3Chat.message).toStringWithFormatting(true)); + this.mc.ingameGUI.getChatGUI().printChatMessage(par1Packet3Chat.message); } public void handleAnimation(Packet18Animation par1Packet18Animation) @@ -1115,7 +1115,7 @@ public class NetClientHandler extends NetHandler { if (!var2 && this.mc.thePlayer != null) { - this.mc.thePlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Unable to locate sign at " + par1Packet130UpdateSign.xPosition + ", " + par1Packet130UpdateSign.yPosition + ", " + par1Packet130UpdateSign.zPosition)); + this.mc.thePlayer.sendChatToPlayer("Unable to locate sign at " + par1Packet130UpdateSign.xPosition + ", " + par1Packet130UpdateSign.yPosition + ", " + par1Packet130UpdateSign.zPosition); } } diff --git a/src/main/java/net/minecraft/src/NetServerHandler.java b/src/main/java/net/minecraft/src/NetServerHandler.java index 174a14e..a6c7a11 100644 --- a/src/main/java/net/minecraft/src/NetServerHandler.java +++ b/src/main/java/net/minecraft/src/NetServerHandler.java @@ -99,7 +99,7 @@ public class NetServerHandler extends NetHandler this.playerEntity.mountEntityAndWakeUp(); this.sendPacketToPlayer(new Packet255KickDisconnect(par1Str)); this.netManager.serverShutdown(); - this.mcServer.getConfigurationManager().sendChatMsg(ChatMessageComponent.createFromTranslationWithSubstitutions("multiplayer.player.left", new Object[] {this.playerEntity.getTranslatedEntityName()}).setColor(EnumChatFormatting.YELLOW)); + this.mcServer.getConfigurationManager().sendChatMsg(StatCollector.translateToLocalFormatted(EnumChatFormatting.YELLOW + "multiplayer.player.left", new Object[] {this.playerEntity.getTranslatedEntityName()})); this.mcServer.getConfigurationManager().playerLoggedOut(this.playerEntity); this.connectionClosed = true; } @@ -445,7 +445,7 @@ public class NetServerHandler extends NetHandler } else if (par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit() - 1 && (par1Packet15Place.getDirection() == 1 || par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit())) { - this.playerEntity.playerNetServerHandler.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromTranslationWithSubstitutions("build.tooHigh", new Object[] {Integer.valueOf(this.mcServer.getBuildLimit())}).setColor(EnumChatFormatting.RED))); + this.playerEntity.playerNetServerHandler.sendPacketToPlayer(new Packet3Chat(StatCollector.translateToLocalFormatted(EnumChatFormatting.RED + "build.tooHigh", new Object[] {Integer.valueOf(this.mcServer.getBuildLimit())}))); var4 = true; } else @@ -521,7 +521,7 @@ public class NetServerHandler extends NetHandler public void handleErrorMessage(String par1Str, Object[] par2ArrayOfObj) { this.mcServer.getLogAgent().logInfo(this.playerEntity.getCommandSenderName() + " lost connection: " + par1Str); - this.mcServer.getConfigurationManager().sendChatMsg(ChatMessageComponent.createFromTranslationWithSubstitutions("multiplayer.player.left", new Object[] {this.playerEntity.getTranslatedEntityName()}).setColor(EnumChatFormatting.YELLOW)); + this.mcServer.getConfigurationManager().sendChatMsg(StatCollector.translateToLocalFormatted(EnumChatFormatting.YELLOW + "multiplayer.player.left", new Object[] {this.playerEntity.getTranslatedEntityName()})); this.mcServer.getConfigurationManager().playerLoggedOut(this.playerEntity); this.connectionClosed = true; @@ -594,7 +594,7 @@ public class NetServerHandler extends NetHandler { if (this.playerEntity.getChatVisibility() == 2) { - this.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromTranslationKey("chat.cannotSend").setColor(EnumChatFormatting.RED))); + this.sendPacketToPlayer(new Packet3Chat(StatCollector.translateToLocal(EnumChatFormatting.RED + "chat.cannotSend"))); } else { @@ -625,11 +625,11 @@ public class NetServerHandler extends NetHandler { if (this.playerEntity.getChatVisibility() == 1) { - this.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromTranslationKey("chat.cannotSend").setColor(EnumChatFormatting.RED))); + this.sendPacketToPlayer(new Packet3Chat(StatCollector.translateToLocal(EnumChatFormatting.RED + "chat.cannotSend"))); return; } - ChatMessageComponent var4 = ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.text", new Object[] {this.playerEntity.getTranslatedEntityName(), var2}); + String var4 = StatCollector.translateToLocalFormatted("chat.type.text", new Object[] {this.playerEntity.getTranslatedEntityName(), var2}); this.mcServer.getConfigurationManager().func_110459_a(var4, false); } @@ -1104,7 +1104,7 @@ public class NetServerHandler extends NetHandler { if (!this.mcServer.isCommandBlockEnabled()) { - this.playerEntity.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("advMode.notEnabled")); + this.playerEntity.sendChatToPlayer(StatCollector.translateToLocal("advMode.notEnabled")); } else if (this.playerEntity.canCommandSenderUseCommand(2, "") && this.playerEntity.capabilities.isCreativeMode) { @@ -1121,7 +1121,7 @@ public class NetServerHandler extends NetHandler { ((TileEntityCommandBlock)var7).setCommand(var6); this.playerEntity.worldObj.markBlockForUpdate(var13, var17, var5); - this.playerEntity.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("advMode.setCommand.success", new Object[] {var6})); + this.playerEntity.sendChatToPlayer(StatCollector.translateToLocalFormatted("advMode.setCommand.success", new Object[] {var6})); } } catch (Exception var9) @@ -1131,7 +1131,7 @@ public class NetServerHandler extends NetHandler } else { - this.playerEntity.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey("advMode.notAllowed")); + this.playerEntity.sendChatToPlayer(StatCollector.translateToLocal("advMode.notAllowed")); } } else if ("MC|Beacon".equals(par1Packet250CustomPayload.channel)) diff --git a/src/main/java/net/minecraft/src/PackMetadataSection.java b/src/main/java/net/minecraft/src/PackMetadataSection.java deleted file mode 100644 index 39845af..0000000 --- a/src/main/java/net/minecraft/src/PackMetadataSection.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.minecraft.src; - -public class PackMetadataSection implements MetadataSection -{ - private final String packDescription; - private final int packFormat; - - public PackMetadataSection(String par1Str, int par2) - { - this.packDescription = par1Str; - this.packFormat = par2; - } - - public String getPackDescription() - { - return this.packDescription; - } - - public int getPackFormat() - { - return this.packFormat; - } -} diff --git a/src/main/java/net/minecraft/src/PackMetadataSectionSerializer.java b/src/main/java/net/minecraft/src/PackMetadataSectionSerializer.java deleted file mode 100644 index d503af2..0000000 --- a/src/main/java/net/minecraft/src/PackMetadataSectionSerializer.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import java.lang.reflect.Type; - -public class PackMetadataSectionSerializer extends BaseMetadataSectionSerializer implements JsonSerializer -{ - public PackMetadataSection func_110489_a(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - JsonObject var4 = par1JsonElement.getAsJsonObject(); - String var5 = this.func_110486_a(var4.get("description"), "description", (String)null, 1, Integer.MAX_VALUE); - int var6 = this.func_110485_a(var4.get("pack_format"), "pack_format", (Integer)null, 1, Integer.MAX_VALUE); - return new PackMetadataSection(var5, var6); - } - - public JsonElement func_110488_a(PackMetadataSection par1PackMetadataSection, Type par2Type, JsonSerializationContext par3JsonSerializationContext) - { - JsonObject var4 = new JsonObject(); - var4.addProperty("pack_format", Integer.valueOf(par1PackMetadataSection.getPackFormat())); - var4.addProperty("description", par1PackMetadataSection.getPackDescription()); - return var4; - } - - /** - * The name of this section type as it appears in JSON. - */ - public String getSectionName() - { - return "pack"; - } - - public Object deserialize(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - return this.func_110489_a(par1JsonElement, par2Type, par3JsonDeserializationContext); - } - - public JsonElement serialize(Object par1Obj, Type par2Type, JsonSerializationContext par3JsonSerializationContext) - { - return this.func_110488_a((PackMetadataSection)par1Obj, par2Type, par3JsonSerializationContext); - } -} diff --git a/src/main/java/net/minecraft/src/Packet3Chat.java b/src/main/java/net/minecraft/src/Packet3Chat.java index 237d1c5..34f32cd 100644 --- a/src/main/java/net/minecraft/src/Packet3Chat.java +++ b/src/main/java/net/minecraft/src/Packet3Chat.java @@ -11,39 +11,24 @@ public class Packet3Chat extends Packet public String message; private boolean isServer; - public Packet3Chat() - { + public Packet3Chat() { this.isServer = true; } - public Packet3Chat(ChatMessageComponent par1ChatMessageComponent) - { - this(par1ChatMessageComponent.toJson()); - } - - public Packet3Chat(ChatMessageComponent par1ChatMessageComponent, boolean par2) - { - this(par1ChatMessageComponent.toJson(), par2); - } - - public Packet3Chat(String par1Str) - { + public Packet3Chat(String par1Str) { this(par1Str, true); } - public Packet3Chat(String par1Str, boolean par2) - { + public Packet3Chat(String par1Str, boolean par2) { this.isServer = true; - if (par1Str.length() > 32767) - { - par1Str = par1Str.substring(0, 32767); + if (par1Str.length() > maxChatLength) { + par1Str = par1Str.substring(0, maxChatLength); } this.message = par1Str; this.isServer = par2; } - /** * Abstract. Reads the raw packet data from the data stream. */ diff --git a/src/main/java/net/minecraft/src/RConConsoleSource.java b/src/main/java/net/minecraft/src/RConConsoleSource.java index 9397fc1..d2ed325 100644 --- a/src/main/java/net/minecraft/src/RConConsoleSource.java +++ b/src/main/java/net/minecraft/src/RConConsoleSource.java @@ -31,9 +31,9 @@ public class RConConsoleSource implements ICommandSender return "Rcon"; } - public void sendChatToPlayer(ChatMessageComponent par1ChatMessageComponent) + public void sendChatToPlayer(String par1ChatMessageComponent) { - this.buffer.append(par1ChatMessageComponent.toString()); + this.buffer.append(par1ChatMessageComponent); } /** diff --git a/src/main/java/net/minecraft/src/Resource.java b/src/main/java/net/minecraft/src/Resource.java index d51726c..308d6c5 100644 --- a/src/main/java/net/minecraft/src/Resource.java +++ b/src/main/java/net/minecraft/src/Resource.java @@ -8,5 +8,4 @@ public interface Resource boolean hasMetadata(); - MetadataSection getMetadata(String var1); } diff --git a/src/main/java/net/minecraft/src/ResourcePack.java b/src/main/java/net/minecraft/src/ResourcePack.java index 0c3337e..ae5d514 100644 --- a/src/main/java/net/minecraft/src/ResourcePack.java +++ b/src/main/java/net/minecraft/src/ResourcePack.java @@ -15,8 +15,6 @@ public interface ResourcePack Set getResourceDomains(); - MetadataSection getPackMetadata(MetadataSerializer var1, String var2) throws IOException; - EaglerImage getPackImage() throws IOException; String getPackName(); diff --git a/src/main/java/net/minecraft/src/ResourcePackFileNotFoundException.java b/src/main/java/net/minecraft/src/ResourcePackFileNotFoundException.java deleted file mode 100644 index 647daef..0000000 --- a/src/main/java/net/minecraft/src/ResourcePackFileNotFoundException.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.minecraft.src; - -import java.io.File; -import java.io.FileNotFoundException; - -public class ResourcePackFileNotFoundException extends FileNotFoundException -{ - public ResourcePackFileNotFoundException(File par1File, String par2Str) - { - super(String.format("\'%s\' in ResourcePack \'%s\'", new Object[] {par2Str, par1File})); - } -} diff --git a/src/main/java/net/minecraft/src/ResourcePackRepository.java b/src/main/java/net/minecraft/src/ResourcePackRepository.java deleted file mode 100644 index b7b9804..0000000 --- a/src/main/java/net/minecraft/src/ResourcePackRepository.java +++ /dev/null @@ -1,119 +0,0 @@ -package net.minecraft.src; - -import java.io.File; -import java.io.FileFilter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -public class ResourcePackRepository -{ - protected static final FileFilter resourcePackFilter = new ResourcePackRepositoryFilter(); - private final File dirResourcepacks; - public final ResourcePack rprDefaultResourcePack; - public final MetadataSerializer rprMetadataSerializer; - private List repositoryEntriesAll = new ArrayList<>(); - private List repositoryEntries = new ArrayList<>(); - - public ResourcePackRepository(File par1File, ResourcePack par2ResourcePack, MetadataSerializer par3MetadataSerializer, GameSettings par4GameSettings) - { - this.dirResourcepacks = par1File; - this.rprDefaultResourcePack = par2ResourcePack; - this.rprMetadataSerializer = par3MetadataSerializer; - this.fixDirResourcepacks(); - this.updateRepositoryEntriesAll(); - Iterator var5 = this.repositoryEntriesAll.iterator(); - - while (var5.hasNext()) - { - ResourcePackRepositoryEntry var6 = (ResourcePackRepositoryEntry)var5.next(); - - if (var6.getResourcePackName().equals(par4GameSettings.skin)) - { - this.repositoryEntries.add(var6); - } - } - } - - private void fixDirResourcepacks() - { - if (!this.dirResourcepacks.isDirectory()) - { - this.dirResourcepacks.delete(); - this.dirResourcepacks.mkdirs(); - } - } - - private List getResourcePackFiles() - { - return this.dirResourcepacks.isDirectory() ? Arrays.asList(this.dirResourcepacks.listFiles(resourcePackFilter)) : Collections.emptyList(); - } - - public void updateRepositoryEntriesAll() - { - ArrayList var1 = new ArrayList<>(); - Iterator var2 = this.getResourcePackFiles().iterator(); - - while (var2.hasNext()) - { - File var3 = (File)var2.next(); - ResourcePackRepositoryEntry var4 = new ResourcePackRepositoryEntry(this, var3, (ResourcePackRepositoryFilter)null); - - if (!this.repositoryEntriesAll.contains(var4)) - { - try - { - var4.updateResourcePack(); - var1.add(var4); - } - catch (Exception var6) - { - var1.remove(var4); - } - } - else - { - var1.add(this.repositoryEntriesAll.get(this.repositoryEntriesAll.indexOf(var4))); - } - } - - this.repositoryEntriesAll.removeAll(var1); - var2 = this.repositoryEntriesAll.iterator(); - - while (var2.hasNext()) - { - ResourcePackRepositoryEntry var7 = (ResourcePackRepositoryEntry)var2.next(); - var7.closeResourcePack(); - } - - this.repositoryEntriesAll = var1; - } - - public List getRepositoryEntriesAll() - { - return List.copyOf(this.repositoryEntriesAll); - } - - public List getRepositoryEntries() - { - return List.copyOf(this.repositoryEntries); - } - - public String getResourcePackName() - { - return this.repositoryEntries.isEmpty() ? "Default" : ((ResourcePackRepositoryEntry)this.repositoryEntries.get(0)).getResourcePackName(); - } - - public void setRepositoryEntries(ResourcePackRepositoryEntry ... par1ArrayOfResourcePackRepositoryEntry) - { - this.repositoryEntries.clear(); - Collections.addAll(this.repositoryEntries, par1ArrayOfResourcePackRepositoryEntry); - } - - public File getDirResourcepacks() - { - return this.dirResourcepacks; - } -} diff --git a/src/main/java/net/minecraft/src/ResourcePackRepositoryEntry.java b/src/main/java/net/minecraft/src/ResourcePackRepositoryEntry.java deleted file mode 100644 index 28c2982..0000000 --- a/src/main/java/net/minecraft/src/ResourcePackRepositoryEntry.java +++ /dev/null @@ -1,94 +0,0 @@ -package net.minecraft.src; - -import net.lax1dude.eaglercraft.EaglerImage; -import net.lax1dude.eaglercraft.TextureLocation; -import java.io.File; -import java.io.IOException; - -public class ResourcePackRepositoryEntry -{ - private final File resourcePackFile; - private ResourcePack reResourcePack; - private PackMetadataSection rePackMetadataSection; - private EaglerImage texturePackIcon; - - final ResourcePackRepository reResourcePackRepository; - - private ResourcePackRepositoryEntry(ResourcePackRepository par1ResourcePackRepository, File par2File) - { - this.reResourcePackRepository = par1ResourcePackRepository; - this.resourcePackFile = par2File; - } - - public void updateResourcePack() throws IOException - { - this.reResourcePack = (ResourcePack)(this.resourcePackFile.isDirectory() ? new FolderResourcePack(this.resourcePackFile) : new FileResourcePack(this.resourcePackFile)); - this.rePackMetadataSection = (PackMetadataSection)this.reResourcePack.getPackMetadata(this.reResourcePackRepository.rprMetadataSerializer, "pack"); - - try - { - this.texturePackIcon = this.reResourcePack.getPackImage(); - } - catch (IOException var2) - { - ; - } - - if (this.texturePackIcon == null) - { - this.texturePackIcon = this.reResourcePackRepository.rprDefaultResourcePack.getPackImage(); - } - - this.closeResourcePack(); - } - - public void bindTexturePackIcon(TextureManager par1TextureManager) // FIX THIS SHIT - { - /*if (this.locationTexturePackIcon == null) - { - this.locationTexturePackIcon = par1TextureManager.getDynamicTextureLocation("texturepackicon", new DynamicTexture(this.texturePackIcon)); - } - - par1TextureManager.bindTexture(this.locationTexturePackIcon);*/ - } - - public void closeResourcePack() - { - - } - - public ResourcePack getResourcePack() - { - return this.reResourcePack; - } - - public String getResourcePackName() - { - return this.reResourcePack.getPackName(); - } - - public String getTexturePackDescription() - { - return this.rePackMetadataSection == null ? EnumChatFormatting.RED + "Invalid pack.mcmeta (or missing \'pack\' section)" : this.rePackMetadataSection.getPackDescription(); - } - - public boolean equals(Object par1Obj) - { - return this == par1Obj ? true : (par1Obj instanceof ResourcePackRepositoryEntry ? this.toString().equals(par1Obj.toString()) : false); - } - - public int hashCode() - { - return this.toString().hashCode(); - } - - public String toString() - { - return String.format("%s:%s:%d", new Object[] {this.resourcePackFile.getName(), this.resourcePackFile.isDirectory() ? "folder" : "zip", Long.valueOf(this.resourcePackFile.lastModified())}); - } - - ResourcePackRepositoryEntry(ResourcePackRepository par1ResourcePackRepository, File par2File, ResourcePackRepositoryFilter par3ResourcePackRepositoryFilter) - { - this(par1ResourcePackRepository, par2File); - } -} diff --git a/src/main/java/net/minecraft/src/ResourcePackRepositoryFilter.java b/src/main/java/net/minecraft/src/ResourcePackRepositoryFilter.java deleted file mode 100644 index acf6d18..0000000 --- a/src/main/java/net/minecraft/src/ResourcePackRepositoryFilter.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.minecraft.src; - -import java.io.File; -import java.io.FileFilter; - -final class ResourcePackRepositoryFilter implements FileFilter -{ - public boolean accept(File par1File) - { - boolean var2 = par1File.isFile() && par1File.getName().endsWith(".zip"); - boolean var3 = par1File.isDirectory() && (new File(par1File, "pack.mcmeta")).isFile(); - return var2 || var3; - } -} diff --git a/src/main/java/net/minecraft/src/ServerCommandManager.java b/src/main/java/net/minecraft/src/ServerCommandManager.java index ec44ebb..683eff9 100644 --- a/src/main/java/net/minecraft/src/ServerCommandManager.java +++ b/src/main/java/net/minecraft/src/ServerCommandManager.java @@ -72,9 +72,7 @@ public class ServerCommandManager extends CommandHandler implements IAdminComman var5 = false; } - ChatMessageComponent var6 = ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.admin", new Object[] {par1ICommandSender.getCommandSenderName(), ChatMessageComponent.createFromTranslationWithSubstitutions(par3Str, par4ArrayOfObj)}); - var6.setColor(EnumChatFormatting.GRAY); - var6.setItalic(Boolean.valueOf(true)); + String var6 = StatCollector.translateToLocalFormatted(EnumChatFormatting.GRAY + "chat.type.admin", new Object[] {par1ICommandSender.getCommandSenderName(), StatCollector.translateToLocalFormatted(par3Str, par4ArrayOfObj)}); if (var5) { @@ -98,7 +96,7 @@ public class ServerCommandManager extends CommandHandler implements IAdminComman if ((par2 & 1) != 1) { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions(par3Str, par4ArrayOfObj)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(par3Str, par4ArrayOfObj)); } } } diff --git a/src/main/java/net/minecraft/src/ServerCommandScoreboard.java b/src/main/java/net/minecraft/src/ServerCommandScoreboard.java index c1aa4d2..1694e46 100644 --- a/src/main/java/net/minecraft/src/ServerCommandScoreboard.java +++ b/src/main/java/net/minecraft/src/ServerCommandScoreboard.java @@ -470,8 +470,8 @@ public class ServerCommandScoreboard extends CommandBase throw new CommandException("commands.scoreboard.teams.list.player.empty", new Object[] {var5.func_96661_b()}); } - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.scoreboard.teams.list.player.count", new Object[] {Integer.valueOf(var6.size()), var5.func_96661_b()}).setColor(EnumChatFormatting.DARK_GREEN)); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromText(joinNiceString(var6.toArray()))); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.DARK_GREEN + "commands.scoreboard.teams.list.player.count", new Object[] {Integer.valueOf(var6.size()), var5.func_96661_b()})); + par1ICommandSender.sendChatToPlayer(joinNiceString(var6.toArray())); } else { @@ -482,13 +482,13 @@ public class ServerCommandScoreboard extends CommandBase throw new CommandException("commands.scoreboard.teams.list.empty", new Object[0]); } - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.scoreboard.teams.list.count", new Object[] {Integer.valueOf(var8.size())}).setColor(EnumChatFormatting.DARK_GREEN)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.DARK_GREEN + "commands.scoreboard.teams.list.count", new Object[] {Integer.valueOf(var8.size())})); Iterator var9 = var8.iterator(); while (var9.hasNext()) { ScorePlayerTeam var7 = (ScorePlayerTeam)var9.next(); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.scoreboard.teams.list.entry", new Object[] {var7.func_96661_b(), var7.func_96669_c(), Integer.valueOf(var7.getMembershipCollection().size())})); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.scoreboard.teams.list.entry", new Object[] {var7.func_96661_b(), var7.func_96669_c(), Integer.valueOf(var7.getMembershipCollection().size())})); } } } @@ -628,13 +628,13 @@ public class ServerCommandScoreboard extends CommandBase } else { - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.scoreboard.objectives.list.count", new Object[] {Integer.valueOf(var3.size())}).setColor(EnumChatFormatting.DARK_GREEN)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.DARK_GREEN + "commands.scoreboard.objectives.list.count", new Object[] {Integer.valueOf(var3.size())})); Iterator var4 = var3.iterator(); while (var4.hasNext()) { ScoreObjective var5 = (ScoreObjective)var4.next(); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.scoreboard.objectives.list.entry", new Object[] {var5.getName(), var5.getDisplayName(), var5.getCriteria().func_96636_a()})); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.scoreboard.objectives.list.entry", new Object[] {var5.getName(), var5.getDisplayName(), var5.getCriteria().func_96636_a()})); } } } @@ -690,13 +690,13 @@ public class ServerCommandScoreboard extends CommandBase throw new CommandException("commands.scoreboard.players.list.player.empty", new Object[] {var5}); } - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.scoreboard.players.list.player.count", new Object[] {Integer.valueOf(var6.size()), var5}).setColor(EnumChatFormatting.DARK_GREEN)); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.DARK_GREEN + "commands.scoreboard.players.list.player.count", new Object[] {Integer.valueOf(var6.size()), var5})); Iterator var7 = var6.values().iterator(); while (var7.hasNext()) { Score var8 = (Score)var7.next(); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.scoreboard.players.list.player.entry", new Object[] {Integer.valueOf(var8.getScorePoints()), var8.func_96645_d().getDisplayName(), var8.func_96645_d().getName()})); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted("commands.scoreboard.players.list.player.entry", new Object[] {Integer.valueOf(var8.getScorePoints()), var8.func_96645_d().getDisplayName(), var8.func_96645_d().getName()})); } } else @@ -708,8 +708,8 @@ public class ServerCommandScoreboard extends CommandBase throw new CommandException("commands.scoreboard.players.list.empty", new Object[0]); } - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationWithSubstitutions("commands.scoreboard.players.list.count", new Object[] {Integer.valueOf(var9.size())}).setColor(EnumChatFormatting.DARK_GREEN)); - par1ICommandSender.sendChatToPlayer(ChatMessageComponent.createFromText(joinNiceString(var9.toArray()))); + par1ICommandSender.sendChatToPlayer(StatCollector.translateToLocalFormatted(EnumChatFormatting.DARK_GREEN + "commands.scoreboard.players.list.count", new Object[] {Integer.valueOf(var9.size())})); + par1ICommandSender.sendChatToPlayer(joinNiceString(var9.toArray())); } } diff --git a/src/main/java/net/minecraft/src/ServerConfigurationManager.java b/src/main/java/net/minecraft/src/ServerConfigurationManager.java index 88958dc..92f2201 100644 --- a/src/main/java/net/minecraft/src/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/src/ServerConfigurationManager.java @@ -84,7 +84,7 @@ public abstract class ServerConfigurationManager var7.sendPacketToPlayer(new Packet16BlockItemSwitch(par2EntityPlayerMP.inventory.currentItem)); this.func_96456_a((ServerScoreboard)var5.getScoreboard(), par2EntityPlayerMP); this.updateTimeAndWeatherForPlayer(par2EntityPlayerMP, var5); - this.sendChatMsg(ChatMessageComponent.createFromTranslationWithSubstitutions("multiplayer.player.joined", new Object[] {par2EntityPlayerMP.getTranslatedEntityName()}).setColor(EnumChatFormatting.YELLOW)); + this.sendChatMsg(StatCollector.translateToLocalFormatted(EnumChatFormatting.YELLOW + "multiplayer.player.joined", new Object[] {par2EntityPlayerMP.getTranslatedEntityName()})); this.playerLoggedIn(par2EntityPlayerMP); var7.setPlayerLocation(par2EntityPlayerMP.posX, par2EntityPlayerMP.posY, par2EntityPlayerMP.posZ, par2EntityPlayerMP.rotationYaw, par2EntityPlayerMP.rotationPitch); var7.sendPacketToPlayer(new Packet4UpdateTime(var5.getTotalWorldTime(), var5.getWorldTime(), var5.getGameRules().getGameRuleBooleanValue("doDaylightCycle"))); @@ -981,7 +981,7 @@ public abstract class ServerConfigurationManager } } - public void func_110459_a(ChatMessageComponent par1ChatMessageComponent, boolean par2) + public void func_110459_a(String par1ChatMessageComponent, boolean par2) { this.mcServer.sendChatToPlayer(par1ChatMessageComponent); this.sendPacketToAllPlayers(new Packet3Chat(par1ChatMessageComponent, par2)); @@ -990,7 +990,7 @@ public abstract class ServerConfigurationManager /** * Sends the given string to every player as chat message. */ - public void sendChatMsg(ChatMessageComponent par1ChatMessageComponent) + public void sendChatMsg(String par1ChatMessageComponent) { this.func_110459_a(par1ChatMessageComponent, true); } diff --git a/src/main/java/net/minecraft/src/SimpleResource.java b/src/main/java/net/minecraft/src/SimpleResource.java deleted file mode 100644 index ffcf94e..0000000 --- a/src/main/java/net/minecraft/src/SimpleResource.java +++ /dev/null @@ -1,95 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.HashMap; -import java.util.Map; - -import net.lax1dude.eaglercraft.TextureLocation; - -public class SimpleResource implements Resource -{ - private final Map mapMetadataSections = new HashMap<>(); - private final TextureLocation srTextureLocation; - private final InputStream resourceInputStream; - private final InputStream mcmetaInputStream; - private final MetadataSerializer srMetadataSerializer; - private boolean mcmetaJsonChecked; - private JsonObject mcmetaJson; - - public SimpleResource(TextureLocation par1TextureLocation, InputStream par2InputStream, InputStream par3InputStream, MetadataSerializer par4MetadataSerializer) - { - this.srTextureLocation = par1TextureLocation; - this.resourceInputStream = par2InputStream; - this.mcmetaInputStream = par3InputStream; - this.srMetadataSerializer = par4MetadataSerializer; - } - - public InputStream getInputStream() - { - return this.resourceInputStream; - } - - public boolean hasMetadata() - { - return this.mcmetaInputStream != null; - } - - public MetadataSection getMetadata(String par1Str) - { - if (!this.hasMetadata()) - { - return null; - } - else - { - if (this.mcmetaJson == null && !this.mcmetaJsonChecked) - { - this.mcmetaJsonChecked = true; - BufferedReader var2 = null; - - try { - var2 = new BufferedReader(new InputStreamReader(this.mcmetaInputStream)); - this.mcmetaJson = (new JsonParser()).parse(var2).getAsJsonObject(); - } finally { - - } - - } - - MetadataSection var6 = (MetadataSection)this.mapMetadataSections.get(par1Str); - - if (var6 == null) - { - var6 = this.srMetadataSerializer.parseMetadataSection(par1Str, this.mcmetaJson); - } - - return var6; - } - } - - public boolean equals(Object par1Obj) - { - if (this == par1Obj) - { - return true; - } - else if (par1Obj instanceof SimpleResource) - { - SimpleResource var2 = (SimpleResource)par1Obj; - return this.srTextureLocation != null ? this.srTextureLocation.equals(var2.srTextureLocation) : var2.srTextureLocation == null; - } - else - { - return false; - } - } - - public int hashCode() - { - return this.srTextureLocation == null ? 0 : this.srTextureLocation.hashCode(); - } -} diff --git a/src/main/java/net/minecraft/src/SimpleTexture.java b/src/main/java/net/minecraft/src/SimpleTexture.java index 63a996e..93ad4e4 100644 --- a/src/main/java/net/minecraft/src/SimpleTexture.java +++ b/src/main/java/net/minecraft/src/SimpleTexture.java @@ -32,7 +32,7 @@ public class SimpleTexture extends AbstractTexture { try { - TextureMetadataSection var7 = (TextureMetadataSection)var3.getMetadata("texture"); + TextureMetadataSection var7 = null; if (var7 != null) { diff --git a/src/main/java/net/minecraft/src/TextureAtlasSprite.java b/src/main/java/net/minecraft/src/TextureAtlasSprite.java deleted file mode 100644 index 3edcb12..0000000 --- a/src/main/java/net/minecraft/src/TextureAtlasSprite.java +++ /dev/null @@ -1,292 +0,0 @@ -package net.minecraft.src; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import javax.imageio.ImageIO; - -public class TextureAtlasSprite implements Icon -{ - private final String iconName; - protected List framesTextureData = new ArrayList<>(); - private AnimationMetadataSection animationMetadata; - protected boolean rotated; - protected int originX; - protected int originY; - protected int width; - protected int height; - private float minU; - private float maxU; - private float minV; - private float maxV; - protected int frameCounter; - protected int tickCounter; - - protected TextureAtlasSprite(String par1Str) - { - this.iconName = par1Str; - } - - public void initSprite(int par1, int par2, int par3, int par4, boolean par5) - { - this.originX = par3; - this.originY = par4; - this.rotated = par5; - float var6 = (float)(0.009999999776482582D / (double)par1); - float var7 = (float)(0.009999999776482582D / (double)par2); - this.minU = (float)par3 / (float)((double)par1) + var6; - this.maxU = (float)(par3 + this.width) / (float)((double)par1) - var6; - this.minV = (float)par4 / (float)par2 + var7; - this.maxV = (float)(par4 + this.height) / (float)par2 - var7; - } - - public void copyFrom(TextureAtlasSprite par1TextureAtlasSprite) - { - this.originX = par1TextureAtlasSprite.originX; - this.originY = par1TextureAtlasSprite.originY; - this.width = par1TextureAtlasSprite.width; - this.height = par1TextureAtlasSprite.height; - this.rotated = par1TextureAtlasSprite.rotated; - this.minU = par1TextureAtlasSprite.minU; - this.maxU = par1TextureAtlasSprite.maxU; - this.minV = par1TextureAtlasSprite.minV; - this.maxV = par1TextureAtlasSprite.maxV; - } - - /** - * Returns the X position of this icon on its texture sheet, in pixels. - */ - public int getOriginX() - { - return this.originX; - } - - /** - * Returns the Y position of this icon on its texture sheet, in pixels. - */ - public int getOriginY() - { - return this.originY; - } - - /** - * Returns the width of the icon, in pixels. - */ - public int getIconWidth() - { - return this.width; - } - - /** - * Returns the height of the icon, in pixels. - */ - public int getIconHeight() - { - return this.height; - } - - /** - * Returns the minimum U coordinate to use when rendering with this icon. - */ - public float getMinU() - { - return this.minU; - } - - /** - * Returns the maximum U coordinate to use when rendering with this icon. - */ - public float getMaxU() - { - return this.maxU; - } - - /** - * Gets a U coordinate on the icon. 0 returns uMin and 16 returns uMax. Other arguments return in-between values. - */ - public float getInterpolatedU(double par1) - { - float var3 = this.maxU - this.minU; - return this.minU + var3 * (float)par1 / 16.0F; - } - - /** - * Returns the minimum V coordinate to use when rendering with this icon. - */ - public float getMinV() - { - return this.minV; - } - - /** - * Returns the maximum V coordinate to use when rendering with this icon. - */ - public float getMaxV() - { - return this.maxV; - } - - /** - * Gets a V coordinate on the icon. 0 returns vMin and 16 returns vMax. Other arguments return in-between values. - */ - public float getInterpolatedV(double par1) - { - float var3 = this.maxV - this.minV; - return this.minV + var3 * ((float)par1 / 16.0F); - } - - public String getIconName() - { - return this.iconName; - } - - public void updateAnimation() - { - ++this.tickCounter; - - if (this.tickCounter >= this.animationMetadata.getFrameTimeSingle(this.frameCounter)) - { - int var1 = this.animationMetadata.getFrameIndex(this.frameCounter); - int var2 = this.animationMetadata.getFrameCount() == 0 ? this.framesTextureData.size() : this.animationMetadata.getFrameCount(); - this.frameCounter = (this.frameCounter + 1) % var2; - this.tickCounter = 0; - int var3 = this.animationMetadata.getFrameIndex(this.frameCounter); - - if (var1 != var3 && var3 >= 0 && var3 < this.framesTextureData.size()) - { - TextureUtil.uploadTextureSub((int[])this.framesTextureData.get(var3), this.width, this.height, this.originX, this.originY, false, false); - } - } - } - - public int[] getFrameTextureData(int par1) - { - return (int[])this.framesTextureData.get(par1); - } - - public int getFrameCount() - { - return this.framesTextureData.size(); - } - - public void setIconWidth(int par1) - { - this.width = par1; - } - - public void setIconHeight(int par1) - { - this.height = par1; - } - - public void loadSprite(Resource par1Resource) throws IOException - { - this.resetSprite(); - InputStream var2 = par1Resource.getInputStream(); - AnimationMetadataSection var3 = (AnimationMetadataSection)par1Resource.getMetadata("animation"); - BufferedImage var4 = ImageIO.read(var2); - this.height = var4.getHeight(); - this.width = var4.getWidth(); - int[] var5 = new int[this.height * this.width]; - var4.getRGB(0, 0, this.width, this.height, var5, 0, this.width); - - if (var3 == null) - { - if (this.height != this.width) - { - throw new RuntimeException("broken aspect ratio and not an animation"); - } - - this.framesTextureData.add(var5); - } - else - { - int var6 = this.height / this.width; - int var7 = this.width; - int var8 = this.width; - this.height = this.width; - int var10; - - if (var3.getFrameCount() > 0) - { - Iterator var9 = var3.getFrameIndexSet().iterator(); - - while (var9.hasNext()) - { - var10 = ((Integer)var9.next()).intValue(); - - if (var10 >= var6) - { - throw new RuntimeException("invalid frameindex " + var10); - } - - this.allocateFrameTextureData(var10); - this.framesTextureData.set(var10, getFrameTextureData(var5, var7, var8, var10)); - } - - this.animationMetadata = var3; - } - else - { - ArrayList var11 = new ArrayList<>(); - - for (var10 = 0; var10 < var6; ++var10) - { - this.framesTextureData.add(getFrameTextureData(var5, var7, var8, var10)); - var11.add(new AnimationFrame(var10, -1)); - } - - this.animationMetadata = new AnimationMetadataSection(var11, this.width, this.height, var3.getFrameTime()); - } - } - } - - private void allocateFrameTextureData(int par1) - { - if (this.framesTextureData.size() <= par1) - { - for (int var2 = this.framesTextureData.size(); var2 <= par1; ++var2) - { - this.framesTextureData.add((Object)null); - } - } - } - - private static int[] getFrameTextureData(int[] par0ArrayOfInteger, int par1, int par2, int par3) - { - int[] var4 = new int[par1 * par2]; - System.arraycopy(par0ArrayOfInteger, par3 * var4.length, var4, 0, var4.length); - return var4; - } - - public void clearFramesTextureData() - { - this.framesTextureData.clear(); - } - - public boolean hasAnimationMetadata() - { - return this.animationMetadata != null; - } - - public void setFramesTextureData(List par1List) - { - this.framesTextureData = par1List; - } - - private void resetSprite() - { - this.animationMetadata = null; - this.setFramesTextureData(new ArrayList<>()); - this.frameCounter = 0; - this.tickCounter = 0; - } - - public String toString() - { - return "TextureAtlasSprite{name=\'" + this.iconName + '\'' + ", frameCount=" + this.framesTextureData.size() + ", rotated=" + this.rotated + ", x=" + this.originX + ", y=" + this.originY + ", height=" + this.height + ", width=" + this.width + ", u0=" + this.minU + ", u1=" + this.maxU + ", v0=" + this.minV + ", v1=" + this.maxV + '}'; - } -} diff --git a/src/main/java/net/minecraft/src/TextureMetadataSection.java b/src/main/java/net/minecraft/src/TextureMetadataSection.java index 8258857..aa9b46a 100644 --- a/src/main/java/net/minecraft/src/TextureMetadataSection.java +++ b/src/main/java/net/minecraft/src/TextureMetadataSection.java @@ -1,6 +1,6 @@ package net.minecraft.src; -public class TextureMetadataSection implements MetadataSection +public class TextureMetadataSection { private final boolean textureBlur; private final boolean textureClamp; diff --git a/src/main/java/net/minecraft/src/TextureMetadataSectionSerializer.java b/src/main/java/net/minecraft/src/TextureMetadataSectionSerializer.java deleted file mode 100644 index 0820885..0000000 --- a/src/main/java/net/minecraft/src/TextureMetadataSectionSerializer.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.minecraft.src; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import java.lang.reflect.Type; - -public class TextureMetadataSectionSerializer extends BaseMetadataSectionSerializer -{ - public TextureMetadataSection func_110494_a(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - JsonObject var4 = par1JsonElement.getAsJsonObject(); - boolean var5 = this.func_110484_a(var4.get("blur"), "blur", Boolean.valueOf(false)); - boolean var6 = this.func_110484_a(var4.get("clamp"), "clamp", Boolean.valueOf(false)); - return new TextureMetadataSection(var5, var6); - } - - /** - * The name of this section type as it appears in JSON. - */ - public String getSectionName() - { - return "texture"; - } - - public Object deserialize(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext) - { - return this.func_110494_a(par1JsonElement, par2Type, par3JsonDeserializationContext); - } -} diff --git a/src/main/java/net/minecraft/src/ThreadDownloadImageData.java b/src/main/java/net/minecraft/src/ThreadDownloadImageData.java deleted file mode 100644 index 9289885..0000000 --- a/src/main/java/net/minecraft/src/ThreadDownloadImageData.java +++ /dev/null @@ -1,81 +0,0 @@ -package net.minecraft.src; - -import net.lax1dude.eaglercraft.TextureLocation; - -import java.awt.image.BufferedImage; -import java.io.IOException; - -public class ThreadDownloadImageData extends AbstractTexture -{ - private final String imageUrl; - private final IImageBuffer imageBuffer; - private BufferedImage bufferedImage; - private Thread imageThread; - private SimpleTexture imageLocation; - private boolean textureUploaded; - - public ThreadDownloadImageData(String par1Str, TextureLocation par2TextureLocation, IImageBuffer par3IImageBuffer) - { - this.imageUrl = par1Str; - this.imageBuffer = par3IImageBuffer; - this.imageLocation = par2TextureLocation != null ? new SimpleTexture(par2TextureLocation) : null; - } - - public int getGlTextureId() - { - int var1 = super.getGlTextureId(); - - if (!this.textureUploaded && this.bufferedImage != null) - { - TextureUtil.uploadTextureImage(var1, this.bufferedImage); - this.textureUploaded = true; - } - - return var1; - } - - public void getBufferedImage(BufferedImage par1BufferedImage) - { - this.bufferedImage = par1BufferedImage; - } - - public void loadTexture(ResourceManager par1ResourceManager) throws IOException - { - if (this.bufferedImage == null) - { - if (this.imageLocation != null) - { - this.imageLocation.loadTexture(par1ResourceManager); - this.glTextureId = this.imageLocation.getGlTextureId(); - } - } - else - { - TextureUtil.uploadTextureImage(this.getGlTextureId(), this.bufferedImage); - } - - if (this.imageThread == null) - { - this.imageThread = new ThreadDownloadImageDataINNER1(this); - this.imageThread.setDaemon(true); - this.imageThread.setName("Skin downloader: " + this.imageUrl); - this.imageThread.start(); - } - } - - public boolean isTextureUploaded() - { - this.getGlTextureId(); - return this.textureUploaded; - } - - static String getImageUrl(ThreadDownloadImageData par0ThreadDownloadImageData) - { - return par0ThreadDownloadImageData.imageUrl; - } - - static IImageBuffer getImageBuffer(ThreadDownloadImageData par0ThreadDownloadImageData) - { - return par0ThreadDownloadImageData.imageBuffer; - } -} diff --git a/src/main/java/net/minecraft/src/ThreadDownloadImageDataINNER1.java b/src/main/java/net/minecraft/src/ThreadDownloadImageDataINNER1.java deleted file mode 100644 index cd70ce4..0000000 --- a/src/main/java/net/minecraft/src/ThreadDownloadImageDataINNER1.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.minecraft.src; - - -class ThreadDownloadImageDataINNER1 extends Thread -{ - final ThreadDownloadImageData theThreadDownloadImageData; - - ThreadDownloadImageDataINNER1(ThreadDownloadImageData par1ThreadDownloadImageData) - { - this.theThreadDownloadImageData = par1ThreadDownloadImageData; - } - - public void run() - { - - } -} diff --git a/src/main/java/net/minecraft/src/TileEntityCommandBlock.java b/src/main/java/net/minecraft/src/TileEntityCommandBlock.java index f20754a..ff1d758 100644 --- a/src/main/java/net/minecraft/src/TileEntityCommandBlock.java +++ b/src/main/java/net/minecraft/src/TileEntityCommandBlock.java @@ -70,7 +70,7 @@ public class TileEntityCommandBlock extends TileEntity implements ICommandSender this.commandSenderName = par1Str; } - public void sendChatToPlayer(ChatMessageComponent par1ChatMessageComponent) {} + public void sendChatToPlayer(String par1ChatMessageComponent) {} /** * Returns true if the command sender is allowed to use the given command.