Skip to content

Port to 26.2 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NotActuallyTerry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Port to 26.2 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ sourceSets {

neoForge {
version = project.neoforgeVersion
accessTransformers.from("src/utilmod/resources/META-INF/accesstransformer.cfg")
validateAccessTransformers = true

mods {
spl {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=false

neoforgeVersion=26.1.0.18-beta
neoforgeVersion=26.2.0.11-beta
17 changes: 6 additions & 11 deletions src/utilmod/java/net/forgecraft/serverpackutility/mixin/client/MinecraftMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,27 @@

import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.mojang.realmsclient.client.RealmsClient;
import net.forgecraft.serverpacklocator.ModAccessor;
import net.minecraft.client.Minecraft;
import net.minecraft.client.GameLoadCookie;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.main.GameConfig;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;

@Mixin(Minecraft.class)
@Mixin(Gui.class)
public abstract class MinecraftMixin {

@Unique
private Minecraft serverpacklocator$getCurrentInstance() {
return (Minecraft) (Object) this;
}

@WrapMethod(method = "buildInitialScreens")
private Runnable serverpacklocator$buildInitialScreens(@Nullable Minecraft.GameLoadCookie cookie, Operation<Runnable> operation) {
private Runnable serverpacklocator$buildInitialScreens(@Nullable GameLoadCookie cookie, Operation<Runnable> operation) {
// parse server address
var serverAddress = ServerAddress.parseString(ModAccessor.getQuickPlayServer());

if ((cookie == null || !cookie.quickPlayData().isEnabled()) && !serverAddress.getHost().equals("server.invalid")) {
RealmsClient realmsclient = RealmsClient.getOrCreate(serverpacklocator$getCurrentInstance());
cookie = new Minecraft.GameLoadCookie(realmsclient, new GameConfig.QuickPlayData(
RealmsClient realmsclient = RealmsClient.getOrCreate(Minecraft.getInstance());
cookie = new GameLoadCookie(realmsclient, new GameConfig.QuickPlayData(
null,
new GameConfig.QuickPlayMultiplayerData(serverAddress.toString())
));
Expand Down
2 changes: 0 additions & 2 deletions src/utilmod/resources/META-INF/accesstransformer.cfg
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions src/utilmod/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ Server Pack Locator Utility mod.
This mod is distributed as part of the ServerPackLocator to allow interaction with the game.
'''
[[mixins]]
config="utilitymod.mixin.json"
[[accessTransformers]]
file="META-INF/accesstransformer.cfg"
config="utilitymod.mixin.json"