Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-19 10:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce duplicated singleton objects (#2473)

Browse Source
This commit is contained in:
Hannes Greule 2023-10-29 10:55:50 +01:00 committed by GitHub
parent 36a892eb37
commit b8434f891e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
worldedit-core/src/main/java/com/fastasyncworldedit/core/FaweCache.java
View File

@ -60,16 +60,17 @@ import java.util.function.Supplier;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
public enum FaweCache implements Trimable { public enum FaweCache implements Trimable {
/**
* @deprecated Use {@link #INSTANCE} to get an instance.
*/
@Deprecated(forRemoval = true, since = "2.0.0")
IMP,
/** /**
* @since 2.0.0 * @since 2.0.0
*/ */
INSTANCE; INSTANCE;
/**
* @deprecated Use {@link #INSTANCE} to get an instance.
*/
@Deprecated(forRemoval = true, since = "2.0.0")
public static final FaweCache IMP = INSTANCE;
private static final Logger LOGGER = LogManagerCompat.getLogger(); private static final Logger LOGGER = LogManagerCompat.getLogger();
public final int BLOCKS_PER_LAYER = 4096; public final int BLOCKS_PER_LAYER = 4096;

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java
View File

@ -19,14 +19,14 @@ import java.util.stream.Stream;
public class Settings extends Config { public class Settings extends Config {
@Ignore
static Settings INSTANCE = new Settings();
/** /**
* @deprecated Use {@link #settings()} instead to get an instance. * @deprecated Use {@link #settings()} instead to get an instance.
*/ */
@Ignore @Ignore
@Deprecated(forRemoval = true, since = "2.0.0") @Deprecated(forRemoval = true, since = "2.0.0")
public static final Settings IMP = new Settings(); public static final Settings IMP = INSTANCE;
@Ignore
static Settings INSTANCE = new Settings();
@Ignore @Ignore
public boolean PROTOCOL_SUPPORT_FIX = false; public boolean PROTOCOL_SUPPORT_FIX = false;
@Comment("These first 6 aren't configurable") // This is a comment @Comment("These first 6 aren't configurable") // This is a comment

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/database/DBHandler.java
View File

@ -13,7 +13,7 @@ public class DBHandler {
* @deprecated Use {@link #dbHandler()} instead. * @deprecated Use {@link #dbHandler()} instead.
*/ */
@Deprecated(forRemoval = true, since = "2.0.0") @Deprecated(forRemoval = true, since = "2.0.0")
public static final DBHandler IMP = new DBHandler(); public static final DBHandler IMP = dbHandler();
private static final Logger LOGGER = LogManagerCompat.getLogger(); private static final Logger LOGGER = LogManagerCompat.getLogger();
private static DBHandler INSTANCE; private static DBHandler INSTANCE;
private final Map<World, RollbackDatabase> databases = new ConcurrentHashMap<>(8, 0.9f, 1); private final Map<World, RollbackDatabase> databases = new ConcurrentHashMap<>(8, 0.9f, 1);

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/util/WEManager.java
View File

@ -32,7 +32,7 @@ public class WEManager {
* @deprecated Use {@link #weManager()} instead. * @deprecated Use {@link #weManager()} instead.
*/ */
@Deprecated(forRemoval = true, since = "2.0.0") @Deprecated(forRemoval = true, since = "2.0.0")
public static WEManager IMP = new WEManager(); public static WEManager IMP = weManager();
private final ArrayDeque<FaweMaskManager> managers = new ArrayDeque<>(); private final ArrayDeque<FaweMaskManager> managers = new ArrayDeque<>();
/** /**

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/HistorySubCommands.java
View File

@ -201,7 +201,7 @@ public class HistorySubCommands {
.at(summary.maxX, world.getMaxY(), summary.maxZ) .at(summary.maxX, world.getMaxY(), summary.maxZ)
); );
rollback.setTime(historyFile.lastModified()); rollback.setTime(historyFile.lastModified());
RollbackDatabase db = DBHandler.IMP RollbackDatabase db = DBHandler.dbHandler()
.getDatabase(world); .getDatabase(world);
db.logEdit(rollback); db.logEdit(rollback);
actor.print(TextComponent.of("Logging: " + historyFile)); actor.print(TextComponent.of("Logging: " + historyFile));