跟进新版

.idea/runConfigurations/Minecraft_Server.xml

@@ -12,5 +12,5 @@
       
     </envs>
     <shortenClasspath name="ARGS_FILE"/>
-  <classpathModifications><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-stb\3.3.3\25dd6161988d7e65f71d5065c99902402ee32746\lwjgl-stb-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-glfw\3.3.3\efa1eb78c5ccd840e9f329717109b5e892d72f8e\lwjgl-glfw-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\commons-logging\commons-logging\1.3.4\b9fc14968d63a8b8a8a2c1885fe3e90564239708\commons-logging-1.3.4.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpcore\4.4.16\51cf043c87253c9f58b539c9f7e44c8894223850\httpcore-4.4.16.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\com.mojang\patchy\2.2.10\da05971b07cbb379d002cf7eaec6a2048211fefc\patchy-2.2.10.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpclient\4.5.14\1194890e6f56ec29177673f2f12d0b8e627dec98\httpclient-4.5.14.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\com.mojang\text2speech\1.18.11\e853a12cdd6ba4f4836e8f4bf3b37844a13482b6\text2speech-1.18.11.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-jemalloc\3.3.3\b543467b7ff3c6920539a88ee602d34098628be5\lwjgl-jemalloc-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\commons-codec\commons-codec\1.17.1\973638b7149d333563584137ebf13a691bb60579\commons-codec-1.17.1.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-openal\3.3.3\daada81ceb5fc0c291fbfdd4433cb8d9423577f2\lwjgl-openal-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-tinyfd\3.3.3\82d755ca94b102e9ca77283b9e2dc46d1b15fbe5\lwjgl-tinyfd-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\com.ibm.icu\icu4j\76.1\215f3a8e936d4069344bd75f2b1368fd58112894\icu4j-76.1.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-opengl\3.3.3\2f6b0147078396a58979125a4c947664e98293a\lwjgl-opengl-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-compress\1.27.1\a19151084758e2fbb6b41eddaa88e7b8ff4e6599\commons-compress-1.27.1.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\com.mojang\blocklist\1.0.10\5c685c5ffa94c4cd39496c7184c1d122e515ecef\blocklist-1.0.10.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl\3.3.3\29589b5f87ed335a6c7e7ee6a5775f81f97ecb84\lwjgl-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.jcraft\jorbis\0.0.17\8872d22b293e8f5d7d56ff92be966e6dc28ebdc6\jorbis-0.0.17.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-freetype\3.3.3\a0db6c84a8becc8ca05f9dbfa985edc348a824c7\lwjgl-freetype-3.3.3.jar"/></classpathModifications></configuration>
+  <classpathModifications><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.jcraft\jorbis\0.0.17\8872d22b293e8f5d7d56ff92be966e6dc28ebdc6\jorbis-0.0.17.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\com.mojang\blocklist\1.0.10\5c685c5ffa94c4cd39496c7184c1d122e515ecef\blocklist-1.0.10.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\com.ibm.icu\icu4j\73.2\61ad4ef7f9131fcf6d25c34b817f90d6da06c9e9\icu4j-73.2.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-jemalloc\3.3.3\b543467b7ff3c6920539a88ee602d34098628be5\lwjgl-jemalloc-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl\3.3.3\29589b5f87ed335a6c7e7ee6a5775f81f97ecb84\lwjgl-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-openal\3.3.3\daada81ceb5fc0c291fbfdd4433cb8d9423577f2\lwjgl-openal-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpcore\4.4.16\51cf043c87253c9f58b539c9f7e44c8894223850\httpcore-4.4.16.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\com.mojang\patchy\2.2.10\da05971b07cbb379d002cf7eaec6a2048211fefc\patchy-2.2.10.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpclient\4.5.13\e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada\httpclient-4.5.13.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-glfw\3.3.3\efa1eb78c5ccd840e9f329717109b5e892d72f8e\lwjgl-glfw-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-freetype\3.3.3\a0db6c84a8becc8ca05f9dbfa985edc348a824c7\lwjgl-freetype-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\com.mojang\text2speech\1.17.9\3cad216e3a7f0c19b4b394388bc9ffc446f13b14\text2speech-1.17.9.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-opengl\3.3.3\2f6b0147078396a58979125a4c947664e98293a\lwjgl-opengl-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\commons-codec\commons-codec\1.16.0\4e3eb3d79888d76b54e28b350915b5dc3919c9de\commons-codec-1.16.0.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-stb\3.3.3\25dd6161988d7e65f71d5065c99902402ee32746\lwjgl-stb-3.3.3.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\commons-logging\commons-logging\1.2\4bfc12adfe4842bf07b657f0369c4cb522955686\commons-logging-1.2.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-compress\1.26.0\659feffdd12280201c8aacb8f7be94f9a883c824\commons-compress-1.26.0.jar"/><entry exclude="true" path="C:\Users\expvintl\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-tinyfd\3.3.3\82d755ca94b102e9ca77283b9e2dc46d1b15fbe5\lwjgl-tinyfd-3.3.3.jar"/></classpathModifications></configuration>
 </component>

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'maven-publish'
 }
 
-version = project.mod_version
+version = project.findProperty("minecraft_version")?.toString()?:"1.0"
 group = project.maven_group
 repositories {
     mavenCentral()

gradle.properties

@@ -2,15 +2,15 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.21.5
-	yarn_mappings=1.21.5+build.1
-	loader_version=0.16.12
+# check these on https://modmuss50.me/fabric.html
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
+loader_version=0.16.0
 
-	#Fabric api
-	fabric_version=0.119.9+1.21.5
+#Fabric api
+fabric_version=0.100.8+1.21
 
 # Mod Properties
-	mod_version = 1.0
-	maven_group = com.expvintl
-	archives_base_name = MCTools
+mod_version = 1.0
+maven_group = com.expvintl
+archives_base_name = MCTools

readme.md

@@ -1,3 +1,22 @@
-## 一个MC工具组
+<div align="center">
 
-> 仍在开发
+# Minecraft 工具集(Fabric)
+
+</div>
+
+## 支持功能
+此mod的所有功能为**c开头**
+1. 自动工具(挖掘、砍伐、亡灵、锋利、伤害等评级)(/cautotool)
+2. 自动钓鱼 (/cautofish)
+3. 自动武器(与工具为合并功能)
+4. 伽马高亮(/fullbirght)
+5. C键放大
+6. 基本信息HUD
+7. 药水状态HUD
+8. 聊天栏头像补丁
+9. 强制Tab列表显示头像补丁
+10. 查询Bukkit系服务器插件(/cqserverplugins)
+11. 自动重生(/cautorespawn)
+12. 自动挂边(/csafewalk)
+13. 无衰落伤害(/cnofallpacket)
+14. 快速丢弃(WIP)(/cfastdrop)

src/main/java/com/expvintl/mctools/FeaturesSettings.java

@@ -0,0 +1,14 @@
+package com.expvintl.mctools;
+
+import com.expvintl.mctools.settingtype.BooleanSetting;
+
+public class FeaturesSettings {
+    public final static FeaturesSettings INSTANCE=new FeaturesSettings();
+    public final BooleanSetting autoRespawn = new BooleanSetting();
+    public final BooleanSetting safeWalk = new BooleanSetting();
+    public final BooleanSetting checkBukkitPlugins = new BooleanSetting();
+    public final BooleanSetting autoTool = new BooleanSetting();
+    public final BooleanSetting autoToolIncludePlayer = new BooleanSetting();
+    public final BooleanSetting autoFish = new BooleanSetting();
+    public final BooleanSetting noFallPacket = new BooleanSetting();
+}

src/main/java/com/expvintl/mctools/Globals.java

@@ -1,13 +0,0 @@
-package com.expvintl.mctools;
-
-import com.expvintl.mctools.types.Setting;
-
-public class Globals {
-    public static Setting autoRespawn=new Setting();
-    public static Setting selfWalk=new Setting();
-    public static Setting checkBukkitPlugins=new Setting();
-    public static Setting autoTool=new Setting();
-    public static Setting autoFish=new Setting();
-    public static Setting noFallPacket=new Setting();
-    public static int TPS=0;
-}

src/main/java/com/expvintl/mctools/commands/CAutoFishCommand.java

@@ -1,6 +1,6 @@
 package com.expvintl.mctools.commands;
 
-import com.expvintl.mctools.Globals;
+import com.expvintl.mctools.FeaturesSettings;
 import com.expvintl.mctools.events.MCEventBus;
 import com.expvintl.mctools.events.client.sounds.PlaySoundEvent;
 import com.expvintl.mctools.utils.CommandUtils;
@@ -22,14 +22,14 @@ public class CAutoFishCommand {
     private static final CAutoFishCommand INSTANCE=new CAutoFishCommand();
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher){
         MCEventBus.INSTANCE.register(INSTANCE);
-        CommandUtils.CreateStatusCommand("cautofish",Globals.autoFish,dispatcher);
+        CommandUtils.CreateStatusCommand("cautofish", FeaturesSettings.INSTANCE.autoFish, dispatcher);
 
         dispatcher.register(literal("cautofish").then(argument("开关", BoolArgumentType.bool()).executes(CAutoFishCommand::execute)));
     }
 
     private static int execute(CommandContext<FabricClientCommandSource> context) {
-        Globals.autoFish.set(context.getArgument("开关", Boolean.class));
-        if(Globals.autoFish.get()){
+        FeaturesSettings.INSTANCE.autoFish.setValue(context.getArgument("开关", Boolean.class));
+        if(FeaturesSettings.INSTANCE.autoFish.getValue()){
             context.getSource().getPlayer().sendMessage(Text.literal("已启用自动钓鱼!"),false);
         }else{
             context.getSource().getPlayer().sendMessage(Text.literal("已禁用自动钓鱼!"),false);
@@ -38,7 +38,7 @@ public class CAutoFishCommand {
     }
     @Subscribe
     private void onPlaySound(PlaySoundEvent event){
-        if(Globals.autoFish.get()) {
+        if(FeaturesSettings.INSTANCE.autoFish.getValue()) {
             //自动钓鱼
             if (event.soundInstance.getId().getPath().equals("entity.fishing_bobber.splash")) {
                 //收杆

src/main/java/com/expvintl/mctools/commands/CAutoRespawnCommand.java

@@ -1,6 +1,6 @@
 package com.expvintl.mctools.commands;
 
-import com.expvintl.mctools.Globals;
+import com.expvintl.mctools.FeaturesSettings;
 import com.expvintl.mctools.events.MCEventBus;
 import com.expvintl.mctools.events.client.OpenScreenEvent;
 import com.expvintl.mctools.utils.CommandUtils;
@@ -21,13 +21,13 @@ public class CAutoRespawnCommand {
     private static final CAutoRespawnCommand INSTANCE=new CAutoRespawnCommand();
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher){
         MCEventBus.INSTANCE.register(INSTANCE);
-        CommandUtils.CreateStatusCommand("cautorespawn",Globals.autoRespawn,dispatcher);
+        CommandUtils.CreateStatusCommand("cautorespawn", FeaturesSettings.INSTANCE.autoRespawn, dispatcher);
         dispatcher.register(literal("cautorespawn").then(argument("开关", BoolArgumentType.bool()).executes(CAutoRespawnCommand::execute)));
     }
 
     private static int execute(CommandContext<FabricClientCommandSource> context) {
-        Globals.autoRespawn.set(context.getArgument("开关", Boolean.class));
-        if(Globals.autoRespawn.get()){
+        FeaturesSettings.INSTANCE.autoRespawn.setValue(context.getArgument("开关", Boolean.class));
+        if(FeaturesSettings.INSTANCE.autoRespawn.getValue()){
             context.getSource().getPlayer().sendMessage(Text.literal("已启用自动重生!"),false);
         }else{
             context.getSource().getPlayer().sendMessage(Text.literal("已禁用自动重生!"),false);
@@ -36,7 +36,7 @@ public class CAutoRespawnCommand {
     }
     @Subscribe
     private void onOpenScreen(OpenScreenEvent event){
-        if(Globals.autoRespawn.get()) {
+        if(FeaturesSettings.INSTANCE.autoRespawn.getValue()) {
             //自动重生
             if (event.screen instanceof DeathScreen) {
                 if (MinecraftClient.getInstance().player != null) {

src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java

@@ -1,10 +1,9 @@
 package com.expvintl.mctools.commands;
 
-import com.expvintl.mctools.Globals;
+import com.expvintl.mctools.FeaturesSettings;
 import com.expvintl.mctools.events.MCEventBus;
 import com.expvintl.mctools.events.player.PlayerAttackBlockEvent;
 import com.expvintl.mctools.events.player.PlayerAttackEntityEvent;
-import com.expvintl.mctools.events.player.PlayerBreakBlockEvent;
 import com.expvintl.mctools.mixin.interfaces.ClientPlayerInteractionManagerAccessor;
 import com.expvintl.mctools.utils.CommandUtils;
 import com.expvintl.mctools.utils.Utils;
@@ -16,6 +15,7 @@ import com.mojang.brigadier.context.CommandContext;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.block.*;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.AttributeModifiersComponent;
 import net.minecraft.enchantment.Enchantments;
@@ -23,11 +23,12 @@ import net.minecraft.entity.*;
 import net.minecraft.entity.attribute.EntityAttribute;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
 import net.minecraft.entity.attribute.EntityAttributes;
-import net.minecraft.entity.mob.HostileEntity;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.*;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.text.Text;
+import net.minecraft.world.GameMode;
 
 import java.util.function.BiConsumer;
 
@@ -38,35 +39,44 @@ public class CAutoToolCommand {
     private static final CAutoToolCommand INSTANCE=new CAutoToolCommand();
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher){
         MCEventBus.INSTANCE.register(INSTANCE);
-        CommandUtils.CreateStatusCommand("cautotool",Globals.autoTool,dispatcher);
-        dispatcher.register(literal("cautotool").then(argument("开关", BoolArgumentType.bool()).executes(CAutoToolCommand::execute)));
+        CommandUtils.CreateStatusCommand("cautotool", FeaturesSettings.INSTANCE.autoTool, dispatcher);
+        dispatcher.register(
+                literal("cautotool")
+                        .then(argument("开关", BoolArgumentType.bool())
+                        .executes(CAutoToolCommand::execute)
+                        .then(argument("包含玩家",BoolArgumentType.bool())
+                        .executes(CAutoToolCommand::execute))));
     }
 
     private static int execute(CommandContext<FabricClientCommandSource> context) {
-        Globals.autoTool.set(context.getArgument("开关", Boolean.class));
-        if(Globals.autoTool.get()){
-            context.getSource().getPlayer().sendMessage(Text.literal("已启用智能工具!"),false);
+        FeaturesSettings.INSTANCE.autoTool.setValue(context.getArgument("开关", Boolean.class));
+        try{
+            FeaturesSettings.INSTANCE.autoToolIncludePlayer.setValue(context.getArgument("包含玩家", Boolean.class));
+        }catch (IllegalArgumentException ignored){
+        }
+        if(FeaturesSettings.INSTANCE.autoTool.getValue()){
+            context.getSource().getPlayer().sendMessage(Text.literal("已启用智能工具! 对玩家使用智能武器:"+FeaturesSettings.INSTANCE.autoToolIncludePlayer.getValue()),false);
         }else{
             context.getSource().getPlayer().sendMessage(Text.literal("已禁用智能工具!"),false);
         }
         return Command.SINGLE_SUCCESS;
     }
 
-    @Subscribe
-    private void onBreakBlock(PlayerBreakBlockEvent event){
-        if(!Globals.autoTool.get()) return;
-        MinecraftClient mc=MinecraftClient.getInstance();
-        if (mc.world == null||mc.player==null) return;
-    }
+//    @Subscribe
+//    private void onBreakBlock(PlayerBreakBlockEvent event){
+//        if(!Globals.autoTool.get()) return;
+//        MinecraftClient mc=MinecraftClient.getInstance();
+//        if (mc.world == null||mc.player==null) return;
+//    }
     @Subscribe
     private void onAttackEntity(PlayerAttackEntityEvent event){
-        if(!Globals.autoTool.get()) return;
+        if(!FeaturesSettings.INSTANCE.autoTool.getValue()) return;
         if(event.target.hasCustomName()) return;
-        //不对玩家使用
-        if(event.target.isPlayer()) return;
+        //对玩家使用
+        if(FeaturesSettings.INSTANCE.autoToolIncludePlayer.getValue()&&event.target.isPlayer()) return;
         float bestScore=-1;
         int slot=-1;
-        for(int i=0;i<9;i++) {
+        for(int i=0;i<PlayerInventory.getHotbarSize();i++) {
             ItemStack item = event.player.getInventory().getStack(i);
             if(!isSwordItem(item.getItem())&&!isToolItem(item.getItem())) continue;
             float score=getWeaponScore(event.target, item);
@@ -82,7 +92,7 @@ public class CAutoToolCommand {
         //低耐久测试
         if(!isLowDurability(currentItem)) {
             //切换过去
-            event.player.getInventory().setSelectedSlot(slot);
+            event.player.getInventory().selectedSlot=slot;
             MinecraftClient mc=MinecraftClient.getInstance();
             if(mc.interactionManager!=null) {
                 ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).syncSelectedSlot();
@@ -92,10 +102,13 @@ public class CAutoToolCommand {
     //方块挖掘
     @Subscribe
     private void onAttackBlock(PlayerAttackBlockEvent event){
-        if(!Globals.autoTool.get()) return;
+        if(!FeaturesSettings.INSTANCE.autoTool.getValue()) return;
         //自动工具
         MinecraftClient mc=MinecraftClient.getInstance();
         if (mc.world == null||mc.player==null) return;
+        PlayerListEntry entry=mc.getNetworkHandler().getPlayerListEntry(mc.player.getUuid());
+        if(entry==null) return;
+        if(entry.getGameMode() != GameMode.SURVIVAL) return; //跳过不符合条件的游戏模式
         BlockState state= mc.world.getBlockState(event.blockPos);
         //跳过不可破坏
         if(state.getHardness(mc.world, event.blockPos) < 0) return;
@@ -104,7 +117,7 @@ public class CAutoToolCommand {
         //工具槽
         int slot=-1;
         //遍历每一个物品槽
-        for(int i=0;i<9;i++){
+        for(int i = 0; i< PlayerInventory.getHotbarSize(); i++){
             ItemStack item = mc.player.getInventory().getStack(i);
             float score= getToolsScore(item,state);
             if(score<=0) continue;
@@ -119,7 +132,7 @@ public class CAutoToolCommand {
         //确定已经选择好了工具就切换
         if(!isLowDurability(currentItem)) {
             //切换过去
-            mc.player.getInventory().setSelectedSlot(slot);
+            mc.player.getInventory().selectedSlot=slot;
             if(mc.interactionManager!=null) {
                 ((ClientPlayerInteractionManagerAccessor) mc.interactionManager).syncSelectedSlot();
             }
@@ -177,13 +190,11 @@ public class CAutoToolCommand {
             return true;
         }
 
-        if (block == Blocks.GLOWSTONE || // 荧石
+        // 海晶灯
+        return block == Blocks.GLOWSTONE || // 荧石
                 block == Blocks.MELON || // 西瓜
                 block == Blocks.GRAVEL || // 沙砾 (影响燧石掉落概率)
-                block == Blocks.SEA_LANTERN){ // 海晶灯
-            return true;
-        }
-        return false;
+                block == Blocks.SEA_LANTERN;
     }
     public float getToolsScore(ItemStack item, BlockState state){
         float score=0;
@@ -205,7 +216,7 @@ public class CAutoToolCommand {
             if (isSwordItem(item.getItem()) && (state.getBlock() instanceof BambooBlock|| state.getBlock() instanceof BambooShootBlock)) {
                 if((item.getItem().getComponents().get(DataComponentTypes.TOOL)!=null)){
                     //根据挖掘等级加分
-                    score += 90 + (item.getItem().getComponents().get(DataComponentTypes.TOOL).getSpeed(state));
+                    score += 90 + item.getMiningSpeedMultiplier(state);
                 }
             }
         }
@@ -219,7 +230,7 @@ public class CAutoToolCommand {
         AttributeModifiersComponent comp=item.getOrDefault(DataComponentTypes.ATTRIBUTE_MODIFIERS, AttributeModifiersComponent.DEFAULT);
         final float[] damageHolder = {0.0f};
         BiConsumer<RegistryEntry<EntityAttribute>, EntityAttributeModifier> baseDamage=(attentry, modify)->{
-            if(attentry.matches(EntityAttributes.ATTACK_DAMAGE)){
+            if(attentry.matches(EntityAttributes.GENERIC_ATTACK_DAMAGE)){
                 //计算基础伤害
                 damageHolder [0]= (float)modify.value();
             }

src/main/java/com/expvintl/mctools/commands/CNoFallPacketCommand.java

@@ -1,6 +1,6 @@
 package com.expvintl.mctools.commands;
 
-import com.expvintl.mctools.Globals;
+import com.expvintl.mctools.FeaturesSettings;
 import com.expvintl.mctools.events.MCEventBus;
 import com.expvintl.mctools.events.network.PacketSendEvent;
 import com.expvintl.mctools.mixin.interfaces.PlayerMoveC2SPacketAccessor;
@@ -23,14 +23,14 @@ public class CNoFallPacketCommand {
     private static final MinecraftClient mc=MinecraftClient.getInstance();
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher){
         MCEventBus.INSTANCE.register(INSTANCE);
-        CommandUtils.CreateStatusCommand("cnofallpacket",Globals.noFallPacket,dispatcher);
+        CommandUtils.CreateStatusCommand("cnofallpacket", FeaturesSettings.INSTANCE.noFallPacket, dispatcher);
 
         dispatcher.register(literal("cnofallpacket").then(argument("开关", BoolArgumentType.bool()).executes(CNoFallPacketCommand::execute)));
     }
 
     private static int execute(CommandContext<FabricClientCommandSource> context) {
-        Globals.noFallPacket.set(context.getArgument("开关", Boolean.class));
-        if(Globals.noFallPacket.get()){
+        FeaturesSettings.INSTANCE.noFallPacket.setValue(context.getArgument("开关", Boolean.class));
+        if(FeaturesSettings.INSTANCE.noFallPacket.getValue()){
             context.getSource().getPlayer().sendMessage(Text.literal("已启用摔落伤害!"),false);
         }else{
             context.getSource().getPlayer().sendMessage(Text.literal("已禁用摔落伤害!"),false);
@@ -42,7 +42,7 @@ public class CNoFallPacketCommand {
         //跳过非移动的数据包
         if(!(event.packet instanceof PlayerMoveC2SPacket)) return;
         //跳过创造
-        if(Globals.noFallPacket.get()&& !mc.player.getAbilities().creativeMode){
+        if(FeaturesSettings.INSTANCE.noFallPacket.getValue()&& !mc.player.getAbilities().creativeMode){
             if(mc.player.fallDistance<=mc.player.getSafeFallDistance()) return;
             if(mc.player.getVelocity().y> -0.5) return;
             //直接发送在地面的数据包来免伤

src/main/java/com/expvintl/mctools/commands/CQServerPluginsCommand.java

@@ -1,6 +1,6 @@
 package com.expvintl.mctools.commands;
 
-import com.expvintl.mctools.Globals;
+import com.expvintl.mctools.FeaturesSettings;
 import com.expvintl.mctools.events.MCEventBus;
 import com.expvintl.mctools.events.network.PacketReceiveEvent;
 import com.expvintl.mctools.utils.Utils;
@@ -29,13 +29,13 @@ public class CQServerPluginsCommand {
     private static int execute(CommandContext<FabricClientCommandSource> context) {
         //注册数据包接受事件
         MCEventBus.INSTANCE.register(INSTANCE);
-        Globals.checkBukkitPlugins.set(true);
+        FeaturesSettings.INSTANCE.checkBukkitPlugins.setValue(true);
         context.getSource().getPlayer().networkHandler.sendPacket(new RequestCommandCompletionsC2SPacket(new Random().nextInt(200),"bukkit:ver "));
         //1秒后关闭避免识别其他命令提示
         Utils.timer.schedule(new TimerTask() {
             @Override
             public void run() {
-                Globals.checkBukkitPlugins.set(false);
+                FeaturesSettings.INSTANCE.checkBukkitPlugins.setValue(false);
                 MCEventBus.INSTANCE.unregister(INSTANCE);
             }
         },1000);
@@ -44,7 +44,7 @@ public class CQServerPluginsCommand {
     @Subscribe
     public void onReceivePacket(PacketReceiveEvent p){
         //探测bukkit服务器插件
-        if (!MinecraftClient.getInstance().isIntegratedServerRunning()&& Globals.checkBukkitPlugins.get()) {
+        if (!MinecraftClient.getInstance().isIntegratedServerRunning()&& FeaturesSettings.INSTANCE.checkBukkitPlugins.getValue()) {
             if (p.packet instanceof CommandSuggestionsS2CPacket sg) {
                 StringBuilder buf=new StringBuilder();
                 buf.append(String.format("找到%d个插件:",sg.getSuggestions().getList().size())).append('\n');
@@ -54,7 +54,7 @@ public class CQServerPluginsCommand {
                 if(MinecraftClient.getInstance().player!=null){
                     MinecraftClient.getInstance().player.sendMessage(Text.literal(buf.toString()),false);
                 }
-                Globals.checkBukkitPlugins.set(false);
+                FeaturesSettings.INSTANCE.checkBukkitPlugins.setValue(false);
                 //取消事件注册
                 MCEventBus.INSTANCE.unregister(INSTANCE);
             }

src/main/java/com/expvintl/mctools/commands/CSafeWalkCommand.java

@@ -1,6 +1,6 @@
 package com.expvintl.mctools.commands;
 
-import com.expvintl.mctools.Globals;
+import com.expvintl.mctools.FeaturesSettings;
 import com.expvintl.mctools.utils.CommandUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
@@ -14,14 +14,14 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.lit
 
 public class CSafeWalkCommand {
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher){
-        CommandUtils.CreateStatusCommand("cselfwalk",Globals.selfWalk,dispatcher);
+        CommandUtils.CreateStatusCommand("cselfwalk", FeaturesSettings.INSTANCE.safeWalk, dispatcher);
 
         dispatcher.register(literal("cselfwalk").then(argument("开关", BoolArgumentType.bool()).executes(CSafeWalkCommand::execute)));
     }
 
     private static int execute(CommandContext<FabricClientCommandSource> context) {
-        Globals.selfWalk.set(context.getArgument("开关", Boolean.class));
-        if(Globals.selfWalk.get()){
+        FeaturesSettings.INSTANCE.safeWalk.setValue(context.getArgument("开关", Boolean.class));
+        if(FeaturesSettings.INSTANCE.safeWalk.getValue()){
             context.getSource().getPlayer().sendMessage(Text.literal("已启用自动挂边!"),false);
         }else{
             context.getSource().getPlayer().sendMessage(Text.literal("已禁用自动挂边!"),false);

src/main/java/com/expvintl/mctools/mixin/player/PlayerEntityMixin.java

@@ -1,6 +1,6 @@
 package com.expvintl.mctools.mixin.player;
 
-import com.expvintl.mctools.Globals;
+import com.expvintl.mctools.FeaturesSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,7 +15,7 @@ public class PlayerEntityMixin {
         if(MinecraftClient.getInstance().world!=null&&MinecraftClient.getInstance().player!=null) {
             if (!MinecraftClient.getInstance().world.isClient) return;
             //挂住边缘
-            if (Globals.selfWalk.get() && !MinecraftClient.getInstance().player.isSneaking()) cir.setReturnValue(true);
+            if (FeaturesSettings.INSTANCE.safeWalk.getValue() && !MinecraftClient.getInstance().player.isSneaking()) cir.setReturnValue(true);
         }
     }
 }

src/main/java/com/expvintl/mctools/settingtype/BooleanSetting.java

@@ -0,0 +1,13 @@
+package com.expvintl.mctools.settingtype;
+
+public class BooleanSetting {
+    private boolean value;
+
+    public void setValue(boolean value) {
+        this.value = value;
+    }
+
+    public boolean getValue() {
+        return value;
+    }
+}

src/main/java/com/expvintl/mctools/texthud/PotionInfo.java

@@ -6,7 +6,6 @@ import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.util.Colors;
 
 import java.util.Collection;
 

src/main/java/com/expvintl/mctools/types/Setting.java

@@ -1,11 +0,0 @@
-package com.expvintl.mctools.types;
-
-public class Setting {
-    public boolean value=false;
-    public boolean get(){
-        return this.value;
-    }
-    public void set(boolean value){
-        this.value=value;
-    }
-}

src/main/java/com/expvintl/mctools/utils/CommandUtils.java

@@ -1,15 +1,16 @@
 package com.expvintl.mctools.utils;
 
-import com.expvintl.mctools.types.Setting;
+import com.expvintl.mctools.FeaturesSettings;
+import com.expvintl.mctools.settingtype.BooleanSetting;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.text.Text;
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 public class CommandUtils {
-    public static void CreateStatusCommand(String cmd, Setting toggle, CommandDispatcher<FabricClientCommandSource> dispatcher){
+    public static void CreateStatusCommand(String cmd, BooleanSetting setting, CommandDispatcher<FabricClientCommandSource> dispatcher){
         dispatcher.register(literal(cmd).executes((context -> {
-            context.getSource().getPlayer().sendMessage(Text.literal("当前启用状态: "+toggle.get()),false);
+            context.getSource().getPlayer().sendMessage(Text.literal("当前启用状态: "+setting.getValue()),false);
             return Command.SINGLE_SUCCESS;
         })));
     }