Port to 1.17

This commit is contained in:
Michael Pfaff 2021-03-24 03:52:49 -04:00
parent e38d66bbee
commit ad84dcd16b
Signed by: michael
GPG Key ID: E53B118B12B5C7F9
4 changed files with 10 additions and 10 deletions

View File

@ -2,11 +2,11 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.16.4 minecraft_version=21w11a
yarn_mappings=1.16.4+build.9 yarn_mappings=21w11a+build.16
loader_version=0.10.8 loader_version=0.11.3
loomVersion=0.6-SNAPSHOT
# Mod Properties # Mod Properties
mod_version=1.1.0 mod_version=1.1.0
maven_group=dev.pfaff maven_group=dev.pfaff
archives_base_name=thinksame archives_base_name=thinksame

View File

@ -3,7 +3,7 @@ package dev.pfaff.thinksame.mixin;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.Mouse; import net.minecraft.client.Mouse;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.options.KeyBinding; import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.GlfwUtil; import net.minecraft.client.util.GlfwUtil;
import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.InputUtil;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
@ -73,7 +73,7 @@ public abstract class MouseMixin {
} }
boolean[] bls = new boolean[]{false}; boolean[] bls = new boolean[]{false};
if (this.client.overlay == null) { if (this.client.getOverlay() == null) {
if (this.client.currentScreen == null) { if (this.client.currentScreen == null) {
if (!this.cursorLocked && bl) { if (!this.cursorLocked && bl) {
this.lockCursor(); this.lockCursor();
@ -93,7 +93,7 @@ public abstract class MouseMixin {
} }
} }
if (!bls[0] && (this.client.currentScreen == null || this.client.currentScreen.passEvents) && this.client.overlay == null) { if (!bls[0] && (this.client.currentScreen == null || this.client.currentScreen.passEvents) && this.client.getOverlay() == null) {
if (button == 0) { if (button == 0) {
this.leftButtonClicked = bl; this.leftButtonClicked = bl;
} else if (button == 2) { } else if (button == 2) {

View File

@ -26,6 +26,6 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.10.8", "fabricloader": ">=0.10.8",
"minecraft": "1.16.4" "minecraft": "1.17.x"
} }
} }

View File

@ -1,2 +1,2 @@
#Fri Mar 05 21:09:08 EST 2021 #Mon Mar 22 23:55:52 EDT 2021
VERSION_BUILD=7 VERSION_BUILD=8