[#50][#51] Fix issues coming in from OpenEye

OreCruncher · Jun 24, 2015 · 1f4ed4a · 1f4ed4a
1 parent 9d9c700
commit 1f4ed4a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/main/java/org/blockartistry/mod/ThermalRecycling/VersionCheck.java b/src/main/java/org/blockartistry/mod/ThermalRecycling/VersionCheck.java
@@ -76,7 +76,7 @@ public SoftwareVersion() {
 			this.isAlpha = false;
 		}
 
-		public SoftwareVersion(final String versionString) {
+		public SoftwareVersion(String versionString) {
 
 			// This can happen when running in debug
 			if (versionString.charAt(0) == '@') {
@@ -91,6 +91,10 @@ public SoftwareVersion(final String versionString) {
 			assert versionString != null;
 			assert versionString.length() > 0;
 
+			isAlpha = StringUtils.containsIgnoreCase(versionString, "ALPHA");
+			if(isAlpha)
+				versionString = StringUtils.remove(versionString, "ALPHA");
+
 			final String[] parts = StringUtils.split(versionString, ".");
 			final int numComponents = parts.length;
 
@@ -100,15 +104,10 @@ public SoftwareVersion(final String versionString) {
 			this.minor = Integer.parseInt(parts[1]);
 			this.revision = Integer.parseInt(parts[2]);
 			if (numComponents == 4) {
-				this.isAlpha = StringUtils
-						.containsIgnoreCase(parts[3], "ALPHA");
-				this.patch = Integer.parseInt(StringUtils.remove(parts[3],
-						"ALPHA"));
+				this.patch = Integer.parseInt(parts[3]);
 			} else {
-				this.isAlpha = false;
 				this.patch = 0;
 			}
-
 		}
 
 		@Override

diff --git a/src/main/java/org/blockartistry/mod/ThermalRecycling/support/ModForestry.java b/src/main/java/org/blockartistry/mod/ThermalRecycling/support/ModForestry.java
@@ -110,21 +110,21 @@ protected void registerForestryRecipes(final Map<Object[], Object[]> entry) {
 	public boolean preInit() {
 
 		StorageManager.crateRegistry.registerCrate(ScrappingTables.debris,
-				"recycling:cratedDebris");
+				"cratedDebris");
 		StorageManager.crateRegistry.registerCrate(ScrappingTables.poorScrap,
-				"recycling:cratedPoorScrap");
+				"cratedPoorScrap");
 		StorageManager.crateRegistry.registerCrate(
-				ScrappingTables.poorScrapBox, "recycling:cratedPoorScrapBox");
+				ScrappingTables.poorScrapBox, "cratedPoorScrapBox");
 		StorageManager.crateRegistry.registerCrate(
-				ScrappingTables.standardScrap, "recycling:cratedStandardScrap");
+				ScrappingTables.standardScrap, "cratedStandardScrap");
 		StorageManager.crateRegistry.registerCrate(
 				ScrappingTables.standardScrapBox,
-				"recycling:cratedStandardScrapBox");
+				"cratedStandardScrapBox");
 		StorageManager.crateRegistry.registerCrate(
-				ScrappingTables.superiorScrap, "recycling:cratedSuperiorScrap");
+				ScrappingTables.superiorScrap, "cratedSuperiorScrap");
 		StorageManager.crateRegistry.registerCrate(
 				ScrappingTables.superiorScrapBox,
-				"recycling:cratedSuperiorScrapBox");
+				"cratedSuperiorScrapBox");
 		return true;
 	}