From 30e51cde58aa9d7b4b5af273601385c43cda9726 Mon Sep 17 00:00:00 2001
From: JFronny <33260128+jfronny@users.noreply.github.com>
Date: Sat, 12 Dec 2020 20:32:51 +0100
Subject: [PATCH] 1.16.4 + Modrinth

---
 .gitlab-ci.yml                                | 14 +++++++--
 build.gradle                                  | 30 ++++++++-----------
 gradle.properties                             |  8 ++---
 .../slyde/mixin/SliderWidgetMixin.java        |  4 +--
 .../slyde/mixin/SodiumSliderControlMixin.java |  4 +--
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf5d82c..aa55379 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,21 @@ variables:
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 
-deploy:
+build_test:
   stage: deploy
-  script: gradle --build-cache assemble
+  script:
+    - gradle --build-cache assemble
+    - cp build/libs/* ./
+    - rm *-dev.jar
+    - mv *.jar latest.jar
   artifacts:
     paths:
       - build/libs
+      - latest.jar
   only:
     - master
+
+modrinth:
+  stage: deploy
+  when: manual
+  script: gradle --build-cache publishModrinth
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2605296..2bb7c1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'fabric-loom' version '0.5-SNAPSHOT'
     id 'maven-publish'
+    id "com.modrinth.minotaur" version "1.1.0"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -55,23 +56,18 @@ jar {
     from "LICENSE"
 }
 
-// configure the maven publication
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            // add all the jars that should be included when publishing to maven
-            artifact(remapJar) {
-                builtBy remapJar
-            }
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-            }
-        }
-    }
+import com.modrinth.minotaur.TaskModrinthUpload
 
-    // select the repositories you want to publish to
-    repositories {
-        // uncomment to publish to the local maven
-        // mavenLocal()
+task publishModrinth (type: TaskModrinthUpload){
+    token = System.getenv("MODRINTH_API_TOKEN") // Use an environment property!
+    projectId = 'diCZrsch'
+    versionNumber = "${project.mod_version}"
+    uploadFile = remapJar // This is the java jar task
+    addGameVersion("${project.minecraft_version}")
+    addLoader('fabric')
+    versionName = "[${project.minecraft_version}] ${project.mod_version}"
+    afterEvaluate {
+        tasks.publishModrinth.dependsOn(remapJar)
+        tasks.publishModrinth.dependsOn(sourcesJar)
     }
 }
diff --git a/gradle.properties b/gradle.properties
index acdaff4..5dac7ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,10 +2,10 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.16.3
-yarn_mappings=1.16.3+build.27
-loader_version=0.10.0+build.208
+minecraft_version=1.16.4
+yarn_mappings=1.16.4+build.7
+loader_version=0.10.8
 # Mod Properties
-mod_version=1.1
+mod_version=1.2
 maven_group=io.gitlab.jfronny
 archives_base_name=Slyde
diff --git a/src/main/java/io/gitlab/jfronny/slyde/mixin/SliderWidgetMixin.java b/src/main/java/io/gitlab/jfronny/slyde/mixin/SliderWidgetMixin.java
index 3bac849..17cb4bc 100644
--- a/src/main/java/io/gitlab/jfronny/slyde/mixin/SliderWidgetMixin.java
+++ b/src/main/java/io/gitlab/jfronny/slyde/mixin/SliderWidgetMixin.java
@@ -21,9 +21,7 @@ public abstract class SliderWidgetMixin {
     @Overwrite
     private void setValue(double mouseX) {
         double d = value;
-        value = mouseX;
-        if (!SlydeClient.isActive())
-            value = MathHelper.clamp(value, 0.0D, 1.0D);
+        value = SlydeClient.isActive() ? mouseX : MathHelper.clamp(mouseX, 0.0D, 1.0D);
         if (d != value) {
             applyValue();
         }
diff --git a/src/main/java/io/gitlab/jfronny/slyde/mixin/SodiumSliderControlMixin.java b/src/main/java/io/gitlab/jfronny/slyde/mixin/SodiumSliderControlMixin.java
index 38bf7f4..b2e44c1 100644
--- a/src/main/java/io/gitlab/jfronny/slyde/mixin/SodiumSliderControlMixin.java
+++ b/src/main/java/io/gitlab/jfronny/slyde/mixin/SodiumSliderControlMixin.java
@@ -25,9 +25,7 @@ public abstract class SodiumSliderControlMixin extends ControlElement<Integer> {
      */
     @Overwrite(remap = false)
     private void setValue(double d) {
-        this.thumbPosition = d;
-        if (!SlydeClient.isActive())
-            this.thumbPosition = MathHelper.clamp(this.thumbPosition, 0.0D, 1.0D);
+        this.thumbPosition = SlydeClient.isActive() ? d : MathHelper.clamp(d, 0.0D, 1.0D);
         int value = this.getIntValue();
         if (this.option.getValue() != value) {
             this.option.setValue(value);