diff options
| author | Nassim Jahnke <[email protected]> | 2024-06-14 14:28:06 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-06-14 14:28:06 +0200 |
| commit | a308c7c8d79df18a3e217e30c2c0900590fc4e81 (patch) | |
| tree | 44449c94f7e39d1f47bed48e9a70c0375aacafd4 /patches/server/0005-Paper-config-files.patch | |
| parent | 0d3ce2d704f295b0e48795ea8145134bed9f4cb1 (diff) | |
| download | Paper-a308c7c8d79df18a3e217e30c2c0900590fc4e81.tar.gz Paper-a308c7c8d79df18a3e217e30c2c0900590fc4e81.zip | |
Fix more compile issues
Diffstat (limited to 'patches/server/0005-Paper-config-files.patch')
| -rw-r--r-- | patches/server/0005-Paper-config-files.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index d958463393..e5631ad5cb 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -3642,7 +3642,7 @@ index 0000000000000000000000000000000000000000..6cdc40cb4a5f94654c874f9dbdb106fa +} diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..f7520ba86c1a650d3bd9b902d2a59ec8eb6cde5d +index 0000000000000000000000000000000000000000..3332531d902899a156179ef2e9ec85b2f42c1fd1 --- /dev/null +++ b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java @@ -0,0 +1,322 @@ @@ -3753,7 +3753,7 @@ index 0000000000000000000000000000000000000000..f7520ba86c1a650d3bd9b902d2a59ec8 + ) + .addVersion(26, ConfigurationTransformation.builder().addAction(path("alt-item-despawn-rate", "items", ConfigurationTransformation.WILDCARD_OBJECT), (path, value) -> { + String itemName = path.get(path.size() - 1).toString(); -+ final Optional<Holder.Reference<Item>> item = BuiltInRegistries.ITEM.getHolder(ResourceKey.create(Registries.ITEM, new ResourceLocation(itemName.toLowerCase(Locale.ROOT)))); ++ final Optional<Holder.Reference<Item>> item = BuiltInRegistries.ITEM.getHolder(ResourceKey.create(Registries.ITEM, ResourceLocation.parse(itemName.toLowerCase(Locale.ROOT)))); + if (item.isEmpty()) { + itemName = Material.valueOf(itemName).getKey().getKey(); + } @@ -3785,7 +3785,7 @@ index 0000000000000000000000000000000000000000..f7520ba86c1a650d3bd9b902d2a59ec8 + Map<String, Integer> rebuild = new HashMap<>(); + value.childrenMap().forEach((key, node) -> { + String itemName = key.toString(); -+ final Optional<Holder.Reference<Item>> itemHolder = BuiltInRegistries.ITEM.getHolder(ResourceKey.create(Registries.ITEM, new ResourceLocation(itemName.toLowerCase(Locale.ROOT)))); ++ final Optional<Holder.Reference<Item>> itemHolder = BuiltInRegistries.ITEM.getHolder(ResourceKey.create(Registries.ITEM, ResourceLocation.parse(itemName.toLowerCase(Locale.ROOT)))); + final @Nullable String item; + if (itemHolder.isEmpty()) { + final @Nullable Material bukkitMat = Material.matchMaterial(itemName); |