fix for 1.21.1

m1919810 · m1919810 · commit b00fc58bf9b9 · 2026-02-11T01:29:24.000+08:00
diff --git a/src/main/java/me/matl114/accessors/events/ItemRendererAccess.java b/src/main/java/me/matl114/accessors/events/ItemRendererAccess.java
diff --git a/src/main/java/me/matl114/events/GlobalEventVars.java b/src/main/java/me/matl114/events/GlobalEventVars.java
@@ -4,4 +4,13 @@
 
 public class GlobalEventVars {
     public static CrashReport crashReport = null;
+    public static boolean lastRenderNeedDisableGuiLight;
+
+    public static boolean fetchThisTimeGuiLightStatus(){
+        if(lastRenderNeedDisableGuiLight){
+            lastRenderNeedDisableGuiLight = false;
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/src/main/java/me/matl114/events/Listener.java b/src/main/java/me/matl114/events/Listener.java
@@ -298,6 +298,10 @@ private static Packet<?> unpackMultiPacket(ClientConnection connection,Packet<?>
     @Broadcast
     private static final EventChannel<Screen> postCloseScreen = new EventChannel<>();
     @Getter
+    @Cancelable
+    @Modifiable
+    private static final EventChannel<Screen> preSetScreen = new EventChannel<>();
+    @Getter
     @Cancelable //note: this cancels post operations of setting a screen , like cursor lock, render refresh and title update
     private static final EventChannel<Screen> postSetScreen = new EventChannel<>();
     @Getter
diff --git a/src/main/java/me/matl114/gui/other/ChatLikeInputSubScreen.java b/src/main/java/me/matl114/gui/other/ChatLikeInputSubScreen.java
@@ -84,10 +84,11 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 
     @Override
     public void renderInDefaultMatrix(VDrawContext context, int mouseX, int mouseY, float delta, boolean disableSelect) {
-        super.renderInDefaultMatrix(context, mouseX, mouseY, delta, disableSelect);
         //draw gray background for chatField
+        //sb ojng
         context.fill(0,-2,  this.chatFieldWidget.getWidth(),  this.chatFieldWidget.getHeight() -2, mc.options.getTextBackgroundColor(Integer.MIN_VALUE));
         RenderHandler.drawHighlightFrame(context, -1, -3, this.chatFieldWidget.getWidth() + 2, this.chatFieldWidget.getHeight() + 2, this.isFocused() ? Colors.WHITE : Colors.GRAY);
+        super.renderInDefaultMatrix(context, mouseX, mouseY, delta, disableSelect);
     }
 
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
diff --git a/src/main/java/me/matl114/gui/presets/lists/ListUnmodifiableWidget.java b/src/main/java/me/matl114/gui/presets/lists/ListUnmodifiableWidget.java
@@ -13,6 +13,7 @@ public ListUnmodifiableWidget(ListEntryWidgetController controller, int x, int y
         this.controller = controller;
         refreshList();
     }
+    //todo check
     protected void refreshList(){
         clearScrollingWidget();
         int size = controller.size();
diff --git a/src/main/java/me/matl114/hacks/ChatTasks.java b/src/main/java/me/matl114/hacks/ChatTasks.java
@@ -13,10 +13,7 @@
 import me.matl114.hacks.api.ModuleManager;
 import me.matl114.hacks.api.ModulePreset;
 import me.matl114.hacks.modules.HackModules;
-import me.matl114.hacks.modules.chat.AutoChat;
-import me.matl114.hacks.modules.chat.ChatCombine;
-import me.matl114.hacks.modules.chat.ChatExtra;
-import me.matl114.hacks.modules.chat.ClientSideCommand;
+import me.matl114.hacks.modules.chat.*;
 import me.matl114.events.Listener;
 import me.matl114.hacks.modules.combat.Attack;
 import me.matl114.hacks.modules.combat.BowEnhance;
@@ -73,6 +70,8 @@ public static void init(){
     public static ClientSideCommand clientSideCommand;
     @Getter
     public static ChatCombine chatCombine;
+    @Getter
+    public static InGuiChatBox inGuiChatBox;
 
     private static void initModules(ModuleManager m){
         chatExtra = new ChatExtra()
@@ -86,6 +85,8 @@ private static void initModules(ModuleManager m){
 
         chatCombine = new ChatCombine()
             .register(m);
+        inGuiChatBox = new InGuiChatBox()
+            .register(m);
     }
     static{
         moduleManager.registerFactories(ChatTasks::initModules);
diff --git a/src/main/java/me/matl114/hacks/CombatTasks.java b/src/main/java/me/matl114/hacks/CombatTasks.java
@@ -213,6 +213,8 @@ public static Vec2f calculatePitchYawPredict(float velocity, Vec3d extraVector,
     @Getter
     public static BowEnhance bowEnhance;
     @Getter
+    public static AutoTotem autoTotem;
+    @Getter
     public static ProjectileEnhance projectileEnhance;
     private static void initModules(ModuleManager m){
         combatExtra = new CombatExtra()
@@ -229,6 +231,8 @@ private static void initModules(ModuleManager m){
             .register(m);
         projectileEnhance = new ProjectileEnhance()
             .register(m);
+        autoTotem = new AutoTotem()
+            .register(m);
     }
     static {
         moduleManager.registerFactories(CombatTasks::initModules);
diff --git a/src/main/java/me/matl114/hacks/MineTasks.java b/src/main/java/me/matl114/hacks/MineTasks.java
@@ -97,7 +97,7 @@ public void onSeedOre(ArgumentInputStream re){
         }
         {
             main.subBuilder(SubCommand.taskBuilder())
-                .name("seedore")
+                .name("seed")
                 .helper("<operation> <seed> 进行seed操作")
                 .arg(
                     SimpleCommandArgs.argumentBuilder()
diff --git a/src/main/java/me/matl114/mixins/events/DrawContextEvents.java b/src/main/java/me/matl114/mixins/events/DrawContextEvents.java
@@ -3,23 +3,22 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import me.matl114.accessors.events.ItemRendererAccess;
+import me.matl114.events.GlobalEventVars;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.DiffuseLighting;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 
 @Mixin(DrawContext.class)
 public abstract class DrawContextEvents {
     @Shadow @Final private MinecraftClient client;
 
     @WrapOperation(method = "drawItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;IIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;draw()V"))
     private void onCorrectingGuiLight(DrawContext instance, Operation<Void> original, @Local boolean bl){
-        boolean status = ((ItemRendererAccess) this.client.getItemRenderer()).fetchThisTimeGuiLightStatus();
+        boolean status = GlobalEventVars.fetchThisTimeGuiLightStatus();
         if(status && ! bl){
             //attach gui lightening fix
             DiffuseLighting.disableGuiDepthLighting();
diff --git a/src/main/java/me/matl114/mixins/events/ItemRendererEvents.java b/src/main/java/me/matl114/mixins/events/ItemRendererEvents.java
@@ -1,13 +1,11 @@
 package me.matl114.mixins.events;
 
-import me.matl114.accessors.events.ItemRendererAccess;
+import me.matl114.events.GlobalEventVars;
 import me.matl114.events.RenderListener;
 import me.matl114.events.Event;
-import me.matl114.utils.DebugUtils;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.DiffuseLighting;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.render.model.BakedModel;
@@ -23,8 +21,7 @@
 
 @Environment(EnvType.CLIENT)
 @Mixin(ItemRenderer.class)
-public abstract class ItemRendererEvents implements ItemRendererAccess {
-    private boolean nextTimeRenderDisableGuiLight = false;
+public abstract class ItemRendererEvents {
     @ModifyVariable(method = "getModel", at = @At("HEAD"), index = 1, argsOnly = true)
     public ItemStack onItemModelLoad(ItemStack stack){
         Event<ItemStack> itemStackEvent = new Event<>(stack, true, true);
@@ -85,21 +82,14 @@ private void renderItemContainerItemInfo(ItemRenderer itemRenderer, MatrixStack
             BakedModel bakedModel=itemRenderer.getModel(stack, MinecraftClient.getInstance().world, MinecraftClient.getInstance().player, 0);
             //fixme: renderer error here
             if(inGui){
-                nextTimeRenderDisableGuiLight = true;
+                GlobalEventVars.lastRenderNeedDisableGuiLight = true;
             }
             itemRenderer.renderItem(stack,renderMode,leftHanded,matrices,vertexConsumers,0xF000F0,overlay,bakedModel);
         }finally {
             matrices.pop();
         }
     }
 
-    public boolean fetchThisTimeGuiLightStatus(){
-        if(nextTimeRenderDisableGuiLight){
-            nextTimeRenderDisableGuiLight = false;
-            return true;
-        }
-        return false;
-    }
 
 
 }
diff --git a/src/main/java/me/matl114/mixins/events/MinecraftClientEvents.java b/src/main/java/me/matl114/mixins/events/MinecraftClientEvents.java
@@ -2,6 +2,8 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import me.matl114.events.GlobalEventVars;
 import me.matl114.events.Listener;
 import me.matl114.events.Event;
@@ -45,6 +47,20 @@ public abstract class MinecraftClientEvents {
 
     @Shadow public abstract Window getWindow();
 
+    @Inject(method = "setScreen", at = @At("HEAD"), cancellable = true)
+    public void onPreSetScreen(Screen screen, CallbackInfo ci, @Local(argsOnly = true) LocalRef<Screen> screenRef){
+        if(!Listener.getPreSetScreen().isEmpty()){
+            Event<Screen> screenEvent = new Event<>(screen, true, true);
+            Listener.getPreSetScreen().handleValue(screenEvent);
+            if(screenEvent.isCancelled()){
+                ci.cancel();
+            }else{
+                if(screenEvent.context != screen){
+                    screenRef.set(screenEvent.context);
+                }
+            }
+        }
+    }
 
     @Inject(method = "setScreen", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;", ordinal = 3, shift = At.Shift.BEFORE), cancellable = true)
     public void onPostSetScreen(Screen screen, CallbackInfo ci){
diff --git a/src/main/java/me/matl114/mixins/events/MouseEvents.java b/src/main/java/me/matl114/mixins/events/MouseEvents.java
@@ -78,7 +78,7 @@ private void onMouseMove(Runnable task, String errorTitle, String screenName, @L
 
     @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;wrapScreenError(Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/String;)V", ordinal = 1))
     private void onMouseDrag(Runnable task, String errorTitle, String screenName, @Local(ordinal =  2) double f, @Local(ordinal = 3) double g, @Local(ordinal =  4) double h, @Local(ordinal = 5) double i){
-        Event<Mouse> event = new Event<>((Mouse) (Object)this, true, false, f, g, h, i, this.activeButton);
+        Event<Mouse> event = new Event<>((Mouse) (Object)this, true, false, f, g, h, i);
         Listener.getMouseDrag().handleValue(event);
         if(!event.isCancelled()){
             Screen.wrapScreenError(task, errorTitle, screenName);
@@ -97,7 +97,7 @@ private void onScreenNull(CallbackInfo ci){
             if (this.activeButton != -1) {
                 double h = this.cursorDeltaX * (double)this.client.getWindow().getScaledWidth() / (double)this.client.getWindow().getWidth();
                 double i = this.cursorDeltaY * (double)this.client.getWindow().getScaledHeight() / (double)this.client.getWindow().getHeight();
-                Event<Mouse> event2 = new Event<>((Mouse) (Object)this, true, false, f, g, h, i, this.activeButton);
+                Event<Mouse> event2 = new Event<>((Mouse) (Object)this, true, false, f, g, h, i);
                 Listener.getMouseDrag().handleValue(event2);
             }
         }
diff --git a/src/main/java/me/matl114/utils/DebugUtils.java b/src/main/java/me/matl114/utils/DebugUtils.java
@@ -1,60 +1,4 @@
 package me.matl114.utils;
 
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.DiffuseLighting;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.render.model.BakedModel;
-import net.minecraft.client.render.model.json.ModelTransformationMode;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.ItemStack;
-
 public class DebugUtils {
-    public static void renderItemContainerItemInfo(ItemRenderer itemRenderer, MatrixStack matrices, ModelTransformationMode renderMode, ItemStack stack, boolean leftHanded, VertexConsumerProvider vertexConsumers, int overlay){
-        matrices.push();
-        try{
-            final float scale=0.54f;
-            final float scale_ground=0.8f;
-            boolean inGui = false;
-            if(renderMode == ModelTransformationMode.GUI){
-                inGui = true;
-                matrices.translate(0.26,-0.26,1f);
-                matrices. scale(scale, scale, scale);
-            }else if(renderMode == ModelTransformationMode.GROUND){
-                matrices.translate(0.15,-0.15,0);
-                matrices. scale(scale_ground, scale_ground, scale_ground);
-            }else if(renderMode == ModelTransformationMode.FIXED){
-                matrices.translate(-0.25,-0.25,-0.05);
-                matrices. scale(scale_ground, scale_ground, scale_ground);
-            }else if(renderMode == ModelTransformationMode.HEAD) {
-                //seems too wierd, give up
-                return;
-//                    matrices.translate(-0.25,0.5,-0.05);
-//    //                matrices. scale(scale_ground, scale_ground, scale_ground);
-//                    renderMode = ModelTransformationMode.FIXED;
-            }else if(renderMode == ModelTransformationMode.THIRD_PERSON_RIGHT_HAND){
-                //seems too wierd
-//                matrices.translate(0.25,0.25,0.05);
-//               matrices. scale(scale, scale, scale);
-//                renderMode = ModelTransformationMode.GUI;
-                return;
-            }else if(renderMode == ModelTransformationMode.THIRD_PERSON_LEFT_HAND){
-                //seems too wierd
-//                matrices.translate(0.25,0.25,0.05);
-//                matrices. scale(scale, scale, scale);
-//                renderMode = ModelTransformationMode.GUI;
-                return;
-            }else{
-                return;
-            }
-            BakedModel bakedModel=itemRenderer.getModel(stack, MinecraftClient.getInstance().world, MinecraftClient.getInstance().player, 0);
-            //fixme: renderer error here
-            if(inGui){
-                DiffuseLighting.disableGuiDepthLighting();
-            }
-            itemRenderer.renderItem(stack,renderMode,leftHanded,matrices,vertexConsumers,0xF000F0,overlay,bakedModel);
-        }finally {
-            matrices.pop();
-        }
-    }
 }
diff --git a/src/main/resources/assets/slimefunhelper/lang/en_us.json b/src/main/resources/assets/slimefunhelper/lang/en_us.json
@@ -132,6 +132,7 @@
 	"att-bot.mace-height-multiply.tooltips": "值不应高于170,若同时使用TP Reach,则值不应高于140/100",
 	"att-bot.mace-pass-totem": "武器攻击:重锤pass图腾",
 	"att-bot.mace-pass-totem.tooltips": "测试功能\n不稳定",
+	"att-bot.mace-enable": "武器攻击:启用重锤",
 	"att-bot.opposite-attack-multiply": "武器攻击:身后实体加权",
 	"att-bot.opposite-attack-multiply.tooltips": "在玩家身后的实体在进行攻击目标选取的时候会获得此加权值\u000A这是为了防止反作弊插件在玩家身后生成假人来测试杀戮\n不加权情况为0.0D,值越大,身后实体越不可能被攻击",
 	"att-bot.player-attack-multiply": "武器攻击:玩家加权",
diff --git a/src/main/resources/slimefun-item-model.yml b/src/main/resources/slimefun-item-model.yml

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public ListUnmodifiableWidget(ListEntryWidgetController controller, int x, int y`
`13`	`13`	`this.controller = controller;`
`14`	`14`	`refreshList();`
`15`	`15`	`}`
	`16`	`+ //todo check`
`16`	`17`	`protected void refreshList(){`
`17`	`18`	`clearScrollingWidget();`
`18`	`19`	`int size = controller.size();`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void onSeedOre(ArgumentInputStream re){`
`97`	`97`	`}`
`98`	`98`	`{`
`99`	`99`	`main.subBuilder(SubCommand.taskBuilder())`
`100`		`- .name("seedore")`
	`100`	`+ .name("seed")`
`101`	`101`	`.helper("<operation> <seed> 进行seed操作")`
`102`	`102`	`.arg(`
`103`	`103`	`SimpleCommandArgs.argumentBuilder()`