Skip to content

Commit 4941f86

Browse files
committed
fix loading on server
1 parent 9ce2548 commit 4941f86

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/main/java/net/hellomouse/authmemes/AuthMemes.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.neoforged.fml.common.Mod;
88
import net.neoforged.fml.config.ModConfig;
99
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
10+
import net.neoforged.fml.loading.FMLEnvironment;
1011
import net.neoforged.neoforge.client.gui.ConfigurationScreen;
1112
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
1213
import net.neoforged.neoforge.common.NeoForge;
@@ -34,7 +35,10 @@ public AuthMemes(IEventBus modEventBus, ModContainer modContainer) {
3435

3536
// Register our mod's ModConfigSpec so that FML can create and load the config file for us
3637
modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
37-
modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
38+
if (FMLEnvironment.dist.isClient()) {
39+
// enable forge config screen if on client
40+
modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
41+
}
3842
}
3943

4044
private void commonSetup(final FMLCommonSetupEvent event) {

src/main/java/net/hellomouse/authmemes/mixin/GameProfileCacheMixin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.hellomouse.authmemes.mixin;
22

3-
import com.llamalad7.mixinextras.sugar.Cancellable;
43
import com.mojang.authlib.GameProfile;
54
import com.mojang.authlib.GameProfileRepository;
65
import net.hellomouse.authmemes.Config;

src/main/java/net/hellomouse/authmemes/mixin/ServerLoginPacketListenerImplMixin.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.mojang.authlib.GameProfile;
44
import com.mojang.logging.LogUtils;
5-
import net.hellomouse.authmemes.AuthMemes;
65
import net.hellomouse.authmemes.Config;
76
import net.minecraft.network.Connection;
87
import net.minecraft.network.chat.Component;
@@ -20,8 +19,7 @@
2019

2120
@Mixin(ServerLoginPacketListenerImpl.class)
2221
public class ServerLoginPacketListenerImplMixin {
23-
@Unique
24-
private static final Logger LOGGER = LogUtils.getLogger();
22+
@Unique private static final Logger LOGGER = LogUtils.getLogger();
2523

2624
@Shadow String requestedUsername;
2725
@Shadow @Final Connection connection;
@@ -55,11 +53,10 @@ public void handleHelloAuth(ServerboundHelloPacket pPacket, CallbackInfo ci) {
5553
}
5654
}
5755

56+
ci.cancel();
5857
if (!allowed) {
59-
ci.cancel();
6058
this.disconnect(Component.literal("IP address mismatch"));
6159
} else {
62-
ci.cancel();
6360
this.startClientVerification(UUIDUtil.createOfflineProfile(offlineEntry.username()));
6461
}
6562
}

0 commit comments

Comments
 (0)