Skip to content

Commit

Permalink
Update last pulled PR (didn't compile anyways :P), bump deps, and upd…
Browse files Browse the repository at this point in the history
…ate to 2.2.1.
  • Loading branch information
Parker8283 committed Jun 6, 2015
1 parent df069a6 commit 9ca8f98
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'maven'
apply plugin: 'eclipse'
apply plugin: 'idea'

version = "2.2.0"
version = "2.2.1"
group = "com.github.parker8283"
archivesBaseName = "BON"

Expand All @@ -12,8 +12,8 @@ repositories {
}

dependencies {
compile 'org.ow2.asm:asm-debug-all:5.0.3'
compile 'com.google.guava:guava:17.0'
compile 'org.ow2.asm:asm-debug-all:5.0.4'
compile 'com.google.guava:guava:18.0'
compile 'net.sf.jopt-simple:jopt-simple:4.8'
}

Expand Down
11 changes: 7 additions & 4 deletions src/main/java/com/github/parker8283/bon2/util/BONUtils.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
package com.github.parker8283.bon2.util;

import com.github.parker8283.bon2.data.BONFiles;
import com.google.common.collect.Lists;

import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.github.parker8283.bon2.data.BONFiles;
import com.google.common.collect.Lists;

public class BONUtils {
private static final Pattern VERSION_PATTERN = Pattern.compile("^\\d+\\.\\d+(\\.\\d+)?(_\\w+)?-\\d+\\.\\d+\\.\\d+\\.\\d+(-.+)?");
private static final Matcher versionMatcher = VERSION_PATTERN.matcher("");

public static List<String> buildValidMappings() {
File[] versionFolders = BONFiles.MINECRAFTFORGE_FORGE_FOLDER.listFiles();
if(versionFolders == null) {
return Collections.emptyList();
}
List<File> acceptedVersions = Lists.newArrayList();
if(versionFolders == null) return new ArrayList<>();
for(File file : versionFolders) {
String name = file.getName();
if(!name.startsWith("1.6") && versionMatcher.reset(name).matches()) {
Expand Down

0 comments on commit 9ca8f98

Please sign in to comment.