diff --git a/src/main/java/net/silentclient/client/emotes/AnimatorController.java b/src/main/java/net/silentclient/client/emotes/AnimatorController.java index 37a3e6c..c1d5b99 100644 --- a/src/main/java/net/silentclient/client/emotes/AnimatorController.java +++ b/src/main/java/net/silentclient/client/emotes/AnimatorController.java @@ -501,7 +501,7 @@ public class AnimatorController { } if(repeat && this.emote.isFinished()) { - this.emote.ticks = 0; + this.setEmote(entitylivingbase, this.entry, true); } if((flag1 || entitylivingbase.isSneaking()) && repeat) { @@ -547,10 +547,14 @@ public class AnimatorController { } public void setEmote(EntityLivingBase entitylivingbase, String s) { - this.setEmote(entitylivingbase, PlayerModelManager.get().getEmote(s)); + this.setEmote(entitylivingbase, PlayerModelManager.get().getEmote(s), false); } public void setEmote(EntityLivingBase entitylivingbase, Emote emotex) { + this.setEmote(entitylivingbase, emotex, false); + } + + public void setEmote(EntityLivingBase entitylivingbase, Emote emotex, boolean ignorePerspective) { if (emotex != null) { BOBJAction bobjaction = this.animation.data.actions.get(emotex.getActionName()); if (bobjaction != null && emotex != null) { @@ -572,7 +576,7 @@ public class AnimatorController { this.emote = actionplayback; this.entry = emotex; this.entry.startAnimation(this.accessor); - if (this.mc.gameSettings.thirdPersonView != EmotesMod.getEmotePerspective() && entitylivingbase == this.mc.thePlayer) { + if (!ignorePerspective && this.mc.gameSettings.thirdPersonView != EmotesMod.getEmotePerspective() && entitylivingbase == this.mc.thePlayer) { this.mc.gameSettings.thirdPersonView = EmotesMod.getEmotePerspective(); this.resetThirdView = true; } diff --git a/src/main/java/net/silentclient/client/emotes/emoticons/Icon.java b/src/main/java/net/silentclient/client/emotes/emoticons/Icon.java index 5faf6b0..4a9d6bb 100644 --- a/src/main/java/net/silentclient/client/emotes/emoticons/Icon.java +++ b/src/main/java/net/silentclient/client/emotes/emoticons/Icon.java @@ -4,7 +4,7 @@ import net.minecraft.client.gui.Gui; import net.minecraft.util.ResourceLocation; public class Icon { - public static final Icon DEFAULT = new Icon(new ResourceLocation("blc/textures/slideout/emotes/emote-icon.png"), 53, 85); + public static final Icon DEFAULT = new Icon(new ResourceLocation("silentclient/emotes/icons/1.png"), 53, 85); public ResourceLocation icon; public int width; public int height; diff --git a/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java b/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java index 5c7f8d1..0ab8ecc 100644 --- a/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java +++ b/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java @@ -5,6 +5,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.ResourceLocation; import net.silentclient.client.Client; +import net.silentclient.client.emotes.PlayerModelManager; +import net.silentclient.client.emotes.emoticons.Emote; import net.silentclient.client.emotes.socket.EmoteSocket; import net.silentclient.client.gui.SilentScreen; import net.silentclient.client.gui.elements.IconButton; @@ -66,6 +68,15 @@ public class EmoteMenuGui extends SilentScreen { float emoteY = y + 20 + scrollY; int emoteIndex = 0; for(PlayerResponse.Account.Cosmetics.CosmeticItem emote : Client.getInstance().getCosmetics().getMyEmotes()) { + String emoteName = PlayerModelManager.get().map.get(emote.id); + if(emoteName == null) { + continue; + } + Emote emoteInstance = PlayerModelManager.get().getEmote(emoteName); + if(emoteInstance == null) { + continue; + } + boolean isHovered = MouseUtils.isInside(mouseX, mouseY, emoteX, emoteY, 80, 80) && !MouseUtils.isInside(mouseX, mouseY, emoteX + 80 - 3 - 10, emoteY + 3, 10, 10); if(isHovered) { cursorType = MouseCursorHandler.CursorType.POINTER; @@ -86,6 +97,8 @@ public class EmoteMenuGui extends SilentScreen { RenderUtil.drawImage(new ResourceLocation(favorite ? "silentclient/icons/star.png" : "silentclient/icons/star_outline.png"), emoteX + 80 - 3 - 10, emoteY + 3, 10, 10); + RenderUtil.drawImage(emoteInstance.icon.icon, emoteX + 3 + 37 - 28 , emoteY + 16, 56, 56); + emoteIndex += 1; if(emoteIndex == 3) { emoteIndex = 0; @@ -120,6 +133,14 @@ public class EmoteMenuGui extends SilentScreen { float emoteY = (int) (y + 20 + scrollHelper.getScroll()); int emoteIndex = 0; for(PlayerResponse.Account.Cosmetics.CosmeticItem emote : Client.getInstance().getCosmetics().getMyEmotes()) { + String emoteName = PlayerModelManager.get().map.get(emote.id); + if(emoteName == null) { + continue; + } + Emote emoteInstance = PlayerModelManager.get().getEmote(emoteName); + if(emoteInstance == null) { + continue; + } boolean isHovered = MouseUtils.isInside(mouseX, mouseY, emoteX, emoteY, 80, 80) && !MouseUtils.isInside(mouseX, mouseY, emoteX + 80 - 3 - 10, emoteY + 3, 10, 10); if(isHovered) { diff --git a/src/main/java/net/silentclient/client/emotes/ui/ScreenEmoteWheel.java b/src/main/java/net/silentclient/client/emotes/ui/ScreenEmoteWheel.java deleted file mode 100644 index 5b3f3e6..0000000 --- a/src/main/java/net/silentclient/client/emotes/ui/ScreenEmoteWheel.java +++ /dev/null @@ -1,155 +0,0 @@ -package net.silentclient.client.emotes.ui; - -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.MathHelper; -import net.silentclient.client.Client; -import net.silentclient.client.emotes.socket.EmoteSocket; -import net.silentclient.client.gui.SilentScreen; -import net.silentclient.client.gui.font.SilentFontRenderer; -import net.silentclient.client.utils.MouseCursorHandler; -import net.silentclient.client.utils.types.PlayerResponse; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; - -import java.awt.*; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.function.Consumer; - - -public class ScreenEmoteWheel extends SilentScreen { - int accept; - protected boolean hovered; - private final HashMap> handlers = new HashMap<>(); - private String foc; - private int page = 1; - - private void handleScroll() { - int maxPage = (int) Math.ceil((double) Client.getInstance().getCosmetics().getMyEmotes().size() / 6); - int scroll = Mouse.getEventDWheel(); - if (scroll > 0 && this.page > 1) { - this.initGui(); - --this.page; - } - - if (scroll < 0 && this.page < maxPage) { - this.initGui(); - ++this.page; - } - } - - @Override - public void handleMouseInput() throws IOException { - super.handleMouseInput(); - this.handleScroll(); - } - - @Override - protected void mouseReleased(int mouseX, int mouseY, int state) { - super.mouseReleased(mouseX, mouseY, state); - if (this.foc != null) { - this.mc.displayGuiScreen(null); - this.handlers.get(this.foc).accept(true); - } - } - - @Override - public void initGui() { - this.handlers.clear(); - int index = (6 * page) - 6; - int currentIndex = 0; - for(PlayerResponse.Account.Cosmetics.CosmeticItem item : Client.getInstance().getCosmetics().getMyEmotes()) { - if(currentIndex >= index) { - this.handlers.put(item.getName(), (emote) -> EmoteSocket.get().startEmote(item.getId())); - if(this.handlers.size() == 6) { - break; - } - } - currentIndex++; - } - this.defaultCursor = false; - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - ScaledResolution resolution = new ScaledResolution(this.mc); - int centerY = resolution.getScaledHeight() / 2; - int centerX = resolution.getScaledWidth() / 2; - super.drawScreen(mouseX, mouseY, partialTicks); - this.foc = null; - int count = this.handlers.size(); - float radius = (float)resolution.getScaledHeight() * 2.0F / 5.0F; - float i = 0.0F; - MouseCursorHandler.CursorType cursorType = getCursor(this.silentInputs, this.buttonList); - Client.getInstance().getSilentFontRenderer().drawString("Scroll to view more.", 1, 1, 14, SilentFontRenderer.FontType.TITLE); - - for(String s : this.handlers.keySet()) { - GL11.glPushMatrix(); - GL11.glEnable(3042); - GL11.glDisable(3553); - GL11.glBlendFunc(770, 771); - GL11.glHint(3152, 4354); - GL11.glBegin(6); - GlStateManager.resetColor(); - float startTheta = (float)((double)(i / (float)count) * Math.PI * 2.0); - float endTheta = (float)((double)((i + 1.0F) / (float)count) * Math.PI * 2.0); - float diff = endTheta - startTheta; - int mouseDeltaX = mouseX - centerX; - int mouseDeltaY = mouseY - centerY; - double sqrt = Math.sqrt(Math.pow((double)mouseDeltaX, 2.0) + Math.pow((double)mouseDeltaY, 2.0)); - boolean hovered = false; - if (sqrt <= (double)radius) { - double mouseTheta = MathHelper.atan2((double)mouseDeltaX, (double)mouseDeltaY); - if (mouseTheta < 0.0) { - mouseTheta += Math.PI * 2; - } - - if (mouseTheta > (double)startTheta && mouseTheta < (double)endTheta) { - this.foc = s; - hovered = true; - cursorType = MouseCursorHandler.CursorType.POINTER; - } - } - - Color tmp = new Color(12, 12, 12, hovered ? 40 : 20); - GlStateManager.color((float)tmp.getRed() / 255.0F, (float)tmp.getGreen() / 255.0F, (float)tmp.getBlue() / 255.0F, (float)tmp.getAlpha() / 255.0F); - GL11.glVertex3d((double)centerX, (double)centerY, 0.0); - - for(float j = 0.0F; j <= 50.0F; ++j) { - float x = (float)centerX + radius * MathHelper.sin(startTheta + diff * j / 50.0F); - float y = (float)centerY + radius * MathHelper.cos(startTheta + diff * j / 50.0F); - GL11.glVertex2f(x, y); - } - - GL11.glEnd(); - GL11.glEnable(3553); - GL11.glDisable(3042); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - float middle = (startTheta + endTheta) / 2.0F; - List strings = this.fontRendererObj.listFormattedStringToWidth(s, 50); - int textCenterX = (int)((float)centerX + radius * MathHelper.sin(middle) / 3.0F * 2.0F); - int textCenterY = (int)((float)centerY + radius * MathHelper.cos(middle) / 3.0F * 2.0F); - textCenterY -= strings.size() * 15; - - for(String string : strings) { - textCenterY += 15; - this.drawScaledText(string, textCenterX, textCenterY, -1); - } - - GL11.glPopMatrix(); - ++i; - } - - Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); - } - - protected void drawScaledText(String text, int trueX, int trueY, int color) { - GlStateManager.pushMatrix(); - GlStateManager.scale(1.2, 1.2, 1.2); - this.fontRendererObj - .drawString(text, (float)((double)trueX / 1.2) - (float)this.fontRendererObj.getStringWidth(text) / 2.0F, (float)((double)trueY / 1.2), color, false); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/best_mates.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/best_mates.png new file mode 100644 index 0000000..5c46260 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/best_mates.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/bitchslap.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/bitchslap.png new file mode 100644 index 0000000..00bffd9 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/bitchslap.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/blinding_lights.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/blinding_lights.png new file mode 100644 index 0000000..ab35695 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/blinding_lights.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/blow_kiss.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/blow_kiss.png new file mode 100644 index 0000000..d9956c2 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/blow_kiss.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/boneless.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/boneless.png new file mode 100644 index 0000000..c947c32 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/boneless.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/bongo_cat.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/bongo_cat.png new file mode 100644 index 0000000..a1dfe37 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/bongo_cat.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/bow.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/bow.png new file mode 100644 index 0000000..92e938e Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/bow.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/boy.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/boy.png new file mode 100644 index 0000000..2c66707 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/boy.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/breathtaking.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/breathtaking.png new file mode 100644 index 0000000..167a7f4 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/breathtaking.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/broom.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/broom.png new file mode 100644 index 0000000..e1c41d4 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/broom.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/bunny_hop.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/bunny_hop.png new file mode 100644 index 0000000..9c8fdba Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/bunny_hop.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/calculated.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/calculated.png new file mode 100644 index 0000000..7062ec8 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/calculated.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/cannibal.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/cannibal.png new file mode 100644 index 0000000..d9849e0 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/cannibal.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/champagne.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/champagne.png new file mode 100644 index 0000000..bae96b0 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/champagne.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/chicken.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/chicken.png new file mode 100644 index 0000000..e7b97c7 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/chicken.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/chicken_dance.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/chicken_dance.png new file mode 100644 index 0000000..87a32bf Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/chicken_dance.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/chimney.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/chimney.png new file mode 100644 index 0000000..c0a73be Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/chimney.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/clapping.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/clapping.png new file mode 100644 index 0000000..679d562 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/clapping.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/club.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/club.png new file mode 100644 index 0000000..e47f46d Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/club.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/coal.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/coal.png new file mode 100644 index 0000000..1ff6561 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/coal.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/confused.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/confused.png new file mode 100644 index 0000000..846bf7f Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/confused.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/crying.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/crying.png new file mode 100644 index 0000000..166d1a8 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/crying.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/dab.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/dab.png new file mode 100644 index 0000000..21b0da4 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/dab.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/default.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/default.png new file mode 100644 index 0000000..7361cf2 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/default.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/disco_fever.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/disco_fever.png new file mode 100644 index 0000000..5d80f82 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/disco_fever.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/disgusted.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/disgusted.png new file mode 100644 index 0000000..c995efd Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/disgusted.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_in_a_basket.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_in_a_basket.png new file mode 100644 index 0000000..714d4a4 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_in_a_basket.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_juggle.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_juggle.png new file mode 100644 index 0000000..e0e59dc Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_juggle.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_l.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_l.png new file mode 100644 index 0000000..2d9c7e1 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/egg_l.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/electro_shuffle.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/electro_shuffle.png new file mode 100644 index 0000000..fb8839d Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/electro_shuffle.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/exhausted.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/exhausted.png new file mode 100644 index 0000000..8677b3a Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/exhausted.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/facepalm.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/facepalm.png new file mode 100644 index 0000000..2eae006 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/facepalm.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/fireworks.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/fireworks.png new file mode 100644 index 0000000..4a46031 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/fireworks.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/fist.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/fist.png new file mode 100644 index 0000000..bf95ede Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/fist.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/floss.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/floss.png new file mode 100644 index 0000000..2bd1504 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/floss.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/football.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/football.png new file mode 100644 index 0000000..b9c88f5 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/football.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/free_flow.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/free_flow.png new file mode 100644 index 0000000..99dc703 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/free_flow.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/fresh.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/fresh.png new file mode 100644 index 0000000..6b597ce Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/fresh.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/funky_town.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/funky_town.png new file mode 100644 index 0000000..058c726 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/funky_town.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/gangnam_style.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/gangnam_style.png new file mode 100644 index 0000000..b0849a4 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/gangnam_style.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/get_funky.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/get_funky.png new file mode 100644 index 0000000..aa3d307 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/get_funky.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/git_up.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/git_up.png new file mode 100644 index 0000000..4dfe49d Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/git_up.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/heartbroken.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/heartbroken.png new file mode 100644 index 0000000..c60f392 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/heartbroken.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/hit_it_fergie.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/hit_it_fergie.png new file mode 100644 index 0000000..24092b1 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/hit_it_fergie.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/hunt.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/hunt.png new file mode 100644 index 0000000..5d2bd49 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/hunt.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/hype.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/hype.png new file mode 100644 index 0000000..1f517fc Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/hype.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/ice_skating.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/ice_skating.png new file mode 100644 index 0000000..f1f15e1 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/ice_skating.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/iceberg.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/iceberg.png new file mode 100644 index 0000000..acf1abc Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/iceberg.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/infinite_dab.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/infinite_dab.png new file mode 100644 index 0000000..6020848 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/infinite_dab.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/kamehameha.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/kamehameha.png new file mode 100644 index 0000000..b043f01 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/kamehameha.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/knife_naruto.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/knife_naruto.png new file mode 100644 index 0000000..1358af2 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/knife_naruto.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/laughing.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/laughing.png new file mode 100644 index 0000000..497a419 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/laughing.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/lawn_chair.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/lawn_chair.png new file mode 100644 index 0000000..abb9da2 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/lawn_chair.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/ninja_star.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/ninja_star.png new file mode 100644 index 0000000..12c7d6e Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/ninja_star.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/no.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/no.png new file mode 100644 index 0000000..35904c7 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/no.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/oh_na_na_na.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/oh_na_na_na.png new file mode 100644 index 0000000..4ff1c7d Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/oh_na_na_na.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/orange_justice.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/orange_justice.png new file mode 100644 index 0000000..b274cc1 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/orange_justice.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/party_popper.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/party_popper.png new file mode 100644 index 0000000..668bc1e Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/party_popper.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/pointing.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/pointing.png new file mode 100644 index 0000000..3667dfd Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/pointing.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/popcorn.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/popcorn.png new file mode 100644 index 0000000..0192432 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/popcorn.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/present.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/present.png new file mode 100644 index 0000000..fc3c348 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/present.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/pumpkin.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/pumpkin.png new file mode 100644 index 0000000..d4fd6fc Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/pumpkin.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/punch.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/punch.png new file mode 100644 index 0000000..6ef60a4 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/punch.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/pure_salt.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/pure_salt.png new file mode 100644 index 0000000..7eca6e8 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/pure_salt.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/rainbow.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/rainbow.png new file mode 100644 index 0000000..d2113b0 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/rainbow.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/renegade.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/renegade.png new file mode 100644 index 0000000..45a3596 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/renegade.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/rising_from_dead.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/rising_from_dead.png new file mode 100644 index 0000000..8ceb8b6 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/rising_from_dead.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/rock_paper_scissors.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/rock_paper_scissors.png new file mode 100644 index 0000000..7db35c0 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/rock_paper_scissors.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/rose.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/rose.png new file mode 100644 index 0000000..58f452b Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/rose.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/salute.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/salute.png new file mode 100644 index 0000000..8c2d509 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/salute.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/sandcastle.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/sandcastle.png new file mode 100644 index 0000000..20e5af0 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/sandcastle.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/savage.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/savage.png new file mode 100644 index 0000000..498a410 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/savage.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/say_so.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/say_so.png new file mode 100644 index 0000000..7389980 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/say_so.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/shimmer.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/shimmer.png new file mode 100644 index 0000000..1420091 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/shimmer.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/shrug.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/shrug.png new file mode 100644 index 0000000..8db455e Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/shrug.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/shuffle.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/shuffle.png new file mode 100644 index 0000000..1655676 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/shuffle.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/skibidi.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/skibidi.png new file mode 100644 index 0000000..43b77ba Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/skibidi.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/smoke_bomb.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/smoke_bomb.png new file mode 100644 index 0000000..5ad8752 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/smoke_bomb.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/sneeze.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/sneeze.png new file mode 100644 index 0000000..8d0f06b Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/sneeze.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowball.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowball.png new file mode 100644 index 0000000..02940b0 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowball.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowing.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowing.png new file mode 100644 index 0000000..7845de1 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowing.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowman.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowman.png new file mode 100644 index 0000000..00ef1a9 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/snowman.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/squat_kick.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/squat_kick.png new file mode 100644 index 0000000..9412a97 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/squat_kick.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/star_power.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/star_power.png new file mode 100644 index 0000000..b878007 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/star_power.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/t_pose.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/t_pose.png new file mode 100644 index 0000000..070af3e Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/t_pose.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/take_the_l.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/take_the_l.png new file mode 100644 index 0000000..fc066d7 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/take_the_l.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/thinking.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/thinking.png new file mode 100644 index 0000000..5effe2c Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/thinking.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/threatening.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/threatening.png new file mode 100644 index 0000000..f69ae11 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/threatening.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/tidy.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/tidy.png new file mode 100644 index 0000000..1169fc7 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/tidy.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/trick_or_treat.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/trick_or_treat.png new file mode 100644 index 0000000..b3bdfc2 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/trick_or_treat.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/turkey.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/turkey.png new file mode 100644 index 0000000..d5e19f3 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/turkey.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/twerk.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/twerk.png new file mode 100644 index 0000000..25f8129 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/twerk.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/vampire.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/vampire.png new file mode 100644 index 0000000..d2157b1 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/vampire.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/wave.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/wave.png new file mode 100644 index 0000000..3e418f6 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/wave.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/woah.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/woah.png new file mode 100644 index 0000000..f9d04d7 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/woah.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/emotes/icons/yes.png b/src/main/resources/assets/minecraft/silentclient/emotes/icons/yes.png new file mode 100644 index 0000000..b378215 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/emotes/icons/yes.png differ