Update to Forge 47.3.29

README.md

@@ -4,7 +4,7 @@
 ### Minecraft Forge Hybrid server implementing the Spigot/Bukkit API, formerly known as Thermos/Cauldron/MCPC+
 
 [![](https://img.shields.io/github/stars/MohistMC/Mohist.svg?label=Stars&logo=github)](https://github.com/MohistMC/Mohist/stargazers)
-[![](https://img.shields.io/badge/Forge-1.20.1--47.3.27-brightgreen.svg?colorB=26303d&logo=Conda-Forge)](https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.1.html)
+[![](https://img.shields.io/badge/Forge-1.20.1--47.3.29-brightgreen.svg?colorB=26303d&logo=Conda-Forge)](https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.1.html)
 [![](https://img.shields.io/badge/NeoForge-1.20.1--47.1.106-brightgreen.svg?colorB=26303d)](https://neoforged.net/)
 [![](https://img.shields.io/badge/JDK-17.0.10-brightgreen.svg?colorB=469C00&logo=java)](https://www.azul.com/downloads/?version=java-17-lts#zulu)
 [![](https://img.shields.io/badge/Gradle-8.8-brightgreen.svg?colorB=469C00&logo=gradle)](https://docs.gradle.org/8.8/release-notes.html)
@@ -20,7 +20,7 @@
 Progress
 ------
 
-- [x] Rectify Forge([**90e8fb1c3**](https://github.com/MinecraftForge/MinecraftForge/commit/90e8fb1c3))
+- [x] Rectify Forge([**fa109380f**](https://github.com/MinecraftForge/MinecraftForge/commit/fa109380f))
 - [x] Rectify NeoForge([**e7ac32353**](https://github.com/neoforged/NeoForge/commit/e7ac32353))
 - [x] Start patch
     * [x] Bukkit([**997de31d**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/997de31d))

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.daemon=false
 bukkit_version=997de31d
 craftbukkit_version=ddc9a2dad
 spigot_version=d2eba2c8
-forge_version=47.3.27
+forge_version=47.3.29
 neoforge_version=47.1.106
 mohist_group_id=com.mohistmc
 

patches/minecraft/net/minecraft/server/Bootstrap.java.patch

@@ -1,10 +1,15 @@
 --- a/net/minecraft/server/Bootstrap.java
 +++ b/net/minecraft/server/Bootstrap.java
-@@ -54,6 +_,8 @@
+@@ -54,6 +_,13 @@
                 CauldronInteraction.m_175649_();
                 BuiltInRegistries.m_257498_();
                 CreativeModeTabs.m_280019_();
 +               net.minecraftforge.registries.GameData.vanillaSnapshot();
++               // Forge: Hacky fix to ensure that NetworkConstants is loaded before mods are constructed.
++               // Many older mods use network internals that shouldn't be used, yet are exposed so they get used anyways.
++               // This can cause class-loading issues with ForgeMod loading NetworkConstants and HandshakeResolver.
++               // To ensure that doesn't happen, we load it here and now. This is not an issue in 1.20.2 and newer.
++               net.minecraftforge.network.NetworkHooks.init();
 +               if (false) // skip redirectOutputToLog, Forge already redirects stdout and stderr output to log so that they print with more context
                 m_135890_();
                 f_285608_.set(Duration.between(instant, Instant.now()).toMillis());

patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -2056,7 +2056,7 @@
 +         String originalFormat = event.getFormat(), originalMessage = event.getMessage();
 +         Bukkit.getPluginManager().callEvent(event);
 +
-+         KouKou.chat(originalMessage);
++         KouKou.chat("<%s>: %s".formatted(thisPlayer.getName(), originalMessage));
 +         if (PlayerChatEvent.getHandlerList().getRegisteredListeners().length != 0) {
 +            // Evil plugins still listening to deprecated event
 +            final PlayerChatEvent queueEvent = new PlayerChatEvent(thisPlayer, event.getMessage(), event.getFormat(), event.getRecipients());

patches/minecraft/net/minecraft/world/entity/npc/VillagerTrades.java.patch

@@ -7,7 +7,7 @@
 +      private Item item; // Mohist
 
        public EmeraldsForVillagerTypeItem(int p_35669_, int p_35670_, int p_35671_, Map<VillagerType, Item> p_35672_) {
-+         //if (false) // FORGE: Modders can add custom villager types, so remove this validation
++         if (Boolean.valueOf(false)) // FORGE: Modders can add custom villager types, so remove this validation, weird condition is to make the compiler not strip this dead code, breaking some mixins
           BuiltInRegistries.f_256934_.m_123024_().filter((p_35680_) -> {
              return !p_35672_.containsKey(p_35680_);
           }).findAny().ifPresent((p_258962_) -> {

src/main/java/com/mohistmc/bukkit/LoginHandler.java

@@ -56,7 +56,7 @@ protected PlayerPreLoginEvent.Result evaluate() {
     }
 
     public static void disconnect(ServerGamePacketListenerImpl serverGamePacketListener, String pTextComponent){
-        Waitable waitable = new Waitable() {
+        Waitable<Object> waitable = new Waitable<>() {
             @Override
             protected Object evaluate() {
                 serverGamePacketListener.disconnect(pTextComponent);

src/main/java/net/minecraftforge/common/ForgeHooks.java

@@ -127,6 +127,7 @@
 import net.minecraft.world.level.biome.BiomeSpecialEffects;
 import net.minecraft.world.level.biome.BiomeGenerationSettings;
 import net.minecraft.world.level.biome.MobSpawnSettings;
+import net.minecraftforge.common.extensions.IForgeEntity;
 import net.minecraftforge.common.loot.IGlobalLootModifier;
 import net.minecraftforge.common.loot.LootModifierManager;
 import net.minecraftforge.common.loot.LootTableIdCondition;

src/main/java/net/minecraftforge/common/ForgeMod.java

@@ -433,7 +433,6 @@ public ForgeMod(FMLJavaModLoadingContext context)
             return uuid.toString();
         });
 
-        LOGGER.debug(FORGEMOD, "Loading Network data for FML net version: {}", NetworkConstants.init());
         CrashReportCallables.registerCrashCallable("FML", ForgeVersion::getSpec);
         CrashReportCallables.registerCrashCallable("Forge", ()->ForgeVersion.getGroup()+":"+ForgeVersion.getVersion());
 

src/main/java/net/minecraftforge/network/NetworkHooks.java

@@ -52,6 +52,11 @@ public class NetworkHooks
 {
     private static final Logger LOGGER = LogManager.getLogger();
 
+    public static void init()
+    {
+        LOGGER.debug("Loading Network data for FML net version: {}", NetworkConstants.init());
+    }
+
     public static String getFMLVersion(final String ip)
     {
         return ip.contains("\0") ? Objects.equals(ip.split("\0")[1], NetworkConstants.NETVERSION) ? NetworkConstants.NETVERSION : ip.split("\0")[1] : NetworkConstants.NOVERSION;