From 6db06249fbede596ad278a03a29b1fb4aac27073 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Wed, 18 Apr 2018 18:05:17 +0200
Subject: Try to make GT++ Ores work + Version increase
---
.classpath | 82 ----------------------
.gitignore | 11 ++-
.settings/org.eclipse.jdt.core.prefs | 2 +-
build.gradle | 14 ++--
build.properties | 2 +-
.../BehaviourDetravToolElectricProPick.java | 4 ++
.../behaviours/BehaviourDetravToolProPick.java | 10 +++
.../java/com/detrav/net/DetravProPickPacket00.java | 46 ++++++++++--
8 files changed, 74 insertions(+), 97 deletions(-)
delete mode 100644 .classpath
diff --git a/.classpath b/.classpath
deleted file mode 100644
index 15f7cbed06..0000000000
--- a/.classpath
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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..5f861aea4f 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
#
-#Sun Jul 10 12:13:28 MSK 2016
+#Wed Apr 18 13:37:53 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
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..58c9c097cd 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
-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/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index 70b5296e00..8b8732a848 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -10,6 +10,7 @@ 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 net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -112,6 +113,9 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
}
}
}
+ else if (tBlock instanceof BlockBaseOre) {
+ packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, new Short((short) (7000+(short) ((BlockBaseOre) tBlock).getMaterialEx().calculateProtons())));
+ }
else if (data == 1) {
ItemData 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/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index c4a12e42bd..16b6a94e5d 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -12,6 +12,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;
@@ -137,6 +138,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..583e2b58a6 100644
--- a/src/main/java/com/detrav/net/DetravProPickPacket00.java
+++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java
@@ -9,9 +9,12 @@ 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 +27,7 @@ public class DetravProPickPacket00 extends DetravPacket {
public int size;
public int ptype;
HashMap[][] map = null;
-
+
@Override
public int getPacketID() {
return 0;
@@ -96,10 +99,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();
+ if(map[aX][aZ] == null)
+ map[aX][aZ] = new HashMap();
map[aX][aZ].put((byte)y,metaData);
//String key = String.format(("x_y"))
}
@@ -133,11 +138,24 @@ 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>10000 || meta<7000) {
+ tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];
+ } else {
+ short l = (short) (meta-7000);
+ for (Field g : gtPlusPlus.core.material.ORES.class.getFields()) {
+ if (g.get(g) instanceof gtPlusPlus.core.material.Material) {
+ gtPlusPlus.core.material.Material p = (Material) g.get(g);
+ if ((short)p.calculateProtons() == l)
+ pMaterial = p;
+ }
+ }
+ }
} catch (Exception e) {
tMaterial = null;
}
+ if (meta>10000 || meta<7000) {
if (tMaterial == null) {
exception++;
continue;
@@ -145,13 +163,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) {
--
cgit