Skip to content

Commit 1a4367e

Browse files
Machine-MakerMachine-Maker
committed
Use Holderable in more places
1 parent a1334d3 commit 1a4367e

15 files changed

+249
-647
lines changed

‎paper-server/src/main/java/io/papermc/paper/registry/HolderableBase.java

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package io.papermc.paper.registry;
2+
3+
import io.papermc.paper.util.Holderable;
4+
import net.minecraft.core.Holder;
5+
import org.bukkit.NamespacedKey;
6+
7+
public abstract class HolderableBase<M> implements Holderable<M> {
8+
9+
protected final Holder<M> holder;
10+
11+
protected HolderableBase(final Holder<M> holder) {
12+
this.holder = holder;
13+
}
14+
15+
@Override
16+
public final Holder<M> getHolder() {
17+
return this.holder;
18+
}
19+
20+
@Override
21+
public final int hashCode() {
22+
return Holderable.super.implHashCode();
23+
}
24+
25+
@Override
26+
public final boolean equals(final Object obj) {
27+
return Holderable.super.implEquals(obj);
28+
}
29+
30+
@Override
31+
public final String toString() {
32+
return Holderable.super.toString();
33+
}
34+
35+
@Override
36+
public final NamespacedKey getKey() {
37+
return Holderable.super.getKey();
38+
}
39+
}

‎paper-server/src/main/java/io/papermc/paper/world/flag/PaperFeatureDependent.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package io.papermc.paper.world.flag;
22

3+
import io.papermc.paper.util.Holderable;
34
import java.util.Set;
45
import net.minecraft.world.flag.FeatureElement;
56
import org.bukkit.FeatureFlag;
6-
import org.checkerframework.checker.nullness.qual.NonNull;
77
import org.jetbrains.annotations.Unmodifiable;
8+
import org.jspecify.annotations.NullMarked;
89

9-
public interface PaperFeatureDependent extends FeatureDependant {
10-
11-
<M extends FeatureElement> M getHandle();
10+
@NullMarked
11+
public interface PaperFeatureDependent<M extends FeatureElement> extends FeatureDependant, Holderable<M> {
1212

1313
@Override
14-
default @Unmodifiable @NonNull Set<FeatureFlag> requiredFeatures() {
14+
default @Unmodifiable Set<FeatureFlag> requiredFeatures() {
1515
return PaperFeatureFlagProviderImpl.fromNms(this.getHandle().requiredFeatures());
1616
}
1717
}

‎paper-server/src/main/java/org/bukkit/craftbukkit/CraftFluid.java

+7-74
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.bukkit.craftbukkit;
22

3-
import java.util.Locale;
3+
import io.papermc.paper.util.OldEnumHolderable;
4+
import net.minecraft.core.Holder;
45
import net.minecraft.core.registries.Registries;
56
import org.bukkit.Fluid;
6-
import org.bukkit.NamespacedKey;
7-
import org.bukkit.craftbukkit.util.Handleable;
8-
import org.jetbrains.annotations.NotNull;
7+
import org.jspecify.annotations.NullMarked;
98

10-
public class CraftFluid implements Fluid, Handleable<net.minecraft.world.level.material.Fluid> {
9+
@NullMarked
10+
public class CraftFluid extends OldEnumHolderable<Fluid, net.minecraft.world.level.material.Fluid> implements Fluid {
1111

1212
private static int count = 0;
1313

@@ -19,74 +19,7 @@ public static net.minecraft.world.level.material.Fluid bukkitToMinecraft(Fluid b
1919
return CraftRegistry.bukkitToMinecraft(bukkit);
2020
}
2121

22-
private final NamespacedKey key;
23-
private final net.minecraft.world.level.material.Fluid fluidType;
24-
private final String name;
25-
private final int ordinal;
26-
27-
public CraftFluid(NamespacedKey key, net.minecraft.world.level.material.Fluid fluidType) {
28-
this.key = key;
29-
this.fluidType = fluidType;
30-
// For backwards compatibility, minecraft values will stile return the uppercase name without the namespace,
31-
// in case plugins use for example the name as key in a config file to receive fluid specific values.
32-
// Custom fluids will return the key with namespace. For a plugin this should look than like a new fluid
33-
// (which can always be added in new minecraft versions and the plugin should therefore handle it accordingly).
34-
if (NamespacedKey.MINECRAFT.equals(key.getNamespace())) {
35-
this.name = key.getKey().toUpperCase(Locale.ROOT);
36-
} else {
37-
this.name = key.toString();
38-
}
39-
this.ordinal = CraftFluid.count++;
40-
}
41-
42-
@Override
43-
public net.minecraft.world.level.material.Fluid getHandle() {
44-
return this.fluidType;
45-
}
46-
47-
@NotNull
48-
@Override
49-
public NamespacedKey getKey() {
50-
return this.key;
51-
}
52-
53-
@Override
54-
public int compareTo(@NotNull Fluid fluid) {
55-
return this.ordinal - fluid.ordinal();
56-
}
57-
58-
@NotNull
59-
@Override
60-
public String name() {
61-
return this.name;
62-
}
63-
64-
@Override
65-
public int ordinal() {
66-
return this.ordinal;
67-
}
68-
69-
@Override
70-
public String toString() {
71-
// For backwards compatibility
72-
return this.name();
73-
}
74-
75-
@Override
76-
public boolean equals(Object other) {
77-
if (this == other) {
78-
return true;
79-
}
80-
81-
if (!(other instanceof CraftFluid otherFluid)) {
82-
return false;
83-
}
84-
85-
return this.getKey().equals(otherFluid.getKey());
86-
}
87-
88-
@Override
89-
public int hashCode() {
90-
return this.getKey().hashCode();
22+
public CraftFluid(final Holder<net.minecraft.world.level.material.Fluid> holder) {
23+
super(holder, count++);
9124
}
9225
}

‎paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBiome.java

+11-86
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.bukkit.craftbukkit.block;
22

3-
import java.util.Locale;
3+
import io.papermc.paper.util.OldEnumHolderable;
44
import net.minecraft.core.Holder;
55
import net.minecraft.core.registries.Registries;
6-
import org.bukkit.NamespacedKey;
76
import org.bukkit.block.Biome;
87
import org.bukkit.craftbukkit.CraftRegistry;
9-
import org.bukkit.craftbukkit.util.Handleable;
10-
import org.jetbrains.annotations.NotNull;
8+
import org.jspecify.annotations.NullMarked;
9+
import org.jspecify.annotations.Nullable;
1110

12-
public class CraftBiome implements Biome, Handleable<net.minecraft.world.level.biome.Biome> {
11+
@NullMarked
12+
public class CraftBiome extends OldEnumHolderable<Biome, net.minecraft.world.level.biome.Biome> implements Biome {
1313

1414
private static int count = 0;
1515

@@ -18,100 +18,25 @@ public static Biome minecraftToBukkit(net.minecraft.world.level.biome.Biome mine
1818
}
1919

2020
public static Biome minecraftHolderToBukkit(Holder<net.minecraft.world.level.biome.Biome> minecraft) {
21-
return CraftBiome.minecraftToBukkit(minecraft.value());
21+
return CraftRegistry.minecraftHolderToBukkit(minecraft, Registries.BIOME);
2222
}
2323

24-
public static net.minecraft.world.level.biome.Biome bukkitToMinecraft(Biome bukkit) {
24+
public static net.minecraft.world.level.biome.@Nullable Biome bukkitToMinecraft(Biome bukkit) {
2525
if (bukkit == Biome.CUSTOM) {
2626
return null;
2727
}
2828

2929
return CraftRegistry.bukkitToMinecraft(bukkit);
3030
}
3131

32-
public static Holder<net.minecraft.world.level.biome.Biome> bukkitToMinecraftHolder(Biome bukkit) {
32+
public static @Nullable Holder<net.minecraft.world.level.biome.Biome> bukkitToMinecraftHolder(Biome bukkit) {
3333
if (bukkit == Biome.CUSTOM) {
3434
return null;
3535
}
36-
37-
net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> registry = CraftRegistry.getMinecraftRegistry(Registries.BIOME);
38-
39-
if (registry.wrapAsHolder(CraftBiome.bukkitToMinecraft(bukkit)) instanceof Holder.Reference<net.minecraft.world.level.biome.Biome> holder) {
40-
return holder;
41-
}
42-
43-
throw new IllegalArgumentException("No Reference holder found for " + bukkit
44-
+ ", this can happen if a plugin creates its own biome base with out properly registering it.");
45-
}
46-
47-
private final NamespacedKey key;
48-
private final net.minecraft.world.level.biome.Biome biomeBase;
49-
private final String name;
50-
private final int ordinal;
51-
52-
public CraftBiome(NamespacedKey key, net.minecraft.world.level.biome.Biome biomeBase) {
53-
this.key = key;
54-
this.biomeBase = biomeBase;
55-
// For backwards compatibility, minecraft values will stile return the uppercase name without the namespace,
56-
// in case plugins use for example the name as key in a config file to receive biome specific values.
57-
// Custom biomes will return the key with namespace. For a plugin this should look than like a new biome
58-
// (which can always be added in new minecraft versions and the plugin should therefore handle it accordingly).
59-
if (NamespacedKey.MINECRAFT.equals(key.getNamespace())) {
60-
this.name = key.getKey().toUpperCase(Locale.ROOT);
61-
} else {
62-
this.name = key.toString();
63-
}
64-
this.ordinal = CraftBiome.count++;
65-
}
66-
67-
@Override
68-
public net.minecraft.world.level.biome.Biome getHandle() {
69-
return this.biomeBase;
70-
}
71-
72-
@NotNull
73-
@Override
74-
public NamespacedKey getKey() {
75-
return this.key;
76-
}
77-
78-
@Override
79-
public int compareTo(@NotNull Biome biome) {
80-
return this.ordinal - biome.ordinal();
81-
}
82-
83-
@NotNull
84-
@Override
85-
public String name() {
86-
return this.name;
87-
}
88-
89-
@Override
90-
public int ordinal() {
91-
return this.ordinal;
92-
}
93-
94-
@Override
95-
public String toString() {
96-
// For backwards compatibility
97-
return this.name();
98-
}
99-
100-
@Override
101-
public boolean equals(Object other) {
102-
if (this == other) {
103-
return true;
104-
}
105-
106-
if (!(other instanceof CraftBiome otherBiome)) {
107-
return false;
108-
}
109-
110-
return this.getKey().equals(otherBiome.getKey());
36+
return CraftRegistry.bukkitToMinecraftHolder(bukkit, Registries.BIOME);
11137
}
11238

113-
@Override
114-
public int hashCode() {
115-
return this.getKey().hashCode();
39+
public CraftBiome(final Holder<net.minecraft.world.level.biome.Biome> holder) {
40+
super(holder, count++);
11641
}
11742
}

0 commit comments

Comments
 (0)