Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.1.+'
id 'fabric-loom' version '1.2.+'
id 'maven-publish'

id "com.github.breadmoirai.github-release" version "2.4.1"
Expand Down Expand Up @@ -186,4 +186,4 @@ if (System.getenv("CURSEFORGE_TOKEN")) {
}

publish.dependsOn(tasks.named("curseforge"))
}
}
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.19.4
yarn_mappings=1.19.4+build.1
loader_version=0.14.17
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.1
loader_version=0.14.21

# Mod Properties
mod_version = 1.1.7
Expand All @@ -14,8 +14,8 @@ org.gradle.jvmargs=-Xmx1G

# 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.75.3+1.19.4
modmenu_version=6.1.0-rc.1
fabric_version=0.83.0+1.20.1
modmenu_version=7.0.1

# Publishing metadata
curseforge_id=310205
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
25 changes: 18 additions & 7 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions src/main/java/link/infra/borderlessmining/config/ConfigScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.Screen;
Expand All @@ -12,7 +13,6 @@
import net.minecraft.client.gui.widget.ElementListWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.client.option.SimpleOption;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
Expand Down Expand Up @@ -86,10 +86,10 @@ public ConfigListEntry(List<ClickableWidget> buttons) {
}

@Override
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
for (ClickableWidget widget : buttons) {
widget.setY(y);
widget.render(matrices, mouseX, mouseY, tickDelta);
widget.render(context, mouseX, mouseY, tickDelta);
}
}

Expand Down Expand Up @@ -125,13 +125,13 @@ public final void removed() {
public abstract void save();

@Override
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
super.render(matrices, mouseX, mouseY, delta);
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
super.render(drawContext, mouseX, mouseY, delta);
Style hoveredStyle = entries.getHoveredStyle(mouseX, mouseY);
if (hoveredStyle != null) {
renderTextHoverEffect(matrices, hoveredStyle, mouseX, mouseY);
drawContext.drawHoverEvent(this.textRenderer, hoveredStyle, mouseX, mouseY);
}
drawCenteredTextWithShadow(matrices, this.textRenderer, this.title, this.width / 2, 10, 16777215);
drawContext.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 10, 16777215);
}

public abstract void addElements();
Expand Down Expand Up @@ -164,8 +164,8 @@ public ConfigListHeader(Text headerText, TextRenderer textRenderer, int width, S
}

@Override
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
drawCenteredTextWithShadow(matrices, textRenderer, headerText, width / 2, y + 5, 16777215);
public void render(DrawContext drawContext, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
drawContext.drawCenteredTextWithShadow(textRenderer, headerText, width / 2, y + 5, 16777215);
}

private Style getStyleAt(int mouseX) {
Expand Down Expand Up @@ -261,9 +261,9 @@ public Style getHoveredStyle(int mouseX, int mouseY) {
}

@Override
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
drawTextWithShadow(matrices, textRenderer, textField.getMessage(), this.x, y + 5, 16777215);
super.render(matrices, index, y, x, entryWidth, entryHeight, mouseX, mouseY, hovered, tickDelta);
public void render(DrawContext drawContext, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
drawContext.drawTextWithShadow(textRenderer, textField.getMessage(), this.x, y + 5, 16777215);
super.render(drawContext, index, y, x, entryWidth, entryHeight, mouseX, mouseY, hovered, tickDelta);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"depends": {
"fabricloader": ">=0.7.2",
"fabric-resource-loader-v0": "*",
"minecraft": "1.19.4"
"minecraft": "~1.20"
}
}