more linter cleanups - this time unifying the various v1 readers into one that internally handles the differences

Author: dshadowwolf

src/main/java/com/mcmoddev/orespawn/json/OS3Reader.java

@@ -189,14 +189,12 @@ private static List<IBlockState> getReplacements(String configField, int dimensi
 		}
 	}
 
-	private static IOS3Reader getReader(String version) {
+	public static IOS3Reader getReader(String version) {
 		switch( version ) {
 			case "1":
-				return new OS3V1Reader();
 			case "1.1":
-				return new OS3V11Reader();
 			case "1.2":
-				return new OS3V12Reader();
+				return new OS3V1Reader();
 			case "2.0":
 				return new OS3V2Reader();
 			default:

src/main/java/com/mcmoddev/orespawn/json/OreSpawnReader.java

@@ -16,8 +16,6 @@
 import com.mcmoddev.orespawn.OreSpawn;
 import com.mcmoddev.orespawn.data.Constants;
 import com.mcmoddev.orespawn.json.os3.IOS3Reader;
-import com.mcmoddev.orespawn.json.os3.readers.OS3V11Reader;
-import com.mcmoddev.orespawn.json.os3.readers.OS3V12Reader;
 import com.mcmoddev.orespawn.json.os3.readers.OS3V1Reader;
 import com.mcmoddev.orespawn.json.os3.readers.OS3V2Reader;
 
@@ -69,25 +67,8 @@ private void loadSpawns(File[] files) {
 						JsonElement full = parser.parse(rawData);
 						JsonObject parsed = full.getAsJsonObject();
 
-						IOS3Reader reader = null;
 						String version = parsed.get("version").getAsString();
-						switch( version ) {
-						case "1":
-							reader = new OS3V1Reader();
-							break;
-						case "1.1":
-							reader = new OS3V11Reader();
-							break;
-						case "1.2":
-							reader = new OS3V12Reader();
-							break;
-						case "2.0":
-							reader = new OS3V2Reader();
-							break;
-						default:
-							OreSpawn.LOGGER.error("Unknown version %s", version);
-							return;
-						}
+						IOS3Reader reader =OS3Reader.getReader( version );
 
 						spawns.add(reader.parseJson(parsed, file.getName().substring(0, file.getName().lastIndexOf('.'))));
 					} catch (Exception e) {

src/main/java/com/mcmoddev/orespawn/json/os3/readers/OS3V11Reader.java

@@ -33,8 +33,20 @@ public JsonObject parseJson(JsonObject entries, String fileName) {
 				JsonObject oreOut = new JsonObject();
 
 				copyOverSingleBlock(ore,oreOut);
-				oreOut.add("biomes", new JsonObject());
-				oreOut.addProperty("name", getBlockName(ore));
+				switch( entries.get(ConfigNames.FILE_VERSION).getAsString() ) {
+					case "1.2":
+						ore.entrySet().forEach( prop -> oreOut.add(prop.getKey(), prop.getValue()));
+						break;
+					case "1.1":
+						JsonArray biomes = ore.has(ConfigNames.BIOMES)?ore.getAsJsonArray(ConfigNames.BIOMES):new JsonArray();
+						JsonObject biomeObj = new JsonObject();
+						biomeObj.add(biomes.size()<1?ConfigNames.BiomeStuff.BLACKLIST:ConfigNames.BiomeStuff.WHITELIST, biomes);
+						oreOut.add("biomes", biomeObj);
+					case "1":
+						oreOut.add("biomes", new JsonObject());
+						oreOut.addProperty("name", getBlockName(ore));
+						break;
+				}
 				dimData.add(oreOut);
 			}
 			retVal.getAsJsonObject("dimensions").add(Integer.toString(dimension), dimData);