Fixed bug with keybinds without controlling > 1.20.1

nikita51bot · nikita51bot · commit 557cd801cedf · 2026-04-02T23:54:15.000+03:00
Updated controlling version on 26.1
Removed unnecessary conditions with  fabric api v1 -&gt; v2
diff --git a/src/main/java/net/lopymine/patpat/PatPat.java b/src/main/java/net/lopymine/patpat/PatPat.java
@@ -10,7 +10,7 @@
 public class PatPat {
 
 	public static final String MOD_VERSION = /*$ mod_version*/ "1.2.6+26.1+fabric";
-	public static final String BUILD_CODE_TIME = /*$ build_code_time*/ "02bc591";
+	public static final String BUILD_CODE_TIME = /*$ build_code_time*/ "02c5479";
 	public static final String MOD_NAME = /*$ mod_name*/ "PatPat";
 	public static final String MOD_ID = /*$ mod_id*/ "patpat";
 	public static final String SERVER_CONFIG_VERSION = /*$ server_config_version*/ "1.0.0";
diff --git a/src/main/java/net/lopymine/patpat/client/command/PatPatClientCommandManager.java b/src/main/java/net/lopymine/patpat/client/command/PatPatClientCommandManager.java
@@ -14,11 +14,9 @@
 import net.lopymine.patpat.entrypoint.ClientMultiLoader;
 import net.lopymine.patpat.extension.TextExtension;
 import net.lopymine.patpat.logger.PatLogger;
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
+
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 
 @ExtensionMethod(TextExtension.class)
 public class PatPatClientCommandManager {
diff --git a/src/main/java/net/lopymine/patpat/client/command/ignore/PatPatClientIgnoreCommand.java b/src/main/java/net/lopymine/patpat/client/command/ignore/PatPatClientIgnoreCommand.java
@@ -19,11 +19,8 @@
 
 import java.util.Objects;
 
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.literal;
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.argument;
 
diff --git a/src/main/java/net/lopymine/patpat/client/command/info/PatPatClientInfoCommand.java b/src/main/java/net/lopymine/patpat/client/command/info/PatPatClientInfoCommand.java
@@ -17,11 +17,8 @@
 import net.minecraft.network.chat.*;
 import net.minecraft.network.chat.ClickEvent.Action;
 
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.literal;
 
 @ExtensionMethod(ClientCommandExtension.class)
diff --git a/src/main/java/net/lopymine/patpat/client/command/list/PatPatClientListChangeCommand.java b/src/main/java/net/lopymine/patpat/client/command/list/PatPatClientListChangeCommand.java
@@ -19,11 +19,8 @@
 
 import java.util.*;
 
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.literal;
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.argument;
 
diff --git a/src/main/java/net/lopymine/patpat/client/command/list/PatPatClientListCommand.java b/src/main/java/net/lopymine/patpat/client/command/list/PatPatClientListCommand.java
@@ -3,11 +3,9 @@
 package net.lopymine.patpat.client.command.list;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
+
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.literal;
 
 public class PatPatClientListCommand {
diff --git a/src/main/java/net/lopymine/patpat/client/command/list/PatPatClientListInfoCommand.java b/src/main/java/net/lopymine/patpat/client/command/list/PatPatClientListInfoCommand.java
@@ -16,11 +16,9 @@
 
 import java.util.*;
 
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
+
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.literal;
 
 @ExtensionMethod(ClientCommandExtension.class)
diff --git a/src/main/java/net/lopymine/patpat/client/command/list/PatPatClientListSetModeCommand.java b/src/main/java/net/lopymine/patpat/client/command/list/PatPatClientListSetModeCommand.java
@@ -16,11 +16,8 @@
 
 import net.minecraft.network.chat.*;
 
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.literal;
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.argument;
 
diff --git a/src/main/java/net/lopymine/patpat/client/command/mod/PatPatClientModEnableCommand.java b/src/main/java/net/lopymine/patpat/client/command/mod/PatPatClientModEnableCommand.java
@@ -14,11 +14,8 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.*;
 
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import static net.lopymine.patpat.client.command.PatPatClientCommandManager.literal;
 
 @ExtensionMethod(ClientCommandExtension.class)
diff --git a/src/main/java/net/lopymine/patpat/client/keybinding/PatPatClientKeybindingManager.java b/src/main/java/net/lopymine/patpat/client/keybinding/PatPatClientKeybindingManager.java
@@ -6,10 +6,9 @@
 import net.minecraft.client.gui.screens.options.controls.*;
 //? if >=1.19.4 && controlling {
 
-/*import net.lopymine.patpat.mixin.controlling.KeyBindsScreenAccessor;
+import net.lopymine.patpat.mixin.KeyBindsScreenAccessor;
 
-*///?}
-import net.minecraft.client.gui.screens./*? if >=1.21 {*/options./*?}*/controls.*;
+//?}
 import net.minecraft.client.KeyMapping;
 
 import net.lopymine.patpat.client.PatPatClient;
@@ -58,9 +57,9 @@ public static void handlePatPatKeybindingOnKeyPressed(
 				keybinding.sendBindingKeys();
 				screen.selectedKey = null;
 			}
-			//? if >=1.19.4 && controlling {
-			/*((KeyBindsScreenAccessor) (screen)).getList().refreshEntries();
-			*///?}
+			//? if >=1.19.4 {
+            ((KeyBindsScreenAccessor) (screen)).getList().refreshEntries();
+			//?}
 			cancel.run();
 		}
 	}
@@ -77,9 +76,9 @@ public static void handlePatPatKeybindingOnMouseClick(
 				keybinding.sendBindingKeys();
 				screen.selectedKey = null;
 			}
-			//? if >=1.19.4 && controlling {
-			/*((KeyBindsScreenAccessor) (screen)).getList().refreshEntries();
-			*///?}
+			//? if >=1.19.4 {
+            ((KeyBindsScreenAccessor) (screen)).getList().refreshEntries();
+			//?}
 			cancel.run();
 		}
 	}
diff --git a/src/main/java/net/lopymine/patpat/entrypoint/loader/client/IClientModLoader.java b/src/main/java/net/lopymine/patpat/entrypoint/loader/client/IClientModLoader.java
@@ -5,11 +5,9 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.brigadier.CommandDispatcher;
 import java.util.function.Consumer;
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
+
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import net.lopymine.patpat.client.resourcepack.AbstractResourceReloadListener;
 import net.lopymine.patpat.packet.*;
 import net.minecraft.client.KeyMapping;
diff --git a/src/main/java/net/lopymine/patpat/extension/ClientCommandExtension.java b/src/main/java/net/lopymine/patpat/extension/ClientCommandExtension.java
@@ -5,11 +5,8 @@
 import net.lopymine.patpat.PatPat;
 import net.lopymine.patpat.utils.TextUtils;
 
-//? if <1.19 {
-/*import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-*///?} else {
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
- //?}
+
 import net.minecraft.network.chat.*;
 
 import com.mojang.brigadier.context.CommandContext;
diff --git a/src/main/java/net/lopymine/patpat/extension/PoseExtension.java b/src/main/java/net/lopymine/patpat/extension/PoseExtension.java
@@ -12,9 +12,9 @@ public static Pose copy(Pose entry) {
 		/*PoseStack poseStack = new PoseStack();
 		Pose copy = poseStack.last();
 		//? if >=1.19.3 {
-		/^copy.pose().set(entry.pose());
+		copy.pose().set(entry.pose());
 		copy.normal().set(entry.normal());
-		^///?} elif >=1.17 {
+		//?} elif >=1.17 {
 		/^copy.pose().load(entry.pose());
 		copy.normal().load(entry.normal());
 		^///?}
diff --git a/src/main/java/net/lopymine/patpat/mixin/KeyBindsScreenAccessor.java b/src/main/java/net/lopymine/patpat/mixin/KeyBindsScreenAccessor.java
@@ -1,8 +1,8 @@
-package net.lopymine.patpat.mixin.controlling;
+package net.lopymine.patpat.mixin;
 
-//? if >=1.19.4 && controlling {
+//? if >=1.19.4 {
 
-/*import net.minecraft.client.gui.screens.options.controls.*;
+import net.minecraft.client.gui.screens.options.controls.*;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
@@ -13,4 +13,4 @@ public interface KeyBindsScreenAccessor {
 	KeyBindsList getList();
 
 }
-*///?}
+//?}
diff --git a/src/main/java/net/lopymine/patpat/mixin/controlling/IPlatformHelperMixin.java b/src/main/java/net/lopymine/patpat/mixin/controlling/IPlatformHelperMixin.java
@@ -2,7 +2,7 @@
 
 //? if >=1.21 && controlling {
 
-/*import com.blamejared.controlling.client.NewKeyBindsScreen;
+import com.blamejared.controlling.client.NewKeyBindsScreen;
 import com.blamejared.controlling.platform.IPlatformHelper;
 import net.lopymine.patpat.client.keybinding.*;
 import net.minecraft.client.Options;
@@ -14,13 +14,13 @@
 public interface IPlatformHelperMixin {
 
 	@Inject(at = @At("HEAD"), method = "handleKeyPress", cancellable = true)
-	private void handlePatPatKeybindingOnKeyPressed(NewKeyBindsScreen screen, Options options, /^? if >=1.21.9 {^//^net.minecraft.client.input.KeyEvent event ^//^?} else {^/ net.minecraft.client.input.KeyEvent event /^?}^/, CallbackInfo ci) {
+	private void handlePatPatKeybindingOnKeyPressed(NewKeyBindsScreen screen, Options options, /*? if >=1.21.9 {*/net.minecraft.client.input.KeyEvent event /*?} else {*/ /*net.minecraft.client.input.KeyEvent event *//*?}*/, CallbackInfo ci) {
 		//? if >=1.21.9 {
-		/^int keyCode = event.key();
+		int keyCode = event.key();
 		int scanCode = event.scancode();
-		^///?}
+		//?}
 		PatPatClientKeybindingManager.handlePatPatKeybindingOnKeyPressed(screen.selectedKey, screen, keyCode, scanCode, ci::cancel);
 	}
 
 }
-*///?}
+//?}
diff --git a/src/main/java/net/lopymine/patpat/mixin/controlling/NewKeyBindsScreenMixin.java b/src/main/java/net/lopymine/patpat/mixin/controlling/NewKeyBindsScreenMixin.java
@@ -42,7 +42,7 @@ private void handlePatPatKeybindingOnKeyPressed(int keyCode, int scanCode, int m
 	}
 
 	//? if <1.19.3 {
-	@Inject(at = @At("TAIL"), method = "render")
+	/^@Inject(at = @At("TAIL"), method = "render")
 	private void renderWithTooltip(PoseStack poseStack, int mouseX, int mouseY, float partialTick, CallbackInfo ci) {
 		if (this instanceof IRequestableTooltipScreen screen) {
 			TooltipRequest tooltipRequest = screen.myTotemDoll$getCurrentRequest();
@@ -52,7 +52,7 @@ private void renderWithTooltip(PoseStack poseStack, int mouseX, int mouseY, floa
 			}
 		}
 	}
-	//?}
+	^///?}
 
 }
 *///?}
diff --git a/src/main/java/net/lopymine/patpat/mixin/controlling/NewKeyEntryMixin.java b/src/main/java/net/lopymine/patpat/mixin/controlling/NewKeyEntryMixin.java
@@ -2,7 +2,7 @@
 
 //? if >=1.17.1 && controlling {
 
-/*import com.blamejared.controlling.client.NewKeyBindsList;
+import com.blamejared.controlling.client.NewKeyBindsList;
 import com.blamejared.controlling.client.NewKeyBindsList.KeyEntry;
 import net.lopymine.patpat.client.keybinding.PatPatKeybinding;
 import net.minecraft.client.KeyMapping;
@@ -16,48 +16,48 @@
 public class NewKeyEntryMixin {
 
 	//? if >=1.19.4 {
-	/^@Shadow/^¹? if forge {¹^//^¹(remap = false)¹^//^¹?}¹^/
+	@Shadow/*? if forge {*//*(remap = false)*//*?}*/
 	@Final
 	private KeyMapping key;
-	^///?} else {
-	@Shadow
+	//?} else {
+	/*@Shadow
 	@Final
 	private KeyMapping keybinding;
-	//?}
+	*///?}
 
-	@Shadow/^? if forge {^//^(remap = false)^//^?}^/
+	@Shadow/*? if forge {*//*(remap = false)*//*?}*/
 	@Final
 	private Button btnChangeKeyBinding;
 
 	//? if <1.19.3 {
-	@Inject(at = @At("TAIL"), method = "<init>")
+	/*@Inject(at = @At("TAIL"), method = "<init>")
 	private void init(NewKeyBindsList list, KeyMapping name, CallbackInfo ci) {
 		if (!(this.keybinding instanceof PatPatKeybinding patPatKeybinding)) {
 			return;
 		}
 
 		this.btnChangeKeyBinding.onTooltip = (button, poseStack, a, b) -> {
 			/^? if >=1.18 {^/
-			/^KeyBindsScreen screen = list.keyBindsScreen;
-			 ^//^?} else {^/
-			KeyBindsScreen screen = ((NewKeyBindsListAccessor) list).getScreenPleaseThanks();
-			/^?}^/
+			KeyBindsScreen screen = list.keyBindsScreen;
+			 /^?} else {^/
+			/^KeyBindsScreen screen = ((NewKeyBindsListAccessor) list).getScreenPleaseThanks();
+			^//^?}^/
 			((net.lopymine.patpat.utils.mixin.IRequestableTooltipScreen) screen).myTotemDoll$requestTooltip((pose, x, y, d) -> {
 				screen.renderTooltip(poseStack, patPatKeybinding.getFullTranslatedKeyMessage(), x, y);
 			});
 		};
 	}
-	//?}
+	*///?}
 
-	@Inject(at = @At(/^? if >=1.19.4 {^/ /^"TAIL" ^//^?} else {^/ "HEAD" /^?}^/), method = /^? if >=1.19.4 {^/ /^"refreshEntry" ^//^?} else {^/ "render" /^?}^/)
+	@Inject(at = @At(/*? if >=1.19.4 {*/ "TAIL" /*?} else {*/ /*"HEAD" *//*?}*/), method = /*? if >=1.19.4 {*/ "refreshEntry" /*?} else {*/ /*"render" *//*?}*/)
 	private void addPatPatTooltipToPatPatKey(CallbackInfo ci) {
 		//? if >=1.19.4 {
-		/^if (!(this.key instanceof PatPatKeybinding patPatKeybinding)) {
+		if (!(this.key instanceof PatPatKeybinding patPatKeybinding)) {
 			return;
 		}
 		this.btnChangeKeyBinding.setTooltip(Tooltip.create(patPatKeybinding.getTranslatedKeyMessage()));
-		^///?}
+		//?}
 	}
 
 }
-*///?}
+//?}
diff --git a/src/main/resources/patpat-controlling.mixins.json5 b/src/main/resources/patpat-controlling.mixins.json5
@@ -9,26 +9,22 @@
 	"client": [
 		//? controlling && >=1.17.1 {
 
-		/*//? if >=1.19.4 {
-		/^"KeyBindsScreenAccessor",
-		^///?}
-
 		//? if >=1.21 {
-		/^"IPlatformHelperMixin",
-		^///?} else {
-		"NewKeyBindsScreenMixin",
-		//?}
+		"IPlatformHelperMixin",
+		//?} else {
+		/*"NewKeyBindsScreenMixin",
+		*///?}
 
 		//? if <1.19.3 {
-		"NewKeyBindsListMixin",
-		//?}
+		/*"NewKeyBindsListMixin",
+		*///?}
 
 		//? if =1.17.1 {
-		/^"NewKeyBindsListAccessor",
-		^///?}
+		/*"NewKeyBindsListAccessor",
+		*///?}
 
 		"NewKeyEntryMixin"
-		*///?}
+		//?}
 
 		//? if controlling && <=1.17 {
 
diff --git a/src/main/resources/patpat.mixins.json5 b/src/main/resources/patpat.mixins.json5
@@ -22,6 +22,10 @@
 		"ParentElementMixin",
 		"KeyBindsScreenMixin",
 
+        //? if >=1.19.4 {
+        "KeyBindsScreenAccessor",
+        //?}
+
 		//? if forge {
 		/*"forge.MinecraftMixin",
 		*///?}
diff --git a/versions/fabric-26.1/gradle.properties b/versions/fabric-26.1/gradle.properties
@@ -14,9 +14,9 @@ dep.flashback=unknown
 # proxlib, check https://modrinth.com/mod/proxlib/versions?g=26.1&l=fabric
 dep.proxlib=unknown
 # controlling, check https://modrinth.com/mod/controlling/versions?g=26.1&l=fabric
-dep.controlling=unknown
+dep.controlling=26.1.0.1
 # searchables, check https://modrinth.com/mod/searchables/versions?g=26.1&l=fabric
-dep.searchables=unknown
+dep.searchables=jayVAixj
 # modmenu, check https://modrinth.com/mod/modmenu/versions?g=26.1&l=fabric
 dep.modmenu=lWZE38V3
 # yacl, check https://modrinth.com/mod/yacl/versions?g=26.1&l=fabric
@@ -28,4 +28,4 @@ dep.geckolib=yUpAp23B
 # iris, check https://modrinth.com/mod/iris/versions?g=26.1&l=fabric
 dep.iris=1.10.7+26.1-fabric
 # sodium, check https://modrinth.com/mod/sodium/versions?g=26.1&l=fabric
-dep.sodium=mc26.1-0.8.7-fabric
+dep.sodium=mc26.1-0.8.7-fabric

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,9 @@`
`6`	`6`	`import net.minecraft.client.gui.screens.options.controls.*;`
`7`	`7`	`//? if >=1.19.4 && controlling {`
`8`	`8`
`9`		`-/*import net.lopymine.patpat.mixin.controlling.KeyBindsScreenAccessor;`
	`9`	`+import net.lopymine.patpat.mixin.KeyBindsScreenAccessor;`
`10`	`10`
`11`		`-*///?}`
`12`		`-import net.minecraft.client.gui.screens./? if >=1.21 {/options./?}/controls.*;`
	`11`	`+//?}`
`13`	`12`	`import net.minecraft.client.KeyMapping;`
`14`	`13`
`15`	`14`	`import net.lopymine.patpat.client.PatPatClient;`
`@@ -58,9 +57,9 @@ public static void handlePatPatKeybindingOnKeyPressed(`
`58`	`57`	`keybinding.sendBindingKeys();`
`59`	`58`	`screen.selectedKey = null;`
`60`	`59`	`}`
`61`		`- //? if >=1.19.4 && controlling {`
`62`		`- /*((KeyBindsScreenAccessor) (screen)).getList().refreshEntries();`
`63`		`- *///?}`
	`60`	`+ //? if >=1.19.4 {`
	`61`	`+ ((KeyBindsScreenAccessor) (screen)).getList().refreshEntries();`
	`62`	`+ //?}`
`64`	`63`	`cancel.run();`
`65`	`64`	`}`
`66`	`65`	`}`
`@@ -77,9 +76,9 @@ public static void handlePatPatKeybindingOnMouseClick(`
`77`	`76`	`keybinding.sendBindingKeys();`
`78`	`77`	`screen.selectedKey = null;`
`79`	`78`	`}`
`80`		`- //? if >=1.19.4 && controlling {`
`81`		`- /*((KeyBindsScreenAccessor) (screen)).getList().refreshEntries();`
`82`		`- *///?}`
	`79`	`+ //? if >=1.19.4 {`
	`80`	`+ ((KeyBindsScreenAccessor) (screen)).getList().refreshEntries();`
	`81`	`+ //?}`
`83`	`82`	`cancel.run();`
`84`	`83`	`}`
`85`	`84`	`}`