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

Update to Minecraft 1.20.5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 899f2acb84
commit f3502f6dac
54 changed files with 1814 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
paper-api/src/main/java/org/bukkit/attribute/Attribute.java
View File

@@ -51,6 +51,10 @@ public enum Attribute implements Keyed, Translatable {
* Armor durability bonus of an Entity.
*/
GENERIC_ARMOR_TOUGHNESS("generic.armor_toughness"),
/**
* The fall damage multiplier of an Entity.
*/
GENERIC_FALL_DAMAGE_MULTIPLIER("generic.fall_damage_multiplier"),
/**
* Luck bonus of an Entity.
*/
@@ -60,9 +64,37 @@ public enum Attribute implements Keyed, Translatable {
*/
GENERIC_MAX_ABSORPTION("generic.max_absorption"),
/**
* Strength with which a horse will jump.
* The distance which an Entity can fall without damage.
*/
HORSE_JUMP_STRENGTH("horse.jump_strength"),
GENERIC_SAFE_FALL_DISTANCE("generic.safe_fall_distance"),
/**
* The relative scale of an Entity.
*/
GENERIC_SCALE("generic.scale"),
/**
* The height which an Entity can walk over.
*/
GENERIC_STEP_HEIGHT("generic.step_height"),
/**
* The gravity applied to an Entity.
*/
GENERIC_GRAVITY("generic.gravity"),
/**
* Strength with which an Entity will jump.
*/
GENERIC_JUMP_STRENGTH("generic.jump_strength"),
/**
* The block reach distance of a Player.
*/
PLAYER_BLOCK_INTERACTION_RANGE("player.block_interaction_range"),
/**
* The entity reach distance of a Player.
*/
PLAYER_ENTITY_INTERACTION_RANGE("player.entity_interaction_range"),
/**
* Block break speed of a Player.
*/
PLAYER_BLOCK_BREAK_SPEED("player.block_break_speed"),
/**
* Chance of a zombie to spawn reinforcements.
*/

40
paper-api/src/main/java/org/bukkit/attribute/AttributeModifier.java
View File

@@ -7,6 +7,7 @@ import java.util.Objects;
import java.util.UUID;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.EquipmentSlotGroup;
import org.bukkit.util.NumberConversions;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -20,17 +21,21 @@ public class AttributeModifier implements ConfigurationSerializable {
private final String name;
private final double amount;
private final Operation operation;
private final EquipmentSlot slot;
private final EquipmentSlotGroup slot;
public AttributeModifier(@NotNull String name, double amount, @NotNull Operation operation) {
this(UUID.randomUUID(), name, amount, operation);
}
public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation) {
this(uuid, name, amount, operation, null);
this(uuid, name, amount, operation, (EquipmentSlotGroup) null);
}
public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @Nullable EquipmentSlot slot) {
this(uuid, name, amount, operation, (slot) == null ? EquipmentSlotGroup.ANY : slot.getGroup());
}
public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @NotNull EquipmentSlotGroup slot) {
Preconditions.checkArgument(uuid != null, "UUID cannot be null");
Preconditions.checkArgument(name != null, "Name cannot be null");
Preconditions.checkArgument(operation != null, "Operation cannot be null");
@@ -85,9 +90,22 @@ public class AttributeModifier implements ConfigurationSerializable {
* or null if this modifier is applicable for any slot.
*
* @return the slot
* @deprecated use {@link #getSlotGroup()}
*/
@Nullable
@Deprecated
public EquipmentSlot getSlot() {
return slot.getExample();
}
/**
* Get the {@link EquipmentSlot} this AttributeModifier is active on,
* or null if this modifier is applicable for any slot.
*
* @return the slot
*/
@NotNull
public EquipmentSlotGroup getSlotGroup() {
return slot;
}
@@ -99,8 +117,8 @@ public class AttributeModifier implements ConfigurationSerializable {
data.put("name", name);
data.put("operation", operation.ordinal());
data.put("amount", amount);
if (slot != null) {
data.put("slot", slot.name());
if (slot != null && slot != EquipmentSlotGroup.ANY) {
data.put("slot", slot.toString());
}
return data;
}
@@ -133,14 +151,24 @@ public class AttributeModifier implements ConfigurationSerializable {
+ ", name=" + this.name
+ ", operation=" + this.operation.name()
+ ", amount=" + this.amount
+ ", slot=" + (this.slot != null ? this.slot.name() : "")
+ ", slot=" + (this.slot != null ? this.slot.toString() : "")
+ "}";
}
@NotNull
public static AttributeModifier deserialize(@NotNull Map<String, Object> args) {
if (args.containsKey("slot")) {
return new AttributeModifier(UUID.fromString((String) args.get("uuid")), (String) args.get("name"), NumberConversions.toDouble(args.get("amount")), Operation.values()[NumberConversions.toInt(args.get("operation"))], EquipmentSlot.valueOf((args.get("slot").toString().toUpperCase())));
EquipmentSlotGroup slotGroup = EquipmentSlotGroup.getByName(args.get("slot").toString().toLowerCase());
if (slotGroup == null) {
slotGroup = EquipmentSlotGroup.ANY;
EquipmentSlot slot = EquipmentSlot.valueOf((args.get("slot").toString().toUpperCase()));
if (slot != null) {
slotGroup = slot.getGroup();
}
}
return new AttributeModifier(UUID.fromString((String) args.get("uuid")), (String) args.get("name"), NumberConversions.toDouble(args.get("amount")), Operation.values()[NumberConversions.toInt(args.get("operation"))], slotGroup);
}
return new AttributeModifier(UUID.fromString((String) args.get("uuid")), (String) args.get("name"), NumberConversions.toDouble(args.get("amount")), Operation.values()[NumberConversions.toInt(args.get("operation"))]);
}