From dd1cc776226c2022b5a0d795c5bb5b02cede987a Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Wed, 14 Jun 2017 22:53:29 +1000
Subject: + Added a Pollution Detector. - Disabled some unused Gregtech Tile
 Entities. % Refactored some classes to be in better locations.

---
 .../gregtech/GregtechEnergyBuffer.java             |  4 ++--
 .../gregtech/GregtechPollutionDetector.java        | 24 ++++++++++++++++++++++
 .../registration/gregtech/GregtechSafeBlock.java   |  2 +-
 .../gregtech/GregtechSteamCondenser.java           |  2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDetector.java

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/registration')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 133695204f..e6c183c5ad 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -6,8 +6,8 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer;
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.creative.GregtechMetaCreativeEnergyBuffer;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer;
 
 public class GregtechEnergyBuffer
 {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDetector.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDetector.java
new file mode 100644
index 0000000000..84e27c1c26
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDetector.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaCondensor;
+
+public class GregtechPollutionDetector {
+
+	public static void run(){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+			Utils.LOG_INFO("Gregtech5u Content | Registering Pollution Detector.");
+			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+				run1();
+			}
+		}
+	}
+
+	private static void run1(){
+		//759
+		GregtechItemList.Pollution_Detector.set(new GregtechMetaCondensor(759, "pollutiondetector.01.tier.single", "Pollution Detection Device").getStackForm(1L));
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
index 3f20fa7a25..7cf3cc11b3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
@@ -5,7 +5,7 @@ import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock;
 
 public class GregtechSafeBlock
 {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
index 7671ea5a68..6831143906 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaCondensor;
 
 public class GregtechSteamCondenser
 {
-- 
cgit