Merge pull request #63 from dshadowwolf/master-1.11.2

Master 1.11.2

Author: dshadowwolf

src/main/java/com/mcmoddev/orespawn/EventHandlers.java

@@ -37,7 +37,7 @@ public EventHandlers() {
 
     @SubscribeEvent
     public void onGenerateMinable(OreGenEvent.GenerateMinable event) {
-    	if( Config.getBoolean(Constants.RETROGEN_KEY) ) {
+    	if( Config.getBoolean(Constants.REPLACE_VANILLA_OREGEN) ) {
     		event.setResult(Event.Result.DENY);
     	}
     }

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

@@ -95,7 +95,11 @@ public static void handleState(JsonObject ore, OreBuilder oreB, String oreName)
 				oreB.setOre(oreName, stateString);
 			}
 		} else {
-			oreB.setOre(oreName);
+			if(ore.has(ConfigNames.METADATA)) {
+				oreB.setOre(oreName, ore.get(ConfigNames.METADATA).getAsInt());
+			} else {
+				oreB.setOre(oreName);
+			}
 		}
 	}
 

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

@@ -42,16 +42,9 @@ public void parseJson(JsonObject entries, String fileName) {
 				JsonObject ore = oresEntry.getAsJsonObject();
 
 				OreBuilder oreB = spawn.newOreBuilder();
-				
 				String oreName = ore.get(ConfigNames.BLOCK).getAsString();
+				Helpers.handleState(ore, oreB, oreName);
 
-				if (ore.has(ConfigNames.STATE)) {
-					String stateString = ore.get(ConfigNames.STATE).getAsString();
-					oreB.setOre(oreName, stateString);
-				} else {
-					oreB.setOre(oreName);
-				}
-
 				FeatureBuilder feature = spawn.newFeatureBuilder(null);
 				feature.setGenerator(ore.get(ConfigNames.FEATURE).getAsString());
 				feature.setParameters(ore.get(ConfigNames.PARAMETERS).getAsJsonObject());