Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-30 04:09:09 +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@617e5a4 Update to configurate 4.2.0 (#12869)
PaperMC/Paper@602ea9f Restore previous PlayerToggleSneakEvent behaviour (#12815)
PaperMC/Paper@c8a8c0e feat(plugin): make Plugin extend Namespaced (#12867)
PaperMC/Paper@a5f2f61 Fix offhand item desync on cancelling interact events (#12828)
PaperMC/Paper@1031877 [ci skip] Update mache for codebook 1.0.15 (#12887)
PaperMC/Paper@6bb9dc6 Normalize and trim spaces in Player#performCommand (#12892)
PaperMC/Paper@840dd9e Fix dialog preconditions (#12895)
PaperMC/Paper@9ccc51d Fix legacy pearls forgetting owner on disconnect (#12884)
PaperMC/Paper@57c1313 Allow to change despawnInPeaceful (#12880)
PaperMC/Paper@a576361  Add WorldDifficultyChangeEvent (#12471)
PaperMC/Paper@dbc367b Keep non-container slots synced when in container view (#12881)
This commit is contained in:
Samsuik
2025-07-27 15:26:05 +01:00
parent 5e5a3d1fe1
commit bd29cd2a09
11 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sakura-server/src/main/java/me/samsuik/sakura/configuration/SakuraConfigurations.java
View File

@@ -6,8 +6,8 @@ import io.leangen.geantyref.TypeToken;
import io.papermc.paper.configuration.*;
import io.papermc.paper.configuration.mapping.InnerClassFieldDiscoverer;
import io.papermc.paper.configuration.serializer.*;
import io.papermc.paper.configuration.serializer.collections.FastutilMapSerializer;
import io.papermc.paper.configuration.serializer.collections.TableSerializer;
import io.papermc.paper.configuration.serializer.collection.map.FastutilMapSerializer;
import io.papermc.paper.configuration.serializer.collection.TableSerializer;
import io.papermc.paper.configuration.serializer.registry.RegistryHolderSerializer;
import io.papermc.paper.configuration.serializer.registry.RegistryValueSerializer;
import it.unimi.dsi.fastutil.objects.Reference2IntMap;
@@ -41,6 +41,7 @@ import java.util.Map;
import java.util.function.Function;
import static io.leangen.geantyref.GenericTypeReflector.erase;
import static io.papermc.paper.configuration.PaperConfigurations.defaultFieldProcessors;
@NullMarked
@SuppressWarnings("Convert2Diamond")
@@ -95,7 +96,7 @@ public final class SakuraConfigurations extends Configurations<GlobalConfigurati
}
private static ObjectMapper.Factory.Builder defaultGlobalFactoryBuilder(ObjectMapper.Factory.Builder builder) {
return builder.addDiscoverer(InnerClassFieldDiscoverer.globalConfig());
return builder.addDiscoverer(InnerClassFieldDiscoverer.globalConfig(defaultFieldProcessors()));
}
@Override
@@ -105,11 +106,7 @@ public final class SakuraConfigurations extends Configurations<GlobalConfigurati
}
private static ConfigurationOptions defaultGlobalOptions(ConfigurationOptions options) {
return options
.header(GLOBAL_HEADER)
.serializers(builder -> builder
.register(new PacketClassSerializer())
);
return options.header(GLOBAL_HEADER);
}
@Override
@@ -130,7 +127,7 @@ public final class SakuraConfigurations extends Configurations<GlobalConfigurati
final Map<Class<?>, Object> overrides = Map.of(
WorldConfiguration.class, createWorldConfigInstance(contextMap)
);
return new InnerClassFieldDiscoverer(overrides);
return InnerClassFieldDiscoverer.create(overrides, defaultFieldProcessors());
}
private static WorldConfiguration createWorldConfigInstance(ContextMap contextMap) {