diff --git a/MagmaCube b/MagmaCube index 1855d36e..c6e8b545 160000 --- a/MagmaCube +++ b/MagmaCube @@ -1 +1 @@ -Subproject commit 1855d36e8ba86ea7433a25f2574590ca21077429 +Subproject commit c6e8b54582f38e5d07dd429d7ea4c72e2b842713 diff --git a/MagmaCube-Patches/0001-POM-Changes.patch b/MagmaCube-Patches/0001-POM-Changes.patch index cabfa757..ddbf6b76 100644 --- a/MagmaCube-Patches/0001-POM-Changes.patch +++ b/MagmaCube-Patches/0001-POM-Changes.patch @@ -27,10 +27,10 @@ index fb84bbcd532981037e97b33e7b8bdef539dbbd2c..871ca99691b10950eeeb6d4b7630708f @DontObfuscate public static String getClientModName() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a8478cb007b26ef2c2bcdcd99419f5173f724593..3d5d90b083b96f64d88062dc7b3d687126d48f9d 100644 +index 40971e87b03fd4689bd41e3bebf03e76ab8ae43e..a670a2abd8d8849bf59a0c4d63d03af729c3ab46 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -920,7 +920,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements +@@ -729,7 +729,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } public String getLaunchedVersion() { diff --git a/MagmaCube-Patches/0004-Mods-support.patch b/MagmaCube-Patches/0004-Mods-support.patch index a0f3b0a3..b03526a4 100644 --- a/MagmaCube-Patches/0004-Mods-support.patch +++ b/MagmaCube-Patches/0004-Mods-support.patch @@ -99,7 +99,7 @@ index da5ac7b22dd629ec1fffcdabc35743c161c5d611..89ff780da13eb16eb1a06fa4652c8604 public void setDetail(String s, String s2) { diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java -index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c748f6a4b 100644 +index 7172210edb203a2bbc1d45a76189c1d666ed7adf..f6fbebbac5f45fa11c29fb0f48d19b6b9e1d48f9 100644 --- a/src/main/java/net/minecraft/client/Minecraft.java +++ b/src/main/java/net/minecraft/client/Minecraft.java @@ -461,7 +461,9 @@ public class Minecraft extends ReentrantBlockableEventLoop implements @@ -128,7 +128,7 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c this.resourceManager.registerReloadListener(blockEntityWithoutLevelRenderer); this.itemRenderer = new ItemRenderer(this.textureManager, this.modelManager, this.itemColors, blockEntityWithoutLevelRenderer); this.resourceManager.registerReloadListener(this.itemRenderer); -@@ -548,6 +552,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements +@@ -549,6 +553,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.reportingContext = ReportingContext.create(ReportEnvironment.local(), this.userApiService); LoadingOverlay.registerTextures(this); List list = this.resourcePackRepository.openAllSelected(); @@ -136,7 +136,7 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c this.reloadStateTracker.startReload(ResourceLoadStateTracker.ReloadReason.INITIAL, list); this.setOverlay(new LoadingOverlay(this, this.resourceManager.createReload(Util.backgroundExecutor(), this, RESOURCE_RELOAD_INITIAL_TASK, list), (optional) -> Util.ifElse(optional, this::rollbackResourcePacks, () -> { if (SharedConstants.IS_RUNNING_IN_IDE) { -@@ -557,8 +562,9 @@ public class Minecraft extends ReentrantBlockableEventLoop implements +@@ -558,8 +563,9 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.reloadStateTracker.finishReload(); }), false)); if (s != null) { @@ -147,7 +147,7 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c this.setScreen(BanNoticeScreen.create((flag) -> { if (flag) { Util.getPlatform().openUri("https://aka.ms/mcjavamoderation"); -@@ -566,8 +572,9 @@ public class Minecraft extends ReentrantBlockableEventLoop implements +@@ -567,8 +573,9 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.setScreen(new TitleScreen(true)); }, this.multiplayerBan())); @@ -158,7 +158,7 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c } } -@@ -744,9 +751,10 @@ public class Minecraft extends ReentrantBlockableEventLoop implements +@@ -745,9 +752,10 @@ public class Minecraft extends ReentrantBlockableEventLoop implements } public static void crash(CrashReport crashReport) { @@ -170,7 +170,7 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c if (crashReport.getSaveFile() != null) { Bootstrap.realStdoutPrintln("#@!@# Game crashed! Crash report saved to: #@!@# " + crashReport.getSaveFile()); System.exit(-1); -@@ -899,6 +907,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements +@@ -900,6 +908,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.screen = screen; BufferUploader.reset(); @@ -178,7 +178,7 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c if (screen != null) { this.mouseHandler.releaseMouse(); KeyMapping.releaseAll(); -@@ -914,6 +923,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements +@@ -915,6 +924,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements public void setOverlay(@Nullable Overlay overlay) { this.overlay = overlay; @@ -186,7 +186,7 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c } public void destroy() { -@@ -938,6 +948,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements +@@ -939,6 +949,7 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.screen.removed(); } @@ -194,7 +194,7 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c this.close(); } finally { Util.timeSource = System::nanoTime; -@@ -1722,6 +1733,10 @@ public class Minecraft extends ReentrantBlockableEventLoop implements +@@ -1724,6 +1735,10 @@ public class Minecraft extends ReentrantBlockableEventLoop implements this.pendingConnection.tick(); } @@ -206,10 +206,10 @@ index 914872b02766cc6822491c2ca230b3fb03d949fc..e8682313699cb2199bc365ef43b3006c this.keyboardHandler.tick(); this.profiler.pop(); diff --git a/src/main/java/net/minecraft/client/gui/components/ChatComponent.java b/src/main/java/net/minecraft/client/gui/components/ChatComponent.java -index 59964c89323957ab357f1a19292502de3a47737e..2ba792735a9635a20e269ab99b5654f0ebf4a0d6 100644 +index 0311dee00a3f408ca403ea2f4b0d66dfd262eaaf..1e3d12c9fd96dd0bb5d295acea1ade5ff6aae474 100644 --- a/src/main/java/net/minecraft/client/gui/components/ChatComponent.java +++ b/src/main/java/net/minecraft/client/gui/components/ChatComponent.java -@@ -365,15 +365,27 @@ public class ChatComponent extends GuiComponent { +@@ -390,15 +390,27 @@ public class ChatComponent extends GuiComponent { } public static int getWidth(double d) { @@ -414,10 +414,10 @@ index 6813cc831731506dedf18d0b475918c149ffb8b8..12d7e2656e89ead6bd08958757328d76 String s = parseArgument(optionSet, optionSpec7); Proxy proxy = Proxy.NO_PROXY; diff --git a/src/main/java/net/minecraft/client/multiplayer/ClientPacketListener.java b/src/main/java/net/minecraft/client/multiplayer/ClientPacketListener.java -index dadd91f0e1c9369385d29207bb1a5482a3465924..a4081163c75dfb6fb7507a7652c4ff22abbeef37 100644 +index ca338f2133d2f2db6735e7beb2eed5ffa73ac46b..46066a5795a3acaa25b6a4f57ea16bd1ea9e549d 100644 --- a/src/main/java/net/minecraft/client/multiplayer/ClientPacketListener.java +++ b/src/main/java/net/minecraft/client/multiplayer/ClientPacketListener.java -@@ -281,7 +281,7 @@ import net.minecraft.world.scores.Team; +@@ -284,7 +284,7 @@ import net.minecraft.world.scores.Team; import net.minecraft.world.scores.criteria.ObjectiveCriteria; import org.slf4j.Logger; @@ -426,7 +426,7 @@ index dadd91f0e1c9369385d29207bb1a5482a3465924..a4081163c75dfb6fb7507a7652c4ff22 private static final Logger LOGGER = LogUtils.getLogger(); private static final Component GENERIC_DISCONNECT_MESSAGE = Component.translatable("disconnect.lost"); private final Connection connection; -@@ -1606,6 +1606,7 @@ public class ClientPacketListener implements ClientGamePacketListener { +@@ -1626,6 +1626,7 @@ public class ClientPacketListener implements ClientGamePacketListener { try { friendlyByteBuf = clientboundCustomPayloadPacket.getData(); @@ -697,10 +697,10 @@ index 5e5e868e9b4f4610187e03e107c6372bac8eaa20..59f194cba20fe2dd958b5afb97d23c09 int i = this.nextModelGroup++; iterable.forEach((blockState) -> this.modelGroups.put(blockState, i)); diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java -index 5b3610cf386b10b12c4d7f8d6c08346df450bc70..83fc14c27b1d99c63b801cbb390a0b5720b7caa7 100644 +index 413c19a0bf732cc52e8ae4976baf1b032a494eb9..db2670d493492823c6d81a8652eeb088b841952e 100644 --- a/src/main/java/net/minecraft/network/ConnectionProtocol.java +++ b/src/main/java/net/minecraft/network/ConnectionProtocol.java -@@ -195,6 +195,12 @@ public enum ConnectionProtocol { +@@ -198,6 +198,12 @@ public enum ConnectionProtocol { STATUS(1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundStatusRequestPacket.class, ServerboundStatusRequestPacket::new).addPacket(ServerboundPingRequestPacket.class, ServerboundPingRequestPacket::new)).addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundStatusResponsePacket.class, ClientboundStatusResponsePacket::new).addPacket(ClientboundPongResponsePacket.class, ClientboundPongResponsePacket::new))), LOGIN(2, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundLoginDisconnectPacket.class, ClientboundLoginDisconnectPacket::new).addPacket(ClientboundHelloPacket.class, ClientboundHelloPacket::new).addPacket(ClientboundGameProfilePacket.class, ClientboundGameProfilePacket::new).addPacket(ClientboundLoginCompressionPacket.class, ClientboundLoginCompressionPacket::new).addPacket(ClientboundCustomQueryPacket.class, ClientboundCustomQueryPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundHelloPacket.class, ServerboundHelloPacket::new).addPacket(ServerboundKeyPacket.class, ServerboundKeyPacket::new).addPacket(ServerboundCustomQueryPacket.class, ServerboundCustomQueryPacket::new))); @@ -774,10 +774,10 @@ index 3ef4b97f18968f75213c7d3ce9276d91b46e26c9..3dddac41cf3163217f932217c90e6f21 CrashReport.preload(); if (optionSet.has(optionSpec14)) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3d5d90b083b96f64d88062dc7b3d687126d48f9d..7799398738a35933afda336fc91ebb2b898883c3 100644 +index a670a2abd8d8849bf59a0c4d63d03af729c3ab46..89c7b88bd8f5d0af76fa3db8228a95bc79ba342f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -265,6 +265,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop