Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused drop premerge config option #3921

Merged
merged 2 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,13 @@
*/
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;

@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.")
Expand All @@ -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();
}
}
Loading