Skip to content
Closed
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
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[versions]
# Fabric (https://fabricmc.net/develop)
jdk = "25"
minecraft = "26.3-pre-1"
fabric-loader = "0.19.3"
fabric-api = "0.159.1+26.3"
minecraft = "26.3"
fabric-loader = "0.19.5"
fabric-api = "0.161.0+26.3"

# Plugins
# Loom (https://github.com/FabricMC/fabric-loom)
Expand All @@ -13,13 +13,13 @@ loom = "1.17-SNAPSHOT"
# Baritone (https://github.com/MeteorDevelopment/baritone)
baritone = "26.1-SNAPSHOT"
# Sodium (https://github.com/CaffeineMC/sodium-fabric)
sodium = "mc26.2-0.9.1-fabric"
sodium = "mc26.3-0.9.2-fabric"
# Lithium (https://github.com/CaffeineMC/lithium-fabric)
lithium = "mc26.2-0.25.2-fabric"
lithium = "mc26.3-0.26.1-fabric"
# Iris (https://github.com/IrisShaders/Iris)
iris = "1.11.2+26.2-fabric"
iris = "1.11.6+26.3-fabric"
# ModMenu (https://github.com/TerraformersMC/ModMenu)
modmenu = "20.0.1"
modmenu = "21.0.0"
# Orbit (https://github.com/MeteorDevelopment/orbit)
orbit = "0.2.4"
# Starscript (https://github.com/MeteorDevelopment/starscript)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package meteordevelopment.meteorclient.commands.commands;

import com.mojang.blaze3d.Blaze3D;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
Expand All @@ -24,11 +25,11 @@
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ClientboundSoundPacket;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.util.Util;
import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;

import java.io.FileWriter;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
Expand All @@ -48,7 +49,7 @@ public NotebotCommand() {
@Override
public void build(LiteralArgumentBuilder<ClientSuggestionProvider> builder) {
builder.then(literal("help").executes(_ -> {
Util.getPlatform().openUri("https://github.com/MeteorDevelopment/meteor-client/wiki/Notebot-Guide");
Blaze3D.openUri(URI.create("https://github.com/MeteorDevelopment/meteor-client/wiki/Notebot-Guide"));
return SINGLE_SUCCESS;
}));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package meteordevelopment.meteorclient.gui.screens;

import com.mojang.blaze3d.Blaze3D;
import meteordevelopment.meteorclient.addons.GithubRepo;
import meteordevelopment.meteorclient.addons.MeteorAddon;
import meteordevelopment.meteorclient.gui.GuiTheme;
Expand All @@ -13,8 +14,8 @@
import meteordevelopment.meteorclient.gui.widgets.containers.WTable;
import meteordevelopment.meteorclient.utils.network.Http;
import meteordevelopment.meteorclient.utils.network.MeteorExecutor;
import net.minecraft.util.Util;

import java.net.URI;
import java.net.http.HttpResponse;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
Expand Down Expand Up @@ -66,11 +67,11 @@ private void populateHeader(String headerMessage) {
l.add(theme.label(headerMessage)).expandX();

String website = addon.getWebsite();
if (website != null) l.add(theme.button("Website")).widget().action = () -> Util.getPlatform().openUri(website);
if (website != null) l.add(theme.button("Website")).widget().action = () -> Blaze3D.openUri(URI.create(website));

l.add(theme.button("GitHub")).widget().action = () -> {
GithubRepo repo = addon.getRepo();
Util.getPlatform().openUri(String.format("https://github.com/%s/tree/%s", repo.getOwnerName(), repo.branch()));
Blaze3D.openUri(URI.create(String.format("https://github.com/%s/tree/%s", repo.getOwnerName(), repo.branch())));
};
}

Expand All @@ -91,7 +92,7 @@ private void populateError() {

l.add(theme.label("Consider using an authentication token: ")).expandX();
l.add(theme.button("Authorization Guide")).widget().action = () -> {
Util.getPlatform().openUri("https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens");
Blaze3D.openUri(URI.create("https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens"));
};
}

Expand All @@ -115,7 +116,7 @@ private void populateCommits() {
String date = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).format(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(commit.commit.committer.date));
t.add(theme.label(date)).top().right().widget().color = theme.textSecondaryColor();

t.add(theme.label(getMessage(commit))).widget().action = () -> Util.getPlatform().openUri(String.format("https://github.com/%s/commit/%s", addon.getRepo().getOwnerName(), commit.sha));
t.add(theme.label(getMessage(commit))).widget().action = () -> Blaze3D.openUri(URI.create(String.format("https://github.com/%s/commit/%s", addon.getRepo().getOwnerName(), commit.sha)));
t.row();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ private void onAddDestroyBlockEffect(BlockPos pos, BlockState blockState, Callba
if (Modules.get().get(NoRender.class).noParticle(ParticleTypes.BLOCK)) ci.cancel();
}

@Inject(method = "addBreakingBlockEffect", at = @At("HEAD"), cancellable = true)
private void onAddBlockBreakingParticles(BlockPos pos, Direction direction, CallbackInfo ci) {
@Inject(method = "addBreakingParticles", at = @At("HEAD"), cancellable = true)
private void onAddBlockBreakingParticles(BlockPos pos, Direction direction, BlockState state, CallbackInfo ci) {
if (Modules.get().get(NoRender.class).noParticle(ParticleTypes.BLOCK)) ci.cancel();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ private static void onDefaultHandleClickEvent(ClickEvent event, Minecraft minecr

@Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
private void onKeyPressed(KeyEvent event, CallbackInfoReturnable<Boolean> cir) {
if ((Object) (this) instanceof ChatScreen) return;
// Input events are pumped while the game is still starting, before Meteor has initialized
if ((Object) (this) instanceof ChatScreen || Modules.get() == null) return;
GUIMove guiMove = Modules.get().get(GUIMove.class);
if ((guiMove.disableArrows() && meteor$isArray(event.key())) || (guiMove.disableSpace() && event.key() == KEY_SPACE)) {
cir.setReturnValue(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

package meteordevelopment.meteorclient.systems.accounts;

import com.mojang.blaze3d.Blaze3D;
import meteordevelopment.meteorclient.MeteorClient;
import meteordevelopment.meteorclient.utils.network.MeteorExecutor;
import net.minecraft.util.Util;
import net.raphimc.minecraftauth.MinecraftAuth;
import net.raphimc.minecraftauth.java.JavaAuthManager;
import net.raphimc.minecraftauth.java.model.MinecraftProfile;
Expand All @@ -19,6 +19,7 @@
import net.raphimc.minecraftauth.msa.service.impl.DeviceCodeMsaAuthService;
import org.jspecify.annotations.Nullable;

import java.net.URI;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
Expand Down Expand Up @@ -54,7 +55,7 @@ public static String getRefreshToken(Consumer<String> callback) {
.login(DeviceCodeMsaAuthService::new, (Consumer<MsaDeviceCode>) deviceCode -> {
String urlString = deviceCode.getDirectVerificationUri();
urlFuture.complete(urlString);
Util.getPlatform().openUri(urlString);
Blaze3D.openUri(URI.create(urlString));
});

MsaToken msaToken = authManager.getMsaToken().getUpToDate();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

//Created by squidoodly

import com.mojang.blaze3d.Blaze3D;
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
import meteordevelopment.discordipc.DiscordIPC;
import meteordevelopment.discordipc.RichPresence;
Expand Down Expand Up @@ -34,9 +35,9 @@
import net.minecraft.client.gui.screens.worldselection.EditWorldScreen;
import net.minecraft.client.gui.screens.worldselection.SelectWorldScreen;
import net.minecraft.realms.RealmsScreen;
import net.minecraft.util.Util;
import org.meteordev.starscript.Script;

import java.net.URI;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -288,7 +289,7 @@ private void onOpenScreen(OpenScreenEvent event) {
@Override
public WWidget getWidget(GuiTheme theme) {
WButton help = theme.button("Open documentation.");
help.action = () -> Util.getPlatform().openUri("https://github.com/MeteorDevelopment/meteor-client/wiki/Starscript");
help.action = () -> Blaze3D.openUri(URI.create("https://github.com/MeteorDevelopment/meteor-client/wiki/Starscript"));

return help;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package meteordevelopment.meteorclient.systems.modules.misc.swarm;

import com.mojang.blaze3d.Blaze3D;
import meteordevelopment.meteorclient.events.game.GameJoinedEvent;
import meteordevelopment.meteorclient.events.game.GameLeftEvent;
import meteordevelopment.meteorclient.events.world.TickEvent;
Expand All @@ -17,7 +18,8 @@
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.util.Util;

import java.net.URI;

public class Swarm extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();
Expand Down Expand Up @@ -72,7 +74,7 @@ public WWidget getWidget(GuiTheme theme) {
stop.action = this::close;

WButton guide = list.add(theme.button("Guide")).expandX().widget();
guide.action = () -> Util.getPlatform().openUri("https://github.com/MeteorDevelopment/meteor-client/wiki/Swarm-Guide");
guide.action = () -> Blaze3D.openUri(URI.create("https://github.com/MeteorDevelopment/meteor-client/wiki/Swarm-Guide"));

return list;
}
Expand Down