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
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ org.gradle.parallel=true
maven_group=com.terraformersmc
archive_name=modmenu

minecraft_version=26.3-snapshot-5
loader_version=0.19.3
fabric_version=0.155.3+26.3
minecraft_version=26.3-pre-3
loader_version=0.19.5
fabric_version=0.160.1+26.3
text_placeholder_api_version=3.1.0-beta.1+26.2
quilt_loader_version=0.30.0-beta.8

Expand All @@ -21,7 +21,7 @@ default_release_type=alpha
# Modrinth Metadata
modrinth_slug=modmenu
modrinth_id=mOgUt4GM
modrinth_game_versions=26.3-snapshot-5
modrinth_game_versions=26.3-pre-3
modrinth_mod_loaders=fabric, quilt
modrinth_required_dependencies=fabric-api, placeholder-api

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public ConfigScreenFactory<?> getModConfigScreenFactory() {

@Override
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
return Map.of("minecraft", parent -> new OptionsScreen(parent, Minecraft.getInstance().options, false));
return Map.of("minecraft", parent -> new OptionsScreen(parent, Minecraft.getInstance().options));
}

@Override
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/terraformersmc/modmenu/gui/ModsScreen.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.terraformersmc.modmenu.gui;

import com.google.common.base.Joiner;
import com.mojang.blaze3d.Blaze3D;
import com.terraformersmc.modmenu.ModMenu;
import com.terraformersmc.modmenu.config.ModMenuConfig;
import com.terraformersmc.modmenu.config.ModMenuConfigManager;
Expand Down Expand Up @@ -37,12 +38,12 @@
import net.minecraft.network.chat.FormattedText;
import net.minecraft.resources.Identifier;
import net.minecraft.util.CommonLinks;
import net.minecraft.util.Util;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
Expand Down Expand Up @@ -216,7 +217,7 @@ protected void init() {
} else {
var url = mod.getWebsite();
if (url != null) {
ConfirmLinkScreen.confirmLinkNow(this, url, false);
ConfirmLinkScreen.confirmLinkNow(this, URI.create(url), false);
}
}
})
Expand All @@ -233,7 +234,7 @@ protected void init() {
} else {
var url = mod.getIssueTracker();
if (url != null) {
ConfirmLinkScreen.confirmLinkNow(this, url, false);
ConfirmLinkScreen.confirmLinkNow(this, URI.create(url), false);
}
}
})
Expand All @@ -254,7 +255,7 @@ protected void init() {
this.descriptionListWidget.setX(this.rightPaneX);

// Mods folder button
AbstractWidget modsFolderButton = Button.builder(ModMenuScreenTexts.MODS_FOLDER, button -> Util.getPlatform().openUri(getModsFolder().toUri())).pos(this.width / 2 - 154, this.height - 28).size(150, 20).build();
AbstractWidget modsFolderButton = Button.builder(ModMenuScreenTexts.MODS_FOLDER, button -> Blaze3D.openUri(getModsFolder().toUri())).pos(this.width / 2 - 154, this.height - 28).size(150, 20).build();

// Done button
AbstractWidget doneButton = Button.builder(CommonComponents.GUI_DONE, button -> minecraft.gui.setScreen(previousScreen)).pos(this.width / 2 + 4, this.height - 28).size(150, 20).build();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.terraformersmc.modmenu.gui.widget;

import com.mojang.blaze3d.Blaze3D;
import com.terraformersmc.modmenu.api.UpdateInfo;
import com.terraformersmc.modmenu.config.ModMenuConfig;
import com.terraformersmc.modmenu.gui.ModsScreen;
Expand All @@ -20,8 +21,8 @@
import net.minecraft.client.input.MouseButtonEvent;
import net.minecraft.network.chat.Component;
import net.minecraft.util.FormattedCharSequence;
import net.minecraft.util.Util;

import java.net.URI;
import java.util.*;

public class DescriptionListWidget extends AbstractSelectionList<DescriptionListWidget.DescriptionEntry> {
Expand Down Expand Up @@ -389,10 +390,10 @@ public boolean mouseClicked(MouseButtonEvent click, boolean doubleClick) {
if (isMouseOver(click.x(), click.y())) {
minecraft.gui.setScreen(new ConfirmLinkScreen((open) -> {
if (open) {
Util.getPlatform().openUri(link);
Blaze3D.openUri(URI.create(link));
}
minecraft.gui.setScreen(parent);
}, link, false));
}, URI.create(link), false));
}

return super.mouseClicked(click, doubleClick);
Expand Down Expand Up @@ -422,10 +423,10 @@ public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
if (isMouseOver(event.x(), event.y())) {
minecraft.gui.setScreen(new ConfirmLinkScreen((open) -> {
if (open) {
Util.getPlatform().openUri("mailto:" + email);
Blaze3D.openUri(URI.create("mailto:" + email));
}
minecraft.gui.setScreen(parent);
}, "mailto:" + email, false));
}, URI.create("mailto:" + email), false));
}
return super.mouseClicked(event, doubleClick);
}
Expand Down
Loading