48 lines
2.8 KiB
Diff
48 lines
2.8 KiB
Diff
--- a/net/minecraft/world/level/levelgen/structure/PersistentStructureLegacy.java
|
|
+++ b/net/minecraft/world/level/levelgen/structure/PersistentStructureLegacy.java
|
|
@@ -20,9 +20,13 @@
|
|
import net.minecraft.world.level.levelgen.feature.StructureGenerator;
|
|
import net.minecraft.world.level.storage.WorldPersistentData;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.level.dimension.DimensionManager;
|
|
+// CraftBukkit end
|
|
+
|
|
public class PersistentStructureLegacy {
|
|
|
|
- private static final Map<String, String> CURRENT_TO_LEGACY_MAP = (Map) SystemUtils.a((Object) Maps.newHashMap(), (hashmap) -> {
|
|
+ private static final Map<String, String> CURRENT_TO_LEGACY_MAP = (Map) SystemUtils.a(Maps.newHashMap(), (hashmap) -> { // CraftBukkit - decompile error
|
|
hashmap.put("Village", "Village");
|
|
hashmap.put("Mineshaft", "Mineshaft");
|
|
hashmap.put("Mansion", "Mansion");
|
|
@@ -35,7 +39,7 @@
|
|
hashmap.put("Fortress", "Fortress");
|
|
hashmap.put("EndCity", "EndCity");
|
|
});
|
|
- private static final Map<String, String> LEGACY_TO_CURRENT_MAP = (Map) SystemUtils.a((Object) Maps.newHashMap(), (hashmap) -> {
|
|
+ private static final Map<String, String> LEGACY_TO_CURRENT_MAP = (Map) SystemUtils.a(Maps.newHashMap(), (hashmap) -> { // CraftBukkit - decompile error
|
|
hashmap.put("Iglu", "Igloo");
|
|
hashmap.put("TeDP", "Desert_Pyramid");
|
|
hashmap.put("TeJP", "Jungle_Pyramid");
|
|
@@ -234,16 +238,16 @@
|
|
}
|
|
}
|
|
|
|
- public static PersistentStructureLegacy a(ResourceKey<World> resourcekey, @Nullable WorldPersistentData worldpersistentdata) {
|
|
- if (resourcekey == World.OVERWORLD) {
|
|
+ public static PersistentStructureLegacy a(ResourceKey<DimensionManager> resourcekey, @Nullable WorldPersistentData worldpersistentdata) { // CraftBukkit
|
|
+ if (resourcekey == DimensionManager.OVERWORLD_LOCATION) { // CraftBukkit
|
|
return new PersistentStructureLegacy(worldpersistentdata, ImmutableList.of("Monument", "Stronghold", "Village", "Mineshaft", "Temple", "Mansion"), ImmutableList.of("Village", "Mineshaft", "Mansion", "Igloo", "Desert_Pyramid", "Jungle_Pyramid", "Swamp_Hut", "Stronghold", "Monument"));
|
|
} else {
|
|
ImmutableList immutablelist;
|
|
|
|
- if (resourcekey == World.NETHER) {
|
|
+ if (resourcekey == DimensionManager.NETHER_LOCATION) { // CraftBukkit
|
|
immutablelist = ImmutableList.of("Fortress");
|
|
return new PersistentStructureLegacy(worldpersistentdata, immutablelist, immutablelist);
|
|
- } else if (resourcekey == World.END) {
|
|
+ } else if (resourcekey == DimensionManager.END_LOCATION) { // CraftBukkit
|
|
immutablelist = ImmutableList.of("EndCity");
|
|
return new PersistentStructureLegacy(worldpersistentdata, immutablelist, immutablelist);
|
|
} else {
|