aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisxander <xander@isxander.dev>2024-05-27 15:29:56 +0100
committerisxander <xander@isxander.dev>2024-05-27 15:29:56 +0100
commit41253828df7c2066b5df29a32aa8e512f34ad85a (patch)
tree43d7c2c591a8d2112a06d6916ce3f55ffc9889da
parent41fd559c4e8c4605b9c74d66f19c92fd561df5b3 (diff)
downloadYetAnotherConfigLib-41253828df7c2066b5df29a32aa8e512f34ad85a.tar.gz
YetAnotherConfigLib-41253828df7c2066b5df29a32aa8e512f34ad85a.tar.bz2
YetAnotherConfigLib-41253828df7c2066b5df29a32aa8e512f34ad85a.zip
Fix kotlin sourceset not being included due to broken stonecutter
-rw-r--r--build.gradle.kts9
-rw-r--r--changelog.md14
-rw-r--r--settings.gradle.kts2
-rw-r--r--src/main/java/dev/isxander/yacl3/gui/ElementListWidgetExt.java2
-rw-r--r--src/main/java/dev/isxander/yacl3/gui/OptionListWidget.java2
5 files changed, 6 insertions, 23 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 9bd118d..26ef177 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ val isForgeLike = isNeoforge || isForge
val mcVersion = stonecutter.current.version
group = "dev.isxander"
-val versionWithoutMC = "3.4.3"
+val versionWithoutMC = "3.4.4"
version = "$versionWithoutMC+${stonecutter.current.project}"
val snapshotVer = "${grgit.branch.current().name.replace('/', '.')}-SNAPSHOT"
@@ -222,14 +222,7 @@ tasks {
dependsOn("publishMods")
dependsOn("publish")
}
-}
-java {
- targetCompatibility = JavaVersion.VERSION_17
- sourceCompatibility = JavaVersion.VERSION_17
-}
-
-tasks {
withType<JavaCompile> {
options.release.set(findProperty("java.version")!!.toString().toInt())
}
diff --git a/changelog.md b/changelog.md
index 4ee5f27..dbab4c7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,4 @@
-# YetAnotherConfigLib 3.4.3
+# YetAnotherConfigLib 3.4.4
This build supports the following versions:
- Fabric 1.20.1
@@ -10,14 +10,4 @@ This build supports the following versions:
## Bug Fixes
-- Fix YACL's metadata not displaying properly in MultiMC and its forks.
-- Fix (Neo)Forge throwing an unusual error when a user accidentally puts YACL for fabric on forge.
-- Fix access transformer not being present on NeoForge builds, causing crashes.
-- Fix right mouse button not propagating to controllers.
- ([#180](https://github.com/isXander/YetAnotherConfigLib/pull/180), thanks Crendgrim)
-
-## Translation Updates
-
-- Add Spanish translation. ([#178](https://github.com/isXander/YetAnotherConfigLib/pull/178), thanks zeedif)
-
-
+- Fix Kotlin DSL not being included
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7b78e52..6e84144 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ pluginManagement {
}
plugins {
- id("dev.kikugie.stonecutter") version "0.3.7"
+ id("dev.kikugie.stonecutter") version "0.3.5"
}
extensions.configure<StonecutterSettings> {
diff --git a/src/main/java/dev/isxander/yacl3/gui/ElementListWidgetExt.java b/src/main/java/dev/isxander/yacl3/gui/ElementListWidgetExt.java
index abe1107..85b86bb 100644
--- a/src/main/java/dev/isxander/yacl3/gui/ElementListWidgetExt.java
+++ b/src/main/java/dev/isxander/yacl3/gui/ElementListWidgetExt.java
@@ -82,10 +82,10 @@ public class ElementListWidgetExt<E extends ElementListWidgetExt.Entry<E>> exten
/*? if >1.20.1 { */
@Override
+ /*?}*/
protected boolean isValidMouseClick(int button) {
return button == InputConstants.MOUSE_BUTTON_LEFT || button == InputConstants.MOUSE_BUTTON_RIGHT;
}
- /*?}*/
@Override
public boolean mouseClicked(double mouseX, double mouseY, int button) {
diff --git a/src/main/java/dev/isxander/yacl3/gui/OptionListWidget.java b/src/main/java/dev/isxander/yacl3/gui/OptionListWidget.java
index 0b0d7f2..51f53b3 100644
--- a/src/main/java/dev/isxander/yacl3/gui/OptionListWidget.java
+++ b/src/main/java/dev/isxander/yacl3/gui/OptionListWidget.java
@@ -169,7 +169,7 @@ public class OptionListWidget extends ElementListWidgetExt<OptionListWidget.Entr
@Override
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
- if (this.getFocused() != null && this.isDragging() && isValidClickButton(button)) {
+ if (this.getFocused() != null && this.isDragging() && isValidMouseClick(button)) {
return this.getFocused().mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
}
return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);