firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[CHORE] Backport changes from 1.20.4

Browse Source
This commit is contained in:
HypherionSA
2024-03-17 15:37:13 +02:00
parent 0ee676e724
commit 8ccbb6b9e6
25 changed files with 419 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Common/src/main/java/com/hypherionmc/craterlib/api/networking/CraterNetworkHandler.java Normal file
View File

@@ -0,0 +1,28 @@
package com.hypherionmc.craterlib.api.networking;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import java.util.List;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public interface CraterNetworkHandler {
<T> void sendToServer(T packet);
<T> void sendToServer(T packet, boolean ignoreCheck);
<T> void sendToClient(T packet, ServerPlayer player);
default <T> void sendToClients(T packet, List<ServerPlayer> players) {
for (ServerPlayer player : players) {
sendToClient(packet, player);
}
}
default <T> void sendToAllClients(T packet, MinecraftServer server) {
sendToClients(packet, server.getPlayerList().getPlayers());
}
}

4
Common/src/main/java/com/hypherionmc/craterlib/core/abstraction/server/AbstractServer.java
View File

@@ -1,5 +1,6 @@
package com.hypherionmc.craterlib.core.abstraction.server;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.server.MinecraftServer;
@@ -9,4 +10,7 @@ public class AbstractServer {
server.getPlayerList().broadcastSystemMessage(message, false);
}
public static void executeCommand(MinecraftServer server, CommandSourceStack stack, String command) {
server.getCommands().performPrefixedCommand(stack, command);
}
}

1
Common/src/main/java/com/hypherionmc/craterlib/core/network/CraterNetworkHandler.java
View File

@@ -10,6 +10,7 @@ import java.util.function.Supplier;
/**
* @author HypherionSA
*/
@Deprecated(forRemoval = true)
public interface CraterNetworkHandler {
<T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection);

1
Common/src/main/java/com/hypherionmc/craterlib/core/network/CraterPacket.java
View File

@@ -6,6 +6,7 @@ import net.minecraft.world.entity.player.Player;
/**
* @author HypherionSA
*/
@Deprecated(forRemoval = true)
public interface CraterPacket<T extends CraterPacket<T>> {
void write(final FriendlyByteBuf buf);

1
Common/src/main/java/com/hypherionmc/craterlib/core/network/PacketDirection.java
View File

@@ -3,6 +3,7 @@ package com.hypherionmc.craterlib.core.network;
/**
* @author HypherionSA
*/
@Deprecated(forRemoval = true)
public enum PacketDirection {
TO_SERVER,
TO_CLIENT

44
Common/src/main/java/com/hypherionmc/craterlib/core/networking/CraterPacketNetwork.java Normal file
View File

@@ -0,0 +1,44 @@
package com.hypherionmc.craterlib.core.networking;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class CraterPacketNetwork {
private final PacketRegistry packetRegistry;
public static CraterPacketNetwork INSTANCE;
private static DeferredPacketRegistrar delayedHandler;
public CraterPacketNetwork(PacketRegistry registry) {
INSTANCE = this;
this.packetRegistry = registry;
getDelayedHandler().registerQueuedPackets(registry);
}
private static DeferredPacketRegistrar getDelayedHandler() {
if (delayedHandler == null) {
delayedHandler = new DeferredPacketRegistrar();
}
return delayedHandler;
}
public static <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
if (INSTANCE != null) {
return INSTANCE.packetRegistry.registerPacket(id, messageType, encoder, decoder, handler);
} else {
return getDelayedHandler().registerPacket(id, messageType, encoder, decoder, handler);
}
}
public PacketRegistry getPacketRegistry() {
return packetRegistry;
}
}

41
Common/src/main/java/com/hypherionmc/craterlib/core/networking/DeferredPacketRegistrar.java Normal file
View File

@@ -0,0 +1,41 @@
package com.hypherionmc.craterlib.core.networking;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public class DeferredPacketRegistrar implements PacketRegistrar {
private static final Map<Class<?>, PacketHolder<?>> QUEUED_PACKET_MAP = new HashMap<>();
@Override
public PacketSide side() {
return PacketSide.CLIENT;
}
@Override
public <T> PacketRegistrar registerPacket(ResourceLocation packetIdentifier, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
PacketHolder<T> container = new PacketHolder<>(packetIdentifier, messageType, encoder, decoder, handler);
QUEUED_PACKET_MAP.put(messageType, container);
return this;
}
public void registerQueuedPackets(PacketRegistry packetRegistration) {
if (!QUEUED_PACKET_MAP.isEmpty()) {
packetRegistration.PACKET_MAP.putAll(QUEUED_PACKET_MAP);
QUEUED_PACKET_MAP.forEach((aClass, container) -> packetRegistration.registerPacket(container));
}
}
}

21
Common/src/main/java/com/hypherionmc/craterlib/core/networking/PacketRegistrar.java Normal file
View File

@@ -0,0 +1,21 @@
package com.hypherionmc.craterlib.core.networking;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public interface PacketRegistrar {
PacketSide side();
<T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler);
}

41
Common/src/main/java/com/hypherionmc/craterlib/core/networking/PacketRegistry.java Normal file
View File

@@ -0,0 +1,41 @@
package com.hypherionmc.craterlib.core.networking;
import com.hypherionmc.craterlib.api.networking.CraterNetworkHandler;
import com.hypherionmc.craterlib.core.networking.data.PacketContext;
import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
import com.hypherionmc.craterlib.core.networking.data.PacketSide;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public abstract class PacketRegistry implements CraterNetworkHandler, PacketRegistrar {
final Map<Class<?>, PacketHolder<?>> PACKET_MAP = new HashMap<>();
protected final PacketSide side;
public PacketRegistry(PacketSide side) {
this.side = side;
}
public <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, Consumer<PacketContext<T>> handler) {
PacketHolder<T> holder = new PacketHolder<>(id, messageType, encoder, decoder, handler);
PACKET_MAP.put(messageType, holder);
registerPacket(holder);
return this;
}
public PacketSide side() {
return side;
}
protected abstract <T> void registerPacket(PacketHolder<T> packetHolder);
}

15
Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketContext.java Normal file
View File

@@ -0,0 +1,15 @@
package com.hypherionmc.craterlib.core.networking.data;
import net.minecraft.world.entity.player.Player;
import org.jetbrains.annotations.Nullable;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record PacketContext<T>(@Nullable Player sender, T message, PacketSide side) {
public PacketContext(T message, PacketSide side) {
this(null, message, side);
}
}

18
Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketHolder.java Normal file
View File

@@ -0,0 +1,18 @@
package com.hypherionmc.craterlib.core.networking.data;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
*/
public record PacketHolder<T>(ResourceLocation packetId,
Class<T> messageType,
BiConsumer<T, FriendlyByteBuf> encoder,
Function<FriendlyByteBuf, T> decoder,
Consumer<PacketContext<T>> handler) {
}

13
Common/src/main/java/com/hypherionmc/craterlib/core/networking/data/PacketSide.java Normal file
View File

@@ -0,0 +1,13 @@
package com.hypherionmc.craterlib.core.networking.data;
public enum PacketSide {
CLIENT,
SERVER;
public PacketSide flipped() {
if (CLIENT.equals(this))
return SERVER;
return CLIENT;
}
}

3
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/client/MinecraftMixin.java
View File

@@ -14,7 +14,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Minecraft.class)
public class MinecraftMixin {
@Shadow @Nullable
@Shadow
@Nullable
public Screen screen;
@Inject(method = "setScreen", at = @At(value = "TAIL"))