Merge pull request #14 from PingIsFun/middle-click

Middle click

Author: PingIsFun

build.gradle

@@ -85,7 +85,7 @@ modrinth {
 		required.project "cloth-config"
 	}
 	syncBodyFrom = rootProject.file("README.md").text
-	changelog = "Small fix"
+	changelog = "Change player status with middle clicking"
 //	debugMode = true
 
 }

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
 	minecraft_version=1.19.2
-	yarn_mappings=1.19.2+build.22
-	loader_version=0.14.9
+	yarn_mappings=1.19.2+build.28
+	loader_version=0.14.10
 
 # Mod Properties
-	mod_version = 0.1.3
+	mod_version = 0.2.0
 	maven_group = io.github.pingisfun.hitboxplus
 	archives_base_name = hitboxplus
 	release_type = beta
 
 # Dependencies
 	cloth_config_version=8.2.88
-	mod_menu_version=4.0.6
+	mod_menu_version=4.1.0

src/main/java/io/github/pingisfun/hitboxplus/HitboxPlus.java

@@ -14,8 +14,18 @@ public class HitboxPlus implements ModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
 //	For dev debug comment when committing
-//	public static void INFO(Object obj) {
-//		LOGGER.info(String.valueOf(obj));
+//	public static void INFO(Object... obj) {
+//		LOGGER.info("<-----------------");
+//		for (Object i : obj) {
+//			LOGGER.info(String.valueOf(i));
+//		}
+//
+//		LOGGER.info("----------------->");
+//	}
+//	public static void SINFO(Object... obj) {
+//		for (Object i : obj) {
+//			LOGGER.info(String.valueOf(i));
+//		}
 //	}
 
 	@Override

src/main/java/io/github/pingisfun/hitboxplus/ModConfig.java

@@ -1,5 +1,6 @@
 package io.github.pingisfun.hitboxplus;
 
+import io.github.pingisfun.hitboxplus.util.ConfEnums;
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
@@ -22,6 +23,10 @@ public class ModConfig implements ConfigData {
     @ConfigEntry.BoundedDiscrete(max = 10, min = 0)
     public int alpha = 10;
 
+    @ConfigEntry.Category(value = "general")
+    @ConfigEntry.Gui.Tooltip
+    @ConfigEntry.Gui.PrefixText
+    public ConfEnums.PlayerListTypes middleClick = ConfEnums.PlayerListTypes.CYCLE;
 
     @ConfigEntry.Gui.PrefixText
     @ConfigEntry.Category(value = "players")
@@ -157,4 +162,5 @@ public PlayerListConfig(int color) {
         @ConfigEntry.BoundedDiscrete(max = 10, min = 0)
         public int alpha = 10;
     }
+
 }

src/main/java/io/github/pingisfun/hitboxplus/mixin/MinecraftClientMixin.java

@@ -0,0 +1,61 @@
+package io.github.pingisfun.hitboxplus.mixin;
+
+import io.github.pingisfun.hitboxplus.ModConfig;
+import io.github.pingisfun.hitboxplus.util.ConfEnums;
+import me.shedaniel.autoconfig.AutoConfig;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.OtherClientPlayerEntity;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftClient.class)
+public abstract class MinecraftClientMixin {
+    @Inject(at = @At("HEAD"), method = "doItemPick")
+    private void toggleHostility(CallbackInfo ci) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (!client.getEntityRenderDispatcher().shouldRenderHitboxes()) {
+            return;
+        }
+        ModConfig config = AutoConfig.getConfigHolder(ModConfig.class).getConfig();
+        if (!config.isPlayerConfigEnabled) {
+            return;
+        }
+        HitResult hit = client.crosshairTarget;
+        if (hit == null || hit.getType() != HitResult.Type.ENTITY) {
+            return;
+        }
+        EntityHitResult entityHit = (EntityHitResult) hit;
+
+        if (entityHit.getEntity() instanceof OtherClientPlayerEntity) {
+            if (config.middleClick == ConfEnums.PlayerListTypes.DISABLED) {
+                return;
+            }
+            String name = entityHit.getEntity().getEntityName();
+            boolean wasEnemy = config.enemy.list.remove(name);
+            boolean wasFriend = config.friend.list.remove(name);
+            // none -> friend -> enemy ->> none -> friend -> enemy ->>
+            if (config.middleClick == ConfEnums.PlayerListTypes.CYCLE) {
+                if (wasFriend && wasEnemy) {
+                    assert true; // Do nothing
+                } else if (!wasFriend && !wasEnemy) {
+                    config.friend.list.add(name);
+                } else if (wasFriend) {
+                    config.enemy.list.add(name);
+                }
+            } else if (config.middleClick == ConfEnums.PlayerListTypes.FRIEND && !wasFriend) {
+                config.friend.list.add(name);
+            } else if (config.middleClick == ConfEnums.PlayerListTypes.ENEMY && !wasEnemy) {
+                config.enemy.list.add(name);
+            }
+
+            AutoConfig.getConfigHolder(ModConfig.class).setConfig(config);
+            AutoConfig.getConfigHolder(ModConfig.class).save();
+        }
+
+    }
+
+}

src/main/java/io/github/pingisfun/hitboxplus/util/ConfEnums.java

@@ -0,0 +1,10 @@
+package io.github.pingisfun.hitboxplus.util;
+
+public class ConfEnums {
+    public enum PlayerListTypes {
+        DISABLED,
+        ENEMY,
+        FRIEND,
+        CYCLE,
+    }
+}

src/main/resources/assets/hitboxplus/lang/en_us.json

@@ -10,6 +10,9 @@
   "text.autoconfig.hitboxplus.option.color": "Color",
   "text.autoconfig.hitboxplus.option.alpha.@Tooltip": "0 = invisible, 10 = solid",
   "text.autoconfig.hitboxplus.option.alpha": "Transparency",
+  "text.autoconfig.hitboxplus.option.middleClick.@PrefixText": "§f§lAdvanced",
+  "text.autoconfig.hitboxplus.option.middleClick.@Tooltip": "Only works when hitboxes are enabled and player config is enabled",
+  "text.autoconfig.hitboxplus.option.middleClick": "Middle Click Functionality",
 
 
   "text.autoconfig.hitboxplus.option.isPlayerConfigEnabled.@PrefixText": "§f§lPlayer Config",

src/main/resources/hitboxplus.mixins.json

@@ -6,7 +6,8 @@
   "mixins": [
   ],
   "client": [
-    "RenderHitboxMixin"
+    "RenderHitboxMixin",
+    "MinecraftClientMixin"
   ],
   "injectors": {
     "defaultRequire": 1