EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 14:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform

Browse Source
This commit is contained in:
Alexander Söderberg 2020-07-14 17:07:03 +02:00
commit f9e5fd714d
No known key found for this signature in database
GPG Key ID: C0207FF7EA146678
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
View File

@ -26,6 +26,7 @@
package com.plotsquared.bukkit;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.Stage;
@ -176,16 +177,16 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
@Getter private Injector injector;
private PlotAreaManager plotAreaManager;
private EventDispatcher eventDispatcher;
private PlotListener plotListener;
@WorldConfig private YamlConfiguration worldConfiguration;
@WorldFile private File worldfile;
private BukkitPlayerManager playerManager;
private BackupManager backupManager;
@ImpromptuPipeline private UUIDPipeline impromptuPipeline;
@BackgroundPipeline private UUIDPipeline backgroundPipeline;
private PlatformWorldManager<World> worldManager;
@Inject private PlotAreaManager plotAreaManager;
@Inject private EventDispatcher eventDispatcher;
@Inject private PlotListener plotListener;
@Inject @WorldConfig private YamlConfiguration worldConfiguration;
@Inject @WorldFile private File worldfile;
@Inject private BukkitPlayerManager playerManager;
@Inject private BackupManager backupManager;
@Inject @ImpromptuPipeline private UUIDPipeline impromptuPipeline;
@Inject @BackgroundPipeline private UUIDPipeline backgroundPipeline;
@Inject private PlatformWorldManager<World> worldManager;
@Override public int[] getServerVersion() {
if (this.version == null) {
@ -308,7 +309,7 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
if (Settings.Enabled_Components.COMPONENT_PRESETS) {
try {
new ComponentPresetManager();
getInjector().getInstance(ComponentPresetManager.class);
} catch (final Exception e) {
PlotSquared.log(Captions.PREFIX + "Failed to initialize the preset system");
e.printStackTrace();

15
Core/src/main/java/com/plotsquared/core/plot/Plot.java
View File

@ -27,6 +27,7 @@ package com.plotsquared.core.plot;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.ConfigurationUtil;
@ -128,13 +129,13 @@ public class Plot {
@NotNull private final PlotId id;
// These will be injected
private EventDispatcher eventDispatcher;
private PlotListener plotListener;
private RegionManager regionManager;
private GlobalBlockQueue blockQueue;
private WorldUtil worldUtil;
private SchematicHandler schematicHandler;
@ImpromptuPipeline private UUIDPipeline impromptuPipeline;
@Inject private EventDispatcher eventDispatcher;
@Inject private PlotListener plotListener;
@Inject private RegionManager regionManager;
@Inject private GlobalBlockQueue blockQueue;
@Inject private WorldUtil worldUtil;
@Inject private SchematicHandler schematicHandler;
@Inject @ImpromptuPipeline private UUIDPipeline impromptuPipeline;
/**
* Plot flag container

7
Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
View File

@ -25,6 +25,7 @@
*/
package com.plotsquared.core.queue;
import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
@ -48,9 +49,9 @@ public abstract class LocalBlockQueue {
@Getter @Setter private boolean forceSync = false;
@Getter @Setter @Nullable private Object chunkObject;
private SchematicHandler schematicHandler;
private WorldUtil worldUtil;
private GlobalBlockQueue blockQueue;
@Inject private SchematicHandler schematicHandler;
@Inject private WorldUtil worldUtil;
@Inject private GlobalBlockQueue blockQueue;
/**
* Needed for compatibility with FAWE.