Update to work with 1.15

Author: andyvanee

README.md

@@ -20,10 +20,11 @@ right. Currently it works perfectly for my needs using a Logitech Mouse.
 
 Using MultiMC - all that's required is to:
 
--   Use Minecraft 1.14.4
+-   Download hscroll-1.0.1.jar from the [Releases Page](https://github.com/andyvanee/hscroll/releases)
+-   Use Minecraft 1.15
 -   `Edit Instance`
 -   `Install Fabric`
--   Add hscroll-1.0.0.jar to 'Loader Mods'
+-   Add hscroll-1.0.1.jar to 'Loader Mods'
 
 ## Build
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.2.5-SNAPSHOT'
+	id 'fabric-loom' version '0.2.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -16,7 +16,7 @@ minecraft {
 dependencies {
 	//to change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.

gradle.properties

@@ -3,15 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.14.4
-	yarn_mappings=1.14.4+build.12
-	loader_version=0.6.1+build.164
-
+	minecraft_version=1.15
+	yarn_mappings=1.15+build.2
+	loader_version=0.7.2+build.175
 # Mod Properties
-	mod_version = 1.0.0
+	mod_version = 1.0.1
 	maven_group = net.fabricmc
 	archives_base_name = hscroll
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.3.2+build.218-1.14
+	fabric_version=0.4.25+build.282-1.15

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -7,26 +7,31 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import net.minecraft.client.util.Window;
 
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin {
     private MinecraftClient client;
     private double eventDeltaWheel;
+    private boolean mixinConfigured;
 
-    @Inject(at = @At("RETURN"), method = "init")
+    @Inject(at = @At("RETURN"), method = "openScreen")
     private void init(CallbackInfo info) {
-        this.client = MinecraftClient.getInstance();
-        this.eventDeltaWheel = 0.0D;
-        // Override MC scroll callback with our own
-        GLFW.glfwSetScrollCallback(this.client.window.getHandle(), this::onMouseScroll);
+        if (!mixinConfigured) {
+            this.client = MinecraftClient.getInstance();
+            this.eventDeltaWheel = 0.0D;
+            // Override MC scroll callback with our own
+            GLFW.glfwSetScrollCallback(this.client.getWindow().getHandle(), this::onMouseScroll);
+        }
+        mixinConfigured = true;
     }
 
     private void onMouseScroll(long window, double xoffset, double yoffset) {
         // TODO: implement these as minecraft settings?
         boolean translateHorizontalScroll = true;
         double horizontalScrollSensitivity = 1.0D;
 
-        if (window == MinecraftClient.getInstance().window.getHandle()) {
+        if (window == MinecraftClient.getInstance().getWindow().getHandle()) {
             double delta;
 
             if (translateHorizontalScroll) {
@@ -42,11 +47,13 @@ private void onMouseScroll(long window, double xoffset, double yoffset) {
             }
 
             if (this.client.overlay == null) {
+                Window clientWindow = MinecraftClient.getInstance().getWindow();
+
                 if (this.client.currentScreen != null) {
-                    double xposition = this.client.mouse.getX() * (double) this.client.window.getScaledWidth()
-                            / (double) this.client.window.getWidth();
-                    double yposition = this.client.mouse.getY() * (double) this.client.window.getScaledHeight()
-                            / (double) this.client.window.getHeight();
+                    double xposition = this.client.mouse.getX() * (double) clientWindow.getScaledWidth()
+                            / (double) clientWindow.getWidth();
+                    double yposition = this.client.mouse.getY() * (double) clientWindow.getScaledHeight()
+                            / (double) clientWindow.getHeight();
                     this.client.currentScreen.mouseScrolled(xposition, yposition, delta);
                 } else if (this.client.player != null) {
                     if (this.eventDeltaWheel != 0.0D && Math.signum(delta) != Math.signum(this.eventDeltaWheel)) {
@@ -61,13 +68,13 @@ private void onMouseScroll(long window, double xoffset, double yoffset) {
 
                     this.eventDeltaWheel -= (double) currentWheelDelta;
                     if (this.client.player.isSpectator()) {
-                        if (this.client.inGameHud.getSpectatorWidget().method_1980()) {
-                            this.client.inGameHud.getSpectatorWidget().method_1976((double) (-currentWheelDelta));
+                        if (this.client.inGameHud.getSpectatorHud().isOpen()) {
+                            this.client.inGameHud.getSpectatorHud().cycleSlot((double) (-currentWheelDelta));
                         } else {
-                            float float_2 = MathHelper.clamp(
+                            float j = MathHelper.clamp(
                                     this.client.player.abilities.getFlySpeed() + currentWheelDelta * 0.005F, 0.0F,
                                     0.2F);
-                            this.client.player.abilities.setFlySpeed(float_2);
+                            this.client.player.abilities.setFlySpeed(j);
                         }
                     } else {
                         this.client.player.inventory.scrollInHotbar((double) currentWheelDelta);

gradlew.bat

@@ -21,7 +21,8 @@
     "mixins": ["hscroll.mixins.json"],
 
     "depends": {
-        "fabricloader": ">=0.4.0"
+        "fabricloader": ">=0.7.2",
+        "minecraft": "1.15.x"
     },
     "suggests": {
         "flamingo": "*"