From 9eb46e7a0fd6f1ca60b3145dd5533d26d95ef7c8 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Mon, 20 Jan 2020 07:15:53 +0100 Subject: [PATCH] Hotrevert to static instanciation --- .../src/de/steamwar/sql/SchematicType.java | 73 ++++++++++++++----- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java b/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java index 32c81dd..c1e6f9e 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java +++ b/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java @@ -1,16 +1,49 @@ package de.steamwar.sql; -import de.steamwar.core.Core; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.YamlConfiguration; +import java.util.HashMap; +import java.util.Map; -import java.io.File; -import java.util.*; +public enum SchematicType { + Normal("", Type.NORMAL), + CAirShip("CAS", Type.CHECK_TYPE), + CWarGear("CWG", Type.CHECK_TYPE), + CWarShip("CWS", Type.CHECK_TYPE), + CMiniWarGear("CMWG", Type.CHECK_TYPE), + AirShip("AS", Type.FIGHT_TYPE, CAirShip), + WarGear("WG", Type.FIGHT_TYPE, CWarGear), + WarShip("WS", Type.FIGHT_TYPE, CWarShip), + MiniWarGear("MWG", Type.FIGHT_TYPE, CMiniWarGear), -public class SchematicType { - public static final SchematicType Normal = new SchematicType("Normal", "", Type.NORMAL, null); //Has to stay publicly availible + CMPPWarGear1_12("CMPPWG", Type.CHECK_TYPE), + CSGWarShip("CSGWS", Type.CHECK_TYPE), + CWarGear1_10("CWG1.10", Type.CHECK_TYPE), + CWarShip1_9("CWS1.9", Type.CHECK_TYPE), + CWarShip1_8("CWS1.8", Type.CHECK_TYPE), + CWarGear1_7("CWG1.7", Type.CHECK_TYPE), + WarGear1_14("WG1.14", Type.FIGHT_TYPE, null), + MPPWarGear1_12("MPPWG", Type.FIGHT_TYPE, CMPPWarGear1_12), + SGWarShip("SGWS", Type.FIGHT_TYPE, CSGWarShip), + WarGear1_12("WG1.12", Type.FIGHT_TYPE, null), + WarShip1_12("WS1.12", Type.FIGHT_TYPE, null), + MiniWarGear1_12("MWG1.12", Type.FIGHT_TYPE, null), + WarGear1_10("WG1.10", Type.FIGHT_TYPE, CWarGear1_10), + WarShip1_9("WS1.9", Type.FIGHT_TYPE, CWarShip1_9), + WarShip1_8("WS1.8", Type.FIGHT_TYPE, CWarShip1_8), + WarGear1_7("WG1.7", Type.FIGHT_TYPE, CWarGear1_7) - private static final Map fromDB; + ; + + + + //public static final SchematicType Normal = new SchematicType("Normal", "", Type.NORMAL, null); //Has to stay publicly availible + + private static final Map fromDB = new HashMap<>(); + static{ + for(SchematicType type : values()){ + fromDB.put(type.name().toLowerCase(), type); + } + } + /*private static final Map fromDB; private static final List types; static{ @@ -34,15 +67,19 @@ public class SchematicType { fromDB = Collections.unmodifiableMap(tmpFromDB); types = Collections.unmodifiableList(tmpTypes); - } + }*/ - private final String name; + //private final String name; private final String kuerzel; private final Type type; private SchematicType checkType; - private SchematicType(String name, String kuerzel, Type type, SchematicType checkType){ - this.name = name; + private SchematicType(String kuerzel, Type type){ + this(kuerzel, type, null); + } + + private SchematicType(String kuerzel, Type type, SchematicType checkType){ + //this.name = name; this.kuerzel = kuerzel; this.type = type; this.checkType = checkType; @@ -68,25 +105,25 @@ public class SchematicType { return type == Type.NORMAL; } - public String name(){ + /*public String name(){ return name; - } + }*/ public String getKuerzel() { return kuerzel; } - public String toDB(){ + /*public String toDB(){ return name.toLowerCase(); - } + }*/ public static SchematicType fromDB(String input){ return fromDB.getOrDefault(input.toLowerCase(), null); } - public static List values(){ + /*public static List values(){ return types; - } + }*/ enum Type{ NORMAL,