Skip to content

Commit a939e86

Browse files
committed
Cosmetics, fixes, and probably others.
1 parent f1301ff commit a939e86

File tree

126 files changed

+4725
-1615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+4725
-1615
lines changed

build.gradle

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,6 @@ repositories {
6363
maven { url 'https://repo.essential.gg/repository/maven-public' }
6464
}
6565

66-
static String ktor(String module, String version, boolean addSuffix) {
67-
return "io.ktor:ktor-" + module + (addSuffix ? "-jvm" : "") + (version != null ? ":" + version : "");
68-
}
69-
70-
static String ktorClient(String module, String version) {
71-
return ktor("client-" + module, version, true);
72-
}
73-
74-
static String ktorServer(String module, String version) {
75-
return ktor("server-" + module, version, true);
76-
}
77-
7866
dependencies {
7967
minecraft("com.mojang:minecraft:1.8.9")
8068
mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
@@ -102,28 +90,6 @@ dependencies {
10290

10391
compileOnly(files('libs/Hytils-Reborn-1.6.0-beta4.jar'))
10492
compileOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.0")
105-
106-
include(platform(ktor("bom", "2.2.4", false)))
107-
108-
include(ktor("serialization-kotlinx-json", null, true))
109-
include(ktor("serialization-gson", null, true))
110-
111-
include(ktorClient("core", null))
112-
include(ktorClient("cio", null))
113-
include(ktorClient("content-negotiation", null))
114-
include(ktorClient("encoding", null))
115-
116-
// include(ktorServer("core", null))
117-
// include(ktorServer("cio", null))
118-
// include(ktorServer("content-negotiation", null))
119-
// include(ktorServer("compression", null))
120-
// include(ktorServer("cors", null))
121-
// include(ktorServer("conditional-headers", null))
122-
// include(ktorServer("auto-head-response", null))
123-
// include(ktorServer("default-headers", null))
124-
// include(ktorServer("host-common", null))
125-
// include(ktorServer("auth", null))
126-
12793
}
12894

12995
processResources {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2G
66

77
mod_name = Hysentials
88
mod_id = hysentials
9-
mod_version = 1.1.0-beta3
9+
mod_version = 1.1.0-beta4
1010
dev_version = 1.1.0-dev
1111

1212
dev = false

src/main/java/cc/woverflow/hysentials/Hysentials.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import cc.polyfrost.oneconfig.events.EventManager;
44
import cc.polyfrost.oneconfig.libs.universal.ChatColor;
55
import cc.polyfrost.oneconfig.libs.universal.UChat;
6+
import cc.woverflow.hysentials.cosmetic.CosmeticManager;
67
import cc.woverflow.hysentials.gui.UpdateChecker;
78
import cc.woverflow.hysentials.guis.club.ClubDashboardHandler;
9+
import cc.woverflow.hysentials.guis.container.ContainerHandler;
810
import cc.woverflow.hysentials.handlers.chat.modules.misc.Limit256;
911
import cc.woverflow.hysentials.util.MUtils;
1012
import cc.polyfrost.oneconfig.utils.commands.CommandManager;
@@ -34,13 +36,13 @@
3436
import cc.woverflow.hysentials.handlers.sbb.SbbRenderer;
3537
import cc.woverflow.hysentials.htsl.Cluster;
3638
import cc.woverflow.hysentials.pets.cubit.CubitCompanion;
37-
import cc.woverflow.hysentials.pets.hamster.HamsterCompanion;
3839
import cc.woverflow.hysentials.util.*;
3940
import cc.woverflow.hysentials.util.blockw.OnlineCache;
4041
import cc.woverflow.hysentials.websocket.Socket;
4142
import cc.woverflow.hytils.util.friends.FriendCache;
4243
import net.minecraft.client.Minecraft;
4344
import net.minecraft.client.gui.FontRenderer;
45+
import net.minecraft.client.settings.KeyBinding;
4446
import net.minecraft.util.ResourceLocation;
4547
import net.minecraftforge.client.ClientCommandHandler;
4648
import net.minecraftforge.common.MinecraftForge;
@@ -91,6 +93,7 @@ public class Hysentials {
9193
private final ChatHandler chatHandler = new ChatHandler();
9294

9395
public final GuiDisplayHandler guiDisplayHandler = new GuiDisplayHandler();
96+
public final CosmeticManager cosmeticManager = new CosmeticManager();
9497

9598
public ImageIconRenderer imageIconRenderer;
9699
public JsonData sbBoxes;
@@ -104,7 +107,6 @@ public class Hysentials {
104107

105108
public String rank;
106109

107-
public HamsterCompanion hamsterCompanion;
108110
public CubitCompanion cubitCompanion;
109111

110112

@@ -212,6 +214,12 @@ private void registerImages() {
212214
new ImageIcon("team", new ResourceLocation("textures/icons/team.png"));
213215
new ImageIcon("friend", new ResourceLocation("textures/icons/friend.png"));
214216

217+
new ImageIcon("common", new ResourceLocation("textures/icons/common.png"));
218+
new ImageIcon("rare", new ResourceLocation("textures/icons/rare.png"));
219+
new ImageIcon("epic", new ResourceLocation("textures/icons/epic.png"));
220+
new ImageIcon("legendary", new ResourceLocation("textures/icons/legendary.png"));
221+
new ImageIcon("exclusive", new ResourceLocation("textures/icons/exclusive.png"));
222+
215223
for (HypixelRanks rank : HypixelRanks.values()) {
216224
try {
217225
new ImageIcon(rank.getIconName(), new ResourceLocation("textures/icons/" + rank.getIconName() + ".png"));
@@ -264,6 +272,8 @@ private void registerHandlers() {
264272
eventBus.register(new MUtils());
265273
eventBus.register(new Limit256());
266274
eventBus.register(cubitCompanion = new CubitCompanion());
275+
eventBus.register(new ContainerHandler());
276+
267277
new Renderer();
268278

269279
// height overlay

0 commit comments

Comments
 (0)