SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Vault block API (#12068)

Browse Source
This commit is contained in:
Warrior
2025-02-12 23:15:22 +01:00
committed by GitHub
parent a06179a018
commit e616498ed7
4 changed files with 360 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
paper-server/patches/sources/net/minecraft/world/level/block/entity/vault/VaultServerData.java.patch Normal file
View File

@ -0,0 +1,40 @@
--- a/net/minecraft/world/level/block/entity/vault/VaultServerData.java
+++ b/net/minecraft/world/level/block/entity/vault/VaultServerData.java
@@ -66,7 +_,12 @@
@VisibleForTesting
public void addToRewardedPlayers(Player player) {
- this.rewardedPlayers.add(player.getUUID());
+ // Paper start - Vault API
+ addToRewardedPlayers(player.getUUID());
+ }
+ public boolean addToRewardedPlayers(final java.util.UUID player) {
+ final boolean removed = this.rewardedPlayers.add(player);
+ // Paper end - Vault API
if (this.rewardedPlayers.size() > 128) {
Iterator<UUID> iterator = this.rewardedPlayers.iterator();
if (iterator.hasNext()) {
@@ -76,6 +_,7 @@
}
this.markChanged();
+ return removed; // Paper - Vault API
}
public long stateUpdatingResumesAt() {
@@ -131,4 +_,15 @@
public float ejectionProgress() {
return this.totalEjectionsNeeded == 1 ? 1.0F : 1.0F - Mth.inverseLerp((float)this.getItemsToEject().size(), 1.0F, (float)this.totalEjectionsNeeded);
}
+
+ // Paper start - Vault API
+ public boolean removeFromRewardedPlayers(final UUID uuid) {
+ if (this.rewardedPlayers.remove(uuid)) {
+ this.markChanged();
+ return true;
+ }
+
+ return false;
+ }
+ // Paper end - Vault API
}

138
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftVault.java
View File

@ -1,17 +1,33 @@
package org.bukkit.craftbukkit.block;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.block.entity.vault.VaultBlockEntity;
import net.minecraft.world.level.block.entity.vault.VaultConfig;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Vault;
import org.bukkit.craftbukkit.CraftLootTable;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack;
import org.bukkit.loot.LootTable;
import org.jetbrains.annotations.Unmodifiable;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
@NullMarked
public class CraftVault extends CraftBlockEntityState<VaultBlockEntity> implements Vault {
public CraftVault(World world, VaultBlockEntity tileEntity) {
super(world, tileEntity);
}
protected CraftVault(CraftVault state, Location location) {
protected CraftVault(CraftVault state, @Nullable Location location) {
super(state, location);
}
@ -24,4 +40,124 @@ public class CraftVault extends CraftBlockEntityState<VaultBlockEntity> implemen
public CraftVault copy(Location location) {
return new CraftVault(this, location);
}
@Override
public double getActivationRange() {
return this.getSnapshot().getConfig().activationRange();
}
@Override
public void setActivationRange(final double activationRange) {
Preconditions.checkArgument(Double.isFinite(activationRange), "activation range must not be NaN or infinite");
Preconditions.checkArgument(activationRange <= this.getDeactivationRange(), "New activation range (%s) must be less or equal to deactivation range (%s)", activationRange, this.getDeactivationRange());
final VaultConfig config = this.getSnapshot().getConfig();
this.getSnapshot().setConfig(new VaultConfig(config.lootTable(), activationRange, config.deactivationRange(), config.keyItem(), config.overrideLootTableToDisplay()));
}
@Override
public double getDeactivationRange() {
return this.getSnapshot().getConfig().deactivationRange();
}
@Override
public void setDeactivationRange(final double deactivationRange) {
Preconditions.checkArgument(Double.isFinite(deactivationRange), "deactivation range must not be NaN or infinite");
Preconditions.checkArgument(deactivationRange >= this.getActivationRange(), "New deactivation range (%s) must be more or equal to activation range (%s)", deactivationRange, this.getActivationRange());
final VaultConfig config = this.getSnapshot().getConfig();
this.getSnapshot().setConfig(new VaultConfig(config.lootTable(), config.activationRange(), deactivationRange, config.keyItem(), config.overrideLootTableToDisplay()));
}
@Override
public ItemStack getKeyItem() {
return this.getSnapshot().getConfig().keyItem().asBukkitCopy();
}
@Override
public void setKeyItem(final ItemStack key) {
Preconditions.checkArgument(key != null, "key must not be null");
final VaultConfig config = this.getSnapshot().getConfig();
this.getSnapshot().setConfig(new VaultConfig(config.lootTable(), config.activationRange(), config.deactivationRange(), CraftItemStack.asNMSCopy(key), config.overrideLootTableToDisplay()));
}
@Override
public LootTable getLootTable() {
return CraftLootTable.minecraftToBukkit(this.getSnapshot().getConfig().lootTable());
}
@Override
public void setLootTable(final LootTable lootTable) {
final ResourceKey<net.minecraft.world.level.storage.loot.LootTable> lootTableKey = CraftLootTable.bukkitToMinecraft(lootTable);
Preconditions.checkArgument(lootTableKey != null, "lootTable must not be null");
final VaultConfig config = this.getSnapshot().getConfig();
this.getSnapshot().setConfig(new VaultConfig(lootTableKey, config.activationRange(), config.deactivationRange(), config.keyItem(), config.overrideLootTableToDisplay()));
}
@Override
public @Nullable LootTable getDisplayedLootTable() {
return this.getSnapshot().getConfig().overrideLootTableToDisplay().map(CraftLootTable::minecraftToBukkit).orElse(null);
}
@Override
public void setDisplayedLootTable(final @Nullable LootTable lootTable) {
final VaultConfig config = this.getSnapshot().getConfig();
this.getSnapshot().setConfig(new VaultConfig(config.lootTable(), config.activationRange(), config.deactivationRange(), config.keyItem(), Optional.ofNullable(CraftLootTable.bukkitToMinecraft(lootTable))));
}
@Override
public long getNextStateUpdateTime() {
return this.getSnapshot().serverData.stateUpdatingResumesAt();
}
@Override
public void setNextStateUpdateTime(final long nextStateUpdateTime) {
this.getSnapshot().serverData.pauseStateUpdatingUntil(nextStateUpdateTime);
}
@Override
public @Unmodifiable Collection<UUID> getRewardedPlayers() {
return ImmutableSet.copyOf(this.getSnapshot().serverData.getRewardedPlayers());
}
@Override
public boolean addRewardedPlayer(final UUID playerUUID) {
Preconditions.checkArgument(playerUUID != null, "playerUUID must not be null");
return this.getSnapshot().serverData.addToRewardedPlayers(playerUUID);
}
@Override
public boolean removeRewardedPlayer(final UUID playerUUID) {
Preconditions.checkArgument(playerUUID != null, "playerUUID must not be null");
return this.getSnapshot().serverData.removeFromRewardedPlayers(playerUUID);
}
@Override
public boolean hasRewardedPlayer(final UUID playerUUID) {
return this.getSnapshot().serverData.getRewardedPlayers().contains(playerUUID);
}
@Override
public @Unmodifiable Set<UUID> getConnectedPlayers() {
return ImmutableSet.copyOf(this.getSnapshot().getSharedData().getConnectedPlayers());
}
@Override
public boolean hasConnectedPlayer(final UUID playerUUID) {
return this.getSnapshot().getSharedData().getConnectedPlayers().contains(playerUUID);
}
@Override
public ItemStack getDisplayedItem() {
return CraftItemStack.asBukkitCopy(this.getSnapshot().getSharedData().getDisplayItem());
}
@Override
public void setDisplayedItem(final ItemStack displayedItem) {
Preconditions.checkArgument(displayedItem != null, "displayedItem must not be null");
this.getSnapshot().getSharedData().setDisplayItem(CraftItemStack.asNMSCopy(displayedItem));
}
}