diff --git a/.idea/runConfigurations/Minecraft_Server.xml b/.idea/runConfigurations/Minecraft_Server.xml index 27bc6a0..370d25d 100644 --- a/.idea/runConfigurations/Minecraft_Server.xml +++ b/.idea/runConfigurations/Minecraft_Server.xml @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 174c29c..d6bd5c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,15 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties - # check these on https://modmuss50.me/fabric.html - minecraft_version=1.20.1 - yarn_mappings=1.20.1+build.10 - loader_version=0.16.12 +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.16.0 - #Fabric api - fabric_version=0.92.5+1.20.1 +#Fabric api +fabric_version=0.97.2+1.20.4 # Mod Properties - mod_version = 1.0 - maven_group = com.expvintl - archives_base_name = MCTools \ No newline at end of file +mod_version = 1.0 +maven_group = com.expvintl +archives_base_name = MCTools \ No newline at end of file diff --git a/src/main/java/com/expvintl/mctools/MCToolsClient.java b/src/main/java/com/expvintl/mctools/MCToolsClient.java index e590a43..c1dc4a6 100644 --- a/src/main/java/com/expvintl/mctools/MCToolsClient.java +++ b/src/main/java/com/expvintl/mctools/MCToolsClient.java @@ -6,21 +6,12 @@ import com.expvintl.mctools.modules.CameraZoom; import com.expvintl.mctools.modules.PlayerListTextLatency; import com.expvintl.mctools.texthud.MCInfo; import com.expvintl.mctools.texthud.PotionInfo; -import com.expvintl.mctools.utils.Utils; import com.mojang.brigadier.CommandDispatcher; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.render.RenderTickCounter; import net.minecraft.command.CommandRegistryAccess; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Colors; -import net.minecraft.util.math.Vec3d; public class MCToolsClient implements ClientModInitializer { diff --git a/src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java b/src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java index b62e5ed..a751172 100644 --- a/src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java +++ b/src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java @@ -4,7 +4,6 @@ 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.google.common.collect.Multimap; @@ -14,7 +13,10 @@ import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.brigadier.context.CommandContext; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; -import net.minecraft.block.*; +import net.minecraft.block.BambooBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; @@ -236,7 +238,7 @@ public class CAutoToolCommand { damageScore += EnchantmentHelper.getLevel(Enchantments.BANE_OF_ARTHROPODS, item) * 3; } //亡灵杀手(这伤害通常更高) - if(((LivingEntity)ent).getGroup()==EntityGroup.UNDEAD){ + if(((LivingEntity)ent).getGroup()== EntityGroup.UNDEAD){ damageScore+=EnchantmentHelper.getLevel(Enchantments.SMITE,item)*3;// 3倍 } //锋利加分 diff --git a/src/main/java/com/expvintl/mctools/commands/CFastDropCommand.java b/src/main/java/com/expvintl/mctools/commands/CFastDropCommand.java index 149dc38..edb4243 100644 --- a/src/main/java/com/expvintl/mctools/commands/CFastDropCommand.java +++ b/src/main/java/com/expvintl/mctools/commands/CFastDropCommand.java @@ -3,7 +3,6 @@ package com.expvintl.mctools.commands; import com.expvintl.mctools.utils.PlayerUtils; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; @@ -17,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.registry.Registries; import net.minecraft.text.Text; -import net.minecraft.util.Identifier; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/expvintl/mctools/events/player/PlayerAttackEntityEvent.java b/src/main/java/com/expvintl/mctools/events/player/PlayerAttackEntityEvent.java index 0d1daf5..f7b8f39 100644 --- a/src/main/java/com/expvintl/mctools/events/player/PlayerAttackEntityEvent.java +++ b/src/main/java/com/expvintl/mctools/events/player/PlayerAttackEntityEvent.java @@ -2,7 +2,6 @@ package com.expvintl.mctools.events.player; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; public class PlayerAttackEntityEvent { private static final PlayerAttackEntityEvent INSTANCE=new PlayerAttackEntityEvent(); diff --git a/src/main/java/com/expvintl/mctools/mixin/hud/ChatHudMixin.java b/src/main/java/com/expvintl/mctools/mixin/hud/ChatHudMixin.java index 5992823..2d187fe 100644 --- a/src/main/java/com/expvintl/mctools/mixin/hud/ChatHudMixin.java +++ b/src/main/java/com/expvintl/mctools/mixin/hud/ChatHudMixin.java @@ -3,7 +3,6 @@ package com.expvintl.mctools.mixin.hud; import com.expvintl.mctools.utils.Utils; import com.llamalad7.mixinextras.injector.ModifyReceiver; import com.llamalad7.mixinextras.sugar.Local; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.ChatHud; @@ -11,7 +10,6 @@ import net.minecraft.client.gui.hud.ChatHudLine; import net.minecraft.text.OrderedText; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; @Mixin(ChatHud.class) public class ChatHudMixin { diff --git a/src/main/java/com/expvintl/mctools/mixin/item/ItemStackMixin.java b/src/main/java/com/expvintl/mctools/mixin/item/ItemStackMixin.java index 5813b10..4746fc3 100644 --- a/src/main/java/com/expvintl/mctools/mixin/item/ItemStackMixin.java +++ b/src/main/java/com/expvintl/mctools/mixin/item/ItemStackMixin.java @@ -4,12 +4,10 @@ import com.expvintl.mctools.events.MCEventBus; import com.expvintl.mctools.events.item.ItemStackTooltipEvent; import com.expvintl.mctools.utils.Utils; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import net.minecraft.client.MinecraftClient; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; import java.util.List; diff --git a/src/main/java/com/expvintl/mctools/modules/BetterTooltip.java b/src/main/java/com/expvintl/mctools/modules/BetterTooltip.java index fd4a563..e680b9b 100644 --- a/src/main/java/com/expvintl/mctools/modules/BetterTooltip.java +++ b/src/main/java/com/expvintl/mctools/modules/BetterTooltip.java @@ -3,8 +3,6 @@ package com.expvintl.mctools.modules; import com.expvintl.mctools.events.MCEventBus; import com.expvintl.mctools.events.item.ItemStackTooltipEvent; import com.google.common.eventbus.Subscribe; -import net.minecraft.client.MinecraftClient; -import net.minecraft.text.Text; public class BetterTooltip { public static BetterTooltip INSTANCE=new BetterTooltip(); diff --git a/src/main/java/com/expvintl/mctools/modules/CameraZoom.java b/src/main/java/com/expvintl/mctools/modules/CameraZoom.java index 60756f9..737da58 100644 --- a/src/main/java/com/expvintl/mctools/modules/CameraZoom.java +++ b/src/main/java/com/expvintl/mctools/modules/CameraZoom.java @@ -2,7 +2,6 @@ package com.expvintl.mctools.modules; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/com/expvintl/mctools/texthud/MCInfo.java b/src/main/java/com/expvintl/mctools/texthud/MCInfo.java index 8aea33a..b33b2e2 100644 --- a/src/main/java/com/expvintl/mctools/texthud/MCInfo.java +++ b/src/main/java/com/expvintl/mctools/texthud/MCInfo.java @@ -3,12 +3,10 @@ package com.expvintl.mctools.texthud; import com.expvintl.mctools.utils.DrawUtils; import com.expvintl.mctools.utils.Utils; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.RenderTickCounter; import net.minecraft.item.ItemStack; -import net.minecraft.util.Colors; import net.minecraft.util.math.Vec3d; import java.util.Objects; @@ -47,7 +45,7 @@ public class MCInfo { public static void drawHUD(DrawContext drawContext, float v) { MinecraftClient mc=MinecraftClient.getInstance(); //跳过调试 - if(mc.options.debugEnabled||mc.options.hudHidden) return; + if(mc.getDebugHud().shouldShowDebugHud()||mc.options.hudHidden) return; if(mc.world!=null&&mc.player!=null) { DrawUtils.leftTextY =1; int selfPing=0; diff --git a/src/main/java/com/expvintl/mctools/texthud/PotionInfo.java b/src/main/java/com/expvintl/mctools/texthud/PotionInfo.java index af3f7ca..8e96dee 100644 --- a/src/main/java/com/expvintl/mctools/texthud/PotionInfo.java +++ b/src/main/java/com/expvintl/mctools/texthud/PotionInfo.java @@ -13,7 +13,7 @@ public class PotionInfo { public static void drawHUD(DrawContext drawContext, float v) { MinecraftClient mc=MinecraftClient.getInstance(); //跳过调试 - if(mc.options.debugEnabled||mc.options.hudHidden) return; + if(mc.getDebugHud().shouldShowDebugHud()||mc.options.hudHidden) return; if(mc.world!=null&&mc.player!=null) { DrawUtils.rightBottomY=1; diff --git a/src/main/java/com/expvintl/mctools/utils/CommandUtils.java b/src/main/java/com/expvintl/mctools/utils/CommandUtils.java index ec214e5..bd180d7 100644 --- a/src/main/java/com/expvintl/mctools/utils/CommandUtils.java +++ b/src/main/java/com/expvintl/mctools/utils/CommandUtils.java @@ -1,11 +1,11 @@ package com.expvintl.mctools.utils; -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, BooleanSetting setting, CommandDispatcher dispatcher){ diff --git a/src/main/java/com/expvintl/mctools/utils/PlayerUtils.java b/src/main/java/com/expvintl/mctools/utils/PlayerUtils.java index 6f78b87..ab39cee 100644 --- a/src/main/java/com/expvintl/mctools/utils/PlayerUtils.java +++ b/src/main/java/com/expvintl/mctools/utils/PlayerUtils.java @@ -3,8 +3,6 @@ package com.expvintl.mctools.utils; import net.minecraft.client.MinecraftClient; import net.minecraft.screen.slot.SlotActionType; -import java.util.Objects; - public class PlayerUtils { public static void DropItem(int slot){ MinecraftClient mc=MinecraftClient.getInstance(); diff --git a/src/main/java/com/expvintl/mctools/utils/Utils.java b/src/main/java/com/expvintl/mctools/utils/Utils.java index a036979..4c7ede8 100644 --- a/src/main/java/com/expvintl/mctools/utils/Utils.java +++ b/src/main/java/com/expvintl/mctools/utils/Utils.java @@ -2,9 +2,6 @@ package com.expvintl.mctools.utils; import com.expvintl.mctools.mixin.interfaces.MinecraftClientAccessor; import com.mojang.authlib.GameProfile; -import com.mojang.blaze3d.systems.RenderSystem; -import it.unimi.dsi.fastutil.objects.Object2IntMap; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; @@ -12,28 +9,15 @@ import net.minecraft.client.gui.PlayerSkinDrawer; import net.minecraft.client.gui.hud.ChatHudLine; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.PlayerListEntry; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.text.MutableText; -import net.minecraft.text.OrderedText; import net.minecraft.text.Text; -import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.biome.Biome; -import java.awt.*; import java.util.Objects; import java.util.Optional; -import java.util.Set; import java.util.Timer; -import java.util.function.Function; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -233,7 +217,7 @@ public class Utils { if(sender==null) return; PlayerListEntry entry = mc.getNetworkHandler().getPlayerListEntry(sender.getId()); if (entry == null) return; - PlayerSkinDrawer.draw(draw,entry.getSkinTexture(),0,y,8); + PlayerSkinDrawer.draw(draw,entry.getSkinTextures(),0,y,8); draw.getMatrices().translate(10, 0, 0); } public static GameProfile getChatSender(String text){