1.21 Add UUID Fix With issue:#16

Satxm · Aug 17, 2024 · b1f3d54 · b1f3d54
1 parent 3953221
commit b1f3d54
Show file tree

Hide file tree

Showing 25 changed files with 448 additions and 142 deletions.
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -18,6 +18,7 @@ dependencies {
     mappings loom.officialMojangMappings()
     modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation "com.google.code.findbugs:jsr305:3.0.2"
 }
 
 sourceSets {

diff --git a/fabric/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnP.java b/fabric/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnP.java
@@ -11,7 +11,6 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.PauseScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.commands.BanIpCommands;
@@ -20,8 +19,6 @@
 import net.minecraft.server.commands.DeOpCommands;
 import net.minecraft.server.commands.OpCommand;
 import net.minecraft.server.commands.WhitelistCommand;
-import net.minecraft.server.players.PlayerList;
-import io.github.satxm.mcwifipnp.mixin.PlayerListAccessor;
 
 public class MCWiFiPnP implements ModInitializer {
     public static final String MODID = "mcwifipnp";
@@ -39,6 +36,7 @@ public void onInitialize() {
             BanIpCommands.register(dispatcher);
             BanListCommands.register(dispatcher);
             BanPlayerCommands.register(dispatcher);
+            OfflinePlayerCommand.register(dispatcher);
         });
     }
 
@@ -65,9 +63,4 @@ private void onServerStop(MinecraftServer server) {
         MCWiFiPnPUnit.CloseUPnPPort(server);
     }
 
-    public static void setMaxPlayers(IntegratedServer server, int num) {
-        PlayerList playerList = server.getPlayerList();
-        ((PlayerListAccessor) playerList).setMaxPlayers(num);
-    }
-
 }
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
+    id 'org.spongepowered.mixin' version '0.7.+'
 }
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
@@ -21,8 +22,6 @@ minecraft {
 
     copyIdeResources = true
 
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
     runs {
 
         configureEach {
@@ -48,7 +47,9 @@ minecraft {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
+    annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
     implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
+    implementation "com.google.code.findbugs:jsr305:3.0.2"
 }
 
 sourceSets {
@@ -63,6 +64,15 @@ sourceSets {
     }
 }
 
+mixin {
+    // MixinGradle Settings
+    add sourceSets.main, 'mcwifipnp.refmap.json'
+    config 'mcwifipnp.mixins.json'
+
+    debug.verbose = true
+    debug.export = true
+}
+
 tasks.named('processResources', ProcessResources).configure {
     var replaceProperties = [
         mod_version : project.mod_version,

diff --git a/forge/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnP.java b/forge/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnP.java
@@ -9,15 +9,13 @@
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.PauseScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.commands.BanIpCommands;
 import net.minecraft.server.commands.BanListCommands;
 import net.minecraft.server.commands.BanPlayerCommands;
 import net.minecraft.server.commands.DeOpCommands;
 import net.minecraft.server.commands.OpCommand;
 import net.minecraft.server.commands.WhitelistCommand;
-import net.minecraft.server.players.PlayerList;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
@@ -57,11 +55,6 @@ public void onServerStopping(ServerStoppingEvent event) {
         MCWiFiPnPUnit.CloseUPnPPort(event.getServer());
     }
 
-    public static void setMaxPlayers(IntegratedServer server, int num) {
-        PlayerList playerList = server.getPlayerList();
-        playerList.maxPlayers = num;
-    }
-
     public static void onAfterInitScreen(Minecraft client, Screen screen, List<GuiEventListener> children,
             Consumer<GuiEventListener> add, Consumer<GuiEventListener> remove) {
         if (screen instanceof PauseScreen pauseScreen && screen.getClass() == PauseScreen.class) {

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -21,10 +21,6 @@ repositories {
 }
 
 minecraft {
-    accessTransformers {
-        file('src/main/resources/META-INF/accesstransformer.cfg')
-    }
-
     runs {
         configureEach {
             workingDirectory project.file('run')
@@ -43,6 +39,7 @@ minecraft {
 
 dependencies {
     implementation "net.neoforged:neoforge:${project.neo_version}"
+    implementation "com.google.code.findbugs:jsr305:3.0.2"
 }
 
 sourceSets {

diff --git a/neoforge/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnP.java b/neoforge/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnP.java
@@ -9,15 +9,13 @@
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.PauseScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.commands.BanIpCommands;
 import net.minecraft.server.commands.BanListCommands;
 import net.minecraft.server.commands.BanPlayerCommands;
 import net.minecraft.server.commands.DeOpCommands;
 import net.minecraft.server.commands.OpCommand;
 import net.minecraft.server.commands.WhitelistCommand;
-import net.minecraft.server.players.PlayerList;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
@@ -59,11 +57,6 @@ public void onServerStopping(ServerStoppingEvent event) {
         MCWiFiPnPUnit.CloseUPnPPort(event.getServer());
     }
 
-    public static void setMaxPlayers(IntegratedServer server, int num) {
-        PlayerList playerList = server.getPlayerList();
-        playerList.maxPlayers = num;
-    }
-
     public static void onAfterInitScreen(Minecraft client, Screen screen, List<GuiEventListener> children,
             Consumer<GuiEventListener> add, Consumer<GuiEventListener> remove) {
         if (screen instanceof PauseScreen pauseScreen && screen.getClass() == PauseScreen.class) {

diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -13,11 +13,11 @@ logoFile="mcwifipnp.png"
 authors="Satxm"
 description="A Minecraft LAN World Tool With WLAN UPnP."
 
-#[[mixins]]
-#config="mcwifipnp.mixins.json"
+[[mixins]]
+config="mcwifipnp.mixins.json"
 
-[[accessTransformers]]
-file="META-INF/accesstransformer.cfg"
+#[[accessTransformers]]
+#file="META-INF/accesstransformer.cfg"
 
 [[dependencies.mcwifipnp]]
     modId="neoforge"

diff --git a/quilt/build.gradle b/quilt/build.gradle
@@ -27,10 +27,9 @@ dependencies {
         officialMojangMappings()
     }
     modImplementation "org.quiltmc:quilt-loader:${project.quilt_loader_version}"
-
     modImplementation "org.quiltmc:qsl:${project.qsl_version}"
-
     modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${qfapi_version}"
+    modImplementation "com.google.code.findbugs:jsr305:3.0.2"
 }
 
 sourceSets {

diff --git a/quilt/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnP.java b/quilt/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnP.java
@@ -12,7 +12,6 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.PauseScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.commands.BanIpCommands;
@@ -21,8 +20,6 @@
 import net.minecraft.server.commands.DeOpCommands;
 import net.minecraft.server.commands.OpCommand;
 import net.minecraft.server.commands.WhitelistCommand;
-import net.minecraft.server.players.PlayerList;
-import io.github.satxm.mcwifipnp.mixin.PlayerListAccessor;
 
 public class MCWiFiPnP implements ModInitializer {
     public static final String MODID = "mcwifipnp";
@@ -66,9 +63,4 @@ private void onServerStop(MinecraftServer server) {
         MCWiFiPnPUnit.CloseUPnPPort(server);
     }
 
-    public static void setMaxPlayers(IntegratedServer server, int num) {
-        PlayerList playerList = server.getPlayerList();
-        ((PlayerListAccessor) playerList).setMaxPlayers(num);
-    }
-
 }
diff --git a/quilt/src/main/java/io/github/satxm/mcwifipnp/mixin/PlayerListAccessor.java b/quilt/src/main/java/io/github/satxm/mcwifipnp/mixin/PlayerListAccessor.java
diff --git a/quilt/src/main/resources/mcwifipnp.mixins.json b/quilt/src/main/resources/mcwifipnp.mixins.json
diff --git a/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnPUnit.java b/src/main/java/io/github/satxm/mcwifipnp/MCWiFiPnPUnit.java
@@ -12,14 +12,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.WeakHashMap;
+import java.util.*;
 
+import io.github.satxm.mcwifipnp.mixin.PlayerListAccessor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -54,7 +49,6 @@ public class MCWiFiPnPUnit {
     public static Config getConfig(MinecraftServer server) {
         return Objects.requireNonNull(configMap.get(server), "no config for server???");
     }
-
 
     public static void OpenToLan() {
         Minecraft client = Minecraft.getInstance();
@@ -67,13 +61,15 @@ public static void OpenToLan() {
                 ? PublishCommand.getSuccessMessage(cfg.port)
                 : Component.translatable("commands.publish.failed");
         client.gui.getChat().addMessage(component);
-        MCWiFiPnP.setMaxPlayers(server,cfg.maxPlayers);
+        ((PlayerListAccessor) playerList).setMaxPlayers(cfg.maxPlayers);
         server.setUsesAuthentication(cfg.OnlineMode);
         server.setPvpAllowed(cfg.PvP);
         server.setEnforceWhitelist(cfg.Whitelist);
         playerList.setUsingWhiteList(cfg.Whitelist);
         playerList.getOps().add(new ServerOpListEntry(server.getSingleplayerProfile(), 4, playerList.canBypassPlayerLimit(server.getSingleplayerProfile())));
         playerList.setAllowCommandsForAllPlayers(cfg.AllPlayersCheats);
+        UUIDFixer.EnableUUIDFix = cfg.EnableUUIDFix;
+        UUIDFixer.alwaysOfflinePlayers = cfg.alwaysOfflinePlayers;
 
         new Thread(() -> {
             MCWiFiPnPUnit.UseUPnP(cfg, client);
@@ -196,6 +192,8 @@ public static class Config {
         public boolean UseUPnP = true;
         public boolean AllowCommands = false;
         public boolean OnlineMode = true;
+        public boolean EnableUUIDFix = false;
+        public List<String> alwaysOfflinePlayers = Collections.emptyList();
         public boolean PvP = true;
         public boolean CopyToClipboard = true;
         public transient Path location;