diff --git a/src/applaunch/java/org/spongepowered/common/applaunch/config/common/CommonConfig.java b/src/applaunch/java/org/spongepowered/common/applaunch/config/common/CommonConfig.java index 606bfc10552..48e84e8a380 100644 --- a/src/applaunch/java/org/spongepowered/common/applaunch/config/common/CommonConfig.java +++ b/src/applaunch/java/org/spongepowered/common/applaunch/config/common/CommonConfig.java @@ -131,6 +131,7 @@ static ConfigurationTransformation buildOneToTwo() { .addAction(NodePath.path("modules", "tracking"), TransformAction.remove()) .addAction(NodePath.path("modules", "real-time"), TransformAction.remove()) .addAction(NodePath.path("modules", "timings"), TransformAction.remove()) + .addAction(NodePath.path("optimizations", "drops-pre-merge"), TransformAction.remove()) .addAction(NodePath.path("optimizations", "eigen-redstone"), TransformAction.remove()) .addAction(NodePath.path("optimizations", "faster-thread-checks"), TransformAction.remove()) .addAction(NodePath.path("optimizations", "optimize-maps"), TransformAction.remove()) diff --git a/src/applaunch/java/org/spongepowered/common/applaunch/config/common/OptimizationCategory.java b/src/applaunch/java/org/spongepowered/common/applaunch/config/common/OptimizationCategory.java index bdc46e10186..062d11bcaf3 100644 --- a/src/applaunch/java/org/spongepowered/common/applaunch/config/common/OptimizationCategory.java +++ b/src/applaunch/java/org/spongepowered/common/applaunch/config/common/OptimizationCategory.java @@ -24,7 +24,6 @@ */ package org.spongepowered.common.applaunch.config.common; -import org.spongepowered.common.applaunch.AppLaunch; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; import org.spongepowered.configurate.objectmapping.meta.Setting; @@ -32,15 +31,6 @@ @ConfigSerializable public final class OptimizationCategory { - @Setting("drops-pre-merge") - @Comment("If 'true', block item drops are pre-processed to avoid \n" - + "having to spawn extra entities that will be merged post spawning. \n" - + "Usually, Sponge is smart enough to determine when to attempt an item pre-merge \n" - + "and when not to, however, in certain cases, some mods rely on items not being \n" - + "pre-merged and actually spawned, in which case, the items will flow right through \n" - + "without being merged.") - public boolean dropsPreMerge; - @Setting("cache-tameable-owners") @Comment("Caches tameable entities owners to avoid constant lookups against data watchers. If mods \n" + "cause issues, disable this.") @@ -65,10 +55,4 @@ public final class OptimizationCategory { + "to be generated on demand. This is a very safe optimization and\n" + "should usually remain enabled.") public boolean enableLazyDFU = true; - - public OptimizationCategory() { - // Enabled by default on SpongeVanilla, disabled by default on SpongeForge. - // Because of how early this constructor gets called, we can't use SpongeImplHooks or even Game - this.dropsPreMerge = AppLaunch.pluginPlatform().vanilla(); - } }