diff --git a/src/main/java/org/ultramine/mods/shops/InitClient.java b/src/main/java/org/ultramine/mods/shops/InitClient.java index 1980a38..34bfcb4 100644 --- a/src/main/java/org/ultramine/mods/shops/InitClient.java +++ b/src/main/java/org/ultramine/mods/shops/InitClient.java @@ -39,25 +39,25 @@ } } - @SubscribeEvent - public void onRenderTick(TickEvent.RenderTickEvent e) - { - if(e.phase == TickEvent.Phase.END) - { - Minecraft mc = Minecraft.getMinecraft(); - if(mc.theWorld != null && !mc.skipRenderWorld && !mc.gameSettings.hideGUI && mc.currentScreen == null && !mc.gameSettings.showDebugInfo) - { - mc.renderEngine.bindTexture(texture); - mc.ingameGUI.drawTexturedModalRect(1, 1, 0, 0, 6, 8); - String gscStr = ClientEconomy.GSC.getGameString(); - int len = mc.fontRenderer.getStringWidth(gscStr); - boolean drawRUR = ClientEconomy.RUR.getMoney() != 0.0d; - if(drawRUR) - mc.ingameGUI.drawTexturedModalRect(9+len+4, 1, 0, 9, 6, 8); - mc.fontRenderer.drawStringWithShadow(gscStr, 9, 1, 0xffffff); - if(drawRUR) - mc.fontRenderer.drawStringWithShadow(ClientEconomy.RUR.getGameString(), 9+len+4+7, 1, 0xffffff); - } - } - } +// @SubscribeEvent +// public void onRenderTick(TickEvent.RenderTickEvent e) +// { +// if(e.phase == TickEvent.Phase.END) +// { +// Minecraft mc = Minecraft.getMinecraft(); +// if(mc.theWorld != null && !mc.skipRenderWorld && !mc.gameSettings.hideGUI && mc.currentScreen == null && !mc.gameSettings.showDebugInfo) +// { +// mc.renderEngine.bindTexture(texture); +// mc.ingameGUI.drawTexturedModalRect(1, 1, 0, 0, 6, 8); +// String gscStr = ClientEconomy.GSC.getGameString(); +// int len = mc.fontRenderer.getStringWidth(gscStr); +// boolean drawRUR = ClientEconomy.RUR.getMoney() != 0.0d; +// if(drawRUR) +// mc.ingameGUI.drawTexturedModalRect(9+len+4, 1, 0, 9, 6, 8); +// mc.fontRenderer.drawStringWithShadow(gscStr, 9, 1, 0xffffff); +// if(drawRUR) +// mc.fontRenderer.drawStringWithShadow(ClientEconomy.RUR.getGameString(), 9+len+4+7, 1, 0xffffff); +// } +// } +// } } diff --git a/src/main/java/org/ultramine/mods/shops/economy/ClientEconomy.java b/src/main/java/org/ultramine/mods/shops/economy/ClientEconomy.java index cb91575..1bc9a76 100644 --- a/src/main/java/org/ultramine/mods/shops/economy/ClientEconomy.java +++ b/src/main/java/org/ultramine/mods/shops/economy/ClientEconomy.java @@ -6,7 +6,7 @@ @SideOnly(Side.CLIENT) public class ClientEconomy { - public static final ClientEconomy GSC = new ClientEconomy("\u00a7a:\u00a76%s$"); + public static final ClientEconomy FRN = new ClientEconomy("\u00a7a:\u00a76%sF"); public static final ClientEconomy RUR = new ClientEconomy("\u00a7a:\u00a76%sŐ”"); private final String format; diff --git a/src/main/java/org/ultramine/mods/shops/packets/PacketPlayerMoney.java b/src/main/java/org/ultramine/mods/shops/packets/PacketPlayerMoney.java index 5565569..a50ccdd 100644 --- a/src/main/java/org/ultramine/mods/shops/packets/PacketPlayerMoney.java +++ b/src/main/java/org/ultramine/mods/shops/packets/PacketPlayerMoney.java @@ -11,34 +11,34 @@ public class PacketPlayerMoney extends UMPacket { - public double moneyGSC; + public double moneyFRN; public double moneyRUR; public PacketPlayerMoney(){} - public PacketPlayerMoney(double moneyGSC, double moneyRUR) + public PacketPlayerMoney(double moneyFRN, double moneyRUR) { - this.moneyGSC = moneyGSC; + this.moneyFRN = moneyFRN; this.moneyRUR = moneyRUR; } @Override public void read(PacketBuffer data) throws IOException { - moneyGSC = data.readDouble(); + moneyFRN = data.readDouble(); moneyRUR = data.readDouble(); } @Override public void write(PacketBuffer data) throws IOException { - data.writeDouble(moneyGSC); + data.writeDouble(moneyFRN); data.writeDouble(moneyRUR); } @SideOnly(Side.CLIENT) public void processClient(NetHandlerPlayClient net) { - ClientEconomy.GSC.setMoney(moneyGSC); + ClientEconomy.FRN.setMoney(moneyFRN); ClientEconomy.RUR.setMoney(moneyRUR); } } diff --git a/src/main/java/org/ultramine/mods/shops/te/TileEntityShop.java b/src/main/java/org/ultramine/mods/shops/te/TileEntityShop.java index 1ff039b..0a4b197 100644 --- a/src/main/java/org/ultramine/mods/shops/te/TileEntityShop.java +++ b/src/main/java/org/ultramine/mods/shops/te/TileEntityShop.java @@ -449,13 +449,13 @@ @SideOnly(Side.CLIENT) public double getClientMoney() { - return ClientEconomy.GSC.getMoney(); + return ClientEconomy.FRN.getMoney(); } @SideOnly(Side.CLIENT) public String getClientMoneySign() { - return "$"; + return "F"; } @SideOnly(Side.SERVER)