diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/other/WatervisionCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/WatervisionCommand.java
similarity index 97%
rename from BauSystem_Main/src/de/steamwar/bausystem/features/other/WatervisionCommand.java
rename to BauSystem_Main/src/de/steamwar/bausystem/features/util/WatervisionCommand.java
index d94ed1fc..ebe888d2 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/other/WatervisionCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/WatervisionCommand.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package de.steamwar.bausystem.features.other;
+package de.steamwar.bausystem.features.util;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.linkage.LinkageType;
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index 6f5fab99..a5712426 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -25,7 +25,6 @@ import de.steamwar.bausystem.region.flags.Flag;
import java.util.HashMap;
import java.util.Map;
-
public class FlagStorage {
protected final Map> flags;
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index 22a27306..2e4cc0cc 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -25,15 +25,13 @@ import java.util.EnumSet;
import java.util.Set;
import lombok.Getter;
-
@Getter
public enum Flag {
- TNT_FLAG(TNT.class, TNT.ALLOW),
- FIRE_FLAG(FIRE.class, FIRE.ALLOW),
- FREEZE_FLAG(FREEZE.class, FREEZE.INACTIVE),
- DAMAGE_FLAG(DAMAGE.class, DAMAGE.ALLOW);
-
+ TNT(TNTMode.class, TNTMode.ALLOW),
+ FIRE(FIREMode.class, FIREMode.ALLOW),
+ FREEZE(FREEZEMode.class, FREEZEMode.INACTIVE),
+ DAMAGE(DAMAGEMode.class, DAMAGEMode.ALLOW);
@Getter
private static final Set flags;
@@ -42,19 +40,16 @@ public enum Flag {
flags = EnumSet.allOf(Flag.class);
}
-
private final Class extends Value>> valueType;
private final Flag.Value> defaultValue;
private final Value>[] values;
-
& Value> Flag(final Class extends Value> valueType, final Flag.Value defaultValue) {
this.valueType = valueType;
this.defaultValue = defaultValue;
this.values = defaultValue.getValues();
}
-
public Value> getFlagValueOf(final String name) {
return this.defaultValue.getValueOf(name);
}
@@ -64,7 +59,6 @@ public enum Flag {
return this.name().toLowerCase();
}
-
public interface Value & Value> {
T getValue();
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIRE.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGEMode.java
similarity index 75%
rename from BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIRE.java
rename to BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGEMode.java
index ab170d03..28a97283 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIRE.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGEMode.java
@@ -27,35 +27,35 @@ import net.md_5.bungee.api.ChatColor;
@Getter
@AllArgsConstructor
-public enum FIRE implements Flag.Value {
+public enum DAMAGEMode implements Flag.Value {
ALLOW(ChatColor.RED + "an"),
DENY(ChatColor.GREEN + "aus");
- private static FIRE[] values;
+ private static DAMAGEMode[] values;
private final String chatValue;
@Override
- public FIRE[] getValues() {
- if (FIRE.values == null) {
- FIRE.values = FIRE.values(); //NOSONAR
+ public DAMAGEMode[] getValues() {
+ if (DAMAGEMode.values == null) {
+ DAMAGEMode.values = DAMAGEMode.values(); //NOSONAR
}
- return FIRE.values;
+ return DAMAGEMode.values;
}
@Override
- public FIRE getValue() {
+ public DAMAGEMode getValue() {
return this;
}
@Override
- public FIRE getValueOf(final String name) {
+ public DAMAGEMode getValueOf(final String name) {
try {
- return FIRE.valueOf(name);
+ return DAMAGEMode.valueOf(name);
} catch (IllegalArgumentException e) {
- return FIRE.ALLOW;
+ return DAMAGEMode.ALLOW;
}
}
}
\ No newline at end of file
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGE.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIREMode.java
similarity index 76%
rename from BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGE.java
rename to BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIREMode.java
index 23ce51ee..237fe1f8 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGE.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIREMode.java
@@ -27,35 +27,35 @@ import net.md_5.bungee.api.ChatColor;
@Getter
@AllArgsConstructor
-public enum DAMAGE implements Flag.Value {
+public enum FIREMode implements Flag.Value {
ALLOW(ChatColor.RED + "an"),
DENY(ChatColor.GREEN + "aus");
- private static DAMAGE[] values;
+ private static FIREMode[] values;
private final String chatValue;
@Override
- public DAMAGE[] getValues() {
- if (DAMAGE.values == null) {
- DAMAGE.values = DAMAGE.values(); //NOSONAR
+ public FIREMode[] getValues() {
+ if (FIREMode.values == null) {
+ FIREMode.values = FIREMode.values(); //NOSONAR
}
- return DAMAGE.values;
+ return FIREMode.values;
}
@Override
- public DAMAGE getValue() {
+ public FIREMode getValue() {
return this;
}
@Override
- public DAMAGE getValueOf(final String name) {
+ public FIREMode getValueOf(final String name) {
try {
- return DAMAGE.valueOf(name);
+ return FIREMode.valueOf(name);
} catch (IllegalArgumentException e) {
- return DAMAGE.ALLOW;
+ return FIREMode.ALLOW;
}
}
}
\ No newline at end of file
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZE.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZEMode.java
similarity index 77%
rename from BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZE.java
rename to BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZEMode.java
index de3a66c5..0214bd90 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZE.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZEMode.java
@@ -28,36 +28,36 @@ import net.md_5.bungee.api.ChatColor;
@Getter
@AllArgsConstructor
-public enum FREEZE implements Flag.Value {
+public enum FREEZEMode implements Flag.Value {
ACTIVE("activate", ChatColor.GREEN + "an"),
INACTIVE("deactivate", ChatColor.RED + "aus");
- private static FREEZE[] values;
+ private static FREEZEMode[] values;
private final String descriptor;
private final String chatValue;
@Override
- public FREEZE[] getValues() {
- if (FREEZE.values == null) {
- FREEZE.values = FREEZE.values(); //NOSONAR
+ public FREEZEMode[] getValues() {
+ if (FREEZEMode.values == null) {
+ FREEZEMode.values = FREEZEMode.values(); //NOSONAR
}
- return FREEZE.values;
+ return FREEZEMode.values;
}
@Override
- public FREEZE getValue() {
+ public FREEZEMode getValue() {
return this;
}
@Override
- public FREEZE getValueOf(final String name) {
+ public FREEZEMode getValueOf(final String name) {
try {
- return FREEZE.valueOf(name);
+ return FREEZEMode.valueOf(name);
} catch (IllegalArgumentException e) {
- return FREEZE.INACTIVE;
+ return FREEZEMode.INACTIVE;
}
}
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNT.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
similarity index 78%
rename from BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNT.java
rename to BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
index 0efd8e53..948dcd2b 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNT.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
@@ -27,36 +27,36 @@ import net.md_5.bungee.api.ChatColor;
@Getter
@AllArgsConstructor
-public enum TNT implements Flag.Value {
+public enum TNTMode implements Flag.Value {
ALLOW(ChatColor.GREEN + "an"),
DENY(ChatColor.RED + "aus"),
ONLY_TB(ChatColor.GRAY + "Kein " + ChatColor.YELLOW + "Baurahmen");
- private static TNT[] values;
+ private static TNTMode[] values;
private final String chatValue;
@Override
- public TNT[] getValues() {
- if (TNT.values == null) {
- TNT.values = TNT.values(); //NOSONAR
+ public TNTMode[] getValues() {
+ if (TNTMode.values == null) {
+ TNTMode.values = TNTMode.values(); //NOSONAR
}
- return TNT.values;
+ return TNTMode.values;
}
@Override
- public TNT getValue() {
+ public TNTMode getValue() {
return this;
}
@Override
- public TNT getValueOf(final String name) {
+ public TNTMode getValueOf(final String name) {
try {
- return TNT.valueOf(name);
+ return TNTMode.valueOf(name);
} catch (IllegalArgumentException e) {
- return TNT.ALLOW;
+ return TNTMode.ALLOW;
}
}
}
\ No newline at end of file