aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.classpath82
-rw-r--r--.gitignore11
-rw-r--r--.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--build.gradle14
-rw-r--r--build.properties4
-rw-r--r--src/main/java/com/detrav/DetravScannerMod.java15
-rw-r--r--src/main/java/com/detrav/gui/DetravGuiProPick.java14
-rw-r--r--src/main/java/com/detrav/gui/textures/DetravMapTexture.java10
-rw-r--r--src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java32
-rw-r--r--src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java17
-rw-r--r--src/main/java/com/detrav/net/DetravProPickPacket00.java41
-rw-r--r--src/main/java/com/detrav/utils/GTppHelper.java29
-rw-r--r--src/main/resources/mcmod.info4
13 files changed, 152 insertions, 124 deletions
diff --git a/.classpath b/.classpath
deleted file mode 100644
index 15f7cbed06..0000000000
--- a/.classpath
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true"/>
- <classpathentry kind="output" path="bin"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forgeSrc-1.7.10-10.13.4.1614-1.7.10-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forgeSrc-1.7.10-10.13.4.1614-1.7.10.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.12/fd80cad9a1b967ce2ff20529dc54e520d5338d7/launchwrapper-1.12-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.12/111e7bea9c968cdb3d06ef4632bf7ff0824d0f36/launchwrapper-1.12.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f0f24f6666c1a15c7e202e91610476bd4ce59368/asm-debug-all-5.0.3-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f9e364ae2a66ce2a543012a4668856e84e5dab74/asm-debug-all-5.0.3.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.typesafe.akka/akka-actor_2.11/2.3.3/9dbceb71c4fd943b4eb4607847261075a989d47f/akka-actor_2.11-2.3.3-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.typesafe.akka/akka-actor_2.11/2.3.3/ed62e9fc709ca0f2ff1a3220daa8b70a2870078e/akka-actor_2.11-2.3.3.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.typesafe/config/1.2.1/bdacf4f82ce9b29cd474bfde2e91eeb0ca623d28/config-1.2.1-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.typesafe/config/1.2.1/f771f71fdae3df231bcd54d5ca2d57f0bf93f467/config-1.2.1.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors-migration_2.11/1.1.0/6bccac72dae4d369537e313d12087c1ca295e84f/scala-actors-migration_2.11-1.1.0-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors-migration_2.11/1.1.0/dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f/scala-actors-migration_2.11-1.1.0.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-compiler/2.11.1/b031d401aabbf7f5f725db500575da3dff90065f/scala-compiler-2.11.1-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-compiler/2.11.1/56ea2e6c025e0821f28d73ca271218b8dd04926a/scala-compiler-2.11.1.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-library_2.11/1.0.2/495afc106eeaa1b3367f6be0bc3768c398e4d360/scala-continuations-library_2.11-1.0.2-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-library_2.11/1.0.2/e517c53a7e9acd6b1668c5a35eccbaa3bab9aac/scala-continuations-library_2.11-1.0.2.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-plugin_2.11.1/1.0.2/c6f3c092ab731f3cf83fdb376ebc465a243c1f4c/scala-continuations-plugin_2.11.1-1.0.2-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-plugin_2.11.1/1.0.2/f361a3283452c57fa30c1ee69448995de23c60f7/scala-continuations-plugin_2.11.1-1.0.2.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-library/2.11.1/8355e4b6841f772a287167666bad6e9860ac4d3c/scala-library-2.11.1-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-library/2.11.1/e11da23da3eabab9f4777b9220e60d44c1aab6a/scala-library-2.11.1.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-parser-combinators_2.11/1.0.1/f05d7345bf5a58924f2837c6c1f4d73a938e1ff0/scala-parser-combinators_2.11-1.0.1.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-reflect/2.11.1/d4c5628e197a0d6af8e9b93a9be32190c547bc8a/scala-reflect-2.11.1-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-reflect/2.11.1/6580347e61cc7f8e802941e7fde40fa83b8badeb/scala-reflect-2.11.1.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-swing_2.11/1.0.1/b1cdd92bd47b1e1837139c1c53020e86bb9112ae/scala-swing_2.11-1.0.1.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-xml_2.11/1.0.2/7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0/scala-xml_2.11-1.0.2.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/4.5/3cf4c3c1a6f565419bfd53a0e564d6fb128deeea/jopt-simple-4.5-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/4.5/6065cc95c661255349c1d0756657be17c29a4fd3/jopt-simple-4.5.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/lzma/lzma/0.0.1/521616dc7487b42bef0e803bd2fa3faf668101d7/lzma-0.0.1.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.3.5/807ae355ee63583becd7ea60e76aab1532bb42e/realms-1.3.5.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/3caea4421428752206c7a94c3e3097f0c47f1bb8/commons-compress-1.8.1-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/a698750c16740fd5b3871425f4cb3bbaa87f529d/commons-compress-1.8.1.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/65cba03c4f6207f2885f88206fcf52c53f8d111b/httpclient-4.3.3-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/18f4247ff4572a074444572cee34647c43e7c9c7/httpclient-4.3.3.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/4809f38359edeea9487f747e09aa58ec8d3a54c5/httpcore-4.3.2-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/31fbbff1ddbf98f3aa7377c94d33b0447c646b6e/httpcore-4.3.2.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/java3d/vecmath/1.3.1/a0ae4f51da409fa0c20fa0ca59e6bbc9413ae71d/vecmath-1.3.1.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.sf.trove4j/trove4j/3.0.3/109c5be93362e6e651e417c51d1863477a22969c/trove4j-3.0.3-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.sf.trove4j/trove4j/3.0.3/42ccaf4761f0dfdfa805c9e340d99a755907e2dd/trove4j-3.0.3.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j-core-mojang/51.2/814397ccbafff1132758e551c37396c528d7f2d7/icu4j-core-mojang-51.2-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j-core-mojang/51.2/63d216a9311cca6be337c1e458e587f99d382b84/icu4j-core-mojang-51.2.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/codecjorbis/20101023/4ca2436396bc14ebd78b7db1d4e11ca607c8705e/codecjorbis-20101023-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/codecjorbis/20101023/c73b5636faf089d9f00e8732a829577de25237ee/codecjorbis-20101023.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/codecwav/20101023/71ec00b9b9c1a6a2c3a8a25f481a23ddb5b21ddb/codecwav-20101023-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/codecwav/20101023/12f031cfe88fef5c1dd36c563c0a3a69bd7261da/codecwav-20101023.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/libraryjavasound/20101123/945ff5711de27751cf699641d1ea316ba6cf7589/libraryjavasound-20101123-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/libraryjavasound/20101123/5c5e304366f75f9eaa2e8cca546a1fb6109348b3/libraryjavasound-20101123.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/librarylwjglopenal/20100824/ecfc8dac1d41bef748997e4edf563d486923ee1e/librarylwjglopenal-20100824-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/librarylwjglopenal/20100824/73e80d0794c39665aec3f62eee88ca91676674ef/librarylwjglopenal-20100824.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/soundsystem/20120107/1b9f4eb11ef11fede7fd76a2e5e8203c2a8adcd/soundsystem-20120107-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.paulscode/soundsystem/20120107/419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6/soundsystem-20120107.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/io.netty/netty-all/4.0.10.Final/9a214bc1e6350ead5234e4dd5eb3a2a802d1c658/netty-all-4.0.10.Final-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/io.netty/netty-all/4.0.10.Final/9e50bd52ffe257a0e2cd8d971688d6ce7d174325/netty-all-4.0.10.Final.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/17.0/7ca0efbeb87ca845b5d7a0ac9c21a4b7b95f7b28/guava-17.0-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/17.0/9c6ef172e8de35fd8d4d8783e4821e57cdef7445/guava-17.0.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.3.2/d2a489573c0ed2c4942b3660decad5d65087b406/commons-lang3-3.3.2-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.3.2/90a3822c38ec8c996e84c16a3477ef632cbc87a3/commons-lang3-3.3.2.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.4/f2d8698c46d1167ff24b06a840a87d91a02db891/commons-io-2.4-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.4/b1b6ea3b7e4aa4f492509a4952029cd8e48019ad/commons-io-2.4.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.9/3f15fff45d57656685abfee9e8302bf14580044c/commons-codec-1.9-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.9/9ce04e34240f674bc72680f8b843b1457383161a/commons-codec-1.9.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput/2.0.5/82604cfeb87b9ab70ed70aa19a137de8ceb21504/jinput-2.0.5-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput/2.0.5/39c7796b469a600f72380316f6b1f11db6c2c7c4/jinput-2.0.5.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/d18678a00b216863206a1bb6190507e02a32971b/jutils-1.0.0-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/e12fe1fda814bd348c1579329c86943d2cd3c6a6/jutils-1.0.0.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.2.4/a6dc5db8a12928e583bd3f23e72d3ab611ecd58f/gson-2.2.4-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.2.4/a60a5e993c98c864010053cb901b7eab25306568/gson-2.2.4.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.16/f7d1af1fd1232bb4f2e7898f059b536ad5bc950/authlib-1.5.16-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.16/ef1582b11fd0943d069cdcb72e99008ac209a283/authlib-1.5.16.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.0-beta9/c6682b8a47ddd9f29108838aed0dc8e0ffdedf68/log4j-api-2.0-beta9-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.0-beta9/1dd66e68cccd907880229f9e2de1314bd13ff785/log4j-api-2.0-beta9.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.0-beta9/c7da50fd52d6ee6991a0e16e2df1431f7656a7f4/log4j-core-2.0-beta9-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.0-beta9/678861ba1b2e1fccb594bb0ca03114bb05da9695/log4j-core-2.0-beta9.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl/2.9.1/ccedb5b6f96913c6f78bc10249e747ded90baa51/lwjgl-2.9.1-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl/2.9.1/f58c5aabcef0e41718a564be9f8e412fff8db847/lwjgl-2.9.1.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl_util/2.9.1/9f350d8a760247f2ae88e996b55f8f7121346c79/lwjgl_util-2.9.1-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl_util/2.9.1/290d7ba8a1bd9566f5ddf16ad06f09af5ec9b20e/lwjgl_util-2.9.1.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/tv.twitch/twitch/5.16/1f55f009c61637c10c0acfb8b5ffc600f30044b4/twitch-5.16.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/appeng/appliedenergistics2/rv2-beta-33/8c859856847e4a5d2890f322455278e1d19da05c/appliedenergistics2-rv2-beta-33-dev.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/codechicken/CodeChickenLib/1.7.10-1.1.3.140/4a9f6d573d85b066647a93a6018ccb49c8981b20/CodeChickenLib-1.7.10-1.1.3.140-dev.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/codechicken/CodeChickenCore/1.7.10-1.0.7.47/3f4dff5483cf69915b761ee5a9e9f1865b03b6c4/CodeChickenCore-1.7.10-1.0.7.47-dev.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.industrial-craft/industrialcraft-2/2.2.790-experimental/4244500740e1f3a103ab37615bf7ca4655fdad7c/industrialcraft-2-2.2.790-experimental-dev.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.sengir.forestry/forestry_1.7.10/4.2.10.58/f7320cd71dc86d0b3e510803c69862bee27474/forestry_1.7.10-4.2.10.58-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.sengir.forestry/forestry_1.7.10/4.2.10.58/9ac1f9ef89417f3c30218f0d8ee30cd34c713f65/forestry_1.7.10-4.2.10.58-dev.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/applecore/AppleCore/1.7.10-1.2.1+107.59407/84686a36256ae410190e9a49963935cc6ad8df37/AppleCore-1.7.10-1.2.1+107.59407-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/applecore/AppleCore/1.7.10-1.2.1+107.59407/cd26be8a9d3c185e267fb4c2b7ab98c611d92780/AppleCore-1.7.10-1.2.1+107.59407-api.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.enderio.core/EnderCore/1.7.10-0.1.0.25_beta/fb0a8c2e27934b105bdd7ec70b1200aa1cef8554/EnderCore-1.7.10-0.1.0.25_beta-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.enderio.core/EnderCore/1.7.10-0.1.0.25_beta/ef060b49862c4fbbe18de29261f05023d3ff6cdb/EnderCore-1.7.10-0.1.0.25_beta-dev.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.enderio/EnderIO/1.7.10-2.3.0.417_beta/2ba6c92a98a0df984b3153133bbc48b796fee924/EnderIO-1.7.10-2.3.0.417_beta-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/com.enderio/EnderIO/1.7.10-2.3.0.417_beta/41f961b24ad01af627d2b5bd41b4790a5a5909ac/EnderIO-1.7.10-2.3.0.417_beta-dev.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/buildcraft/7.1.11/bc5f1a5d6121f0a18f7815ec693d91306f9c398c/buildcraft-7.1.11-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/buildcraft/7.1.11/4d70356dd35e2b1c32ee0c390ec2b7247a778470/buildcraft-7.1.11-dev.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/CoFHLib/[1.7.10]1.0.3-175-dev/8dc3e8af490e428ea5831fe155f14c2b6117d799/CoFHLib-[1.7.10]1.0.3-175-dev.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/CoFHLib/[1.7.10]1.0.3-175-dev/8dc3e8af490e428ea5831fe155f14c2b6117d799/CoFHLib-[1.7.10]1.0.3-175-dev.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/CoFHCore/[1.7.10]3.0.3-303-dev/646df6effc560769380a145a2781f606213ac7ea/CoFHCore-[1.7.10]3.0.3-303-dev.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/CoFHCore/[1.7.10]3.0.3-303-dev/646df6effc560769380a145a2781f606213ac7ea/CoFHCore-[1.7.10]3.0.3-303-dev.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/Railcraft/1.7.10-9.4.0.0/72f8f4c050a945579443d6fcd1d77c7f08113f4c/Railcraft-1.7.10-9.4.0.0.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/Railcraft/1.7.10-9.4.0.0/72f8f4c050a945579443d6fcd1d77c7f08113f4c/Railcraft-1.7.10-9.4.0.0.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/IC2NuclearControl/2.3.4a/ec152053239fb4a8c65907620ad4c1eea73bbdb5/IC2NuclearControl-2.3.4a.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/IC2NuclearControl/2.3.4a/ec152053239fb4a8c65907620ad4c1eea73bbdb5/IC2NuclearControl-2.3.4a.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors/2.11.0/e1dfa274766d5278166b0d660294fe96396693b2/scala-actors-2.11.0-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors/2.11.0/8ccfb6541de179bb1c4d45cf414acee069b7f78b/scala-actors-2.11.0.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-xml_2.11/1.0.2/312c3557d1ca0b34820f3b3fc5404a47936ceb26/scala-xml_2.11-1.0.2-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-xml_2.11/1.0.2/820fbca7e524b530fdadc594c39d49a21ea0337e/scala-xml_2.11-1.0.2.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-parser-combinators_2.11/1.0.1/34d013c02d0b73794ba2911552896dd9c00f34c3/scala-parser-combinators_2.11-1.0.1-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-parser-combinators_2.11/1.0.1/f05d7345bf5a58924f2837c6c1f4d73a938e1ff0/scala-parser-combinators_2.11-1.0.1.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/7ff832a6eb9ab6a767f1ade2b548092d0fa64795/jinput-platform-2.0.5-natives-linux.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/385ee093e01f587f30ee1c8a2ee7d408fd732e16/jinput-platform-2.0.5-natives-windows.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/53f9c919f34d2ca9de8c51fc4e1e8282029a9232/jinput-platform-2.0.5-natives-osx.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/tv.twitch/twitch-platform/5.16/7c6affe439099806a4f552da14c42f9d643d8b23/twitch-platform-5.16-natives-windows-32.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/tv.twitch/twitch-platform/5.16/39d0c3d363735b4785598e0e7fbf8297c706a9f9/twitch-platform-5.16-natives-windows-64.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/tv.twitch/twitch-platform/5.16/62503ee712766cf77f97252e5902786fd834b8c5/twitch-platform-5.16-natives-osx.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/tv.twitch/twitch-external-platform/4.5/18215140f010c05b9f86ef6f0f8871954d2ccebf/twitch-external-platform-4.5-natives-windows-32.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/tv.twitch/twitch-external-platform/4.5/c3cde57891b935d41b6680a9c5e1502eeab76d86/twitch-external-platform-4.5-natives-windows-64.jar" exported="true"/>
- <classpathentry sourcepath="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.16.4/450329f3f47a26833270f49da5f9acc5d3d6bb37/lombok-1.16.4-sources.jar" kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.16.4/398110b5c579cc69d7be47600c2ff810c5c34487/lombok-1.16.4.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.1/4c517eca808522457dd95ee8fc1fbcdbb602efbe/lwjgl-platform-2.9.1-natives-windows.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.1/aa9aae879af8eb378e22cfc64db56ec2ca9a44d1/lwjgl-platform-2.9.1-natives-linux.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.1/2d12c83fdfbc04ecabf02c7bc8cc54d034f0daac/lwjgl-platform-2.9.1-natives-osx.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/modules-2/files-2.1/codechicken/NotEnoughItems/1.7.10-1.0.5.111/a98cb4436882cfa8257d5b72938f65414248fd40/NotEnoughItems-1.7.10-1.0.5.111-dev.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/Source/minecraft/DetravScannerMod/libs/gregtech-5.09.22-dev.jar" exported="true"/>
- <classpathentry kind="lib" path="C:/Users/wital_000/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/start" exported="true"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 482fd9afff..656f5903f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
.gradle
-build/
# Ignore Gradle GUI config
gradle-app.setting
@@ -75,3 +74,13 @@ tmp/
libsrc/
out/
*.bat
+.classpath
+.settings
+libs/
+build/*
+bin/
+'.classpath'
+"
+.classpath"
+*
+.classpath \ No newline at end of file
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 3a9a8e8ca8..9285c6556e 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,10 @@
#
-#Sun Jul 10 12:13:28 MSK 2016
+#Thu Apr 19 03:42:11 CEST 2018
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
diff --git a/build.gradle b/build.gradle
index 62040659fa..a96585e8e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,9 +16,9 @@ buildscript {
}
apply plugin: 'forge'
-apply plugin: 'idea'
+//apply plugin: 'idea'
-idea.module.inheritOutputDirs = true
+//idea.module.inheritOutputDirs = true
file "build.properties" withReader {
def prop = new Properties()
@@ -73,10 +73,10 @@ repositories {
name 'CoFHCore'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]"
}
- ivy {
- name 'Railcraft'
- artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]"
- }
+ //ivy {
+ // name 'Railcraft'
+ // artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]"
+ //}
ivy {
name 'IC2NuclearControl'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.nc.cf}/[module]-[revision].[ext]"
@@ -100,7 +100,7 @@ dependencies {
provided name: 'buildcraft', version: config.buildcraft.version, classifier: "dev", ext: 'jar'
provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
- provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar'
+ //provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar'
provided name: 'IC2NuclearControl', version: config.nc.version, ext: 'jar'
}
diff --git a/build.properties b/build.properties
index 5c52b933c6..eca05b7a51 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
minecraft.version=1.7.10
-forge.version=10.13.4.1566-1.7.10
+forge.version=10.13.4.1614-1.7.10
-detravscanner.version=1.4.1
+detravscanner.version=1.4.2
ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407
diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index a74e435141..61b662ef27 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -1,8 +1,13 @@
package com.detrav;
+import org.apache.logging.log4j.LogManager;
+
+import com.detrav.net.DetravNetwork;
import com.detrav.proxies.CommonProxy;
import com.detrav.utils.DetravCreativeTab;
-import com.detrav.net.DetravNetwork;
+import com.detrav.utils.GTppHelper;
+
+import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.SidedProxy;
@@ -14,14 +19,16 @@ import gregtech.api.GregTech_API;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.config.Configuration;
-@Mod(modid = DetravScannerMod.MODID, version = DetravScannerMod.VERSION,dependencies = "required-after:IC2;required-after:gregtech")
+@Mod(modid = DetravScannerMod.MODID, version = DetravScannerMod.VERSION,dependencies = "required-after:IC2;required-after:gregtech;after:miscutils")
public class DetravScannerMod
{
public static final String MODID = "detravscannermod";
- public static final String VERSION = "1.3";
+ public static final String VERSION = "1.4.2";
public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
+ public static final org.apache.logging.log4j.Logger Logger = LogManager.getLogger("GT Scanner Mod");
+
@SidedProxy(clientSide = "com.detrav.proxies.ClientProxy", serverSide = "com.detrav.proxies.ServerProxy")
public static CommonProxy proxy;
@@ -64,6 +71,8 @@ public class DetravScannerMod
@EventHandler
public void onPostLoad(FMLPostInitializationEvent aEvent) {
proxy.onPostLoad();
+ if (Loader.isModLoaded("miscutils"))
+ GTppHelper.generate_OreIDs();
}
}
diff --git a/src/main/java/com/detrav/gui/DetravGuiProPick.java b/src/main/java/com/detrav/gui/DetravGuiProPick.java
index 9c95fa13cd..b62be499fe 100644
--- a/src/main/java/com/detrav/gui/DetravGuiProPick.java
+++ b/src/main/java/com/detrav/gui/DetravGuiProPick.java
@@ -1,16 +1,18 @@
package com.detrav.gui;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import org.lwjgl.opengl.GL11;
+
import com.detrav.gui.textures.DetravMapTexture;
+
import cpw.mods.fml.client.GuiScrollingList;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
/**
* Created by wital_000 on 21.03.2016.
diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
index 7696e67d43..58d69260ce 100644
--- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
+++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
@@ -1,15 +1,17 @@
package com.detrav.gui.textures;
+import java.awt.image.BufferedImage;
+import java.util.HashMap;
+
+import org.lwjgl.opengl.GL11;
+
import com.detrav.net.DetravProPickPacket00;
+
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.AbstractTexture;
import net.minecraft.client.renderer.texture.TextureUtil;
import net.minecraft.client.resources.IResourceManager;
-import org.lwjgl.opengl.GL11;
-
-import java.awt.image.BufferedImage;
-import java.util.HashMap;
/**
* Created by wital_000 on 21.03.2016.
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index 70b5296e00..3a588aa74f 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -1,8 +1,15 @@
package com.detrav.items.behaviours;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import com.detrav.DetravScannerMod;
import com.detrav.items.DetravMetaGeneratedTool01;
import com.detrav.net.DetravNetwork;
import com.detrav.net.DetravProPickPacket00;
+import com.detrav.utils.GTppHelper;
+
import gregtech.api.items.GT_MetaBase_Item;
import gregtech.api.objects.ItemData;
import gregtech.api.util.GT_LanguageManager;
@@ -10,6 +17,8 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.common.GT_UndergroundOil;
import gregtech.common.blocks.GT_Block_Ores_Abstract;
import gregtech.common.blocks.GT_TileEntity_Ores;
+import gtPlusPlus.core.block.base.BlockBaseOre;
+import gtPlusPlus.core.material.Material;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -21,10 +30,6 @@ import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.fluids.FluidStack;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
/**
* Created by wital_000 on 19.03.2016.
*/
@@ -34,8 +39,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
super(aCosts);
}
- public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-
+ public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
if (!aWorld.isRemote) {
int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue();
if (aPlayer.isSneaking()) {
@@ -88,7 +92,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
int ySize = c.getHeightValue(x, z);//(int)aPlayer.posY;//c.getHeightValue(x, z);
for (int y = 1; y < ySize; y++) {
switch (data) {
- case 0:
+ case 0:
case 1:
Block tBlock = c.getBlock(x,y,z);
short tMetaID = (short)c.getBlockMetadata(x,y,z);
@@ -112,6 +116,17 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
}
}
}
+ else if (tBlock instanceof BlockBaseOre) {
+ Short packaged = 0;
+ Material m = ((BlockBaseOre) tBlock).getMaterialEx();
+ packaged = GTppHelper.encodeoresGTpp.get(m);
+ try {
+ packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) (packaged+7000));
+ }
+ catch(Exception e) {
+
+ }
+ }
else if (data == 1) {
ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
@@ -142,7 +157,8 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution);
break;
}
- if (data > 1) break;
+ if (data > 1)
+ break;
}
}
}
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index c4a12e42bd..5dd8ddd55d 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -1,6 +1,10 @@
package com.detrav.items.behaviours;
+import java.util.HashMap;
+import java.util.Random;
+
import com.detrav.items.DetravMetaGeneratedTool01;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.items.GT_MetaBase_Item;
@@ -12,6 +16,7 @@ import gregtech.common.GT_UndergroundOil;
import gregtech.common.blocks.GT_Block_Ores_Abstract;
import gregtech.common.blocks.GT_TileEntity_Ores;
import gregtech.common.items.behaviors.Behaviour_None;
+import gtPlusPlus.core.block.base.BlockBaseOre;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
@@ -23,9 +28,6 @@ import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.fluids.FluidStack;
-import java.util.HashMap;
-import java.util.Random;
-
/**
* Created by wital_000 on 19.03.2016.
*/
@@ -137,6 +139,15 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
}
}
}
+ } else if (tBlock instanceof BlockBaseOre) {
+ String name = tBlock.getLocalizedName();
+ if (!ores.containsKey(name))
+ ores.put(name, 1);
+ else {
+ int val = ores.get(name);
+ ores.put(name, val + 1);
+ }
+
} else if (data == 1) {
tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java
index 385ad71e95..1631e98dc3 100644
--- a/src/main/java/com/detrav/net/DetravProPickPacket00.java
+++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java
@@ -3,15 +3,19 @@ package com.detrav.net;
import com.detrav.DetravScannerMod;
import com.detrav.gui.DetravGuiProPick;
import com.detrav.gui.textures.DetravMapTexture;
+import com.detrav.utils.GTppHelper;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.ORES;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
+import java.lang.reflect.Field;
import java.util.HashMap;
@@ -24,7 +28,7 @@ public class DetravProPickPacket00 extends DetravPacket {
public int size;
public int ptype;
HashMap<Byte,Short>[][] map = null;
-
+
@Override
public int getPacketID() {
return 0;
@@ -96,10 +100,12 @@ public class DetravProPickPacket00 extends DetravPacket {
}
public void addBlock(int x, int y, int z, short metaData) {
- if(map == null) map = new HashMap[(size*2+1)*16][(size*2+1)*16];
+ if(map == null)
+ map = new HashMap[(size*2+1)*16][(size*2+1)*16];
int aX = x - (chunkX-size)*16;
int aZ = z - (chunkZ-size)*16;
- if(map[aX][aZ] == null) map[aX][aZ] = new HashMap<Byte, Short>();
+ if(map[aX][aZ] == null)
+ map[aX][aZ] = new HashMap<Byte, Short>();
map[aX][aZ].put((byte)y,metaData);
//String key = String.format(("x_y"))
}
@@ -133,11 +139,18 @@ public class DetravProPickPacket00 extends DetravPacket {
String name;
short[] rgba;
Materials tMaterial = null;
+ gtPlusPlus.core.material.Material pMaterial = null;
try {
- tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];
+ if (meta<7000||meta>7500) {
+ tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];
+ } else {
+ Short l = (short) (meta-7000);
+ pMaterial = GTppHelper.decodeoresGTpp.get(l);
+ }
} catch (Exception e) {
tMaterial = null;
}
+ if (meta<7000||meta>7500) {
if (tMaterial == null) {
exception++;
continue;
@@ -145,13 +158,31 @@ public class DetravProPickPacket00 extends DetravPacket {
rgba = tMaterial.getRGBA();
//ores.put(GT_Ore)
name = tMaterial.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name"));
-
+
raster.setSample(i, j, 0, rgba[0]);
raster.setSample(i, j, 1, rgba[1]);
raster.setSample(i, j, 2, rgba[2]);
raster.setSample(i, j, 3, 255);
if (!ores.containsKey(name))
ores.put(name, (0xFF << 24) + ((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF)));
+ }
+ else{
+ if (pMaterial == null) {
+ exception++;
+ continue;
+ }
+ rgba = pMaterial.getRGBA();
+ //ores.put(GT_Ore)
+ name = pMaterial.getLocalizedName() + " Ore";
+
+ raster.setSample(i, j, 0, rgba[0]);
+ raster.setSample(i, j, 1, rgba[1]);
+ raster.setSample(i, j, 2, rgba[2]);
+ raster.setSample(i, j, 3, 255);
+ if (!ores.containsKey(name))
+ ores.put(name, (0xFF << 24) + ((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF)));
+ }
+
}
}
if (playerI == i || playerJ == j) {
diff --git a/src/main/java/com/detrav/utils/GTppHelper.java b/src/main/java/com/detrav/utils/GTppHelper.java
new file mode 100644
index 0000000000..e3704671e4
--- /dev/null
+++ b/src/main/java/com/detrav/utils/GTppHelper.java
@@ -0,0 +1,29 @@
+package com.detrav.utils;
+
+import java.util.HashMap;
+
+import com.detrav.DetravScannerMod;
+
+import gtPlusPlus.core.material.Material;
+
+/**
+ * Created by bartimaeusnek on 19.04.2018.
+ */
+public class GTppHelper {
+ public static HashMap<Short,Material> decodeoresGTpp = new HashMap<Short,Material>();
+ public static HashMap<Material,Short> encodeoresGTpp = new HashMap<Material,Short>();
+
+ public static void generate_OreIDs() {
+ for (short n=0;n<gtPlusPlus.core.material.ORES.class.getFields().length;++n) {
+ try {
+ Short i = (short) (n+1);
+ Material m = ((Material)gtPlusPlus.core.material.ORES.class.getFields()[n].get(gtPlusPlus.core.material.ORES.class.getFields()[n]));
+ decodeoresGTpp.put(i,m);
+ encodeoresGTpp.put(m,i);
+ } catch (Exception e) {
+ }
+
+ }
+ }
+
+}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 4d3750bd65..618df6eb4e 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,11 +3,11 @@
"modid": "detravscannermod",
"name": "GT Scanner Mod",
"description": "To locate ores deep underground.",
- "version": "1.3",
+ "version": "1.4.2",
"mcversion": "1.7.10",
"url": "https://github.com/GTNewHorizons/GTScannerMod",
"updateUrl": "",
- "authorList": ["Ethryan, GTNewHorizons Team"],
+ "authorList": ["Ethryan, GTNewHorizons Team, bartimaeusnek"],
"credits": "Detrav",
"logoFile": "",
"screenshots": [],
generated by cgit (git 2.46.0) at 2025-05-25 19:53:33 +0000