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

#1498: Make Attribute an interface and align names with the new minecraft ones

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2024-10-29 06:43:14 +11:00
parent 228b3effa4
commit 08c83835f3
9 changed files with 134 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
paper-server/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
View File

@@ -354,7 +354,39 @@ public class FieldRename {
private static final FieldRenameData ATTRIBUTE_DATA = FieldRenameData.Builder.newBuilder()
.forAllVersions()
.withKeyRename()
.change("HORSE.JUMP_STRENGTH", "GENERIC.JUMP_STRENGTH")
.change("HORSE.JUMP_STRENGTH", "JUMP_STRENGTH")
.change("GENERIC.MAX_HEALTH", "MAX_HEALTH")
.change("GENERIC.FOLLOW_RANGE", "FOLLOW_RANGE")
.change("GENERIC.KNOCKBACK_RESISTANCE", "KNOCKBACK_RESISTANCE")
.change("GENERIC.MOVEMENT_SPEED", "MOVEMENT_SPEED")
.change("GENERIC.FLYING_SPEED", "FLYING_SPEED")
.change("GENERIC.ATTACK_DAMAGE", "ATTACK_DAMAGE")
.change("GENERIC.ATTACK_KNOCKBACK", "ATTACK_KNOCKBACK")
.change("GENERIC.ATTACK_SPEED", "ATTACK_SPEED")
.change("GENERIC.ARMOR", "ARMOR")
.change("GENERIC.ARMOR_TOUGHNESS", "ARMOR_TOUGHNESS")
.change("GENERIC.FALL_DAMAGE_MULTIPLIER", "FALL_DAMAGE_MULTIPLIER")
.change("GENERIC.LUCK", "LUCK")
.change("GENERIC.MAX_ABSORPTION", "MAX_ABSORPTION")
.change("GENERIC.SAFE_FALL_DISTANCE", "SAFE_FALL_DISTANCE")
.change("GENERIC.SCALE", "SCALE")
.change("GENERIC.STEP_HEIGHT", "STEP_HEIGHT")
.change("GENERIC.GRAVITY", "GRAVITY")
.change("GENERIC.JUMP_STRENGTH", "JUMP_STRENGTH")
.change("GENERIC.BURNING_TIME", "BURNING_TIME")
.change("GENERIC.EXPLOSION_KNOCKBACK_RESISTANCE", "EXPLOSION_KNOCKBACK_RESISTANCE")
.change("GENERIC.MOVEMENT_EFFICIENCY", "MOVEMENT_EFFICIENCY")
.change("GENERIC.OXYGEN_BONUS", "OXYGEN_BONUS")
.change("GENERIC.WATER_MOVEMENT_EFFICIENCY", "WATER_MOVEMENT_EFFICIENCY")
.change("GENERIC.TEMPT_RANGE", "TEMPT_RANGE")
.change("PLAYER.BLOCK_INTERACTION_RANGE", "BLOCK_INTERACTION_RANGE")
.change("PLAYER.ENTITY_INTERACTION_RANGE", "ENTITY_INTERACTION_RANGE")
.change("PLAYER.BLOCK_BREAK_SPEED", "BLOCK_BREAK_SPEED")
.change("PLAYER.MINING_EFFICIENCY", "MINING_EFFICIENCY")
.change("PLAYER.SNEAKING_SPEED", "SNEAKING_SPEED")
.change("PLAYER.SUBMERGED_MINING_SPEED", "SUBMERGED_MINING_SPEED")
.change("PLAYER.SWEEPING_DAMAGE_RATIO", "SWEEPING_DAMAGE_RATIO")
.change("ZOMBIE.SPAWN_REINFORCEMENTS", "SPAWN_REINFORCEMENTS")
.build();
public static final BiFunction<NamespacedKey, ApiVersion, NamespacedKey> ATTRIBUTE_RENAME = ATTRIBUTE_DATA::getReplacement;

2
paper-server/src/main/java/org/bukkit/craftbukkit/legacy/enums/EnumEvil.java
View File

@@ -17,6 +17,7 @@ import java.util.stream.Collector;
import java.util.stream.Collectors;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.attribute.Attribute;
import org.bukkit.block.banner.PatternType;
import org.bukkit.craftbukkit.legacy.FieldRename;
import org.bukkit.craftbukkit.legacy.reroute.DoNotReroute;
@@ -44,6 +45,7 @@ public class EnumEvil {
static {
// Add Classes which got changed here
REGISTRIES.put(Attribute.class, new LegacyRegistryData(Registry.ATTRIBUTE, Attribute::valueOf));
REGISTRIES.put(Villager.Type.class, new LegacyRegistryData(Registry.VILLAGER_TYPE, Villager.Type::valueOf));
REGISTRIES.put(Villager.Profession.class, new LegacyRegistryData(Registry.VILLAGER_PROFESSION, Villager.Profession::valueOf));
REGISTRIES.put(Frog.Variant.class, new LegacyRegistryData(Registry.FROG_VARIANT, Frog.Variant::valueOf));