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

Update to Minecraft 1.16.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
View File

@@ -10,10 +10,10 @@ import org.bukkit.attribute.AttributeModifier;
public class CraftAttributeInstance implements AttributeInstance {
private final net.minecraft.server.AttributeInstance handle;
private final net.minecraft.server.AttributeModifiable handle;
private final Attribute attribute;
public CraftAttributeInstance(net.minecraft.server.AttributeInstance handle, Attribute attribute) {
public CraftAttributeInstance(net.minecraft.server.AttributeModifiable handle, Attribute attribute) {
this.handle = handle;
this.attribute = attribute;
}

35
paper-server/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
View File

@@ -1,13 +1,14 @@
package org.bukkit.craftbukkit.attribute;
import com.google.common.base.CaseFormat;
import com.google.common.base.Preconditions;
import java.util.Locale;
import net.minecraft.server.AttributeMapBase;
import org.apache.commons.lang3.EnumUtils;
import net.minecraft.server.IRegistry;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.attribute.Attributable;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
public class CraftAttributeMap implements Attributable {
@@ -20,36 +21,12 @@ public class CraftAttributeMap implements Attributable {
@Override
public AttributeInstance getAttribute(Attribute attribute) {
Preconditions.checkArgument(attribute != null, "attribute");
net.minecraft.server.AttributeInstance nms = handle.a(toMinecraft(attribute.name()));
net.minecraft.server.AttributeModifiable nms = handle.a(IRegistry.ATTRIBUTE.get(CraftNamespacedKey.toMinecraft(attribute.getKey())));
return (nms == null) ? null : new CraftAttributeInstance(nms, attribute);
}
public static String toMinecraft(String bukkit) {
int first = bukkit.indexOf('_');
int second = bukkit.indexOf('_', first + 1);
StringBuilder sb = new StringBuilder(bukkit.toLowerCase(java.util.Locale.ENGLISH));
sb.setCharAt(first, '.');
if (second != -1) {
sb.deleteCharAt(second);
sb.setCharAt(second, bukkit.charAt(second + 1));
}
return sb.toString();
}
public static String toMinecraft(Attribute attribute) {
return toMinecraft(attribute.name());
}
public static Attribute fromMinecraft(String nms) {
String[] split = nms.split("\\.", 2);
String generic = split[0];
String descriptor = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, split[1]); // movementSpeed -> MOVEMENT_SPEED
String fin = generic + "_" + descriptor;
return EnumUtils.getEnum(Attribute.class, fin.toUpperCase(Locale.ROOT)); // so we can return null without throwing exceptions
return Registry.ATTRIBUTE.get(NamespacedKey.minecraft(nms));
}
}