diff --git a/src/main/java/net/silentclient/client/admin/AdminRender.java b/src/main/java/net/silentclient/client/admin/AdminRender.java index 62382a6..490af2d 100644 --- a/src/main/java/net/silentclient/client/admin/AdminRender.java +++ b/src/main/java/net/silentclient/client/admin/AdminRender.java @@ -1,17 +1,6 @@ package net.silentclient.client.admin; -import java.awt.Color; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.text.DecimalFormat; - import net.minecraft.client.Minecraft; -import net.silentclient.client.cosmetics.StaticResourceLocation; -import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; -import org.lwjgl.Sys; -import org.lwjgl.input.Mouse; - import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.MathHelper; @@ -20,15 +9,25 @@ import net.minecraft.util.Util; import net.silentclient.client.Client; import net.silentclient.client.cosmetics.AnimatedResourceLocation; import net.silentclient.client.cosmetics.ShieldData; +import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.client.cosmetics.gui.CosmeticsGui; +import net.silentclient.client.gui.elements.StaticButton; import net.silentclient.client.gui.lite.clickgui.utils.GlUtils; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.lite.clickgui.utils.RenderUtils; -import net.silentclient.client.gui.elements.StaticButton; +import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mods.CustomFontRenderer; import net.silentclient.client.mods.CustomFontRenderer.RenderMode; import net.silentclient.client.utils.FileUtils; import net.silentclient.client.utils.Players; +import org.lwjgl.Sys; +import org.lwjgl.input.Mouse; + +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.text.DecimalFormat; public class AdminRender extends GuiScreen { public static File adminRenderPath = new File(Client.getInstance().configDir, "admin-render"); diff --git a/src/main/java/net/silentclient/client/cosmetics/Cosmetics.java b/src/main/java/net/silentclient/client/cosmetics/Cosmetics.java index 9e16f86..97eaf22 100644 --- a/src/main/java/net/silentclient/client/cosmetics/Cosmetics.java +++ b/src/main/java/net/silentclient/client/cosmetics/Cosmetics.java @@ -59,79 +59,77 @@ public class Cosmetics { } Client.logger.info("STARTING > cosmeitcs > default_icon"); defaultIcon = new StaticResourceLocation("silentclient/icons/player_icon.png"); - if(!Client.getInstance().isDebug()) { - PlayerResponse.Account.Cosmetics allCosmetics = getAllCosmetics(); - Client.logger.info("STARTING > cosmeitcs > capes"); - capes.clear(); - capesShoulders.clear(); + PlayerResponse.Account.Cosmetics allCosmetics = getAllCosmetics(); + Client.logger.info("STARTING > cosmeitcs > capes"); + capes.clear(); + capesShoulders.clear(); - if(allCosmetics != null && allCosmetics.getCapes() != null) { - allCosmetics.getCapes().forEach((cape) -> { - capes.put(cape.getId(), new AnimatedResourceLocation("silentclient/cosmetics/capes/"+cape.getId(), cape.getFrames(), cape.getFrameDelay(), false, cape.getId() == Client.getInstance().getAccount().getSelectedCape())); - capesShoulders.put(cape.getId(), new StaticResourceLocation("silentclient/cosmetics/capes/"+cape.getId()+"/shoulders.png")); - }); - } + if(allCosmetics != null && allCosmetics.getCapes() != null) { + allCosmetics.getCapes().forEach((cape) -> { + capes.put(cape.getId(), new AnimatedResourceLocation("silentclient/cosmetics/capes/"+cape.getId(), cape.getFrames(), cape.getFrameDelay(), false, cape.getId() == Client.getInstance().getAccount().getSelectedCape())); + capesShoulders.put(cape.getId(), new StaticResourceLocation("silentclient/cosmetics/capes/"+cape.getId()+"/shoulders.png")); + }); + } - Client.logger.info("STARTING > cosmeitcs > wings"); - wings.clear(); - if(allCosmetics != null && allCosmetics.getWings() != null) { - allCosmetics.getWings().forEach((wing) -> { - wings.put(wing.getId(), new AnimatedResourceLocation("silentclient/cosmetics/wings/"+ wing.getId(), wing.getFrames(), wing.getFrameDelay(), false, wing.getId() == Client.getInstance().getAccount().getSelectedWings())); - }); - } + Client.logger.info("STARTING > cosmeitcs > wings"); + wings.clear(); + if(allCosmetics != null && allCosmetics.getWings() != null) { + allCosmetics.getWings().forEach((wing) -> { + wings.put(wing.getId(), new AnimatedResourceLocation("silentclient/cosmetics/wings/"+ wing.getId(), wing.getFrames(), wing.getFrameDelay(), false, wing.getId() == Client.getInstance().getAccount().getSelectedWings())); + }); + } - Client.logger.info("STARTING > cosmeitcs > bandanas"); - bandanas.clear(); - if(allCosmetics != null && allCosmetics.getBandanas() != null) { - allCosmetics.getBandanas().forEach((bandana) -> { - bandanas.put(bandana.getId(), new AnimatedResourceLocation("silentclient/cosmetics/bandanas/"+bandana.getId(), bandana.getFrames(), bandana.getFrameDelay(), false, bandana.getId() == Client.getInstance().getAccount().getSelectedBandana())); - }); - } + Client.logger.info("STARTING > cosmeitcs > bandanas"); + bandanas.clear(); + if(allCosmetics != null && allCosmetics.getBandanas() != null) { + allCosmetics.getBandanas().forEach((bandana) -> { + bandanas.put(bandana.getId(), new AnimatedResourceLocation("silentclient/cosmetics/bandanas/"+bandana.getId(), bandana.getFrames(), bandana.getFrameDelay(), false, bandana.getId() == Client.getInstance().getAccount().getSelectedBandana())); + }); + } - Client.logger.info("STARTING > cosmeitcs > hats"); - hats.clear(); - if(allCosmetics != null && allCosmetics.getHats() != null) { - allCosmetics.getHats().forEach((hat) -> { - hats.put(hat.getId(), new HatData(new AnimatedResourceLocation("silentclient/cosmetics/hats/"+hat.getId(), hat.getFrames(), hat.getFrameDelay(), false, hat.getId() == Client.getInstance().getAccount().getSelectedHat()), hat.getModel())); - if(!hatModels.containsKey(hat.getModel())) { - try { - Client.logger.info("STARTING > cosmeitcs > hats > model > " + hat.getModel()); - ModelBuffer model = new ModelBuffer(new ResourceLocation("silentclient/models/"+ hat.getModel() + ".obj")); - if(model != null) { - hatModels.put(hat.getModel(), model); - } - } catch (Exception e) { - e.printStackTrace(); + Client.logger.info("STARTING > cosmeitcs > hats"); + hats.clear(); + if(allCosmetics != null && allCosmetics.getHats() != null) { + allCosmetics.getHats().forEach((hat) -> { + hats.put(hat.getId(), new HatData(new AnimatedResourceLocation("silentclient/cosmetics/hats/"+hat.getId(), hat.getFrames(), hat.getFrameDelay(), false, hat.getId() == Client.getInstance().getAccount().getSelectedHat()), hat.getModel())); + if(!hatModels.containsKey(hat.getModel())) { + try { + Client.logger.info("STARTING > cosmeitcs > hats > model > " + hat.getModel()); + ModelBuffer model = new ModelBuffer(new ResourceLocation("silentclient/models/"+ hat.getModel() + ".obj")); + if(model != null) { + hatModels.put(hat.getModel(), model); } + } catch (Exception e) { + e.printStackTrace(); } - }); - } - Client.logger.info("STARTING > cosmeitcs > shields"); - shields.clear(); - if(allCosmetics != null && allCosmetics.getShields() != null) { - allCosmetics.getShields().forEach((shield) -> { - shields.put(shield.getId(), new ShieldData(new AnimatedResourceLocation("silentclient/cosmetics/shields/"+shield.getId(), shield.getFrames(), shield.getFrameDelay(), false, shield.getId() == Client.getInstance().getAccount().getSelectedShield()), shield.getModel())); - if(!hatModels.containsKey(shield.getModel())) { - try { - Client.logger.info("STARTING > cosmeitcs > shields > model > " + shield.getModel()); - ModelBuffer model = new ModelBuffer(new ResourceLocation("silentclient/models/"+ shield.getModel() + ".obj")); - if(model != null) { - shieldModels.put(shield.getModel(), model); - } - } catch (Exception e) { - e.printStackTrace(); + } + }); + } + Client.logger.info("STARTING > cosmeitcs > shields"); + shields.clear(); + if(allCosmetics != null && allCosmetics.getShields() != null) { + allCosmetics.getShields().forEach((shield) -> { + shields.put(shield.getId(), new ShieldData(new AnimatedResourceLocation("silentclient/cosmetics/shields/"+shield.getId(), shield.getFrames(), shield.getFrameDelay(), false, shield.getId() == Client.getInstance().getAccount().getSelectedShield()), shield.getModel())); + if(!hatModels.containsKey(shield.getModel())) { + try { + Client.logger.info("STARTING > cosmeitcs > shields > model > " + shield.getModel()); + ModelBuffer model = new ModelBuffer(new ResourceLocation("silentclient/models/"+ shield.getModel() + ".obj")); + if(model != null) { + shieldModels.put(shield.getModel(), model); } + } catch (Exception e) { + e.printStackTrace(); } - }); - } + } + }); + } - Client.logger.info("STARTING > cosmeitcs > icons"); - icons.clear(); - if(allCosmetics != null && allCosmetics.getIcons() != null) { - allCosmetics.getIcons().forEach((icon) -> { - icons.put(icon.getId(), new StaticResourceLocation("silentclient/cosmetics/icons/"+ icon.getId() + "/0.png")); - }); - } + Client.logger.info("STARTING > cosmeitcs > icons"); + icons.clear(); + if(allCosmetics != null && allCosmetics.getIcons() != null) { + allCosmetics.getIcons().forEach((icon) -> { + icons.put(icon.getId(), new StaticResourceLocation("silentclient/cosmetics/icons/"+ icon.getId() + "/0.png")); + }); } Client.logger.info("STARTING > cosmeitcs > outfits"); diff --git a/src/main/java/net/silentclient/client/cosmetics/HatRenderer.java b/src/main/java/net/silentclient/client/cosmetics/HatRenderer.java index 1690101..d0428c3 100644 --- a/src/main/java/net/silentclient/client/cosmetics/HatRenderer.java +++ b/src/main/java/net/silentclient/client/cosmetics/HatRenderer.java @@ -1,19 +1,5 @@ package net.silentclient.client.cosmetics; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.HashMap; -import java.util.HashSet; -import java.util.UUID; - -import javax.imageio.ImageIO; -import javax.vecmath.Vector3f; -import javax.vecmath.Vector4f; - -import net.silentclient.client.mixin.accessors.MinecraftAccessor; -import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; @@ -23,7 +9,19 @@ import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.item.ItemStack; import net.silentclient.client.Client; import net.silentclient.client.blc.BlcGlStateManager; +import net.silentclient.client.mixin.accessors.MinecraftAccessor; +import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mods.settings.CosmeticsMod; +import org.lwjgl.opengl.GL11; + +import javax.imageio.ImageIO; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.HashMap; +import java.util.HashSet; +import java.util.UUID; public class HatRenderer extends ModelBase implements LayerRenderer { private final RenderPlayer playerRenderer; @@ -176,6 +174,11 @@ public class HatRenderer extends ModelBase implements LayerRenderer