1.20.2-pre1

This commit is contained in:
LexManos committed 2023-09-08 10:56:10 -07:00
1 parent 12d24df4f6
commit 3edefbe33e
368 files changed
+3555 -6356

No files matched your search

@@ -15,6 +15,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.protocol.common.ServerboundClientInformationPacket;
import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket;
import net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket;
import net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery;
@@ -24,17 +25,14 @@ import net.minecraft.network.protocol.game.ServerboundChatCommandPacket;
import net.minecraft.network.protocol.game.ServerboundChatPacket;
import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket;
import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
import net.minecraft.network.protocol.game.ServerboundClientInformationPacket;
import net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket;
import net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket;
import net.minecraft.network.protocol.game.ServerboundContainerClickPacket;
import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
import net.minecraft.network.protocol.game.ServerboundEditBookPacket;
import net.minecraft.network.protocol.game.ServerboundEntityTagQuery;
import net.minecraft.network.protocol.game.ServerboundInteractPacket;
import net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket;
import net.minecraft.network.protocol.game.ServerboundKeepAlivePacket;
import net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket;
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
import net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket;
@@ -48,7 +46,6 @@ import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
import net.minecraft.network.protocol.game.ServerboundRecipeBookChangeSettingsPacket;
import net.minecraft.network.protocol.game.ServerboundRecipeBookSeenRecipePacket;
import net.minecraft.network.protocol.game.ServerboundRenameItemPacket;
import net.minecraft.network.protocol.game.ServerboundResourcePackPacket;
import net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket;
import net.minecraft.network.protocol.game.ServerboundSelectTradePacket;
import net.minecraft.network.protocol.game.ServerboundSetBeaconPacket;
@@ -64,8 +61,10 @@ import net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket;
import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
import net.minecraft.network.protocol.game.ServerboundUseItemPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ClientInformation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.stats.Stat;
import net.minecraft.world.damagesource.DamageSource;
@@ -77,12 +76,10 @@ import org.jetbrains.annotations.Nullable;
/**
* A basic fake server player implementation that can be used to simulate player actions.
*/
public class FakePlayer extends ServerPlayer
{
public FakePlayer(ServerLevel level, GameProfile name)
{
super(level.getServer(), level, name);
this.connection = new FakePlayerNetHandler(level.getServer(), this);
@Deprecated // TODO: Re-write this whole system to be less hacky. Use until we get a good replacement.
public class FakePlayer extends ServerPlayer {
protected FakePlayer(ServerLevel level, GameProfile name, ClientInformation info) {
super(level.getServer(), level, name, info);
}
@Override public void displayClientMessage(Component chatComponent, boolean actionBar) { }
@@ -91,15 +88,14 @@ public class FakePlayer extends ServerPlayer
@Override public boolean canHarmPlayer(Player player) { return false; }
@Override public void die(DamageSource source) { }
@Override public void tick() { }
@Override public void updateOptions(ServerboundClientInformationPacket packet) { }
@Override @Nullable public MinecraftServer getServer() { return ServerLifecycleHooks.getCurrentServer(); }
@ParametersAreNonnullByDefault
private static class FakePlayerNetHandler extends ServerGamePacketListenerImpl {
static class NetHandler extends ServerGamePacketListenerImpl {
private static final Connection DUMMY_CONNECTION = new Connection(PacketFlow.CLIENTBOUND);
public FakePlayerNetHandler(MinecraftServer server, ServerPlayer player) {
super(server, DUMMY_CONNECTION, player);
NetHandler(MinecraftServer server, ServerPlayer player, CommonListenerCookie cookie) {
super(server, DUMMY_CONNECTION, player, cookie);
}
@Override public void tick() { }
@@ -130,7 +126,6 @@ public class FakePlayer extends ServerPlayer
@Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { }
@Override public void handleUseItem(ServerboundUseItemPacket packet) { }
@Override public void handleTeleportToEntityPacket(ServerboundTeleportToEntityPacket packet) { }
@Override public void handleResourcePackResponse(ServerboundResourcePackPacket packet) { }
@Override public void handlePaddleBoat(ServerboundPaddleBoatPacket packet) { }
@Override public void onDisconnect(Component message) { }
@Override public void send(Packet<?> packet) { }
@@ -147,10 +142,7 @@ public class FakePlayer extends ServerPlayer
@Override public void handleContainerButtonClick(ServerboundContainerButtonClickPacket packet) { }
@Override public void handleSetCreativeModeSlot(ServerboundSetCreativeModeSlotPacket packet) { }
@Override public void handleSignUpdate(ServerboundSignUpdatePacket packet) { }
@Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { }
@Override public void handlePlayerAbilities(ServerboundPlayerAbilitiesPacket packet) { }
@Override public void handleClientInformation(ServerboundClientInformationPacket packet) { }
@Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { }
@Override public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) { }
@Override public void handleLockDifficulty(ServerboundLockDifficultyPacket packet) { }
@Override public void teleport(double x, double y, double z, float yaw, float pitch, Set<RelativeMovement> relativeSet) { }
@@ -12,8 +12,10 @@ import com.google.common.collect.Maps;
import com.mojang.authlib.GameProfile;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.network.CommonListenerCookie;
//To be expanded for generic Mod fake players?
@Deprecated // TODO: Re-write this whole system to be less hacky. Use until we get a good replacement.
public class FakePlayerFactory
{
private static final GameProfile MINECRAFT = new GameProfile(UUID.fromString("41C82C87-7AfB-4024-BA57-13D2C99CAE77"), "[Minecraft]");
@@ -35,11 +37,18 @@ public class FakePlayerFactory
public static FakePlayer get(ServerLevel level, GameProfile username)
{
FakePlayerKey key = new FakePlayerKey(level, username);
return fakePlayers.computeIfAbsent(key, k -> new FakePlayer(k.level(), k.username()));
return fakePlayers.computeIfAbsent(key, FakePlayerFactory::create);
}
public static void unloadLevel(ServerLevel level)
{
fakePlayers.entrySet().removeIf(entry -> entry.getValue().level() == level);
}
private static FakePlayer create(FakePlayerKey key) {
var cookie = CommonListenerCookie.createInitial(key.username());
var ret = new FakePlayer(key.level(), cookie.gameProfile(), cookie.clientInformation());
new FakePlayer.NetHandler(key.level().getServer(), ret, cookie);
return ret;
}
}
@@ -6,58 +6,63 @@
package net.minecraftforge.common.util;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.datafix.DataFixTypes;
import net.minecraft.world.level.saveddata.SavedData;
import net.minecraft.world.level.storage.DimensionDataStorage;
import org.jetbrains.annotations.Nullable;
public class LevelCapabilityData extends SavedData
{
public class LevelCapabilityData extends SavedData {
public static final String ID = "capabilities";
private INBTSerializable<CompoundTag> serializable;
private CompoundTag capNBT = null;
public LevelCapabilityData(@Nullable INBTSerializable<CompoundTag> serializable)
{
public LevelCapabilityData(@Nullable INBTSerializable<CompoundTag> serializable) {
this.serializable = serializable;
}
public static LevelCapabilityData load(CompoundTag tag, @Nullable INBTSerializable<CompoundTag> serializable) {
LevelCapabilityData data = new LevelCapabilityData(serializable);
data.read(tag);
return data;
}
public void read(CompoundTag nbt)
{
public void read(CompoundTag nbt) {
this.capNBT = nbt;
if (serializable != null)
{
if (serializable != null) {
serializable.deserializeNBT(this.capNBT);
this.capNBT = null;
}
}
@Override
public CompoundTag save(CompoundTag nbt)
{
public CompoundTag save(CompoundTag nbt) {
if (serializable != null)
nbt = serializable.serializeNBT();
return nbt;
}
@Override
public boolean isDirty()
{
public boolean isDirty() {
return true;
}
public void setCapabilities(INBTSerializable<CompoundTag> capabilities)
{
public void setCapabilities(INBTSerializable<CompoundTag> capabilities) {
this.serializable = capabilities;
if (this.capNBT != null && serializable != null)
{
if (this.capNBT != null && serializable != null) {
serializable.deserializeNBT(this.capNBT);
this.capNBT = null;
}
}
public static LevelCapabilityData compute(DimensionDataStorage data, @Nullable INBTSerializable<CompoundTag> caps) {
var factory = new Factory<>(
() -> new LevelCapabilityData(caps),
(tag) -> {
var ret = new LevelCapabilityData(caps);
ret.read(tag);
return ret;
},
DataFixTypes.SAVED_DATA_COMMAND_STORAGE //TODO: Hook this for our own types?
);
var ret = data.computeIfAbsent(factory, ID);
ret.setCapabilities(caps);
return ret;
}
}