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

3
paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
View File

@@ -87,7 +87,8 @@ public class Commodore {
"org/bukkit/entity/Frog$Variant", "NOP",
"org/bukkit/entity/Cat$Type", "NOP",
"org/bukkit/map/MapCursor$Type", "NOP",
"org/bukkit/block/banner/PatternType", "NOP"
"org/bukkit/block/banner/PatternType", "NOP",
"org/bukkit/attribute/Attribute", "NOP"
);
private final List<Reroute> reroutes = new ArrayList<>(); // only for testing

3
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@@ -51,7 +51,6 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftFeatureFlag;
import org.bukkit.craftbukkit.CraftRegistry;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.attribute.CraftAttribute;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.damage.CraftDamageEffect;
import org.bukkit.craftbukkit.damage.CraftDamageSourceBuilder;
@@ -368,7 +367,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public String getTranslationKey(final Attribute attribute) {
return CraftAttribute.bukkitToMinecraft(attribute).getDescriptionId();
return attribute.getTranslationKey();
}
@Override