Skip to content

Commit

Permalink
Fix method name clash when PortingLib is installed
Browse files Browse the repository at this point in the history
  • Loading branch information
Sollace committed Mar 31, 2024
1 parent 5253209 commit b91e80b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 12 deletions.
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
Expand All @@ -17,6 +17,7 @@ archivesBaseName = project.name

loom {
mixin.defaultRefmapName = 'kirin.mixin.refmap.json'
accessWidenerPath = file('src/main/resources/kirin.aw')
}

reckon {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/kirin.aw
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
accessWidener v1 named
extendable method net/minecraft/client/gui/widget/PressableWidget getTextureY ()I

0 comments on commit b91e80b

Please sign in to comment.