+ Adds GT ores support

Relvl · Relvl · commit 4da04e0ec414 · 2022-11-21T00:47:03.000+05:00
* Fixed id meta store
diff --git a/.run/Minecraft Client.run.xml b/.run/Minecraft Client.run.xml
@@ -3,8 +3,18 @@
     <option name="MAIN_CLASS_NAME" value="GradleStart" />
     <module name="XRay-Mod.main" />
     <option name="PROGRAM_PARAMETERS" value="--username Johnson" />
-    <option name="VM_PARAMETERS" value="-Xincgc -Xmx1024M -Xms1024M" />
+    <option name="VM_PARAMETERS" value="-Xincgc -Xmx4092M -Xms4092M" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/eclipse" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+      </ENTRIES>
+    </extension>
     <RunnerSettings RunnerId="Run" />
     <ConfigurationWrapper RunnerId="Run" />
     <method v="2">
diff --git a/.run/Minecraft Server.run.xml b/.run/Minecraft Server.run.xml
@@ -4,6 +4,16 @@
     <module name="XRay-Mod.main" />
     <option name="VM_PARAMETERS" value="-Xincgc -Dfml.ignoreInvalidMinecraftCertificates=true" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/eclipse" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+      </ENTRIES>
+    </extension>
     <RunnerSettings RunnerId="Run" />
     <ConfigurationWrapper RunnerId="Run" />
     <method v="2">
diff --git a/.run/XRay-Mod [build].run.xml b/.run/XRay-Mod [build].run.xml
@@ -0,0 +1,35 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="XRay-Mod [build]" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="build" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
+      <extension name="net.ashald.envfile">
+        <option name="IS_ENABLED" value="false" />
+        <option name="IS_SUBST" value="false" />
+        <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+        <option name="IS_IGNORE_MISSING_FILES" value="false" />
+        <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+        <ENTRIES>
+          <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+        </ENTRIES>
+      </extension>
+    </EXTENSION>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/README.md b/README.md
@@ -1,45 +1,51 @@
 ## Minecraft advanced X-Ray cheat
+
 Minecraft Forge XRay mod for 1.7.10
 
 I WILL NOT port this mod to MC version 1.8+ until GTNH don't (never).
 
 Mod id and file name DO NOT CONTAIN 'xray' or 'cheat' words and sometime will be changed.
 
 ## Features:
+
     - Awesome GUI
     - Customizable search radius
     - Fancy detection render
     - Able to add/remove/edit ores/blocks
     - Color selector (RGB)
     - Hotkeys to enable/disable options
     - Can limit height of blocks searching
+    - GregTech ores detection (at leaset for GT5Unoficial, GTNH pack)
 
 Tested with:
- - Vanilla Minecraft 1.7.10 with Forge
- - GT: New Horizins modpack
- 
+
+- Vanilla Minecraft 1.7.10 with Forge
+- GT: New Horizins modpack
+
 <details>
     <summary>Screenshots</summary>
-    
+
 ![image](https://user-images.githubusercontent.com/4003026/154060596-d7078d2a-8c50-4f83-8df4-2f353b312ddb.png)
 ![image](https://user-images.githubusercontent.com/4003026/154060841-21fbdb89-3bf4-4eb9-b8f2-6eb5743c16af.png)
-    
+
 </details>
-    
+
 ## Todo:
+
     - Add entity detection
     - Add dropped item detection
-    - Add GT ores detection
-    - Add fast commands menu
 
 ## Gradle build
+
     If you dont have cached mc files (that was removed from the amazon) read this (russian): https://forum.mcmodding.ru/resources/fajly-dlja-forgegradle.300/
-1. Run graddle task `setupDecompWorkspace`
-2. Update graddle project
+
+1. Run gradle task `setupDecompWorkspace`
+2. Update gradle project
 3. Create directory `eclipse` if needed
 4. Run `minecraft client` debugging
 
 ## License
+
 Licensed under the [DBaJ (Don't Be a Jerk) non-commercial care-free license](http://www.dbad-license.org/).
 
 The rendering is copied off of CJB's MoreInfo mod. Thanks CJB!
diff --git a/build.gradle b/build.gradle
@@ -1,59 +1,60 @@
 buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "https://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-        maven {
-            name = "maven"
-            url = "https://repo1.maven.org/maven2"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
+  repositories {
+    mavenCentral()
+    maven { url = "https://files.minecraftforge.net/maven" }
+    maven { url = "https://repo1.maven.org/maven2" }
+    maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
+  }
+  dependencies {
+    classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+  }
 }
 
 repositories {
-    maven {
-        name = "maven"
-        url = "https://repo1.maven.org/maven2"
-    }
+  maven { url = "https://repo1.maven.org/maven2" }
+  maven { url = "https://gregtech.overminddl1.com/" }
+  maven { url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" }
+  maven { url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases" }
 }
 
 apply plugin: 'forge'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 group = "io.github.relvl"
-version = "1.0.2"
+version = "1.0.3"
 archivesBaseName = "schematica-advancement-1.7.10"
 
 minecraft {
-    version = "1.7.10-10.13.4.1558-1.7.10"
-    runDir = "eclipse"
+  version = "1.7.10-10.13.4.1558-1.7.10"
+  runDir = "eclipse"
+}
+
+dependencies {
+  // this mod ONLY for confortable testing and do not required in any case
+  compile('com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev')
+  compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.17:dev')
+  compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+  compile('com.github.GTNewHorizons:WAWLA:1.1.3-GTNH:dev')
+  compile('com.github.GTNewHorizons:WAILAPlugins:0.2.5:dev')
+  compile('com.github.GTNewHorizons:waila:1.5.22:dev')
 }
 
 processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace version and mcversion
-        expand 'version': project.version, 'mcversion': project.minecraft.version
-    }
-
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
+  // this will ensure that this task is redone when the versions change.
+  inputs.property "version", project.version
+  inputs.property "mcversion", project.minecraft.version
+
+  // replace stuff in mcmod.info, nothing else
+  from(sourceSets.main.resources.srcDirs) {
+    include 'mcmod.info'
+
+    // replace version and mcversion
+    expand 'version': project.version, 'mcversion': project.minecraft.version
+  }
+
+  // copy everything else, thats not the mcmod.info
+  from(sourceSets.main.resources.srcDirs) {
+    exclude 'mcmod.info'
+  }
 }
diff --git a/src/main/java/io/github/relvl/schematicaadvancement/client/ClientTick.java b/src/main/java/io/github/relvl/schematicaadvancement/client/ClientTick.java
@@ -1,5 +1,6 @@
 package io.github.relvl.schematicaadvancement.client;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,13 +11,13 @@
 import io.github.relvl.schematicaadvancement.reference.ColoredPosition;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 
 public class ClientTick implements Runnable {
     private static final int DELAY = 200;
 
     private volatile int localPlyX;
-    private volatile int localPlyY;
     private volatile int localPlyZ;
 
     private final Minecraft mc = Minecraft.getMinecraft();
@@ -27,7 +28,6 @@ public class ClientTick implements Runnable {
     public void tickEnd(TickEvent.ClientTickEvent event) {
         if ((event.phase == TickEvent.Phase.END) && (mc.thePlayer != null)) {
             localPlyX = MathHelper.floor_double(mc.thePlayer.posX);
-            localPlyY = MathHelper.floor_double(mc.thePlayer.posY);
             localPlyZ = MathHelper.floor_double(mc.thePlayer.posZ);
 
             if (ConfigHandler.globalEnabled && ((this.thread == null) || !this.thread.isAlive()) && ((mc.theWorld != null))) {
@@ -45,21 +45,42 @@ public void run() {
             while (!this.thread.isInterrupted()) {
                 if (ConfigHandler.globalEnabled && !ConfigHandler.blocks.isEmpty() && (mc != null) && (mc.theWorld != null) && (mc.thePlayer != null)) {
                     if (nextTimeMs > System.currentTimeMillis()) {
+                        //noinspection BusyWait
                         Thread.sleep(1);
                         continue;
                     }
 
-                    List<ColoredPosition> temp = new ArrayList<ColoredPosition>();
+                    List<ColoredPosition> temp = new ArrayList<>();
                     int radius = ConfigHandler.getRadius();
                     int px = localPlyX;
-                    int py = localPlyY;
                     int pz = localPlyZ;
                     for (int y = ConfigHandler.getLowHeight(); y <= ConfigHandler.getHighHeight(); y++) {
                         for (int x = px - radius; x < px + radius; x++) {
                             for (int z = pz - radius; z < pz + radius; z++) {
                                 int id = Block.getIdFromBlock(mc.theWorld.getBlock(x, y, z));
                                 int meta = mc.theWorld.getBlockMetadata(x, y, z);
 
+                                if (mc.theWorld.getBlock(x, y, z).getUnlocalizedName().equals("gt.blockores")) {
+                                    TileEntity et = mc.theWorld.getTileEntity(x, y, z);
+                                    if (et != null) {
+                                        Field f = et.getClass().getDeclaredField("mMetaData");
+                                        //noinspection ConstantConditions
+                                        if (f == null) {
+                                            for (Field field : et.getClass().getDeclaredFields()) {
+                                                if (field.getType() == Short.TYPE) {
+                                                    f = field;
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                        //noinspection ConstantConditions
+                                        if (f != null) {
+                                            f.setAccessible(true);
+                                            meta = f.getShort(et);
+                                        }
+                                    }
+                                }
+
                                 for (BlockInfo ore : ConfigHandler.blocks) {
                                     if (ore.enabled && ore.getIdent().equals(id, meta)) {
                                         temp.add(new ColoredPosition(x, y, z, ore.color));
diff --git a/src/main/java/io/github/relvl/schematicaadvancement/config/ConfigHandler.java b/src/main/java/io/github/relvl/schematicaadvancement/config/ConfigHandler.java
@@ -101,15 +101,10 @@ public static void addBlock(String name, Ident ident, int color) {
 
     public static void update(BlockInfo info) {
         String categoryName = "blocks." + info.getIdent().getIdentPair();
-        for (String category : config.getCategoryNames()) {
-            if (category.startsWith("blocks.")) {
-                config.get(categoryName, "name", "").set(info.name);
-                config.get(categoryName, "color", -1).set(info.color);
-                config.get(categoryName, "enabled", false).set(info.enabled);
-                config.save();
-                break;
-            }
-        }
+        config.get(categoryName, "name", "").set(info.name);
+        config.get(categoryName, "color", -1).set(info.color);
+        config.get(categoryName, "enabled", false).set(info.enabled);
+        config.save();
     }
 
     public static void remove(BlockInfo info) {
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
         "modid": "schematica-advancement",
         "name": "Schematica Advancement",
         "description": "An advanced Schematica plugin",
-        "version": "1.0.2",
+        "version": "1.0.3",
         "mcversion": "1.7.10",
         "url": "https://github.com/Relvl/XRay-Mod",
         "updateUrl": "",
