Skip to content

Commit 564344f

Browse files
lynxplaylynxplay
committed
More compiler issues
1 parent 7633dde commit 564344f

File tree

13 files changed

+219
-211
lines changed

13 files changed

+219
-211
lines changed

‎build-data/paper.at

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public net.minecraft.commands.CommandSourceStack source
1515
public net.minecraft.commands.arguments.DimensionArgument ERROR_INVALID_VALUE
1616
public net.minecraft.commands.arguments.blocks.BlockInput tag
1717
public net.minecraft.core.MappedRegistry validateWrite(Lnet/minecraft/resources/ResourceKey;)V
18-
public net.minecraft.nbt.ListTag <init>(Ljava/util/List;B)V
18+
public net.minecraft.nbt.ListTag <init>(Ljava/util/List;)V
19+
public net.minecraft.nbt.ListTag identifyRawElementType()B
1920
public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
2021
public net.minecraft.nbt.TagParser type(Ljava/lang/String;)Lnet/minecraft/nbt/Tag;
2122
public net.minecraft.network.Connection address
@@ -39,7 +40,7 @@ public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket yRot
3940
public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket z
4041
public net.minecraft.resources.RegistryOps lookupProvider
4142
public net.minecraft.resources.RegistryOps$HolderLookupAdapter
42-
public net.minecraft.server.Main forceUpgrade(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/core/RegistryAccess;Z)V
43+
public net/minecraft/server/Main forceUpgrade(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lnet/minecraft/world/level/storage/WorldData;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/core/RegistryAccess;Z)V
4344
public net.minecraft.server.MinecraftServer LOGGER
4445
public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
4546
public net.minecraft.server.MinecraftServer executor
@@ -94,6 +95,7 @@ public net.minecraft.server.level.ServerLevel serverLevelData
9495
public net.minecraft.server.level.ServerPlayer completeUsingItem()V
9596
public net.minecraft.server.level.ServerPlayer containerSynchronizer
9697
public net.minecraft.server.level.ServerPlayer findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;FZZ)Ljava/util/Optional;
98+
public net.minecraft.server.level.ServerPlayer findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/server/level/ServerPlayer$RespawnConfig;Z)Ljava/util/Optional;
9799
public net.minecraft.server.level.ServerPlayer initMenu(Lnet/minecraft/world/inventory/AbstractContainerMenu;)V
98100
public net.minecraft.server.level.ServerPlayer isChangingDimension
99101
public net.minecraft.server.level.ServerPlayer language

‎paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

+8-6
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,13 @@
355355
+ if (!keepInventory) {
356356
+ for (ItemStack item : this.getInventory().getContents()) {
357357
+ if (!item.isEmpty() && !EnchantmentHelper.has(item, net.minecraft.world.item.enchantment.EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP)) {
358-
+ loot.add(new DefaultDrop(item, stack -> this.drop(stack, true, false, false))); // Paper - Restore vanilla drops behavior; drop function taken from Inventory#dropAll (don't fire drop event)
358+
+ loot.add(new DefaultDrop(item, stack -> this.drop(stack, true, false, false, null))); // Paper - Restore vanilla drops behavior; drop function taken from Inventory#dropAll (don't fire drop event)
359359
+ }
360360
+ }
361361
+ }
362362
+ if (this.shouldDropLoot() && this.serverLevel().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper - fix player loottables running when mob loot gamerule is false
363363
+ // SPIGOT-5071: manually add player loot tables (SPIGOT-5195 - ignores keepInventory rule)
364-
+ this.dropFromLootTable(this.serverLevel(), cause, this.lastHurtByPlayerTime > 0);
364+
+ this.dropFromLootTable(this.serverLevel(), cause, this.lastHurtByPlayerMemoryTime > 0);
365365
+ // Paper - Restore vanilla drops behaviour; custom death loot is a noop on server player, remove.
366366
+ loot.addAll(this.drops);
367367
+ this.drops.clear(); // SPIGOT-5188: make sure to clear
@@ -558,7 +558,7 @@
558558
+ // CraftBukkit end
559559
}
560560

561-
private static Optional<ServerPlayer.RespawnPosAngle> findRespawnAndUseSpawnBlock(
561+
public static Optional<ServerPlayer.RespawnPosAngle> findRespawnAndUseSpawnBlock(
562562
@@ -947,10 +_,10 @@
563563
level.setBlock(blockPos, blockState.setValue(RespawnAnchorBlock.CHARGE, blockState.getValue(RespawnAnchorBlock.CHARGE) - 1), 3);
564564
}
@@ -1249,15 +1249,17 @@
12491249
}
12501250

12511251
@Override
1252-
@@ -1820,12 +_,53 @@
1253-
this.setRespawnPosition(player.respawnConfig, false);
1252+
@@ -1821,11 +_,56 @@
12541253
}
12551254

1256-
- public void setRespawnPosition(@Nullable ServerPlayer.RespawnConfig respawnConfig, boolean displayInChat) {
1255+
public void setRespawnPosition(@Nullable ServerPlayer.RespawnConfig respawnConfig, boolean displayInChat) {
12571256
- if (displayInChat && respawnConfig != null && !respawnConfig.isSamePosition(this.respawnConfig)) {
12581257
- this.sendSystemMessage(SPAWN_SET_MESSAGE);
12591258
+ // Paper start - Add PlayerSetSpawnEvent
1259+
+ setRespawnPosition(respawnConfig, displayInChat, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.UNKNOWN);
1260+
+ }
12601261
+ public boolean setRespawnPosition(@Nullable ServerPlayer.RespawnConfig respawnConfig, boolean displayInChat, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause cause) {
1262+
+ // Paper end - Add PlayerSetSpawnEvent
12611263
+ org.bukkit.Location spawnLoc = null;
12621264
+ boolean actuallyDisplayInChat = false;
12631265
+ if (respawnConfig != null) {

‎paper-server/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ static Codec<HoverEvent.ShowEntity> showEntityCodec(final Codec<Component> compo
125125
}
126126

127127
static Codec<HoverEvent.ShowItem> showItemCodec(final Codec<Component> componentCodec) {
128-
return net.minecraft.network.chat.HoverEvent.ItemStackInfo.CODEC.xmap(isi -> {
129-
@Subst("key") final String typeKey = isi.item.unwrapKey().orElseThrow().location().toString();
130-
return HoverEvent.ShowItem.showItem(Key.key(typeKey), isi.count, PaperAdventure.asAdventure(isi.getItemStack().getComponentsPatch()));
131-
}, si -> {
132-
final Item itemType = BuiltInRegistries.ITEM.getValue(PaperAdventure.asVanilla(si.item()));
133-
final Map<Key, DataComponentValue> dataComponentsMap = si.dataComponents();
134-
final ItemStack stack = new ItemStack(BuiltInRegistries.ITEM.wrapAsHolder(itemType), si.count(), PaperAdventure.asVanilla(dataComponentsMap));
135-
return new net.minecraft.network.chat.HoverEvent.ItemStackInfo(stack);
136-
});
128+
return net.minecraft.network.chat.HoverEvent.ShowItem.CODEC.xmap(internal -> {
129+
@Subst("key") final String typeKey = internal.item().getItemHolder().unwrapKey().orElseThrow().location().toString();
130+
return HoverEvent.ShowItem.showItem(Key.key(typeKey), internal.item().getCount(), PaperAdventure.asAdventure(internal.item().getComponentsPatch()));
131+
}, adventure -> {
132+
final Item itemType = BuiltInRegistries.ITEM.getValue(PaperAdventure.asVanilla(adventure.item()));
133+
final Map<Key, DataComponentValue> dataComponentsMap = adventure.dataComponents();
134+
final ItemStack stack = new ItemStack(BuiltInRegistries.ITEM.wrapAsHolder(itemType), adventure.count(), PaperAdventure.asVanilla(dataComponentsMap));
135+
return new net.minecraft.network.chat.HoverEvent.ShowItem(stack);
136+
}).codec();
137137
}
138138

139139
static final HoverEventType<HoverEvent.ShowEntity> SHOW_ENTITY_HOVER_EVENT_TYPE = new HoverEventType<>(AdventureCodecs::showEntityCodec, HoverEvent.Action.SHOW_ENTITY, "show_entity", AdventureCodecs::legacyDeserializeEntity);
@@ -143,11 +143,11 @@ static Codec<HoverEvent.ShowItem> showItemCodec(final Codec<Component> component
143143

144144
static DataResult<HoverEvent.ShowEntity> legacyDeserializeEntity(final Component component, final @Nullable RegistryOps<?> ops, final Codec<Component> componentCodec) {
145145
try {
146-
final CompoundTag tag = TagParser.parseTag(PlainTextComponentSerializer.plainText().serialize(component));
146+
final CompoundTag tag = TagParser.parseCompoundFully(PlainTextComponentSerializer.plainText().serialize(component));
147147
final DynamicOps<JsonElement> dynamicOps = ops != null ? ops.withParent(JsonOps.INSTANCE) : JsonOps.INSTANCE;
148-
final DataResult<Component> entityNameResult = componentCodec.parse(dynamicOps, JsonParser.parseString(tag.getString("name")));
149-
@Subst("key") final String keyString = tag.getString("type");
150-
final UUID entityUUID = UUID.fromString(tag.getString("id"));
148+
final DataResult<Component> entityNameResult = componentCodec.parse(dynamicOps, JsonParser.parseString(tag.getStringOr("name", "")));
149+
@Subst("key") final String keyString = tag.getStringOr("type", "");
150+
final UUID entityUUID = UUID.fromString(tag.getStringOr("id", ""));
151151
return entityNameResult.map(name -> HoverEvent.ShowEntity.showEntity(Key.key(keyString), entityUUID, name));
152152
} catch (final Exception ex) {
153153
return DataResult.error(() -> "Failed to parse tooltip: " + ex.getMessage());
@@ -156,7 +156,7 @@ static DataResult<HoverEvent.ShowEntity> legacyDeserializeEntity(final Component
156156

157157
static DataResult<HoverEvent.ShowItem> legacyDeserializeItem(final Component component, final @Nullable RegistryOps<?> ops, final Codec<Component> componentCodec) {
158158
try {
159-
final CompoundTag tag = TagParser.parseTag(PlainTextComponentSerializer.plainText().serialize(component));
159+
final CompoundTag tag = TagParser.parseCompoundFully(PlainTextComponentSerializer.plainText().serialize(component));
160160
final DynamicOps<Tag> dynamicOps = ops != null ? ops.withParent(NbtOps.INSTANCE) : NbtOps.INSTANCE;
161161
final DataResult<ItemStack> stackResult = ItemStack.CODEC.parse(dynamicOps, tag);
162162
return stackResult.map(stack -> {

‎paper-server/src/main/java/io/papermc/paper/persistence/PaperPersistentDataContainerView.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public <P, C> C getOrDefault(final NamespacedKey key, final PersistentDataType<P
7575

7676
@Override
7777
public Set<NamespacedKey> getKeys() {
78-
final Set<String> names = this.toTagCompound().getAllKeys();
78+
final Set<String> names = this.toTagCompound().keySet();
7979
final Set<NamespacedKey> keys = new HashSet<>(names.size());
8080
names.forEach(key -> {
8181
final String[] keyPart = key.split(":", 2);
@@ -96,7 +96,7 @@ public void copyTo(final PersistentDataContainer other, final boolean replace) {
9696
Preconditions.checkArgument(other != null, "The target container cannot be null");
9797
final CraftPersistentDataContainer target = (CraftPersistentDataContainer) other;
9898
final CompoundTag tag = this.toTagCompound();
99-
for (final String key : tag.getAllKeys()) {
99+
for (final String key : tag.keySet()) {
100100
if (replace || !target.getRaw().containsKey(key)) {
101101
target.getRaw().put(key, tag.get(key).copy());
102102
}

‎paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ public World createWorld(WorldCreator creator) {
14131413
primaryLevelData.setModdedInfo(this.console.getServerModName(), this.console.getModdedStatus().shouldReportAsModified());
14141414

14151415
if (this.console.options.has("forceUpgrade")) {
1416-
net.minecraft.server.Main.forceUpgrade(levelStorageAccess, DataFixers.getDataFixer(), this.console.options.has("eraseCache"), () -> true, registryAccess, this.console.options.has("recreateRegionFiles"));
1416+
net.minecraft.server.Main.forceUpgrade(levelStorageAccess, primaryLevelData, DataFixers.getDataFixer(), this.console.options.has("eraseCache"), () -> true, registryAccess, this.console.options.has("recreateRegionFiles"));
14171417
}
14181418

14191419
long i = BiomeManager.obfuscateSeed(primaryLevelData.worldGenOptions().seed());

‎paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public EntitySnapshot createEntitySnapshot(String input) {
2525

2626
CompoundTag tag;
2727
try {
28-
tag = TagParser.parseTag(input);
28+
tag = TagParser.parseCompoundFully(input);
2929
} catch (CommandSyntaxException e) {
3030
throw new IllegalArgumentException("Could not parse Entity: " + input, e);
3131
}

‎paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java

+36-31
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.bukkit.craftbukkit.entity;
22

3+
import com.destroystokyo.paper.event.player.PlayerSetSpawnEvent;
34
import com.google.common.base.Preconditions;
45
import com.google.common.collect.ImmutableList;
56
import com.google.common.collect.ImmutableSet;
@@ -1561,11 +1562,12 @@ public Location getBedSpawnLocation() {
15611562

15621563
@Override
15631564
public Location getRespawnLocation() {
1564-
ServerLevel world = this.getHandle().server.getLevel(this.getHandle().getRespawnDimension());
1565-
BlockPos bed = this.getHandle().getRespawnPosition();
1565+
final ServerPlayer.RespawnConfig respawnConfig = this.getHandle().getRespawnConfig();
1566+
if (respawnConfig == null) return null;
15661567

1567-
if (world != null && bed != null) {
1568-
Optional<ServerPlayer.RespawnPosAngle> spawnLoc = ServerPlayer.findRespawnAndUseSpawnBlock(world, bed, this.getHandle().getRespawnAngle(), this.getHandle().isRespawnForced(), true);
1568+
ServerLevel world = this.getHandle().server.getLevel(respawnConfig.dimension());
1569+
if (world != null) {
1570+
Optional<ServerPlayer.RespawnPosAngle> spawnLoc = ServerPlayer.findRespawnAndUseSpawnBlock(world, respawnConfig, true);
15691571
if (spawnLoc.isPresent()) {
15701572
ServerPlayer.RespawnPosAngle vec = spawnLoc.get();
15711573
return CraftLocation.toBukkit(vec.position(), world.getWorld(), vec.yaw(), 0);
@@ -1592,9 +1594,18 @@ public void setBedSpawnLocation(Location location, boolean override) {
15921594
@Override
15931595
public void setRespawnLocation(Location location, boolean override) {
15941596
if (location == null) {
1595-
this.getHandle().setRespawnPosition(null, null, 0.0F, override, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLUGIN); // Paper - Add PlayerSetSpawnEvent
1597+
this.getHandle().setRespawnPosition(null, false, PlayerSetSpawnEvent.Cause.PLUGIN);
15961598
} else {
1597-
this.getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().dimension(), CraftLocation.toBlockPosition(location), location.getYaw(), override, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLUGIN); // Paper - Add PlayerSetSpawnEvent
1599+
this.getHandle().setRespawnPosition(
1600+
new ServerPlayer.RespawnConfig(
1601+
((CraftWorld) location.getWorld()).getHandle().dimension(),
1602+
CraftLocation.toBlockPosition(location),
1603+
location.getYaw(),
1604+
override
1605+
),
1606+
false,
1607+
PlayerSetSpawnEvent.Cause.PLUGIN
1608+
);
15981609
}
15991610
}
16001611

@@ -1612,7 +1623,7 @@ public Input getCurrentInput() {
16121623
public Location getBedLocation() {
16131624
Preconditions.checkState(this.isSleeping(), "Not sleeping");
16141625

1615-
BlockPos bed = this.getHandle().getRespawnPosition();
1626+
BlockPos bed = this.getHandle().getRespawnConfig().pos();
16161627
return CraftLocation.toBukkit(bed, this.getWorld());
16171628
}
16181629

@@ -1874,7 +1885,7 @@ public int applyMending(int amount) {
18741885
final net.minecraft.world.item.ItemStack itemstack = stackEntry.map(net.minecraft.world.item.enchantment.EnchantedItemInUse::itemStack).orElse(net.minecraft.world.item.ItemStack.EMPTY);
18751886
if (!itemstack.isEmpty() && itemstack.getItem().components().has(net.minecraft.core.component.DataComponents.MAX_DAMAGE)) {
18761887
net.minecraft.world.entity.ExperienceOrb orb = net.minecraft.world.entity.EntityType.EXPERIENCE_ORB.create(handle.level(), net.minecraft.world.entity.EntitySpawnReason.COMMAND);
1877-
orb.value = amount;
1888+
orb.setValue(amount);;
18781889
orb.spawnReason = org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM;
18791890
orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
18801891

@@ -2372,33 +2383,27 @@ public long getLastSeen() {
23722383

23732384
public void readExtraData(CompoundTag nbttagcompound) {
23742385
this.hasPlayedBefore = true;
2375-
if (nbttagcompound.contains("bukkit")) {
2376-
CompoundTag data = nbttagcompound.getCompound("bukkit");
2377-
2378-
if (data.contains("firstPlayed")) {
2379-
this.firstPlayed = data.getLong("firstPlayed");
2380-
this.lastPlayed = data.getLong("lastPlayed");
2381-
}
2386+
nbttagcompound.getCompound("bukkit").ifPresent(data -> {
2387+
this.firstPlayed = data.getLongOr("firstPlayed", 0);
2388+
this.lastPlayed = data.getLongOr("lastPlayed", 0);
23822389

2383-
if (data.contains("newExp")) {
2384-
ServerPlayer handle = this.getHandle();
2385-
handle.newExp = data.getInt("newExp");
2386-
handle.newTotalExp = data.getInt("newTotalExp");
2387-
handle.newLevel = data.getInt("newLevel");
2388-
handle.expToDrop = data.getInt("expToDrop");
2389-
handle.keepLevel = data.getBoolean("keepLevel");
2390-
}
2391-
}
2390+
final ServerPlayer handle = getHandle();
2391+
handle.newExp = data.getIntOr("newExp", 0);
2392+
handle.newTotalExp = data.getIntOr("newTotalExp", 0);
2393+
handle.newLevel = data.getIntOr("newLevel", 0);
2394+
handle.expToDrop = data.getIntOr("expToDrop", 0);
2395+
handle.keepLevel = data.getBooleanOr("keepLevel", false);
2396+
});
23922397
}
23932398

2394-
public void setExtraData(CompoundTag nbttagcompound) {
2399+
public void setExtraData(CompoundTag compoundTag) {
23952400
this.lastSaveTime = System.currentTimeMillis(); // Paper
23962401

2397-
if (!nbttagcompound.contains("bukkit")) {
2398-
nbttagcompound.put("bukkit", new CompoundTag());
2402+
if (!compoundTag.contains("bukkit")) {
2403+
compoundTag.put("bukkit", new CompoundTag());
23992404
}
24002405

2401-
CompoundTag data = nbttagcompound.getCompound("bukkit");
2406+
CompoundTag data = compoundTag.getCompoundOrEmpty("bukkit");
24022407
ServerPlayer handle = this.getHandle();
24032408
data.putInt("newExp", handle.newExp);
24042409
data.putInt("newTotalExp", handle.newTotalExp);
@@ -2410,11 +2415,11 @@ public void setExtraData(CompoundTag nbttagcompound) {
24102415
data.putString("lastKnownName", handle.getScoreboardName());
24112416

24122417
// Paper start - persist for use in offline save data
2413-
if (!nbttagcompound.contains("Paper")) {
2414-
nbttagcompound.put("Paper", new CompoundTag());
2418+
if (!compoundTag.contains("Paper")) {
2419+
compoundTag.put("Paper", new CompoundTag());
24152420
}
24162421

2417-
CompoundTag paper = nbttagcompound.getCompound("Paper");
2422+
CompoundTag paper = compoundTag.getCompoundOrEmpty("Paper");
24182423
paper.putLong("LastLogin", handle.loginTime);
24192424
paper.putLong("LastSeen", System.currentTimeMillis());
24202425
// Paper end

0 commit comments

Comments
 (0)