Skip to content
This repository was archived by the owner on Dec 30, 2022. It is now read-only.

Commit 097c344

Browse files
committed
Update to minecraft 1.17.1
1 parent 1f5cc7d commit 097c344

10 files changed

Lines changed: 27 additions & 17 deletions

File tree

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//file:noinspection GroovyAssignabilityCheck
22
//file:noinspection GroovyAccessibility
33
plugins {
4-
id "fabric-loom" version "0.8-SNAPSHOT"
4+
id "fabric-loom" version "0.9-SNAPSHOT"
55
id "maven-publish"
66
}
77

@@ -82,6 +82,7 @@ publishing {
8282
}
8383

8484
repositories {
85+
mavenLocal()
8586
maven {
8687
url = "http://vault:8081/repository/maven-snapshots/"
8788
allowInsecureProtocol true

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
org.gradle.jvmargs=-Xms2G -Xmx4G
1919
# Fabric Properties
2020
# check this on https://modmuss50.me/fabric.html
21-
minecraft_version=1.17
22-
yarn_mappings=1.17+build.6
23-
loader_version=0.11.3
21+
minecraft_version=1.17.1
22+
yarn_mappings=1.17.1+build.39
23+
loader_version=0.11.6
2424
# Mod Properties
2525
mod_version=1.0.0-SNAPSHOT
2626
maven_group=xyz.deathsgun
2727
archives_base_name=modmanager
2828
# Dependencies
29-
modmenu_version=2.0.2
29+
modmenu_version=2.0.5

src/main/java/xyz/deathsgun/modmanager/gui/ModDetailScreen.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected void init() {
6363
detailedMod = ModManager.getModProvider().getMod(summarizedMod.id());
6464
} catch (Exception e) {
6565
e.printStackTrace();
66-
Objects.requireNonNull(this.client).openScreen(new ModManagerErrorScreen(this, e));
66+
Objects.requireNonNull(this.client).setScreen(new ModManagerErrorScreen(this, e));
6767
}
6868
int buttonX = this.width / 8;
6969
String text = detailedMod.body();
@@ -72,7 +72,7 @@ protected void init() {
7272
}
7373
this.descriptionWidget = this.addSelectableChild(new DescriptionWidget(client, this.width - 20, this.height - 34, 79, this.height - 30, textRenderer.fontHeight, text));
7474
this.descriptionWidget.setLeftPos(10);
75-
this.addDrawableChild(new ButtonWidget(buttonX, this.height - 28, 150, 20, ScreenTexts.BACK, button -> Objects.requireNonNull(client).openScreen(previousScreen)));
75+
this.addDrawableChild(new ButtonWidget(buttonX, this.height - 28, 150, 20, ScreenTexts.BACK, button -> Objects.requireNonNull(client).setScreen(previousScreen)));
7676

7777
this.actionButton = this.addDrawableChild(new ButtonWidget(this.width - buttonX - 150, this.height - 28, 150, 20, new TranslatableText("modmanager.message.install"),
7878
this::handleActionClick));
@@ -82,7 +82,7 @@ protected void init() {
8282
private void handleActionClick(ButtonWidget buttonWidget) {
8383
if (exception != null) {
8484
buttonWidget.active = true;
85-
MinecraftClient.getInstance().openScreen(new ModManagerErrorScreen(this, exception));
85+
MinecraftClient.getInstance().setScreen(new ModManagerErrorScreen(this, exception));
8686
return;
8787
}
8888
buttonWidget.active = false;
@@ -179,6 +179,6 @@ public boolean shouldCloseOnEsc() {
179179

180180
@Override
181181
public void onClose() {
182-
Objects.requireNonNull(this.client).openScreen(previousScreen);
182+
Objects.requireNonNull(this.client).setScreen(previousScreen);
183183
}
184184
}

src/main/java/xyz/deathsgun/modmanager/gui/ModManagerErrorScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private void clearErrors() {
6666

6767
@Override
6868
public void onClose() {
69-
Objects.requireNonNull(client).openScreen(parentScreen);
69+
Objects.requireNonNull(client).setScreen(parentScreen);
7070
}
7171

7272
@Override

src/main/java/xyz/deathsgun/modmanager/gui/ModsOverviewScreen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void tick() {
9797
public void onClose() {
9898
super.onClose();
9999
this.modListWidget.close();
100-
Objects.requireNonNull(this.client).openScreen(this.previousScreen);
100+
Objects.requireNonNull(this.client).setScreen(this.previousScreen);
101101
}
102102

103103
@Override
@@ -113,7 +113,7 @@ public <E> void updateSelectedEntry(Object widget, E entry) {
113113
if (widget == this.modListWidget) {
114114
if (entry != null) {
115115
if (this.selectedMod == entry) {
116-
Objects.requireNonNull(this.client).openScreen(new ModDetailScreen(this, ((ModListEntry) entry).getMod()));
116+
Objects.requireNonNull(this.client).setScreen(new ModDetailScreen(this, ((ModListEntry) entry).getMod()));
117117
return;
118118
}
119119
if (entry instanceof ModListEntry) {

src/main/java/xyz/deathsgun/modmanager/gui/widget/CategoryListEntry.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,16 @@ public String id() {
5252
}
5353

5454
@Override
55-
public Text method_37006() {
55+
public Text getTitle() {
5656
return category.text();
5757
}
5858

5959
public Category getCategory() {
6060
return category;
6161
}
62+
63+
@Override
64+
public Text getNarration() {
65+
return null;
66+
}
6267
}

src/main/java/xyz/deathsgun/modmanager/gui/widget/CategoryListWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void init() {
4646
}
4747
setSelected(this.getEntry(0));
4848
} catch (Exception e) {
49-
client.openScreen(new ModManagerErrorScreen((Screen) parent, e));
49+
client.setScreen(new ModManagerErrorScreen((Screen) parent, e));
5050
e.printStackTrace();
5151
}
5252
}

src/main/java/xyz/deathsgun/modmanager/gui/widget/ModListEntry.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,9 @@ private void bindIconTexture() {
115115
public SummarizedMod getMod() {
116116
return mod;
117117
}
118+
119+
@Override
120+
public Text getNarration() {
121+
return null;
122+
}
118123
}

src/main/java/xyz/deathsgun/modmanager/gui/widget/better/BetterListWidget.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ public BetterListEntry(BetterListWidget<E> list, Text title) {
201201

202202
public abstract String id();
203203

204-
@Override
205-
public Text method_37006() {
204+
public Text getTitle() {
206205
return title;
207206
}
208207

src/main/java/xyz/deathsgun/modmanager/mixin/ModsScreenMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void onInit(CallbackInfo ci) {
4747
int searchBoxWidth = this.paneWidth - 32 - 22;
4848
this.addDrawableChild(new ModManagerTexturedButtonWidget(this.paneWidth / 2 + searchBoxWidth / 2 + 14,
4949
22, 20, 20, 0, 0, MODMANAGER_BUTTON_LOCATION, 32, 64, button -> {
50-
Objects.requireNonNull(this.client).openScreen(new ModsOverviewScreen(this));
50+
Objects.requireNonNull(this.client).setScreen(new ModsOverviewScreen(this));
5151
}, new TranslatableText("modmanager.button.open")));
5252
}
5353

0 commit comments

Comments
 (0)