Permission change. Also event changes. Removed unused mixin.

.github/workflows/gradle.yml

@@ -7,7 +7,9 @@
 
 name: Java Gradle
 
-on: push
+on: [pull_request,push]
+permissions:
+  contents: write
 
 jobs:
   build:

src/main/java/dev/heliosclient/event/events/player/PlayerJoinEvent.java

@@ -4,17 +4,25 @@
 import dev.heliosclient.event.Event;
 import dev.heliosclient.event.LuaEvent;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
 
 @Cancelable
 @LuaEvent("PlayerJoinEvent")
 public class PlayerJoinEvent extends Event {
     private final PlayerEntity player;
+    private final GameJoinS2CPacket packet;
 
-    public PlayerJoinEvent(PlayerEntity player) {
+
+    public PlayerJoinEvent(PlayerEntity player, GameJoinS2CPacket packet) {
         this.player = player;
+        this.packet = packet;
     }
 
     public PlayerEntity getPlayer() {
         return player;
     }
+
+    public GameJoinS2CPacket getPacket() {
+        return packet;
+    }
 }

src/main/java/dev/heliosclient/event/events/player/PlayerRespawnEvent.java

@@ -4,17 +4,24 @@
 import dev.heliosclient.event.Event;
 import dev.heliosclient.event.LuaEvent;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
 
 @Cancelable
 @LuaEvent("PlayerRespawnEvent")
 public class PlayerRespawnEvent extends Event {
     private final PlayerEntity player;
+    private final PlayerRespawnS2CPacket packet;
 
-    public PlayerRespawnEvent(PlayerEntity player) {
+    public PlayerRespawnEvent(PlayerEntity player, PlayerRespawnS2CPacket packet) {
         this.player = player;
+        this.packet = packet;
     }
 
     public PlayerEntity getPlayer() {
         return player;
     }
+
+    public PlayerRespawnS2CPacket getPacket() {
+        return packet;
+    }
 }

src/main/java/dev/heliosclient/managers/CommandManager.java

@@ -62,6 +62,8 @@ public void add(Command command) {
         command.registerTo(DISPATCHER);
         commands.add(command);
         commandInstances.put(command.getClass(), command);
+
+        commands.sort(Comparator.comparing(Command::getName));
     }
 
     public Command getCommandByName(String commandName) {

src/main/java/dev/heliosclient/managers/ConfigManager.java

@@ -11,6 +11,9 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+/**
+ * Manager class for configs. Manages multiple config TOMLs and their maps for saving/loading.
+ */
 public class ConfigManager {
     // Stores the configuration maps.
     private final Map<String, Map<String, Object>> configMaps = new HashMap<>();

src/main/java/dev/heliosclient/mixin/ClientConnectionMixin.java

@@ -33,6 +33,7 @@ private static <T extends PacketListener> void onHandlePacket(Packet<T> packet,
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("HEAD"), cancellable = true)
     public void send(Packet<?> packet, CallbackInfo ci) {
         if (EventManager.postEvent(new PacketEvent.SEND(packet)).isCanceled()) ci.cancel();
+
         // Call commands if the prefix is sent
         if (packet instanceof ChatMessageC2SPacket && ((ChatMessageC2SPacket) packet).chatMessage().startsWith(CommandManager.get().getPrefix())) {
             try {

src/main/java/dev/heliosclient/mixin/MixinClientPlayNetworkHandler.java

@@ -4,6 +4,7 @@
 import dev.heliosclient.event.Event;
 import dev.heliosclient.event.events.player.PlayerDeathEvent;
 import dev.heliosclient.event.events.player.PlayerJoinEvent;
+import dev.heliosclient.event.events.player.PlayerRespawnEvent;
 import dev.heliosclient.managers.EventManager;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.entity.player.PlayerEntity;
@@ -22,7 +23,7 @@ public abstract class MixinClientPlayNetworkHandler {
     @Inject(method = "onGameJoin", at = @At("RETURN"), cancellable = true)
     private void onGameJoin(GameJoinS2CPacket packet, CallbackInfo info) {
         PlayerEntity player = HeliosClient.MC.player;
-        Event event = new PlayerJoinEvent(player);
+        Event event = new PlayerJoinEvent(player,packet);
         EventManager.postEvent(event);
         if (event.isCanceled()) {
             info.cancel();
@@ -33,9 +34,8 @@ private void onGameJoin(GameJoinS2CPacket packet, CallbackInfo info) {
     @Inject(method = "onPlayerRespawn", at = @At("RETURN"), cancellable = true)
     private void onPlayerRespawn(PlayerRespawnS2CPacket packet, CallbackInfo info) {
         PlayerEntity player = HeliosClient.MC.player;
-        Event event = new PlayerJoinEvent(player);
-        EventManager.postEvent(event);
-        if (event.isCanceled()) {
+        Event event = new PlayerRespawnEvent(player,packet);
+        if (EventManager.postEvent(event).isCanceled()) {
             info.cancel();
         }
     }

src/main/java/dev/heliosclient/mixin/MixinPlayerEntity.java

@@ -40,14 +40,8 @@ private void onDeath(DamageSource damageSource, CallbackInfo ci) {
     @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
     private void onPlayerDamage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
         // This variable holds the event object
-        PlayerDamageEvent event = new PlayerDamageEvent((PlayerEntity) (Object) this, source);
-
-        // This line posts the event to the event manager
-        EventManager.postEvent(event);
-
-        // This line checks if the event is canceled and returns false if so
-        if (event.isCanceled()) {
-            cir.setReturnValue(event.isCanceled());
+        if(EventManager.postEvent(new PlayerDamageEvent((PlayerEntity) (Object) this, source)).isCanceled()){
+            cir.cancel();
         }
     }
 }

src/main/java/dev/heliosclient/mixin/MouseMixin.java

@@ -28,6 +28,7 @@ public abstract class MouseMixin {
 
     @Inject(method = "onMouseButton", at = @At(value = "TAIL"), cancellable = true)
     private void onButton(long window, int button, int action, int mods, CallbackInfo ci) {
+        //Translate screen mouse positions to minecraft friendly positions
         double mouseX = getX() * (double) this.client.getWindow().getScaledWidth() / (double) this.client.getWindow().getWidth();
         double mouseY = getY() * (double) this.client.getWindow().getScaledHeight() / (double) this.client.getWindow().getHeight();
 

src/main/java/dev/heliosclient/module/Module_.java

@@ -8,7 +8,6 @@
 import dev.heliosclient.event.events.render.RenderEvent;
 import dev.heliosclient.event.listener.Listener;
 import dev.heliosclient.managers.EventManager;
-import dev.heliosclient.managers.ModuleManager;
 import dev.heliosclient.managers.NotificationManager;
 import dev.heliosclient.module.modules.misc.NotificationModule;
 import dev.heliosclient.module.settings.BooleanSetting;
@@ -24,7 +23,6 @@
 import net.minecraft.client.MinecraftClient;
 
 import java.util.*;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * Template for modules.
@@ -35,7 +33,7 @@ public abstract class Module_ implements Listener, ISettingChange, ISaveAndLoad
     public String description;
     public Category category;
     public Set<SettingGroup> settingGroups;
-    public Set<Setting> quickSettings;
+    public Set<Setting<?>> quickSettings;
     public boolean settingsOpen = false;
     public SettingGroup sgbind = new SettingGroup("Bind");
 
@@ -116,7 +114,7 @@ public void addSettingGroup(SettingGroup settingGroup) {
      * Adds a setting to the {@link #quickSettings} list
      * @param setting setting to be added
      */
-    public void addQuickSetting(Setting setting) {
+    public void addQuickSetting(Setting<?> setting) {
         this.quickSettings.add(setting);
     }
 
@@ -128,7 +126,7 @@ public void addQuickSetting(Setting setting) {
      *
      * @param setting setting list to be added
      */
-    public void addQuickSettings(List<Setting> setting) {
+    public void addQuickSettings(List<Setting<?>> setting) {
         this.quickSettings.addAll(setting);
     }
 
@@ -152,7 +150,7 @@ public boolean isActive() {
     }
 
     /**
-     * Called on disable. Probably shouldn't disable original functionality since it will remove chat feedback.
+     * Called on disable. Probably shouldn't override without super call since it will remove chat feedback.
      */
     public void onDisable() {
         active.value = false;
@@ -164,7 +162,7 @@ public void onDisable() {
     }
 
     /**
-     * Called on motion.
+     * Called on player motion.
      */
     @SubscribeEvent
     public void onMotion(PlayerMotionEvent event) {

src/main/java/dev/heliosclient/module/settings/SettingGroup.java

@@ -11,7 +11,7 @@
 public class SettingGroup {
     private final String name;
     private final float groupNameHeight;
-    private List<Setting> settings = new ArrayList<>();
+    private List<Setting<?>> settings = new ArrayList<>();
     private float height;
     private boolean shouldRender = true;
     private int x, y, windowWidth;
@@ -110,11 +110,11 @@ public int getWindowWidth() {
         return windowWidth;
     }
 
-    public List<Setting> getSettings() {
+    public List<Setting<?>> getSettings() {
         return settings;
     }
 
-    public void setSettings(List<Setting> settings) {
+    public void setSettings(List<Setting<?>> settings) {
         this.settings = settings;
     }