forked from SteamWar/SteamWar
Update stuff
This commit is contained in:
-5
@@ -128,9 +128,4 @@ public class DynamicRegionSystem implements RegionSystem {
|
|||||||
neighbours.remove(GlobalRegion.INSTANCE);
|
neighbours.remove(GlobalRegion.INSTANCE);
|
||||||
return ((Set<DynamicRegion>)(Set) neighbours).stream();
|
return ((Set<DynamicRegion>)(Set) neighbours).stream();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isModular() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-3
@@ -21,7 +21,6 @@ package de.steamwar.bausystem.region.dynamic.global;
|
|||||||
|
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||||
import de.steamwar.bausystem.region.*;
|
import de.steamwar.bausystem.region.*;
|
||||||
import de.steamwar.bausystem.region.dynamic.DynamicRegion;
|
|
||||||
import de.steamwar.bausystem.region.dynamic.NonNormalFlagStorage;
|
import de.steamwar.bausystem.region.dynamic.NonNormalFlagStorage;
|
||||||
import de.steamwar.bausystem.region.dynamic.RegionDataRepository;
|
import de.steamwar.bausystem.region.dynamic.RegionDataRepository;
|
||||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
import de.steamwar.bausystem.utils.PasteBuilder;
|
||||||
@@ -89,7 +88,7 @@ public class GlobalRegion implements Region {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
private static final RegionConfig GLOBAL_CONFIG = new RegionConfig(null);
|
private static final GameModeConfig GLOBAL_CONFIG = new GameModeConfig(null);
|
||||||
|
|
||||||
private static FlagStorage FLAG_STORAGE = new NonNormalFlagStorage();
|
private static FlagStorage FLAG_STORAGE = new NonNormalFlagStorage();
|
||||||
static {
|
static {
|
||||||
@@ -130,7 +129,7 @@ public class GlobalRegion implements Region {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull RegionConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return GLOBAL_CONFIG;
|
return GLOBAL_CONFIG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.bausystem.region.dynamic.normal.work;
|
package de.steamwar.bausystem.region.dynamic.normal.work;
|
||||||
|
|
||||||
import de.steamwar.bausystem.region.RegionConfig;
|
import de.steamwar.bausystem.region.GameModeConfig;
|
||||||
import de.steamwar.bausystem.region.RegionType;
|
import de.steamwar.bausystem.region.RegionType;
|
||||||
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
||||||
import de.steamwar.bausystem.region.dynamic.normal.WorkArea;
|
import de.steamwar.bausystem.region.dynamic.normal.WorkArea;
|
||||||
@@ -41,7 +41,7 @@ public class MicroWarGear21WorkRegion extends WorkRegion {
|
|||||||
private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem");
|
private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem");
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private final RegionConfig gameModeConfig = new RegionConfig(null); // TODO: Implement
|
private final GameModeConfig gameModeConfig = new GameModeConfig(null); // TODO: Implement
|
||||||
|
|
||||||
public MicroWarGear21WorkRegion(int minX, int minZ) {
|
public MicroWarGear21WorkRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
|
|||||||
+2
-2
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.bausystem.region.dynamic.normal.work;
|
package de.steamwar.bausystem.region.dynamic.normal.work;
|
||||||
|
|
||||||
import de.steamwar.bausystem.region.RegionConfig;
|
import de.steamwar.bausystem.region.GameModeConfig;
|
||||||
import de.steamwar.bausystem.region.RegionType;
|
import de.steamwar.bausystem.region.RegionType;
|
||||||
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
||||||
import de.steamwar.bausystem.region.dynamic.normal.WorkArea;
|
import de.steamwar.bausystem.region.dynamic.normal.WorkArea;
|
||||||
@@ -41,7 +41,7 @@ public class MiniWarGear21WorkRegion extends WorkRegion {
|
|||||||
private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem");
|
private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem");
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private final RegionConfig gameModeConfig = new RegionConfig(null); // TODO: Implement
|
private final GameModeConfig gameModeConfig = new GameModeConfig(null); // TODO: Implement
|
||||||
|
|
||||||
public MiniWarGear21WorkRegion(int minX, int minZ) {
|
public MiniWarGear21WorkRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
|
|||||||
+2
-2
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.bausystem.region.dynamic.normal.work;
|
package de.steamwar.bausystem.region.dynamic.normal.work;
|
||||||
|
|
||||||
import de.steamwar.bausystem.region.RegionConfig;
|
import de.steamwar.bausystem.region.GameModeConfig;
|
||||||
import de.steamwar.bausystem.region.RegionType;
|
import de.steamwar.bausystem.region.RegionType;
|
||||||
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
||||||
import de.steamwar.bausystem.region.dynamic.normal.WorkArea;
|
import de.steamwar.bausystem.region.dynamic.normal.WorkArea;
|
||||||
@@ -41,7 +41,7 @@ public class WarGear21WorkRegion extends WorkRegion {
|
|||||||
private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem");
|
private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem");
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private final RegionConfig gameModeConfig = new RegionConfig(null); // TODO: Implement
|
private final GameModeConfig gameModeConfig = new GameModeConfig(null); // TODO: Implement
|
||||||
|
|
||||||
public WarGear21WorkRegion(int minX, int minZ) {
|
public WarGear21WorkRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
|
|||||||
+2
-2
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.bausystem.region.dynamic.normal.work;
|
package de.steamwar.bausystem.region.dynamic.normal.work;
|
||||||
|
|
||||||
import de.steamwar.bausystem.region.RegionConfig;
|
import de.steamwar.bausystem.region.GameModeConfig;
|
||||||
import de.steamwar.bausystem.region.RegionType;
|
import de.steamwar.bausystem.region.RegionType;
|
||||||
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
||||||
import de.steamwar.bausystem.region.dynamic.normal.WorkArea;
|
import de.steamwar.bausystem.region.dynamic.normal.WorkArea;
|
||||||
@@ -41,7 +41,7 @@ public class WarShip21WorkRegion extends WorkRegion {
|
|||||||
private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem");
|
private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem");
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private final RegionConfig gameModeConfig = new RegionConfig(null); // TODO: Implement
|
private final GameModeConfig gameModeConfig = new GameModeConfig(null); // TODO: Implement
|
||||||
|
|
||||||
public WarShip21WorkRegion(int minX, int minZ) {
|
public WarShip21WorkRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
|
|||||||
+3
-3
@@ -20,7 +20,7 @@
|
|||||||
package de.steamwar.bausystem.region.dynamic.path;
|
package de.steamwar.bausystem.region.dynamic.path;
|
||||||
|
|
||||||
import de.steamwar.bausystem.region.FlagStorage;
|
import de.steamwar.bausystem.region.FlagStorage;
|
||||||
import de.steamwar.bausystem.region.RegionConfig;
|
import de.steamwar.bausystem.region.GameModeConfig;
|
||||||
import de.steamwar.bausystem.region.RegionHistory;
|
import de.steamwar.bausystem.region.RegionHistory;
|
||||||
import de.steamwar.bausystem.region.RegionType;
|
import de.steamwar.bausystem.region.RegionType;
|
||||||
import de.steamwar.bausystem.region.dynamic.DynamicRegion;
|
import de.steamwar.bausystem.region.dynamic.DynamicRegion;
|
||||||
@@ -40,7 +40,7 @@ public class PathRegion extends DynamicRegion {
|
|||||||
|
|
||||||
private FlagStorage flagStorage = new NonNormalFlagStorage();
|
private FlagStorage flagStorage = new NonNormalFlagStorage();
|
||||||
private final Area area;
|
private final Area area;
|
||||||
private final RegionConfig config = new RegionConfig(null);
|
private final GameModeConfig config = new GameModeConfig(null);
|
||||||
|
|
||||||
public PathRegion(int minX, int minZ) {
|
public PathRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
@@ -103,7 +103,7 @@ public class PathRegion extends DynamicRegion {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull RegionConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-7
@@ -19,11 +19,11 @@
|
|||||||
|
|
||||||
package de.steamwar.bausystem.region.dynamic.spawn;
|
package de.steamwar.bausystem.region.dynamic.spawn;
|
||||||
|
|
||||||
import de.steamwar.bausystem.region.FlagStorage;
|
import de.steamwar.bausystem.region.*;
|
||||||
import de.steamwar.bausystem.region.RegionConfig;
|
import de.steamwar.bausystem.region.dynamic.DynamicRegion;
|
||||||
import de.steamwar.bausystem.region.RegionHistory;
|
import de.steamwar.bausystem.region.dynamic.NonNormalFlagStorage;
|
||||||
import de.steamwar.bausystem.region.RegionType;
|
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
||||||
import de.steamwar.bausystem.region.dynamic.*;
|
import de.steamwar.bausystem.region.dynamic.RegionDataRepository;
|
||||||
import lombok.NonNull;
|
import lombok.NonNull;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ public class SpawnPathRegion extends DynamicRegion {
|
|||||||
|
|
||||||
private FlagStorage flagStorage = new NonNormalFlagStorage();
|
private FlagStorage flagStorage = new NonNormalFlagStorage();
|
||||||
private final Area area;
|
private final Area area;
|
||||||
private final RegionConfig config = new RegionConfig(null);
|
private final GameModeConfig config = new GameModeConfig(null);
|
||||||
|
|
||||||
public SpawnPathRegion(int minX, int minZ) {
|
public SpawnPathRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
@@ -101,7 +101,7 @@ public class SpawnPathRegion extends DynamicRegion {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull RegionConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -20,7 +20,7 @@
|
|||||||
package de.steamwar.bausystem.region.dynamic.spawn;
|
package de.steamwar.bausystem.region.dynamic.spawn;
|
||||||
|
|
||||||
import de.steamwar.bausystem.region.FlagStorage;
|
import de.steamwar.bausystem.region.FlagStorage;
|
||||||
import de.steamwar.bausystem.region.RegionConfig;
|
import de.steamwar.bausystem.region.GameModeConfig;
|
||||||
import de.steamwar.bausystem.region.RegionHistory;
|
import de.steamwar.bausystem.region.RegionHistory;
|
||||||
import de.steamwar.bausystem.region.RegionType;
|
import de.steamwar.bausystem.region.RegionType;
|
||||||
import de.steamwar.bausystem.region.dynamic.DynamicRegion;
|
import de.steamwar.bausystem.region.dynamic.DynamicRegion;
|
||||||
@@ -39,7 +39,7 @@ public class SpawnRegion extends DynamicRegion {
|
|||||||
|
|
||||||
private FlagStorage flagStorage = new NonNormalFlagStorage();
|
private FlagStorage flagStorage = new NonNormalFlagStorage();
|
||||||
private final Area area;
|
private final Area area;
|
||||||
private final RegionConfig config = new RegionConfig(null);
|
private final GameModeConfig config = new GameModeConfig(null);
|
||||||
|
|
||||||
public SpawnRegion(int minX, int minZ) {
|
public SpawnRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
@@ -88,7 +88,7 @@ public class SpawnRegion extends DynamicRegion {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull RegionConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user