diff --git a/build.gradle b/build.gradle index 641375eb..02a13717 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.5-SNAPSHOT' id 'maven-publish' id 'org.ajoberstar.reckon' version '0.13.0' } @@ -17,6 +17,7 @@ archivesBaseName = project.name loom { mixin.defaultRefmapName = 'kirin.mixin.refmap.json' + accessWidenerPath = file('src/main/resources/kirin.aw') } reckon { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e..db9a6b82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/minelittlepony/common/client/gui/element/Button.java b/src/main/java/com/minelittlepony/common/client/gui/element/Button.java index d0f72ce1..ac9eb329 100644 --- a/src/main/java/com/minelittlepony/common/client/gui/element/Button.java +++ b/src/main/java/com/minelittlepony/common/client/gui/element/Button.java @@ -253,16 +253,6 @@ public void drawMessage(DrawContext context, TextRenderer textRenderer, int colo drawScrollableText(context, textRenderer, getMessage(), bounds.left + left, bounds.top, bounds.right() - 2, bounds.bottom(), color); } - protected int getTextureY() { - int i = 1; - if (!active) { - i = 0; - } else if (isSelected()) { - i = 2; - } - return 46 + i * 20; - } - protected final void renderButtonBlit(DrawContext context, int x, int y, int state, int blockWidth, int blockHeight) { context.drawNineSlicedTexture(WIDGETS_TEXTURE, x, y, blockWidth, blockHeight, 20, 4, 200, 20, 0, state); } diff --git a/src/main/resources/kirin.aw b/src/main/resources/kirin.aw new file mode 100644 index 00000000..bbdc319a --- /dev/null +++ b/src/main/resources/kirin.aw @@ -0,0 +1,2 @@ +accessWidener v1 named +extendable method net/minecraft/client/gui/widget/PressableWidget getTextureY ()I