feat: all shit

Author: m1919810

build.gradle

@@ -69,8 +69,6 @@ dependencies {
 	compileOnly 'org.projectlombok:lombok:1.18.30'   // 最新的 Lombok 版本
 	compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 	annotationProcessor 'org.projectlombok:lombok:1.18.30'  // 注解处理器
-	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
-	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
 
 
 }
@@ -172,10 +170,6 @@ tasks.named("runClient", JavaExec) {
 //	]
 //}
 
-tasks.test {
-	useJUnitPlatform()
-}
-
 
 // configure the maven publication
 publishing {

src/main/java/me/matl114/events/Listener.java

@@ -466,7 +466,7 @@ public static EventChannel<Packet<?>> getPacketSendPoint(){
     private static final EventChannel<Mouse> mouseMove = new EventChannel<>();
     @Getter
     @Cancelable
-    @ExtraArgs(value = {double.class, double.class, int.class, double.class, double.class}, names = {"mouseX", "mouseY", "activeButton", "deltaX", "deltaY"})
+    @ExtraArgs(value = {double.class, double.class, double.class, double.class}, names = {"mouseX", "mouseY", "deltaX", "deltaY"})
     private static final EventChannel<Mouse> mouseDrag = new EventChannel<>();
     @Getter
     @Cancelable

src/main/java/me/matl114/hacks/modules/interact/InteractExtra.java

@@ -20,6 +20,7 @@ public InteractExtra() {
         .build();
 
     public final IntRef noCooldownValue = builder(Configs.INTERACT_CONFIG, NO_COOLDOWN_VALUE, IntRef.TYPE)
+        .defaultValue(4)
         .build();
 
     public final FlagRef rideUse = builder(Configs.INTERACT_CONFIG, INTERACT_WHEN_RIDING, FlagRef.TYPE)

src/main/java/me/matl114/hacks/modules/render/SleepMode.java

@@ -363,7 +363,7 @@ public void interceptMouseDragged(Event<Mouse> event){
         if(isScreenSleeping()){
             event.cancel();
             if(sleepingScreenInstance != null){
-                sleepingScreenInstance.mouseDragged((Double) event.extraArgs[0], (Double) event.extraArgs[1], (Integer)event.extraArgs[2], (Double) event.extraArgs[3], (Double)event.extraArgs[4]);
+                sleepingScreenInstance.mouseDragged((Double) event.extraArgs[0], (Double) event.extraArgs[1], event.context.activeButton, (Double) event.extraArgs[2], (Double)event.extraArgs[3]);
             }
         }
     }

src/main/java/me/matl114/hacks/modules/slimefun/SlimefunGuide.java

@@ -90,16 +90,6 @@ public void openCraftTypeMenu(RecipeDatabase.CraftingType type){
         ));
     }
 
-    public void openVanillaRecipeTypeMenuFromEntry(RecipeEntry type){
-        if(handleNotEnable())return;
-        SlimefunTasks.openOrSwitch(SlimefunEntryListScreen.recipeEntry(RecipeTasks.getAllRecipe().values()
-            .stream()
-            .filter(i-> Objects.equals(type, i.type()))
-            .map(RecipeEntry.class::cast)
-            .toList())
-        );
-    }
-
 
     private static final Text TITLE_ALL_ITEM = Text.literal("全部记录物品");
     public static final List<Text> TOOLTIPS_ITEM_RULE =  List.of(

src/main/java/me/matl114/managers/config/Config.java

@@ -437,7 +437,8 @@ public SettingBuilder(MapRef ref, Config rootConfig, Class<T> clazz){
         protected final Class<T> clazz;
         protected String[] path;
         protected Ref<T> ref;
-        protected T defaultValue;
+        @Nullable
+        protected Optional<T> defaultValue;
         protected Ref<T> getRef(){
             if(ref == null){
                 Object obj = root.get(path);
@@ -456,7 +457,7 @@ public SettingBuilder<T> path(String... path){
         }
 
         public SettingBuilder<T> defaultValue(T val){
-            this.defaultValue = val;
+            this.defaultValue = Optional.ofNullable(val);
             var instance = Refs.wrapInstance(val);
             ref = (Ref<T>) root.getOrCreate(instance, path);
             if(ref == instance){
@@ -485,7 +486,7 @@ public SettingBuilder<T> registerHotkey(SimpleHotKey.InputHandler handler){
                     ((SettingBuilder<MultiKeyBind>)this).updateListener(hotKey::setKeyCodes);
                     return this;
                 }else{
-                    MultiKeyBind defaultKeyBind = this.defaultValue == null ? new MultiKeyBind(""): (MultiKeyBind)this.defaultValue;
+                    MultiKeyBind defaultKeyBind = this.defaultValue == null ? new MultiKeyBind(""): (MultiKeyBind)this.defaultValue.orElse(null);
                     IHotKey hotKey1 = new SimpleHotKey(path, defaultKeyBind);
                     hotKey1.setInputHandler(handler);
                     SimpleInputManager.getInstance().registerHotKeys(hotKey1);
@@ -506,6 +507,7 @@ public <W extends Ref<T>> SettingBuilder<T> apply(Consumer<W> va){
         }
 
         public  <W extends Ref<T>> W build(){
+            Objects.requireNonNull(defaultValue);
             var ref1 = (W) Objects.requireNonNull(getRef());
             ref1.setConfigReference(rootConfig);
             return ref1;

src/main/java/me/matl114/mixins/events/MinecraftClientEvents.java

@@ -1,5 +1,7 @@
 package me.matl114.mixins.events;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import me.matl114.events.GlobalEventVars;
 import me.matl114.events.Listener;
 import me.matl114.events.Event;
@@ -68,12 +70,12 @@ public void onServerDisconnect(Screen disconnectionScreen, boolean transferring,
             Listener.getServerDisconnectPoint().broadcast(null);
     }
 
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;render(Lnet/minecraft/client/render/RenderTickCounter;Z)V"))
-    private void onGameRenderer(GameRenderer renderer, RenderTickCounter counter, boolean z){
-        Event<GameRenderer> rendererEvent = new Event<>(renderer, true, false, counter, z);
+    @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;render(Lnet/minecraft/client/render/RenderTickCounter;Z)V"))
+    private void onGameRenderer(GameRenderer instance, RenderTickCounter tickCounter, boolean tick, Operation<Void> original){
+        Event<GameRenderer> rendererEvent = new Event<>(instance, true, false, tickCounter, tick);
         Listener.getGameRender().handleValue(rendererEvent);
         if(!rendererEvent.isCancelled()){
-            renderer.render(counter, z);
+            original.call(instance, tickCounter, tick);
         }
     }
     @Inject(method = "printCrashReport(Lnet/minecraft/client/MinecraftClient;Ljava/io/File;Lnet/minecraft/util/crash/CrashReport;)V", at = @At(value = "INVOKE", target = "Ljava/lang/System;exit(I)V", shift = At.Shift.BEFORE), cancellable = true)

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, this.activeButton , h, i);
+        Event<Mouse> event = new Event<>((Mouse) (Object)this, true, false, f, g, h, i, this.activeButton);
         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, this.activeButton , h, i);
+                Event<Mouse> event2 = new Event<>((Mouse) (Object)this, true, false, f, g, h, i, this.activeButton);
                 Listener.getMouseDrag().handleValue(event2);
             }
         }