Skip to content

Commit

Permalink
Update to Minecraft 1.20.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Jerozgen committed Dec 5, 2023
1 parent 6edf8ee commit 7bd72f0
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 18 deletions.
11 changes: 6 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.4
minecraft_version=1.20.3
yarn_mappings=1.20.3+build.1
loader_version=0.14.24
fabric_version=0.90.7+1.20.2
fabric_version=0.91.1+1.20.3

# Mod Properties
mod_version=1.5.10+1.20.2
mod_version=1.5.10+1.20.3
maven_group=jerozgen
archives_base_name=language-reload

# Dependencies
modmenu_version=8.0.0
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
modmenu_version=9.0.0-pre.1
15 changes: 5 additions & 10 deletions src/main/java/jerozgen/languagereload/gui/LanguageListWidget.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package jerozgen.languagereload.gui;


import jerozgen.languagereload.access.ILanguageOptionsScreen;
import jerozgen.languagereload.mixin.EntryListWidgetAccessor;
import net.minecraft.client.MinecraftClient;
Expand All @@ -21,7 +20,7 @@ public class LanguageListWidget extends AlwaysSelectedEntryListWidget<LanguageEn
private final LanguageOptionsScreen screen;

public LanguageListWidget(MinecraftClient client, LanguageOptionsScreen screen, int width, int height, Text title) {
super(client, width, height, 48, height - 55 + 4, 24);
super(client, width, height - 83 - 16, 32 + 16, 24);
this.title = title;
this.screen = screen;

Expand All @@ -33,7 +32,7 @@ public LanguageListWidget(MinecraftClient client, LanguageOptionsScreen screen,
protected void renderHeader(DrawContext context, int x, int y) {
var headerText = title.copy().formatted(Formatting.UNDERLINE, Formatting.BOLD);
int headerPosX = x + width / 2 - client.textRenderer.getWidth(headerText) / 2;
int headerPosY = Math.min(top + 3, y);
int headerPosY = Math.min(this.getY() + 3, y);
context.drawText(client.textRenderer, headerText, headerPosX, headerPosY, 0xFFFFFF, false);
}

Expand Down Expand Up @@ -87,11 +86,11 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
@Nullable
protected LanguageEntry getEntryAtPosition(double x, double y) {
int halfRowWidth = this.getRowWidth() / 2;
int center = left + width / 2;
int center = this.getX() + width / 2;
int minX = center - halfRowWidth;
int maxX = center + halfRowWidth;
var scrollbarPositionX = this.getScrollbarPositionX();
int m = MathHelper.floor(y - top) - headerHeight + (int) this.getScrollAmount() - 4 + 2;
int m = MathHelper.floor(y - this.getY()) - headerHeight + (int) this.getScrollAmount() - 4 + 2;
int entryIndex = m / itemHeight;
return (x < scrollbarPositionX && x >= minX && x <= maxX && entryIndex >= 0 && m >= 0
&& entryIndex < this.getEntryCount() ? this.children().get(entryIndex) : null);
Expand All @@ -101,10 +100,6 @@ public LanguageOptionsScreen getScreen() {
return screen;
}

public int getBottom() {
return bottom;
}

public int getRowHeight() {
return itemHeight;
}
Expand All @@ -116,6 +111,6 @@ public int getRowWidth() {

@Override
protected int getScrollbarPositionX() {
return right - 6;
return this.getRight() - 6;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ public void setFocused(boolean focused) {
var it = (LanguageOptionsScreen) (Object) this;
availableLanguageList = new LanguageListWidget(client, it, listWidth, height, Text.translatable("pack.available.title"));
selectedLanguageList = new LanguageListWidget(client, it, listWidth, height, Text.translatable("pack.selected.title"));
availableLanguageList.setLeftPos(width / 2 - 4 - listWidth);
selectedLanguageList.setLeftPos(width / 2 + 4);
availableLanguageList.setX(width / 2 - 4 - listWidth);
selectedLanguageList.setX(width / 2 + 4);
addSelectableChild(availableLanguageList);
addSelectableChild(selectedLanguageList);
refresh();
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 @@ -45,7 +45,7 @@
"depends": {
"fabric-resource-loader-v0": "*",
"fabricloader": ">=0.14.21",
"minecraft": ">=1.20.2"
"minecraft": ">=1.20.3"
},
"suggests": {
"modmenu": "*"
Expand Down

0 comments on commit 7bd72f0

Please sign in to comment.