From f7726fdaab391bf4f273878516e969a6ce59deb5 Mon Sep 17 00:00:00 2001 From: MrHell228 Date: Fri, 1 Nov 2024 14:38:10 +0300 Subject: [PATCH] Replace SpongeCommon.server().registryAccess() -> SpongeCommon.vanillaRegistryAccess() --- .../common/adventure/SpongeChatTypeTemplate.java | 4 ++-- .../common/data/provider/entity/PaintingData.java | 2 +- .../data/provider/item/stack/BookPagesItemStackData.java | 2 +- .../common/data/type/SpongeArtTypeTemplate.java | 4 ++-- .../common/datapack/JsonDataPackSerializer.java | 4 ++-- .../common/datapack/NbtDataPackSerializer.java | 4 ++-- .../common/entity/player/SpongeUserData.java | 4 ++-- .../common/entity/player/SpongeUserInventory.java | 8 ++++---- .../cause/entity/damage/SpongeDamageSourceBuilder.java | 2 +- .../cause/entity/damage/SpongeDamageTypeTemplate.java | 4 ++-- .../org/spongepowered/common/item/SpongeItemStack.java | 4 ++-- .../enchantment/SpongeRandomEnchantmentListBuilder.java | 4 ++-- .../org/spongepowered/common/tag/SpongeTagTemplate.java | 2 +- .../common/util/SpongeDamageSourceFactory.java | 2 +- .../common/world/biome/SpongeBiomeTemplate.java | 4 ++-- .../world/generation/SpongeChunkGeneratorFactory.java | 2 +- .../world/generation/carver/SpongeCarverTemplate.java | 4 ++-- .../config/noise/SpongeDensityFunctionTemplate.java | 4 ++-- .../config/noise/SpongeNoiseGeneratorConfigTemplate.java | 4 ++-- .../generation/config/noise/SpongeNoiseTemplate.java | 4 ++-- .../world/generation/feature/SpongeFeatureTemplate.java | 4 ++-- .../generation/feature/SpongePlacedFeatureTemplate.java | 4 ++-- .../generation/structure/SpongeSchematicTemplate.java | 2 +- .../generation/structure/SpongeStructureSetTemplate.java | 4 ++-- .../generation/structure/SpongeStructureTemplate.java | 4 ++-- .../structure/jigsaw/SpongeJigsawPoolTemplate.java | 4 ++-- .../structure/jigsaw/SpongeProcessorListTemplate.java | 4 ++-- .../common/world/schematic/SchematicTranslator.java | 6 +++--- .../common/world/server/SpongeWorldManager.java | 2 +- .../common/world/server/SpongeWorldTemplate.java | 6 +++--- .../common/world/server/SpongeWorldTypeTemplate.java | 2 +- .../mixin/api/minecraft/map/MapDecorationMixin_API.java | 2 +- .../minecraft/world/item/crafting/RecipeMixin_API.java | 2 +- .../levelgen/carver/ConfiguredWorldCarverMixin_API.java | 2 +- .../world/level/levelgen/carver/WorldCarverMixin_API.java | 2 +- .../levelgen/feature/ConfiguredFeatureMixin_API.java | 2 +- .../world/level/levelgen/feature/FeatureMixin_API.java | 2 +- .../placement/PlacementModifierTypeMixin_API.java | 2 +- .../level/levelgen/structure/StructureMixin_API.java | 2 +- .../level/levelgen/structure/StructureTypeMixin_API.java | 2 +- .../templatesystem/StructureProcessorMixin_API.java | 2 +- .../templatesystem/StructureProcessorTypeMixin_API.java | 2 +- .../common/mixin/core/server/level/ServerLevelMixin.java | 4 ++-- 43 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/main/java/org/spongepowered/common/adventure/SpongeChatTypeTemplate.java b/src/main/java/org/spongepowered/common/adventure/SpongeChatTypeTemplate.java index bdc5636e3a6..b332f15be5a 100644 --- a/src/main/java/org/spongepowered/common/adventure/SpongeChatTypeTemplate.java +++ b/src/main/java/org/spongepowered/common/adventure/SpongeChatTypeTemplate.java @@ -62,7 +62,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeChatTypeTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeChatTypeTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -173,7 +173,7 @@ public Builder reset() { @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final ChatType chatType = SpongeChatTypeTemplate.decode(json, SpongeCommon.server().registryAccess()); + final ChatType chatType = SpongeChatTypeTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); this.fromValue((org.spongepowered.api.adventure.ChatType) (Object) chatType); return this; } diff --git a/src/main/java/org/spongepowered/common/data/provider/entity/PaintingData.java b/src/main/java/org/spongepowered/common/data/provider/entity/PaintingData.java index 97771ab0dfc..b1d40e15cd5 100644 --- a/src/main/java/org/spongepowered/common/data/provider/entity/PaintingData.java +++ b/src/main/java/org/spongepowered/common/data/provider/entity/PaintingData.java @@ -53,7 +53,7 @@ public static void register(final DataProviderRegistrator registrator) { .setAnd((h, v) -> { if (!h.level().isClientSide) { final Holder oldArt = h.getVariant(); - var newArt = SpongeCommon.server().registryAccess().lookupOrThrow(Registries.PAINTING_VARIANT).wrapAsHolder((PaintingVariant) (Object) v); + var newArt = SpongeCommon.vanillaRegistry(Registries.PAINTING_VARIANT).wrapAsHolder((PaintingVariant) (Object) v); h.setVariant(newArt); ((HangingEntityAccessor) h).invoker$setDirection(h.getDirection()); if (!h.survives()) { diff --git a/src/main/java/org/spongepowered/common/data/provider/item/stack/BookPagesItemStackData.java b/src/main/java/org/spongepowered/common/data/provider/item/stack/BookPagesItemStackData.java index e064bad1c6f..6c1bc57d3b4 100644 --- a/src/main/java/org/spongepowered/common/data/provider/item/stack/BookPagesItemStackData.java +++ b/src/main/java/org/spongepowered/common/data/provider/item/stack/BookPagesItemStackData.java @@ -71,7 +71,7 @@ private static boolean set(final ItemStack holder, final List value if (value.isEmpty()) { return BookPagesItemStackData.delete(holder, component); } - final var registry = SpongeCommon.server().registryAccess().lookupOrThrow(Registries.ENCHANTMENT); + final var registry = SpongeCommon.vanillaRegistry(Registries.ENCHANTMENT); holder.update(component, ItemEnchantments.EMPTY, ench -> { final ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(ench); mutable.keySet().clear(); diff --git a/src/main/java/org/spongepowered/common/data/type/SpongeArtTypeTemplate.java b/src/main/java/org/spongepowered/common/data/type/SpongeArtTypeTemplate.java index 1b184a83ef8..4ced398801e 100644 --- a/src/main/java/org/spongepowered/common/data/type/SpongeArtTypeTemplate.java +++ b/src/main/java/org/spongepowered/common/data/type/SpongeArtTypeTemplate.java @@ -61,7 +61,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeArtTypeTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeArtTypeTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -116,7 +116,7 @@ public Builder fromValue(final ArtType value) { @Override public Builder fromDataPack(final DataView dataView) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(dataView)); - final var damageType = SpongeArtTypeTemplate.decode(json, SpongeCommon.server().registryAccess()); + final var damageType = SpongeArtTypeTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); this.fromValue((ArtType) (Object) damageType); return this; } diff --git a/src/main/java/org/spongepowered/common/datapack/JsonDataPackSerializer.java b/src/main/java/org/spongepowered/common/datapack/JsonDataPackSerializer.java index 7ec99ec73dc..b167cbea3df 100644 --- a/src/main/java/org/spongepowered/common/datapack/JsonDataPackSerializer.java +++ b/src/main/java/org/spongepowered/common/datapack/JsonDataPackSerializer.java @@ -53,7 +53,7 @@ public String fileEnding() { @Override public void serializeObject(final SpongeDataPack pack, final Path packDir, final T packEntry) throws IOException { - final JsonElement serialized = this.encoder.encode(packEntry, SpongeCommon.server().registryAccess()); + final JsonElement serialized = this.encoder.encode(packEntry, SpongeCommon.vanillaRegistryAccess()); final Path file = this.packEntryFile(pack.type(), packEntry.key(), packDir); final JsonElement finalJson = this.transformSerialized(file, packEntry, serialized); Files.createDirectories(file.getParent()); @@ -82,7 +82,7 @@ public T deserialize(final SpongeDataPack pack, final InputStrea if (this.decoder != null) { // TODO this is actually blocking - return this.decoder.decode(pack, key, element, SpongeCommon.server().registryAccess()); + return this.decoder.decode(pack, key, element, SpongeCommon.vanillaRegistryAccess()); } } return null; diff --git a/src/main/java/org/spongepowered/common/datapack/NbtDataPackSerializer.java b/src/main/java/org/spongepowered/common/datapack/NbtDataPackSerializer.java index 8ded4c9327f..1e9b3b023a3 100644 --- a/src/main/java/org/spongepowered/common/datapack/NbtDataPackSerializer.java +++ b/src/main/java/org/spongepowered/common/datapack/NbtDataPackSerializer.java @@ -50,7 +50,7 @@ public String fileEnding() { @Override public void serializeObject(final SpongeDataPack pack, final Path packDir, final T packEntry) throws IOException { - final CompoundTag serialized = this.encoder.encode(packEntry, SpongeCommon.server().registryAccess()); + final CompoundTag serialized = this.encoder.encode(packEntry, SpongeCommon.vanillaRegistryAccess()); final Path file = this.packEntryFile(pack.type(), packEntry.key(), packDir); Files.createDirectories(file.getParent()); NbtDataPackSerializer.writeFile(file, serialized); @@ -73,7 +73,7 @@ public T deserialize(final SpongeDataPack pack, final InputStrea final CompoundTag element = NbtIo.readCompressed(dis, NbtAccounter.unlimitedHeap()); if (this.decoder != null) { // TODO this is actually blocking - return this.decoder.decode(pack, key, element, SpongeCommon.server().registryAccess()); + return this.decoder.decode(pack, key, element, SpongeCommon.vanillaRegistryAccess()); } } return null; diff --git a/src/main/java/org/spongepowered/common/entity/player/SpongeUserData.java b/src/main/java/org/spongepowered/common/entity/player/SpongeUserData.java index 6fe79650820..12597eb2d21 100644 --- a/src/main/java/org/spongepowered/common/entity/player/SpongeUserData.java +++ b/src/main/java/org/spongepowered/common/entity/player/SpongeUserData.java @@ -210,7 +210,7 @@ private SpongeUserData loadEnderInventory() { this.enderChest = new SpongeUserInventoryEnderchest(this); if (this.compound.contains(Constants.Entity.Player.ENDERCHEST_INVENTORY, 9)) { final ListTag nbttaglist1 = this.compound.getList(Constants.Entity.Player.ENDERCHEST_INVENTORY, 10); - this.enderChest.fromTag(nbttaglist1, SpongeCommon.server().registryAccess()); + this.enderChest.fromTag(nbttaglist1, SpongeCommon.vanillaRegistryAccess()); } } return this; @@ -244,7 +244,7 @@ public void writeCompound(final CompoundTag compound) { this.loadEnderInventory(); compound.put(Constants.Entity.Player.INVENTORY, this.inventory.writeList(new ListTag())); - compound.put(Constants.Entity.Player.ENDERCHEST_INVENTORY, this.enderChest.createTag(SpongeCommon.server().registryAccess())); + compound.put(Constants.Entity.Player.ENDERCHEST_INVENTORY, this.enderChest.createTag(SpongeCommon.vanillaRegistryAccess())); compound.putInt(Constants.Entity.Player.SELECTED_ITEM_SLOT, this.inventory.currentItem); compound.put(Constants.Entity.ENTITY_POSITION, Constants.NBT.newDoubleNBTList(this.x, this.y, this.z)); diff --git a/src/main/java/org/spongepowered/common/entity/player/SpongeUserInventory.java b/src/main/java/org/spongepowered/common/entity/player/SpongeUserInventory.java index 9a08c90c14b..f8c33b610d1 100644 --- a/src/main/java/org/spongepowered/common/entity/player/SpongeUserInventory.java +++ b/src/main/java/org/spongepowered/common/entity/player/SpongeUserInventory.java @@ -139,7 +139,7 @@ public ListTag writeList(final ListTag nbtTagListIn) { if (!this.mainInventory.get(i).isEmpty()) { final CompoundTag nbttagcompound = new CompoundTag(); nbttagcompound.putByte("Slot", (byte) i); - this.mainInventory.get(i).save(SpongeCommon.server().registryAccess(), nbttagcompound); + this.mainInventory.get(i).save(SpongeCommon.vanillaRegistryAccess(), nbttagcompound); nbtTagListIn.add(nbttagcompound); } } @@ -148,7 +148,7 @@ public ListTag writeList(final ListTag nbtTagListIn) { if (!this.armorInventory.get(j).isEmpty()) { final CompoundTag nbttagcompound1 = new CompoundTag(); nbttagcompound1.putByte("Slot", (byte) (j + 100)); - this.armorInventory.get(j).save(SpongeCommon.server().registryAccess(), nbttagcompound1); + this.armorInventory.get(j).save(SpongeCommon.vanillaRegistryAccess(), nbttagcompound1); nbtTagListIn.add(nbttagcompound1); } } @@ -157,7 +157,7 @@ public ListTag writeList(final ListTag nbtTagListIn) { if (!this.offHandInventory.get(k).isEmpty()) { final CompoundTag nbttagcompound2 = new CompoundTag(); nbttagcompound2.putByte("Slot", (byte) (k + 150)); - this.offHandInventory.get(k).save(SpongeCommon.server().registryAccess(), nbttagcompound2); + this.offHandInventory.get(k).save(SpongeCommon.vanillaRegistryAccess(), nbttagcompound2); nbtTagListIn.add(nbttagcompound2); } } @@ -178,7 +178,7 @@ public void readList(final ListTag nbtTagListIn) { for (int i = 0; i < nbtTagListIn.size(); ++i) { final CompoundTag nbttagcompound = nbtTagListIn.getCompound(i); final int j = nbttagcompound.getByte("Slot") & 255; - final ItemStack itemstack = ItemStack.parse(SpongeCommon.server().registryAccess(), nbttagcompound).get(); + final ItemStack itemstack = ItemStack.parse(SpongeCommon.vanillaRegistryAccess(), nbttagcompound).get(); if (!itemstack.isEmpty()) { if (j >= 0 && j < this.mainInventory.size()) { diff --git a/src/main/java/org/spongepowered/common/event/cause/entity/damage/SpongeDamageSourceBuilder.java b/src/main/java/org/spongepowered/common/event/cause/entity/damage/SpongeDamageSourceBuilder.java index c2141f4b563..6cbc695fee1 100644 --- a/src/main/java/org/spongepowered/common/event/cause/entity/damage/SpongeDamageSourceBuilder.java +++ b/src/main/java/org/spongepowered/common/event/cause/entity/damage/SpongeDamageSourceBuilder.java @@ -63,7 +63,7 @@ public DamageSource build() throws IllegalStateException { @Override public DamageSource.Builder type(final DamageType damageType) { - final var registry = SpongeCommon.server().registryAccess().lookupOrThrow(Registries.DAMAGE_TYPE); + final var registry = SpongeCommon.vanillaRegistry(Registries.DAMAGE_TYPE); this.damageType = registry.wrapAsHolder((net.minecraft.world.damagesource.DamageType) (Object) damageType); return this; } diff --git a/src/main/java/org/spongepowered/common/event/cause/entity/damage/SpongeDamageTypeTemplate.java b/src/main/java/org/spongepowered/common/event/cause/entity/damage/SpongeDamageTypeTemplate.java index 32a6840a18d..5b394060e98 100644 --- a/src/main/java/org/spongepowered/common/event/cause/entity/damage/SpongeDamageTypeTemplate.java +++ b/src/main/java/org/spongepowered/common/event/cause/entity/damage/SpongeDamageTypeTemplate.java @@ -62,7 +62,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeDamageTypeTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeDamageTypeTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -154,7 +154,7 @@ public Builder reset() { @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final DamageType damageType = SpongeDamageTypeTemplate.decode(json, SpongeCommon.server().registryAccess()); + final DamageType damageType = SpongeDamageTypeTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); this.fromValue((org.spongepowered.api.event.cause.entity.damage.DamageType) (Object) damageType); return this; } diff --git a/src/main/java/org/spongepowered/common/item/SpongeItemStack.java b/src/main/java/org/spongepowered/common/item/SpongeItemStack.java index 04adf4a5b78..5876396a886 100644 --- a/src/main/java/org/spongepowered/common/item/SpongeItemStack.java +++ b/src/main/java/org/spongepowered/common/item/SpongeItemStack.java @@ -282,7 +282,7 @@ public static DataContainer getDataContainer(final net.minecraft.world.item.Item SpongeItemStack.cleanupOldCustomData(mcStack); // Serialize all DataComponents... - var ops = RegistryOps.create(NbtOps.INSTANCE, SpongeCommon.server().registryAccess()); + var ops = RegistryOps.create(NbtOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()); var componentsTag = DataComponentPatch.CODEC.encodeStart(ops, mcStack.getComponentsPatch()); var components = NBTTranslator.INSTANCE.translate((CompoundTag) componentsTag.getOrThrow()); container.set(Constants.ItemStack.COMPONENTS, components); @@ -352,7 +352,7 @@ public static Optional createItemStack(final DataView container) { public static DataComponentPatch patchFromData(final DataView container) { return container.getView(Constants.ItemStack.COMPONENTS).map(NBTTranslator.INSTANCE::translate).flatMap(compound -> { - var dynamic = new Dynamic<>(RegistryOps.create(NbtOps.INSTANCE, SpongeCommon.server().registryAccess()), compound); + var dynamic = new Dynamic<>(RegistryOps.create(NbtOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()), compound); return DataComponentPatch.CODEC.decode(dynamic).result().map(Pair::getFirst); }).orElse(DataComponentPatch.EMPTY); } diff --git a/src/main/java/org/spongepowered/common/item/enchantment/SpongeRandomEnchantmentListBuilder.java b/src/main/java/org/spongepowered/common/item/enchantment/SpongeRandomEnchantmentListBuilder.java index 7c2699c0549..f1aa873f21c 100644 --- a/src/main/java/org/spongepowered/common/item/enchantment/SpongeRandomEnchantmentListBuilder.java +++ b/src/main/java/org/spongepowered/common/item/enchantment/SpongeRandomEnchantmentListBuilder.java @@ -93,7 +93,7 @@ public List build() throws IllegalStateException { if (this.pool == null || this.pool.isEmpty()) { Objects.requireNonNull(this.item, "The item cannot be null"); this.randomSource.setSeed(this.seed + this.option); - final var registry = SpongeCommon.server().registryAccess().lookupOrThrow(Registries.ENCHANTMENT); + final var registry = SpongeCommon.vanillaRegistry(Registries.ENCHANTMENT); var stream = registry.listElements().map($$0x -> (Holder)$$0x); enchantments = EnchantmentHelper.selectEnchantment(this.randomSource, ItemStackUtil.toNative(this.item), this.level, stream); } else { @@ -139,7 +139,7 @@ public static List fromNative(final List list) } public static List toNative(final List list) { - final var registry = SpongeCommon.server().registryAccess().lookupOrThrow(Registries.ENCHANTMENT); + final var registry = SpongeCommon.vanillaRegistry(Registries.ENCHANTMENT); return list.stream().map(ench -> { var mcEnch = registry.wrapAsHolder((net.minecraft.world.item.enchantment.Enchantment) (Object) ench.type()); return new EnchantmentInstance(mcEnch, ench.level()); diff --git a/src/main/java/org/spongepowered/common/tag/SpongeTagTemplate.java b/src/main/java/org/spongepowered/common/tag/SpongeTagTemplate.java index 7f7d0c84d03..e9e7e8d62e9 100644 --- a/src/main/java/org/spongepowered/common/tag/SpongeTagTemplate.java +++ b/src/main/java/org/spongepowered/common/tag/SpongeTagTemplate.java @@ -54,7 +54,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonObject jsonObject = SpongeTagTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonObject jsonObject = SpongeTagTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { final DataContainer container = DataFormats.JSON.get().read(jsonObject.getAsString()); container.set(DataQuery.of("replace"), this.replace); diff --git a/src/main/java/org/spongepowered/common/util/SpongeDamageSourceFactory.java b/src/main/java/org/spongepowered/common/util/SpongeDamageSourceFactory.java index c1d9b4a78f8..0754a61339d 100644 --- a/src/main/java/org/spongepowered/common/util/SpongeDamageSourceFactory.java +++ b/src/main/java/org/spongepowered/common/util/SpongeDamageSourceFactory.java @@ -34,7 +34,7 @@ public final class SpongeDamageSourceFactory implements DamageSource.Factory { private DamageSources damageSources() { if (this.damageSources == null) { - this.damageSources = new DamageSources(SpongeCommon.server().registryAccess()); + this.damageSources = new DamageSources(SpongeCommon.vanillaRegistryAccess()); } return damageSources; } diff --git a/src/main/java/org/spongepowered/common/world/biome/SpongeBiomeTemplate.java b/src/main/java/org/spongepowered/common/world/biome/SpongeBiomeTemplate.java index 481ed65a69c..6fd82db904d 100644 --- a/src/main/java/org/spongepowered/common/world/biome/SpongeBiomeTemplate.java +++ b/src/main/java/org/spongepowered/common/world/biome/SpongeBiomeTemplate.java @@ -85,7 +85,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeBiomeTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeBiomeTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -154,7 +154,7 @@ public Builder fromValue(final org.spongepowered.api.world.biome.Biome biome) { @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final Biome biome = SpongeBiomeTemplate.decode(json, SpongeCommon.server().registryAccess()); + final Biome biome = SpongeBiomeTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); this.fromValue((org.spongepowered.api.world.biome.Biome) (Object) biome); return this; } diff --git a/src/main/java/org/spongepowered/common/world/generation/SpongeChunkGeneratorFactory.java b/src/main/java/org/spongepowered/common/world/generation/SpongeChunkGeneratorFactory.java index 9c52d42e4b0..0b4a254d9e7 100644 --- a/src/main/java/org/spongepowered/common/world/generation/SpongeChunkGeneratorFactory.java +++ b/src/main/java/org/spongepowered/common/world/generation/SpongeChunkGeneratorFactory.java @@ -97,6 +97,6 @@ public ConfigurableChunkGenerator theEnd() { @Override public ChunkGenerator fromDataPack(DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - return (ChunkGenerator) SpongeWorldTemplate.decodeStem(json, SpongeCommon.server().registryAccess()).generator(); + return (ChunkGenerator) SpongeWorldTemplate.decodeStem(json, SpongeCommon.vanillaRegistryAccess()).generator(); } } diff --git a/src/main/java/org/spongepowered/common/world/generation/carver/SpongeCarverTemplate.java b/src/main/java/org/spongepowered/common/world/generation/carver/SpongeCarverTemplate.java index cefbb919521..a1c9bff173e 100644 --- a/src/main/java/org/spongepowered/common/world/generation/carver/SpongeCarverTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/carver/SpongeCarverTemplate.java @@ -58,7 +58,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeCarverTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeCarverTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -125,7 +125,7 @@ public Builder fromValue(final Carver carver) { @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final ConfiguredWorldCarver carver = SpongeCarverTemplate.decode(ConfiguredWorldCarver.DIRECT_CODEC, json, SpongeCommon.server().registryAccess()); + final ConfiguredWorldCarver carver = SpongeCarverTemplate.decode(ConfiguredWorldCarver.DIRECT_CODEC, json, SpongeCommon.vanillaRegistryAccess()); this.fromValue((Carver) (Object) carver); return this; } diff --git a/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeDensityFunctionTemplate.java b/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeDensityFunctionTemplate.java index 7d52ebff2c2..ff712b5d77c 100644 --- a/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeDensityFunctionTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeDensityFunctionTemplate.java @@ -59,7 +59,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeDensityFunctionTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeDensityFunctionTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -104,7 +104,7 @@ public Builder fromValue(final org.spongepowered.api.world.generation.config.noi @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - this.densityFunction = SpongeDensityFunctionTemplate.decode(json, SpongeCommon.server().registryAccess()); + this.densityFunction = SpongeDensityFunctionTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); return this; } diff --git a/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseGeneratorConfigTemplate.java b/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseGeneratorConfigTemplate.java index cb7707232b1..44cbddfce4d 100644 --- a/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseGeneratorConfigTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseGeneratorConfigTemplate.java @@ -69,7 +69,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeNoiseGeneratorConfigTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeNoiseGeneratorConfigTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -210,7 +210,7 @@ public Builder fromValue(final NoiseGeneratorConfig value) { @Override public Builder fromDataPack(final DataView datapack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(datapack)); - final NoiseGeneratorSettings decoded = SpongeNoiseGeneratorConfigTemplate.decode(json, SpongeCommon.server().registryAccess()); + final NoiseGeneratorSettings decoded = SpongeNoiseGeneratorConfigTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); return this.fromValue((NoiseGeneratorConfig) (Object) decoded); } diff --git a/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseTemplate.java b/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseTemplate.java index 57e4ab827cd..6758cad9f31 100644 --- a/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/config/noise/SpongeNoiseTemplate.java @@ -63,7 +63,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeNoiseTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeNoiseTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -131,7 +131,7 @@ public Builder reset() { @Override public Builder fromDataPack(final DataView datapack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(datapack)); - return this.fromValue((Noise) (Object) SpongeNoiseTemplate.decode(json, SpongeCommon.server().registryAccess())); + return this.fromValue((Noise) (Object) SpongeNoiseTemplate.decode(json, SpongeCommon.vanillaRegistryAccess())); } @Override diff --git a/src/main/java/org/spongepowered/common/world/generation/feature/SpongeFeatureTemplate.java b/src/main/java/org/spongepowered/common/world/generation/feature/SpongeFeatureTemplate.java index 514c33a6f2b..3999d12ec75 100644 --- a/src/main/java/org/spongepowered/common/world/generation/feature/SpongeFeatureTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/feature/SpongeFeatureTemplate.java @@ -56,7 +56,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeFeatureTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeFeatureTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -123,7 +123,7 @@ public Builder fromValue(final org.spongepowered.api.world.generation.feature.Fe @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final ConfiguredFeature feature = SpongeFeatureTemplate.decode(json, SpongeCommon.server().registryAccess()); + final ConfiguredFeature feature = SpongeFeatureTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); this.fromValue((Feature) (Object) feature); return this; } diff --git a/src/main/java/org/spongepowered/common/world/generation/feature/SpongePlacedFeatureTemplate.java b/src/main/java/org/spongepowered/common/world/generation/feature/SpongePlacedFeatureTemplate.java index 77a0b06ab0c..5d0faf92450 100644 --- a/src/main/java/org/spongepowered/common/world/generation/feature/SpongePlacedFeatureTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/feature/SpongePlacedFeatureTemplate.java @@ -63,7 +63,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongePlacedFeatureTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongePlacedFeatureTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { final DataContainer container = DataFormats.JSON.get().read(serialized.toString()); container.set(Queries.CONTENT_VERSION, this.contentVersion()); @@ -154,7 +154,7 @@ public Builder addModifier(final PlacementModifier modifier) { @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final net.minecraft.world.level.levelgen.placement.PlacedFeature feature = SpongePlacedFeatureTemplate.decode(json, SpongeCommon.server().registryAccess()); + final net.minecraft.world.level.levelgen.placement.PlacedFeature feature = SpongePlacedFeatureTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); this.fromValue((PlacedFeature) (Object) feature); return this; } diff --git a/src/main/java/org/spongepowered/common/world/generation/structure/SpongeSchematicTemplate.java b/src/main/java/org/spongepowered/common/world/generation/structure/SpongeSchematicTemplate.java index 924ef197561..a1a4306d15e 100644 --- a/src/main/java/org/spongepowered/common/world/generation/structure/SpongeSchematicTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/structure/SpongeSchematicTemplate.java @@ -54,7 +54,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final CompoundTag serialized = SpongeSchematicTemplate.encode(this, SpongeCommon.server().registryAccess()); + final CompoundTag serialized = SpongeSchematicTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); return NBTTranslator.INSTANCE.translateFrom(serialized); } diff --git a/src/main/java/org/spongepowered/common/world/generation/structure/SpongeStructureSetTemplate.java b/src/main/java/org/spongepowered/common/world/generation/structure/SpongeStructureSetTemplate.java index e2b13b26b98..925a71362b1 100644 --- a/src/main/java/org/spongepowered/common/world/generation/structure/SpongeStructureSetTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/structure/SpongeStructureSetTemplate.java @@ -66,7 +66,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeStructureSetTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeStructureSetTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -114,7 +114,7 @@ public Builder fromValue(final org.spongepowered.api.world.generation.structure. @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final StructureSet decoded = SpongeStructureSetTemplate.decode(json, SpongeCommon.server().registryAccess()); + final StructureSet decoded = SpongeStructureSetTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); this.structureSelectionEntries = decoded.structures(); this.placement = decoded.placement(); return this; diff --git a/src/main/java/org/spongepowered/common/world/generation/structure/SpongeStructureTemplate.java b/src/main/java/org/spongepowered/common/world/generation/structure/SpongeStructureTemplate.java index 61894fca865..943857c353c 100644 --- a/src/main/java/org/spongepowered/common/world/generation/structure/SpongeStructureTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/structure/SpongeStructureTemplate.java @@ -59,7 +59,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeStructureTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeStructureTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -104,7 +104,7 @@ public Builder fromValue(final org.spongepowered.api.world.generation.structure. @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - this.structure = SpongeStructureTemplate.decode(json, SpongeCommon.server().registryAccess()); + this.structure = SpongeStructureTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); return this; } diff --git a/src/main/java/org/spongepowered/common/world/generation/structure/jigsaw/SpongeJigsawPoolTemplate.java b/src/main/java/org/spongepowered/common/world/generation/structure/jigsaw/SpongeJigsawPoolTemplate.java index a6011f2a6cd..397ac99a6db 100644 --- a/src/main/java/org/spongepowered/common/world/generation/structure/jigsaw/SpongeJigsawPoolTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/structure/jigsaw/SpongeJigsawPoolTemplate.java @@ -65,7 +65,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeJigsawPoolTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeJigsawPoolTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -113,7 +113,7 @@ public Builder fromValue(final JigsawPool StructureTemplatePool) { @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final StructureTemplatePool decoded = SpongeJigsawPoolTemplate.decode(json, SpongeCommon.server().registryAccess()); + final StructureTemplatePool decoded = SpongeJigsawPoolTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); return this.fromValue((JigsawPool) decoded); } diff --git a/src/main/java/org/spongepowered/common/world/generation/structure/jigsaw/SpongeProcessorListTemplate.java b/src/main/java/org/spongepowered/common/world/generation/structure/jigsaw/SpongeProcessorListTemplate.java index 03abb6d758c..a7b70bba68f 100644 --- a/src/main/java/org/spongepowered/common/world/generation/structure/jigsaw/SpongeProcessorListTemplate.java +++ b/src/main/java/org/spongepowered/common/world/generation/structure/jigsaw/SpongeProcessorListTemplate.java @@ -63,7 +63,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeProcessorListTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeProcessorListTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { @@ -122,7 +122,7 @@ public Builder reset() { @Override public Builder fromDataPack(final DataView datapack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(datapack)); - final StructureProcessorList decoded = SpongeProcessorListTemplate.decode(json, SpongeCommon.server().registryAccess()); + final StructureProcessorList decoded = SpongeProcessorListTemplate.decode(json, SpongeCommon.vanillaRegistryAccess()); this.fromValue((ProcessorList) decoded); return this; } diff --git a/src/main/java/org/spongepowered/common/world/schematic/SchematicTranslator.java b/src/main/java/org/spongepowered/common/world/schematic/SchematicTranslator.java index 54b41bbb76d..cc781ad9926 100644 --- a/src/main/java/org/spongepowered/common/world/schematic/SchematicTranslator.java +++ b/src/main/java/org/spongepowered/common/world/schematic/SchematicTranslator.java @@ -327,7 +327,7 @@ private static void deserializeBiomeContainer( .orElseThrow(() -> new InvalidDataException("Missing BiomePalette as required by the schematic spec")); final Set biomeKeys = biomeMap.keys(false); - final Registry biomeRegistry = VolumeStreamUtils.nativeToSpongeRegistry(SpongeCommon.server().registryAccess().lookupOrThrow(Registries.BIOME)); + final Registry biomeRegistry = VolumeStreamUtils.nativeToSpongeRegistry(SpongeCommon.vanillaRegistry(Registries.BIOME)); biomePalette = new MutableBimapPalette<>( PaletteTypes.BIOME_PALETTE.get(), biomeRegistry, @@ -454,7 +454,7 @@ public DataView addTo(final Schematic schematic, final DataView data) { final Registry blockRegistry = VolumeStreamUtils.nativeToSpongeRegistry( - SpongeCommon.server().registryAccess().lookupOrThrow(Registries.BLOCK)); + SpongeCommon.vanillaRegistry(Registries.BLOCK)); SchematicTranslator.writePaletteToView( blockData, palette, blockRegistry, Constants.Sponge.Schematic.BLOCK_PALETTE, BlockState::type, @@ -506,7 +506,7 @@ public DataView addTo(final Schematic schematic, final DataView data) { // Should never reach here. } - final Registry biomeRegistry = VolumeStreamUtils.nativeToSpongeRegistry(SpongeCommon.server().registryAccess().lookupOrThrow(Registries.BIOME)); + final Registry biomeRegistry = VolumeStreamUtils.nativeToSpongeRegistry(SpongeCommon.vanillaRegistry(Registries.BIOME)); SchematicTranslator.writePaletteToView( biomeContainer, biomePalette, biomeRegistry, Constants.Sponge.Schematic.BIOME_PALETTE, diff --git a/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java b/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java index b84758999ab..f4ca6deefe7 100644 --- a/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java +++ b/src/main/java/org/spongepowered/common/world/server/SpongeWorldManager.java @@ -682,7 +682,7 @@ public CompletableFuture deleteWorld(final ResourceKey key) { final LevelStorageSource.LevelStorageAccess storageSource = ((MinecraftServerAccessor) this.server).accessor$storageSource(); final PrimaryLevelData levelData = (PrimaryLevelData) this.server.getWorldData(); - storageSource.saveDataTag(SpongeCommon.server().registryAccess(), levelData, null); + storageSource.saveDataTag(SpongeCommon.vanillaRegistryAccess(), levelData, null); return true; }, SpongeCommon.server()); diff --git a/src/main/java/org/spongepowered/common/world/server/SpongeWorldTemplate.java b/src/main/java/org/spongepowered/common/world/server/SpongeWorldTemplate.java index 05a87b59d10..7bc9a9671de 100644 --- a/src/main/java/org/spongepowered/common/world/server/SpongeWorldTemplate.java +++ b/src/main/java/org/spongepowered/common/world/server/SpongeWorldTemplate.java @@ -166,7 +166,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeWorldTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeWorldTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { final DataContainer container = DataFormats.JSON.get().read(serialized.toString()); container.set(Queries.CONTENT_VERSION, this.contentVersion()); @@ -230,7 +230,7 @@ public Builder from(final WorldTemplate template) { @Override public Builder fromDataPack(final DataView pack) throws IOException { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(pack)); - final LevelStem levelStem = SpongeWorldTemplate.decodeStem(json, SpongeCommon.server().registryAccess()); + final LevelStem levelStem = SpongeWorldTemplate.decodeStem(json, SpongeCommon.vanillaRegistryAccess()); return this.from(levelStem); } @@ -289,7 +289,7 @@ protected WorldTemplate build0() { @NonNull private static Holder dimensionTypeHolder(final WorldType worldType) { - final Registry dimensionTypeRegistry = SpongeCommon.server().registryAccess().lookupOrThrow(Registries.DIMENSION_TYPE); + final Registry dimensionTypeRegistry = SpongeCommon.vanillaRegistry(Registries.DIMENSION_TYPE); final ResourceLocation key = dimensionTypeRegistry.getKey((DimensionType) (Object) worldType); if (key == null) { return Holder.direct((DimensionType) (Object) worldType); diff --git a/src/main/java/org/spongepowered/common/world/server/SpongeWorldTypeTemplate.java b/src/main/java/org/spongepowered/common/world/server/SpongeWorldTypeTemplate.java index 586e9d4380d..a5e37859975 100644 --- a/src/main/java/org/spongepowered/common/world/server/SpongeWorldTypeTemplate.java +++ b/src/main/java/org/spongepowered/common/world/server/SpongeWorldTypeTemplate.java @@ -100,7 +100,7 @@ public int contentVersion() { @Override public DataContainer toContainer() { - final JsonElement serialized = SpongeWorldTypeTemplate.encode(this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeWorldTypeTemplate.encode(this, SpongeCommon.vanillaRegistryAccess()); try { final DataContainer container = DataFormats.JSON.get().read(serialized.toString()); container.set(Queries.CONTENT_VERSION, this.contentVersion()); diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/map/MapDecorationMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/map/MapDecorationMixin_API.java index e1a76fb46eb..c8eda430385 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/map/MapDecorationMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/map/MapDecorationMixin_API.java @@ -106,7 +106,7 @@ public DataContainer toContainer() { .set(Constants.Map.DECORATION_X, this.x) .set(Constants.Map.DECORATION_Y, this.y) .set(Constants.Map.DECORATION_ROTATION, (byte) MapUtil.normalizeDecorationOrientation(this.rot)); - this.name.ifPresent(component -> data.set(Constants.Map.NAME, Component.Serializer.toJson(component, SpongeCommon.server().registryAccess()))); + this.name.ifPresent(component -> data.set(Constants.Map.NAME, Component.Serializer.toJson(component, SpongeCommon.vanillaRegistryAccess()))); return data; } } diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/item/crafting/RecipeMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/item/crafting/RecipeMixin_API.java index 8b19f11b424..53096d45a1a 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/item/crafting/RecipeMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/item/crafting/RecipeMixin_API.java @@ -75,7 +75,7 @@ default boolean isValid(@NonNull final I2 inv, @NonNull final ServerWorld world) @NonNull @Override default ItemStackSnapshot result(@NonNull final I2 inv) { - return ItemStackUtil.snapshotOf(this.shadow$assemble((I) InventoryUtil.toCraftingInputOrThrow(inv), SpongeCommon.server().registryAccess())); + return ItemStackUtil.snapshotOf(this.shadow$assemble((I) InventoryUtil.toCraftingInputOrThrow(inv), SpongeCommon.vanillaRegistryAccess())); } @NonNull diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/carver/ConfiguredWorldCarverMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/carver/ConfiguredWorldCarverMixin_API.java index b8deff29e63..4ae497db095 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/carver/ConfiguredWorldCarverMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/carver/ConfiguredWorldCarverMixin_API.java @@ -56,7 +56,7 @@ public CarverType type() { @Override public DataView toContainer() { - final JsonElement serialized = SpongeCarverTemplate.encode((Codec>) (Object) this.worldCarver.configuredCodec(), (ConfiguredWorldCarver) (Object) this, SpongeCommon.server().registryAccess()); + final JsonElement serialized = SpongeCarverTemplate.encode((Codec>) (Object) this.worldCarver.configuredCodec(), (ConfiguredWorldCarver) (Object) this, SpongeCommon.vanillaRegistryAccess()); try { return DataFormats.JSON.get().read(serialized.toString()); } catch (IOException e) { diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/carver/WorldCarverMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/carver/WorldCarverMixin_API.java index e0105288e0e..1b7f7c6959e 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/carver/WorldCarverMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/carver/WorldCarverMixin_API.java @@ -54,7 +54,7 @@ public abstract class WorldCarverMixin_API implem public Carver configure(final DataView config) throws IllegalArgumentException { try { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(config)); - return (Carver) (Object) SpongeCarverTemplate.decode((Codec>) (Object) this.configuredCodec.codec(), json, SpongeCommon.server().registryAccess()); + return (Carver) (Object) SpongeCarverTemplate.decode((Codec>) (Object) this.configuredCodec.codec(), json, SpongeCommon.vanillaRegistryAccess()); } catch (IOException e) { throw new IllegalStateException("Could not read configuration: " + config, e); } diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/feature/ConfiguredFeatureMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/feature/ConfiguredFeatureMixin_API.java index 3226480c026..c51a46160f2 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/feature/ConfiguredFeatureMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/feature/ConfiguredFeatureMixin_API.java @@ -68,7 +68,7 @@ public APIF type() { @Override public DataView toContainer() { - final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.server().registryAccess()); + final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()); final JsonElement serialized = this.feature.configuredCodec().codec().encodeStart(ops, (ConfiguredFeature>) (Object) this).getOrThrow(); try { return DataFormats.JSON.get().read(serialized.toString()); diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/feature/FeatureMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/feature/FeatureMixin_API.java index 834e95ef47c..8732077f796 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/feature/FeatureMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/feature/FeatureMixin_API.java @@ -53,7 +53,7 @@ public abstract class FeatureMixin_API implemen public Feature configure(final DataView config) { try { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(config)); - final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.server().registryAccess()); + final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()); return (Feature) (Object) this.configuredCodec.codec().parse(ops, json).getOrThrow(); } catch (IOException e) { diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/placement/PlacementModifierTypeMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/placement/PlacementModifierTypeMixin_API.java index 0bf6767b445..0b697a65e6d 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/placement/PlacementModifierTypeMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/placement/PlacementModifierTypeMixin_API.java @@ -48,7 +48,7 @@ public interface PlacementModifierTypeMixin_API

ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.server().registryAccess()); + final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()); return (PlacementModifier) this.shadow$codec().codec().parse(ops, json).getOrThrow(); } catch (Exception e) { throw new IllegalArgumentException("Could not configure PlacementModifier." , e); diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureMixin_API.java index 349ad7f4869..3d77fd82a83 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureMixin_API.java @@ -118,7 +118,7 @@ public DecorationStep decorationStep() { @Override public DataView toContainer() { - final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.server().registryAccess()); + final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()); final JsonElement serialized = this.api$codec().encodeStart(ops, (Structure) (Object) this).getOrThrow(); try { return DataFormats.JSON.get().read(serialized.toString()); diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureTypeMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureTypeMixin_API.java index fc85a2e240a..0be19e6dd19 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureTypeMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/StructureTypeMixin_API.java @@ -49,7 +49,7 @@ default Structure configure(DataView config) { try { final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(config)); - final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.server().registryAccess()); + final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()); return (Structure) (Object) this.codec().codec().parse(ops, json).getOrThrow(); } catch (IOException e) { diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorMixin_API.java index c30a3c57d88..9d86b399532 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorMixin_API.java @@ -53,7 +53,7 @@ public ProcessorType type() { @Override public DataContainer toContainer() { - final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.server().registryAccess()); + final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()); final JsonElement serialized = this.shadow$getType().codec().codec().encodeStart(ops, (StructureProcessor) (Object) this).getOrThrow(); try { return DataFormats.JSON.get().read(serialized.toString()); diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorTypeMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorTypeMixin_API.java index 6a2c6060c27..064a72c6fab 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorTypeMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/levelgen/structure/templatesystem/StructureProcessorTypeMixin_API.java @@ -50,7 +50,7 @@ public interface StructureProcessorTypeMixin_API

e @Override default Processor configure(final DataView dataView) throws IOException { - final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.server().registryAccess()); + final RegistryOps ops = RegistryOps.create(JsonOps.INSTANCE, SpongeCommon.vanillaRegistryAccess()); final JsonElement json = JsonParser.parseString(DataFormats.JSON.get().write(dataView)); final P processor = this.shadow$codec().codec().parse(ops, json).getOrThrow(); return (Processor) processor; diff --git a/src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java b/src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java index 2f5244abbef..736b1ba2531 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java +++ b/src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java @@ -381,9 +381,9 @@ public void save(@Nullable final ProgressListener progress, final boolean flush, levelData.setWorldBorder(this.getWorldBorder().createSettings()); - levelData.setCustomBossEvents(((ServerLevelBridge) this).bridge$getBossBarManager().save(SpongeCommon.server().registryAccess())); + levelData.setCustomBossEvents(((ServerLevelBridge) this).bridge$getBossBarManager().save(SpongeCommon.vanillaRegistryAccess())); - ((ServerLevelBridge) this).bridge$getLevelSave().saveDataTag(SpongeCommon.server().registryAccess() + ((ServerLevelBridge) this).bridge$getLevelSave().saveDataTag(SpongeCommon.vanillaRegistryAccess() , (PrimaryLevelData) this.shadow$getLevelData(), this.shadow$dimension() == Level.OVERWORLD ? SpongeCommon.server().getPlayerList() .getSingleplayerData() : null);