Skip to content

Commit 4ca44e3

Browse files
sinendersinender
committed
Fix naming package naming scheme, remove things that arent supposed to be there and more
1 parent 793d7d8 commit 4ca44e3

File tree

87 files changed

+184
-501
lines changed

Some content is hidden

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

87 files changed

+184
-501
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ build
2222
# other
2323
eclipse
2424
run
25+
26+
# vscode
27+
.vscode

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ dependencies {
7474

7575
compileOnly('cc.polyfrost:oneconfig-1.8.9-forge:0.2.1-alpha184')
7676
include('cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta+')
77-
include('org.polyfrost:polyui:1.1.+')
7877
include('org.reflections:reflections:0.10.2')
7978
include('org.json:json:20231013')
8079
include('org.slick2d:slick2d-core:1.0.2') {
@@ -89,6 +88,7 @@ dependencies {
8988
}
9089

9190
compileOnly('org.spongepowered:mixin:0.7.+')
91+
modRuntimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.2")
9292
}
9393

9494
processResources {

‎src/main/java/llc/redstone/hysentials/Hysentials.java‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import cc.polyfrost.oneconfig.libs.universal.ChatColor;
66
import cc.polyfrost.oneconfig.libs.universal.UChat;
77
import llc.redstone.hysentials.cosmetics.capes.CapeHandler;
8-
import llc.redstone.hysentials.config.hysentialMods.FormattingConfig;
9-
import llc.redstone.hysentials.config.hysentialMods.icons.IconStuff;
8+
import llc.redstone.hysentials.config.hysentialmods.FormattingConfig;
9+
import llc.redstone.hysentials.config.hysentialmods.icons.IconStuff;
1010
import llc.redstone.hysentials.cosmetic.CosmeticManager;
1111
import llc.redstone.hysentials.cosmetics.backpack.BackpackCosmetic;
1212
import llc.redstone.hysentials.cosmetics.hamster.HamsterCompanion;
@@ -21,13 +21,10 @@
2121
import llc.redstone.hysentials.cosmetics.wings.tdarth.TdarthCosmetic;
2222
import llc.redstone.hysentials.guis.container.containers.club.ClubDashboardHandler;
2323
import llc.redstone.hysentials.guis.container.ContainerHandler;
24-
import llc.redstone.hysentials.guis.polyui.LwjglManagerImpl;
2524
import llc.redstone.hysentials.handlers.chat.modules.misc.Limit256;
2625
import llc.redstone.hysentials.handlers.guis.GuiScreenPost;
2726
import llc.redstone.hysentials.handlers.guis.OneConfigHudClickHandler;
2827
import llc.redstone.hysentials.handlers.htsl.*;
29-
import llc.redstone.hysentials.polyui.ui.VisitHouseScreen;
30-
import llc.redstone.hysentials.util.LocrawUtil;
3128
import llc.redstone.hysentials.handlers.misc.HousingJoinHandler;
3229
import llc.redstone.hysentials.handlers.misc.PacketRecievedHandler;
3330
import llc.redstone.hysentials.handlers.misc.QuestHandler;
@@ -77,9 +74,6 @@
7774
import org.apache.logging.log4j.Logger;
7875
import org.json.JSONArray;
7976
import org.json.JSONObject;
80-
import org.polyfrost.polyui.PolyUI;
81-
import org.polyfrost.polyui.component.Drawable;
82-
import org.polyfrost.polyui.input.Translator;
8377

8478
import javax.net.ssl.HttpsURLConnection;
8579
import javax.net.ssl.SSLContext;
@@ -251,9 +245,6 @@ public void postInit(FMLPostInitializationEvent event) {
251245
Minecraft.getMinecraft().fontRendererObj = imageIconRenderer;
252246
}
253247

254-
preload();
255-
preloadScreens();
256-
257248
registerHandlers();
258249

259250
MinecraftForge.EVENT_BUS.post(new HysentialsLoadedEvent());
@@ -266,11 +257,6 @@ public void postInit(FMLPostInitializationEvent event) {
266257
config.macroWheelHud.position.setPosition((Renderer.screen.getWidth() / 2f) - (34*5f) / 2, (Renderer.screen.getHeight() / 2f) - (34*5f) / 2);
267258
}
268259
}
269-
270-
private void preloadScreens() {
271-
new VisitHouseScreen().create("Sin_ender");
272-
}
273-
274260
@Mod.EventHandler
275261
public void finishedStarting(FMLLoadCompleteEvent event) {
276262
this.loadedCall = true;
@@ -539,26 +525,6 @@ public static InputStream post(String url, JSONObject json) throws IOException {
539525
return connection.getInputStream();
540526
}
541527

542-
/**
543-
* Ensure that key PolyUI classes are loaded to prevent lag-spikes when loading PolyUI for the first time.
544-
*/
545-
private static void preload() {
546-
long t1 = System.nanoTime();
547-
try {
548-
Class.forName(PolyUI.class.getName());
549-
Class.forName(Drawable.class.getName());
550-
Class.forName(Translator.class.getName());
551-
552-
LwjglManagerImpl.INSTANCE = new LwjglManagerImpl();
553-
LwjglManagerImpl.INSTANCE.getRenderer();
554-
} catch (Exception e) {
555-
throw new IllegalStateException("Failed to preload necessary PolyUI classes", e);
556-
} catch (Throwable e) {
557-
throw new RuntimeException(e);
558-
}
559-
System.out.printf("PolyUI preload took %sms", (System.nanoTime() - t1) / 1_000_000.0);
560-
}
561-
562528
public boolean isApec() {
563529
return isApec && Minecraft.getMinecraft().ingameGUI instanceof ApecGuiIngameForge;
564530
}

‎src/main/java/llc/redstone/hysentials/command/GlobalChatCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import cc.polyfrost.oneconfig.libs.universal.UChat;
44
import llc.redstone.hysentials.Hysentials;
5-
import llc.redstone.hysentials.config.hysentialMods.ChatConfig;
5+
import llc.redstone.hysentials.config.hysentialmods.ChatConfig;
66
import llc.redstone.hysentials.util.BUtils;
77
import llc.redstone.hysentials.config.HysentialsConfig;
88
import llc.redstone.hysentials.websocket.Socket;

‎src/main/java/llc/redstone/hysentials/command/HypixelChatCommand.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package llc.redstone.hysentials.command;
22

33
import cc.polyfrost.oneconfig.libs.universal.UChat;
4-
import llc.redstone.hysentials.config.hysentialMods.ChatConfig;
5-
import llc.redstone.hysentials.handlers.chat.modules.bwranks.BWSReplace;
4+
import llc.redstone.hysentials.config.hysentialmods.ChatConfig;
65
import llc.redstone.hysentials.util.BUtils;
76
import llc.redstone.hysentials.Hysentials;
87
import net.minecraft.client.Minecraft;

‎src/main/java/llc/redstone/hysentials/command/HysentialsCommand.java‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
import llc.redstone.hysentials.guis.misc.HysentialsLevel;
1111
import llc.redstone.hysentials.guis.quest.QuestMainGui;
1212
import llc.redstone.hysentials.handlers.imageicons.ImageIcon;
13-
import llc.redstone.hysentials.polyui.ui.VisitHouseScreen;
1413
import llc.redstone.hysentials.util.LocrawUtil;
1514
import llc.redstone.hysentials.handlers.npc.NPC;
1615
import llc.redstone.hysentials.htsl.compiler.CompileKt;
1716
import llc.redstone.hysentials.macrowheel.MacroWheelSelector;
18-
import llc.redstone.hysentials.profileViewer.DefaultProfileGui;
19-
import llc.redstone.hysentials.renderer.plusStand.PlusStandEntity;
17+
import llc.redstone.hysentials.profileviewer.DefaultProfileGui;
2018
import llc.redstone.hysentials.schema.HysentialsSchema;
2119
import llc.redstone.hysentials.util.*;
2220
import llc.redstone.hysentials.utils.ChatLib;
@@ -26,14 +24,8 @@
2624
import com.google.gson.JsonObject;
2725
import com.mojang.authlib.GameProfile;
2826
import com.mojang.authlib.properties.PropertyMap;
29-
import net.hypixel.data.type.GameType;
30-
import net.hypixel.data.type.ServerType;
31-
import net.hypixel.modapi.HypixelModAPI;
32-
import net.hypixel.modapi.handler.ClientboundPacketHandler;
3327
import net.hypixel.modapi.packet.impl.clientbound.ClientboundPingPacket;
34-
import net.hypixel.modapi.packet.impl.clientbound.event.ClientboundLocationPacket;
3528
import net.hypixel.modapi.packet.impl.serverbound.ServerboundPingPacket;
36-
import net.hypixel.modapi.packet.impl.serverbound.ServerboundPlayerInfoPacket;
3729
import net.minecraft.client.Minecraft;
3830
import net.minecraft.command.CommandBase;
3931
import net.minecraft.command.CommandException;
@@ -359,11 +351,6 @@ private static void handleTest(String command, String args) {
359351
break;
360352
}
361353

362-
case "house": {
363-
VisitHouseScreen.INSTANCE.open();
364-
break;
365-
}
366-
367354
case "doorbell": {
368355
Socket.CLIENT.sendText(
369356
new Request(

‎src/main/java/llc/redstone/hysentials/config/HysentialsConfig.java‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,32 @@
33
import cc.polyfrost.oneconfig.config.Config;
44
import cc.polyfrost.oneconfig.config.annotations.*;
55
import cc.polyfrost.oneconfig.config.annotations.Button;
6-
import cc.polyfrost.oneconfig.config.annotations.Checkbox;
7-
import cc.polyfrost.oneconfig.config.annotations.Color;
8-
import cc.polyfrost.oneconfig.config.annotations.Number;
96
import cc.polyfrost.oneconfig.config.core.ConfigUtils;
107
import cc.polyfrost.oneconfig.config.core.OneColor;
118
import cc.polyfrost.oneconfig.config.core.OneKeyBind;
129
import cc.polyfrost.oneconfig.config.data.Mod;
1310
import cc.polyfrost.oneconfig.config.data.ModType;
1411
import cc.polyfrost.oneconfig.config.elements.BasicOption;
1512
import cc.polyfrost.oneconfig.config.elements.OptionPage;
16-
import cc.polyfrost.oneconfig.gui.OneConfigGui;
17-
import cc.polyfrost.oneconfig.hud.BasicHud;
18-
import cc.polyfrost.oneconfig.hud.SingleTextHud;
19-
import cc.polyfrost.oneconfig.libs.universal.UChat;
2013
import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
21-
import cc.polyfrost.oneconfig.libs.universal.UMatrixStack;
22-
import cc.polyfrost.oneconfig.renderer.NanoVGHelper;
23-
import cc.polyfrost.oneconfig.utils.InputHandler;
2414
import cc.polyfrost.oneconfig.utils.NetworkUtils;
25-
import cc.polyfrost.oneconfig.utils.gui.GuiUtils;
2615
import llc.redstone.hysentials.Hysentials;
27-
import llc.redstone.hysentials.config.hysentialMods.*;
28-
import llc.redstone.hysentials.config.hysentialMods.page.PageAnnotation;
29-
import llc.redstone.hysentials.config.hysentialMods.page.PageOption;
30-
import llc.redstone.hysentials.config.hysentialMods.rank.RankAnnotation;
31-
import llc.redstone.hysentials.config.hysentialMods.rank.RankOption;
16+
import llc.redstone.hysentials.config.hysentialmods.*;
17+
import llc.redstone.hysentials.config.hysentialmods.page.PageAnnotation;
18+
import llc.redstone.hysentials.config.hysentialmods.page.PageOption;
3219
import llc.redstone.hysentials.cosmetic.CosmeticGui;
3320
import llc.redstone.hysentials.guis.sbBoxes.huds.ActionBarHUD;
3421
import llc.redstone.hysentials.guis.sbBoxes.huds.BossbarSbBoxHud;
3522
import llc.redstone.hysentials.guis.sbBoxes.huds.HeldItemTooltipHUD;
3623
import llc.redstone.hysentials.macrowheel.overlay.MacroWheelHudConfigThing;
37-
import llc.redstone.hysentials.macrowheel.overlay.MacroWheelOverlay;
38-
import llc.redstone.hysentials.updateGui.UpdateChecker;
24+
import llc.redstone.hysentials.updategui.UpdateChecker;
3925

40-
import llc.redstone.hysentials.util.ImageIconRenderer;
41-
import llc.redstone.hysentials.util.Renderer;
4226
import llc.redstone.hysentials.utils.RedstoneRepo;
4327
import llc.redstone.hysentials.utils.UpdateNotes;
4428
import cc.woverflow.hytils.HytilsReborn;
4529
import net.minecraft.client.Minecraft;
4630
import org.json.JSONObject;
4731

48-
import java.awt.*;
49-
import java.io.File;
5032
import java.lang.reflect.Field;
5133
import java.util.Arrays;
5234
import java.util.List;

src/main/java/llc/redstone/hysentials/config/hysentialMods/ChatConfig.java renamed to src/main/java/llc/redstone/hysentials/config/hysentialmods/ChatConfig.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package llc.redstone.hysentials.config.hysentialMods;
1+
package llc.redstone.hysentials.config.hysentialmods;
22

33
import cc.polyfrost.oneconfig.config.Config;
44
import cc.polyfrost.oneconfig.config.annotations.Color;
@@ -8,9 +8,6 @@
88
import cc.polyfrost.oneconfig.config.core.OneColor;
99
import cc.polyfrost.oneconfig.config.data.Mod;
1010
import cc.polyfrost.oneconfig.config.data.ModType;
11-
import cc.polyfrost.oneconfig.gui.OneConfigGui;
12-
import cc.polyfrost.oneconfig.gui.pages.ModConfigPage;
13-
import cc.polyfrost.oneconfig.utils.gui.GuiUtils;
1411

1512
import java.io.File;
1613

src/main/java/llc/redstone/hysentials/config/hysentialMods/CosmeticConfig.java renamed to src/main/java/llc/redstone/hysentials/config/hysentialmods/CosmeticConfig.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package llc.redstone.hysentials.config.hysentialMods;
1+
package llc.redstone.hysentials.config.hysentialmods;
22

33
import cc.polyfrost.oneconfig.config.Config;
4-
import cc.polyfrost.oneconfig.config.annotations.Checkbox;
54
import cc.polyfrost.oneconfig.config.annotations.Dropdown;
6-
import cc.polyfrost.oneconfig.config.annotations.Number;
75
import cc.polyfrost.oneconfig.config.annotations.Switch;
86
import cc.polyfrost.oneconfig.config.core.ConfigUtils;
97
import cc.polyfrost.oneconfig.config.data.Mod;

src/main/java/llc/redstone/hysentials/config/hysentialMods/FormattingConfig.java renamed to src/main/java/llc/redstone/hysentials/config/hysentialmods/FormattingConfig.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package llc.redstone.hysentials.config.hysentialMods;
1+
package llc.redstone.hysentials.config.hysentialmods;
22

33
import cc.polyfrost.oneconfig.config.Config;
44
import cc.polyfrost.oneconfig.config.annotations.*;
55
import cc.polyfrost.oneconfig.config.annotations.Button;
6-
import cc.polyfrost.oneconfig.config.annotations.Color;
76
import cc.polyfrost.oneconfig.config.core.ConfigUtils;
87
import cc.polyfrost.oneconfig.config.core.OneColor;
98
import cc.polyfrost.oneconfig.config.data.Mod;
@@ -12,14 +11,9 @@
1211
import cc.polyfrost.oneconfig.config.elements.OptionPage;
1312
import cc.polyfrost.oneconfig.libs.universal.UChat;
1413
import llc.redstone.hysentials.Hysentials;
15-
import llc.redstone.hysentials.config.HysentialsConfig;
16-
import llc.redstone.hysentials.config.hysentialMods.rank.RankAnnotation;
17-
import llc.redstone.hysentials.config.hysentialMods.rank.RankOption;
18-
import llc.redstone.hysentials.config.hysentialMods.rank.RankStuff;
19-
import llc.redstone.hysentials.Hysentials;
20-
import llc.redstone.hysentials.config.hysentialMods.rank.RankAnnotation;
21-
import llc.redstone.hysentials.config.hysentialMods.rank.RankOption;
22-
import llc.redstone.hysentials.config.hysentialMods.rank.RankStuff;
14+
import llc.redstone.hysentials.config.hysentialmods.rank.RankAnnotation;
15+
import llc.redstone.hysentials.config.hysentialmods.rank.RankOption;
16+
import llc.redstone.hysentials.config.hysentialmods.rank.RankStuff;
2317
import net.minecraft.client.Minecraft;
2418

2519
import java.awt.*;

0 commit comments

Comments
 (0)