diff --git a/client/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java b/client/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java index 9b2c776..2c0d5cd 100644 --- a/client/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java +++ b/client/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java @@ -7,6 +7,7 @@ import ru.di9.minecraft.shared.item.ItemStack; import ru.di9.minecraft.shared.utils.MathHelper; import ru.di9.minecraft.shared.world.World; +@SuppressWarnings("all") public class EntityOtherPlayerMP extends EntityPlayer { private boolean isItemInUse; @@ -17,17 +18,17 @@ public class EntityOtherPlayerMP extends EntityPlayer private double otherPlayerMPYaw; private double otherPlayerMPPitch; - public EntityOtherPlayerMP(World par1World, String par2Str) + public EntityOtherPlayerMP(World par1World, String username) { super(par1World); isItemInUse = false; - username = par2Str; + this.username = username; yOffset = 0.0F; stepHeight = 0.0F; - if (par2Str != null && par2Str.length() > 0) + if (username != null && username.length() > 0) { - skinUrl = (new StringBuilder()).append("http://s3.amazonaws.com/MinecraftSkins/").append(par2Str).append(".png").toString(); + skinUrl= GlobalSharedBeans.INSTANCE.getSkinURL(username); } noClip = true; diff --git a/client/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java b/client/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java index b48db3c..503e82b 100644 --- a/client/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java +++ b/client/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java @@ -58,7 +58,7 @@ public class EntityPlayerSP extends EntityPlayer if (par3Session != null && par3Session.username != null && par3Session.username.length() > 0) { - skinUrl = (new StringBuilder()).append("http://s3.amazonaws.com/MinecraftSkins/").append(par3Session.username).append(".png").toString(); + skinUrl = GlobalSharedBeans.INSTANCE.getSkinURL(par3Session.username); } username = par3Session.username; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/GlobalSharedBeans.java b/shared/src/main/java/ru/di9/minecraft/shared/GlobalSharedBeans.java new file mode 100644 index 0000000..1e2b598 --- /dev/null +++ b/shared/src/main/java/ru/di9/minecraft/shared/GlobalSharedBeans.java @@ -0,0 +1,16 @@ +package ru.di9.minecraft.shared; + +public final class GlobalSharedBeans { + public static final GlobalSharedBeans INSTANCE = new GlobalSharedBeans(); + + private GlobalSharedBeans() { + } + + public String getSkinURL(String username) { + return "http://localhost:25560/skins/%s.png".formatted(username); + } + + public String getCloaksURL(String username) { + return "http://localhost:25560/cloaks/%s.png".formatted(username); + } +} diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityPlayer.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityPlayer.java index e670bba..030fb7a 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityPlayer.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityPlayer.java @@ -463,7 +463,7 @@ public abstract class EntityPlayer extends EntityLiving public void updateCloak() { - playerCloakUrl = (new StringBuilder()).append("http://s3.amazonaws.com/MinecraftCloaks/").append(username).append(".png").toString(); + playerCloakUrl = GlobalSharedBeans.INSTANCE.getCloaksURL(username); cloakUrl = playerCloakUrl; }