Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-25 18:09:17 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1f93f566 [ci/skip] Improve getPotentialBedLocation deprecation (#12857)
PaperMC/Paper@6fb36e34 Replace compileOnly with implementation for test visibility (#12841)
PaperMC/Paper@aa4ef067 Update DataConverter constants for 1.21.8
PaperMC/Paper@f7c59f91 Fix broken resource pack API when configured in configuration stage (#12866)
PaperMC/Paper@0dad7f15 Add Bee#set/getTimeSinceSting() methods (#12792)
PaperMC/Paper@782ce950 Allow forcing break effects when using breakNaturally (#12734)
PaperMC/Paper@a2d37f12 Remove invalid team colors nicely (#12874)
PaperMC/Paper@617e5a46 Update to configurate 4.2.0 (#12869)
PaperMC/Paper@602ea9f0 Restore previous PlayerToggleSneakEvent behaviour (#12815)
PaperMC/Paper@c8a8c0ef feat(plugin): make Plugin extend Namespaced (#12867)
This commit is contained in:
Dreeam
2025-07-21 08:21:51 +08:00
parent f31e24cd93
commit cb403fe2cd
17 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
leaf-server/src/main/java/org/galemc/gale/configuration/GaleConfigurations.java
View File

@@ -14,11 +14,11 @@ import io.papermc.paper.configuration.legacy.RequiresSpigotInitialization;
import io.papermc.paper.configuration.mapping.InnerClassFieldDiscoverer;
import io.papermc.paper.configuration.serializer.ComponentSerializer;
import io.papermc.paper.configuration.serializer.EnumValueSerializer;
import io.papermc.paper.configuration.serializer.PacketClassSerializer;
import io.papermc.paper.configuration.serializer.ServerboundPacketClassSerializer;
import io.papermc.paper.configuration.serializer.StringRepresentableSerializer;
import io.papermc.paper.configuration.serializer.collections.FastutilMapSerializer;
import io.papermc.paper.configuration.serializer.collections.MapSerializer;
import io.papermc.paper.configuration.serializer.collections.TableSerializer;
import io.papermc.paper.configuration.serializer.collection.TableSerializer;
import io.papermc.paper.configuration.serializer.collection.map.FastutilMapSerializer;
import io.papermc.paper.configuration.serializer.collection.map.MapSerializer;
import io.papermc.paper.configuration.serializer.registry.RegistryHolderSerializer;
import io.papermc.paper.configuration.serializer.registry.RegistryValueSerializer;
import io.papermc.paper.configuration.transformation.Transformations;
@@ -140,7 +140,7 @@ public class GaleConfigurations extends Configurations<GaleGlobalConfiguration,
}
private static ObjectMapper.Factory.Builder defaultGlobalFactoryBuilder(ObjectMapper.Factory.Builder builder) {
return builder.addDiscoverer(InnerClassFieldDiscoverer.globalConfig());
return builder.addDiscoverer(InnerClassFieldDiscoverer.globalConfig(PaperConfigurations.defaultFieldProcessors()));
}
@Override
@@ -152,7 +152,7 @@ public class GaleConfigurations extends Configurations<GaleGlobalConfiguration,
private static ConfigurationOptions defaultGlobalOptions(RegistryAccess registryAccess, ConfigurationOptions options) {
return options
.header(GLOBAL_HEADER)
.serializers(builder -> builder.register(new PacketClassSerializer())
.serializers(builder -> builder.register(new ServerboundPacketClassSerializer())
.register(new RegistryValueSerializer<>(new TypeToken<DataComponentType<?>>() {}, registryAccess, Registries.DATA_COMPONENT_TYPE, false))
);
}
@@ -175,7 +175,7 @@ public class GaleConfigurations extends Configurations<GaleGlobalConfiguration,
return super.createWorldObjectMapperFactoryBuilder(contextMap)
.addNodeResolver(new RequiresSpigotInitialization.Factory(contextMap.require(PaperConfigurations.SPIGOT_WORLD_CONFIG_CONTEXT_KEY).get()))
.addNodeResolver(new NestedSetting.Factory())
.addDiscoverer(InnerClassFieldDiscoverer.galeWorldConfig(contextMap));
.addDiscoverer(InnerClassFieldDiscoverer.galeWorldConfig(contextMap, PaperConfigurations.defaultFieldProcessors()));
}
@Override