diff --git a/.classpath b/.classpath index c4a1247..59c135d 100644 --- a/.classpath +++ b/.classpath @@ -6,21 +6,16 @@ - - - - - - - + - + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6f1d295..13b3428 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=9 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=9 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/src/IronMiner.java b/src/IronMiner.java index f417836..759541c 100644 --- a/src/IronMiner.java +++ b/src/IronMiner.java @@ -47,6 +47,7 @@ public class IronMiner { public void run() throws Exception { while (true) { BufferedImage screenCapture = objectDetector.captureScreenshotGameWindow(); + System.out.println("looking for iron ores"); ArrayList detectedObjects = objectDetector.getObjectsInImage(screenCapture, 0.60); ArrayList ironOres = objectDetector.getObjectsOfClassInList(detectedObjects, "ironOre"); @@ -67,7 +68,7 @@ public class IronMiner { } } - dropInventoryIfFull(); + //dropInventoryIfFull(); } } diff --git a/src/ObjectDetector.java b/src/ObjectDetector.java index 4eec842..9f03821 100644 --- a/src/ObjectDetector.java +++ b/src/ObjectDetector.java @@ -49,7 +49,7 @@ public class ObjectDetector { Robot robot; public ObjectDetector() throws AWTException { - this.model = SavedModelBundle.load(Paths.TENSORFLOW_MODEL_DIRECTORY, "serve"); + this.model = SavedModelBundle.load("/home/dpapp/raccoon_dataset/results/checkpoint_56749/saved_model/", "serve"); this.robot = new Robot(); } @@ -140,4 +140,9 @@ public class ObjectDetector { data[i + 2] = tmp; } } + + public BufferedImage captureScreenshotGameWindow() throws IOException, AWTException { + Rectangle area = new Rectangle(Constants.GAME_WINDOW_OFFSET_X, Constants.GAME_WINDOW_OFFSET_Y, Constants.GAME_WINDOW_WIDTH, Constants.GAME_WINDOW_HEIGHT); + return robot.createScreenCapture(area); + } } \ No newline at end of file diff --git a/src/main.java b/src/main.java index 4fd4924..4334070 100644 --- a/src/main.java +++ b/src/main.java @@ -10,8 +10,13 @@ public class main { public static void main(String[] args) throws Exception { System.out.println("Starting Iron Miner."); + System.load("/usr/local/cuda/lib64/libcublas.so.9.0"); + System.load("/usr/local/cuda/lib64/libcusolver.so.9.0"); + System.load("/usr/local/cuda/lib64/libcudart.so.9.0"); + System.load("/usr/local/cuda/lib64/libcufft.so.9.0"); + System.load("/usr/local/cuda/lib64/libcurand.so.9.0"); //System.loadLibrary(Core.NATIVE_LIBRARY_NAME); - //System.loadLibrary(org.tensorflow); + System.load("/home/dpapp/jni/libtensorflow_jni.so"); IronMiner ironMiner = new IronMiner(); ironMiner.run(); diff --git a/target/classes/ColorAnalyzer.class b/target/classes/ColorAnalyzer.class index 0b16f5a..b03be73 100644 Binary files a/target/classes/ColorAnalyzer.class and b/target/classes/ColorAnalyzer.class differ diff --git a/target/classes/Constants.class b/target/classes/Constants.class index 1629fde..a4c61c2 100644 Binary files a/target/classes/Constants.class and b/target/classes/Constants.class differ diff --git a/target/classes/Cursor.class b/target/classes/Cursor.class index b7c03b7..d706b87 100644 Binary files a/target/classes/Cursor.class and b/target/classes/Cursor.class differ diff --git a/target/classes/CursorDataFileParser.class b/target/classes/CursorDataFileParser.class index 8449d71..bb3687e 100644 Binary files a/target/classes/CursorDataFileParser.class and b/target/classes/CursorDataFileParser.class differ diff --git a/target/classes/CursorPath.class b/target/classes/CursorPath.class index 1c05474..140199b 100644 Binary files a/target/classes/CursorPath.class and b/target/classes/CursorPath.class differ diff --git a/target/classes/CursorPathTest.class b/target/classes/CursorPathTest.class index 3bacbd2..0d520b4 100644 Binary files a/target/classes/CursorPathTest.class and b/target/classes/CursorPathTest.class differ diff --git a/target/classes/CursorPoint.class b/target/classes/CursorPoint.class index 2bdb434..9493941 100644 Binary files a/target/classes/CursorPoint.class and b/target/classes/CursorPoint.class differ diff --git a/target/classes/CursorPointTest.class b/target/classes/CursorPointTest.class index 4147ccc..f9340f3 100644 Binary files a/target/classes/CursorPointTest.class and b/target/classes/CursorPointTest.class differ diff --git a/target/classes/CursorTask.class b/target/classes/CursorTask.class index c601f0e..43d8617 100644 Binary files a/target/classes/CursorTask.class and b/target/classes/CursorTask.class differ diff --git a/target/classes/CursorTest.class b/target/classes/CursorTest.class index 80a1381..bb6aa4e 100644 Binary files a/target/classes/CursorTest.class and b/target/classes/CursorTest.class differ diff --git a/target/classes/DetectedObject.class b/target/classes/DetectedObject.class index 036eb10..27f2259 100644 Binary files a/target/classes/DetectedObject.class and b/target/classes/DetectedObject.class differ diff --git a/target/classes/ImageCollector$1.class b/target/classes/ImageCollector$1.class index 3217e39..1681850 100644 Binary files a/target/classes/ImageCollector$1.class and b/target/classes/ImageCollector$1.class differ diff --git a/target/classes/ImageCollector.class b/target/classes/ImageCollector.class index b37335a..f007ae4 100644 Binary files a/target/classes/ImageCollector.class and b/target/classes/ImageCollector.class differ diff --git a/target/classes/Inventory.class b/target/classes/Inventory.class index 74270db..deb5caa 100644 Binary files a/target/classes/Inventory.class and b/target/classes/Inventory.class differ diff --git a/target/classes/InventoryItem.class b/target/classes/InventoryItem.class index aec537f..5230a00 100644 Binary files a/target/classes/InventoryItem.class and b/target/classes/InventoryItem.class differ diff --git a/target/classes/InventoryItems.class b/target/classes/InventoryItems.class index 32d37ff..dff1cd2 100644 Binary files a/target/classes/InventoryItems.class and b/target/classes/InventoryItems.class differ diff --git a/target/classes/InventoryItemsTest.class b/target/classes/InventoryItemsTest.class index be11463..f12e0ad 100644 Binary files a/target/classes/InventoryItemsTest.class and b/target/classes/InventoryItemsTest.class differ diff --git a/target/classes/InventorySlot.class b/target/classes/InventorySlot.class index 68ea1c5..786669e 100644 Binary files a/target/classes/InventorySlot.class and b/target/classes/InventorySlot.class differ diff --git a/target/classes/InventoryTest.class b/target/classes/InventoryTest.class index 558274d..a2d4e5c 100644 Binary files a/target/classes/InventoryTest.class and b/target/classes/InventoryTest.class differ diff --git a/target/classes/IronMiner.class b/target/classes/IronMiner.class index 2b55f0f..190b5da 100644 Binary files a/target/classes/IronMiner.class and b/target/classes/IronMiner.class differ diff --git a/target/classes/ObjectDetector.class b/target/classes/ObjectDetector.class index 6615fe6..d0a3852 100644 Binary files a/target/classes/ObjectDetector.class and b/target/classes/ObjectDetector.class differ diff --git a/target/classes/ObjectDetectorTest.class b/target/classes/ObjectDetectorTest.class index 8e10d82..b47e04d 100644 Binary files a/target/classes/ObjectDetectorTest.class and b/target/classes/ObjectDetectorTest.class differ diff --git a/target/classes/ObjectTracker.class b/target/classes/ObjectTracker.class index 1c99f2b..2fc0010 100644 Binary files a/target/classes/ObjectTracker.class and b/target/classes/ObjectTracker.class differ diff --git a/target/classes/ObjectTrackerSpeedTest.class b/target/classes/ObjectTrackerSpeedTest.class index 06cb54c..2f590af 100644 Binary files a/target/classes/ObjectTrackerSpeedTest.class and b/target/classes/ObjectTrackerSpeedTest.class differ diff --git a/target/classes/ObjectTrackerTest.class b/target/classes/ObjectTrackerTest.class index 089c667..0723cc3 100644 Binary files a/target/classes/ObjectTrackerTest.class and b/target/classes/ObjectTrackerTest.class differ diff --git a/target/classes/Paths.class b/target/classes/Paths.class index d6451c7..cc61d2a 100644 Binary files a/target/classes/Paths.class and b/target/classes/Paths.class differ diff --git a/target/classes/PointTest.class b/target/classes/PointTest.class index 2abced0..ebfa96e 100644 Binary files a/target/classes/PointTest.class and b/target/classes/PointTest.class differ diff --git a/target/classes/Randomizer.class b/target/classes/Randomizer.class index 3860910..3dcca13 100644 Binary files a/target/classes/Randomizer.class and b/target/classes/Randomizer.class differ diff --git a/target/classes/RandomizerTest.class b/target/classes/RandomizerTest.class index 9a0292b..0f210bf 100644 Binary files a/target/classes/RandomizerTest.class and b/target/classes/RandomizerTest.class differ diff --git a/target/classes/cascadeTrainingImageCollector.class b/target/classes/cascadeTrainingImageCollector.class index 30e6ea6..21b619a 100644 Binary files a/target/classes/cascadeTrainingImageCollector.class and b/target/classes/cascadeTrainingImageCollector.class differ diff --git a/target/classes/main.class b/target/classes/main.class index 441a20b..59e8a5a 100644 Binary files a/target/classes/main.class and b/target/classes/main.class differ