Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Update to Minecraft 1.18.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot 2022-03-01 02:00:00 +11:00
parent f37d1372b3
commit 6b7d2d9a91
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paper-api/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version> <version>1.18.2-R0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Bukkit</name> <name>Bukkit</name>
@ -48,7 +48,7 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.8</version> <version>2.8.9</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

20
paper-api/src/main/java/org/bukkit/StructureType.java
View File

@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
* The registration of new {@link StructureType}s is case-sensitive. * The registration of new {@link StructureType}s is case-sensitive.
*/ */
// Order is retrieved from WorldGenFactory // Order is retrieved from WorldGenFactory
public final class StructureType { public final class StructureType implements Keyed {
private static final Map<String, StructureType> structureTypeMap = new HashMap<>(); private static final Map<String, StructureType> structureTypeMap = new HashMap<>();
@ -161,7 +161,7 @@ public final class StructureType {
* STRUCTURE TYPES REGISTERED ABOVE THIS * STRUCTURE TYPES REGISTERED ABOVE THIS
* **************** * ****************
*/ */
private final String name; private final NamespacedKey key;
private final MapCursor.Type mapCursor; private final MapCursor.Type mapCursor;
/** /**
@ -176,7 +176,7 @@ public final class StructureType {
*/ */
private StructureType(@NotNull String name, @Nullable MapCursor.Type mapIcon) { private StructureType(@NotNull String name, @Nullable MapCursor.Type mapIcon) {
Validate.notEmpty(name, "Structure name cannot be empty"); Validate.notEmpty(name, "Structure name cannot be empty");
this.name = name; this.key = NamespacedKey.minecraft(name);
this.mapCursor = mapIcon; this.mapCursor = mapIcon;
} }
@ -188,7 +188,7 @@ public final class StructureType {
*/ */
@NotNull @NotNull
public String getName() { public String getName() {
return name; return key.getKey();
} }
/** /**
@ -211,20 +211,20 @@ public final class StructureType {
return false; return false;
} }
StructureType that = (StructureType) other; StructureType that = (StructureType) other;
return this.name.equals(that.name) && this.mapCursor == that.mapCursor; return this.key.equals(that.key) && this.mapCursor == that.mapCursor;
} }
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 7; int hash = 7;
hash = 71 * hash + Objects.hashCode(this.name); hash = 71 * hash + Objects.hashCode(this.key);
hash = 71 * hash + Objects.hashCode(this.mapCursor); hash = 71 * hash + Objects.hashCode(this.mapCursor);
return hash; return hash;
} }
@Override @Override
public String toString() { public String toString() {
return "StructureType{name=" + this.name + ", cursor=" + this.mapCursor + "}"; return "StructureType{key=" + this.key + ", cursor=" + this.mapCursor + "}";
} }
@NotNull @NotNull
@ -244,4 +244,10 @@ public final class StructureType {
public static Map<String, StructureType> getStructureTypes() { public static Map<String, StructureType> getStructureTypes() {
return ImmutableMap.copyOf(structureTypeMap); return ImmutableMap.copyOf(structureTypeMap);
} }
@NotNull
@Override
public NamespacedKey getKey() {
return key;
}
} }

4
paper-api/src/main/java/org/bukkit/Tag.java
View File

@ -348,6 +348,10 @@ public interface Tag<T extends Keyed> extends Keyed {
* Vanilla block tag representing all climbable blocks. * Vanilla block tag representing all climbable blocks.
*/ */
Tag<Material> CLIMBABLE = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("climbable"), Material.class); Tag<Material> CLIMBABLE = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("climbable"), Material.class);
/**
* Vanilla block tag representing all blocks which reset fall damage.
*/
Tag<Material> FALL_DAMAGE_RESETTING = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("fall_damage_resetting"), Material.class);
/** /**
* Vanilla block tag representing all shulker boxes. * Vanilla block tag representing all shulker boxes.
*/ */