Merge pull request #49 from dshadowwolf/v3

Fix integration issues

Author: jriwanek

src/main/java/com/mcmoddev/orespawn/api/plugin/PluginLoader.java

@@ -45,7 +45,7 @@ public PluginData(String modId, String resourcePath, IOreSpawnPlugin plugin) {
 		}
 	}
 
-	private List<PluginData> dataStore = new ArrayList<>();
+	private static List<PluginData> dataStore = new ArrayList<>();
 
 	private String getAnnotationItem(String item, final ASMData asmData) {
 		if (asmData.getAnnotationInfo().get(item) != null) {
@@ -60,16 +60,13 @@ public void load(FMLPreInitializationEvent event) {
 			final String modId = getAnnotationItem("modid", asmDataItem);
 			final String resourceBase = getAnnotationItem("resourcePath", asmDataItem);
 			final String clazz = asmDataItem.getClassName();
-
-			if ( event.getModMetadata().modId.equals(modId) ) {
-				IOreSpawnPlugin integration;
-				try {
-					integration = Class.forName(clazz).asSubclass(IOreSpawnPlugin.class).newInstance();
-					PluginData pd = new PluginData( modId, resourceBase, integration);
-					dataStore.add(pd);
-				} catch (final Exception ex) {
-					OreSpawn.LOGGER.error("Couldn't load integrations for " + modId, ex);
-				}
+			IOreSpawnPlugin integration;
+			try {
+				integration = Class.forName(clazz).asSubclass(IOreSpawnPlugin.class).newInstance();
+				PluginData pd = new PluginData( modId, resourceBase, integration);
+				dataStore.add(pd);
+			} catch (final Exception ex) {
+				OreSpawn.LOGGER.error("Couldn't load integrations for " + modId, ex);
 			}
 		}
 	}
@@ -81,11 +78,7 @@ public void register() {
 	public void scanResources(PluginData pd) {
 		String base = String.format("assets/%s/%s", pd.modId, pd.resourcePath);
 		URL resURL = getClass().getClassLoader().getResource(base);
-		if( resURL == null ) {
-			// nothing to load!
-			return;
-		}
-
+		
 		URI uri;
 		try {
 			uri = resURL.toURI();
@@ -106,14 +99,11 @@ public void scanResources(PluginData pd) {
 				myPath = Paths.get(uri);
 			}
 
-			if( !myPath.toFile().exists() ) {
-				return;
-			}
-
 			Stream<Path> walk = Files.walk(myPath, 1);
 			for (Iterator<Path> it = walk.iterator(); it.hasNext();){
 				Path p = it.next();
 				String name = p.getFileName().toString();
+
 				if( "json".equals(FilenameUtils.getExtension(name)) ) {
 					InputStream reader = null;
 					Path target = Paths.get(".","orespawn","os3",String.format("%s.json", pd.modId));
@@ -123,6 +113,7 @@ public void scanResources(PluginData pd) {
 						walk.close();
 						return;
 					}
+
 					reader = Files.newInputStream(p);
 					FileUtils.copyInputStreamToFile(reader, target.toFile());
 					IOUtils.closeQuietly(reader);

src/main/java/com/mcmoddev/orespawn/data/Config.java

@@ -27,9 +27,6 @@ public static void loadConfig() {
 
 	public static boolean getBoolean(String keyname) {
 		if( knownKeys.contains(keyname) && boolVals.containsKey(keyname) ) {
-//			if(keyname.equals(Constants.RETROGEN_KEY) || keyname.equals(Constants.FORCE_RETROGEN_KEY)) {
-//				return false;
-//			}
 			return boolVals.get(keyname);
 		}
 		return false;

src/main/java/com/mcmoddev/orespawn/data/Constants.java

@@ -29,7 +29,7 @@ private ConfigNames() {}
 		public static final String METADATA = "metaData";
 		public static final String BIOMES = "biomes";
 		public static final String STATE = "state";
-		public static final String REPLACEMENT = "replacement_block";
+		public static final String REPLACEMENT = "replace_block";
 		public static final String FEATURE = "feature";
 		public static final String PARAMETERS = "parameters";
 		public static final String FILE_VERSION = "version";

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

@@ -43,7 +43,7 @@ public void parseJson(JsonObject entries, String fileName) {
 
 				OreBuilder oreB = spawn.newOreBuilder();
 
-				String oreName = ore.get(ConfigNames.ORES).getAsString();
+				String oreName = ore.get(ConfigNames.BLOCK).getAsString();
 
 				if (ore.has(ConfigNames.STATE)) {
 					String stateString = ore.get(ConfigNames.STATE).getAsString();