summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Culkin <15405@DESKTOP-JT5100E>2020-03-23 17:56:34 -0400
committerBen Culkin <15405@DESKTOP-JT5100E>2020-03-23 17:56:34 -0400
commit01ee6b9ad844db04902db4d2ae25af588fffba06 (patch)
tree43cd1bc80804664f4da6d338917a97748aa07298
parentc832171d0b0a82cf58a8d9c0dd9ac2ef60b8585f (diff)
General cleanup
Just doing some general cleanup around the code base
-rw-r--r--.classpath32
-rw-r--r--.project23
-rw-r--r--.settings/org.eclipse.core.resources.prefs4
-rw-r--r--.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--EFFECTSLIST.DATbin287416 -> 139239 bytes
-rw-r--r--GLOBALS.DATbin80860 -> 39686 bytes
-rw-r--r--src/main/java/tlIItools/AffixLister.java8
-rw-r--r--src/main/java/tlIItools/NameFileReader.java6
9 files changed, 73 insertions, 12 deletions
diff --git a/.classpath b/.classpath
new file mode 100644
index 00000000..2efb9eea
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="data">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 00000000..fbddd866
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>tlIITools</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..382b70be
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8
+encoding/data=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..2f5cc74c
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..f897a7f1
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/EFFECTSLIST.DAT b/EFFECTSLIST.DAT
index d04a2521..f9d03259 100644
--- a/EFFECTSLIST.DAT
+++ b/EFFECTSLIST.DAT
Binary files differ
diff --git a/GLOBALS.DAT b/GLOBALS.DAT
index 8da46bae..cdd4e2ba 100644
--- a/GLOBALS.DAT
+++ b/GLOBALS.DAT
Binary files differ
diff --git a/src/main/java/tlIItools/AffixLister.java b/src/main/java/tlIItools/AffixLister.java
index 76e93996..b241caf5 100644
--- a/src/main/java/tlIItools/AffixLister.java
+++ b/src/main/java/tlIItools/AffixLister.java
@@ -5,13 +5,10 @@ import java.io.FileReader;
import java.io.PrintStream;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Scanner;
-import java.util.Set;
/**
* Lists randomly generated affixes for Torchlight II gear.
@@ -80,7 +77,6 @@ public class AffixLister {
boolean omitZeros = false;
boolean listZeros = false;
- boolean guessGroups = false;
NameMode nameMode = NameMode.ALL;
@@ -93,8 +89,6 @@ public class AffixLister {
List<Affix> nonGroupContents = afst.ungroupedAffixes;
- int argCount = 0;
-
NameFileReader nfr = new NameFileReader(false);
nfr.groupRx = ".*/mods/([^/]+)/*";
@@ -231,8 +225,6 @@ public class AffixLister {
}
if (isArg) {
- argCount += 1;
-
continue;
}
diff --git a/src/main/java/tlIItools/NameFileReader.java b/src/main/java/tlIItools/NameFileReader.java
index ad2a83b4..c63ac417 100644
--- a/src/main/java/tlIItools/NameFileReader.java
+++ b/src/main/java/tlIItools/NameFileReader.java
@@ -111,8 +111,6 @@ public class NameFileReader {
* @return The number of files read.
*/
public void readFrom(String from) {
- int ret;
-
try (FileReader fr = new FileReader(from)) {
readFrom(fr);
} catch (IOException ioex) {
@@ -131,8 +129,6 @@ public class NameFileReader {
* @return The number of files read.
*/
public void readFrom(Reader r) {
- int numFiles = 0;
-
Scanner scn = new Scanner(r);
while (scn.hasNextLine()) {
@@ -156,6 +152,8 @@ public class NameFileReader {
skipAdd = false;
}
+
+ scn.close();
}
/**