+More classes stolen from GT to implement my own items on a metaitem.

+Added LuV -> Max Voltage Machine components.
+Added Rocket Engines, High tier diesel generators.
+Added new textures for everything.
+Added BedLocator_Base.java - Debug item for testing and NBT data storage.
+Added Machine_Charger.java - Another Debug machine for testing NBT value manipulation.

7 files changed, 50 insertions, 9 deletions

diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
index 9035039cdf..078c3984ac 100644
--- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
@@ -24,6 +24,7 @@ import miscutil.core.handler.registration.gregtech.GregtechEnergyBuffer;
 import miscutil.core.handler.registration.gregtech.GregtechIndustrialCentrifuge;
 import miscutil.core.handler.registration.gregtech.GregtechIndustrialCokeOven;
 import miscutil.core.handler.registration.gregtech.GregtechIndustrialPlatePress;
+import miscutil.core.handler.registration.gregtech.GregtechRocketFuelGenerator;
 import miscutil.core.handler.registration.gregtech.GregtechSafeBlock;
 import miscutil.core.handler.registration.gregtech.GregtechSteamCondenser;
 import miscutil.core.item.ModItems;
@@ -34,6 +35,7 @@ import miscutil.core.recipe.ShapedRecipeObject;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
+import miscutil.gregtech.common.items.MetaGeneratedGregtechItems;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -71,6 +73,7 @@ public class COMPAT_HANDLER {
 	
 	public static void registerGregtechMachines() {
 		if (Gregtech) {
+		new MetaGeneratedGregtechItems();
 		GregtechEnergyBuffer.run();
 		GregtechConduits.run();
 		GregtechSteamCondenser.run();
@@ -78,6 +81,7 @@ public class COMPAT_HANDLER {
 		GregtechIndustrialCentrifuge.run();
 		GregtechIndustrialCokeOven.run();
 		GregtechIndustrialPlatePress.run();
+		GregtechRocketFuelGenerator.run();
 		}
 
 	}
diff --git a/src/Java/miscutil/core/handler/GuiHandler.java b/src/Java/miscutil/core/handler/GuiHandler.java
index 67200c6cf3..d604f1b147 100644
--- a/src/Java/miscutil/core/handler/GuiHandler.java
+++ b/src/Java/miscutil/core/handler/GuiHandler.java
@@ -1,8 +1,11 @@
 package miscutil.core.handler;
 
+import miscutil.core.container.Container_Charger;
 import miscutil.core.container.Container_NHG;
+import miscutil.core.gui.machine.GUI_Charger;
 import miscutil.core.gui.machine.GUI_NHG;
-import miscutil.core.tileentities.TileEntityNHG;
+import miscutil.core.tileentities.machines.TileEntityCharger;
+import miscutil.core.tileentities.machines.TileEntityNHG;
 import miscutil.core.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
@@ -12,7 +15,7 @@ import cpw.mods.fml.common.network.IGuiHandler;
 public class GuiHandler implements IGuiHandler {
 
 	private static final int GUI1 = 0;      //Nuclear Helium Gen.
-	private static final int GUI2 = 1;      //Energy Buffer
+	private static final int GUI2 = 1;      //Energy Charger
 
 
 
@@ -25,7 +28,7 @@ public class GuiHandler implements IGuiHandler {
 				return new Container_NHG((TileEntityNHG)te, player);
 			}
 			else if (ID == GUI2){
-
+				return new Container_Charger((TileEntityCharger)te, player);
 			}
 
 
@@ -44,8 +47,8 @@ public class GuiHandler implements IGuiHandler {
 			return new GUI_NHG((TileEntityNHG) te, player);
 		}
 		else  if (ID == GUI2){
-			Utils.LOG_WARNING("Opening Gui with Id: "+ID+" Energy Buffer");
-			//return new GUI_Bat_Buf();
+			Utils.LOG_WARNING("Opening Gui with Id: "+ID+" Charger");
+			return new GUI_Charger((TileEntityCharger) te, player);
 		}
 		}
 		return null;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
index 06da27f8a3..324131155d 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -2,7 +2,7 @@ package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.common.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
 
 public class GregtechIndustrialCentrifuge
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
index 00aecf6415..53f540609c 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
@@ -2,7 +2,7 @@ package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.common.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
+import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
 
 public class GregtechIndustrialCokeOven
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
index c66dad598d..eba567ea42 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -1,7 +1,7 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.common.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
+import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
 
 public class GregtechIndustrialPlatePress
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
new file mode 100644
index 0000000000..79e33d5a78
--- /dev/null
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -0,0 +1,34 @@
+package miscutil.core.handler.registration.gregtech;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import miscutil.core.lib.LoadedMods;
+import miscutil.core.util.Utils;
+import miscutil.gregtech.api.enums.GregtechItemList;
+import miscutil.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
+
+public class GregtechRocketFuelGenerator {
+	
+	public static void run()
+	{
+		if (LoadedMods.Gregtech){
+			Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Industrial Rocket Engines.");
+			run1();
+		}
+
+	}
+
+	private static void run1(){
+		GregtechItemList.Rocket_Engine_EV.set(new GregtechMetaTileEntityRocketFuelGenerator(793, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4).getStackForm(1L));
+		GregtechItemList.Rocket_Engine_IV.set(new GregtechMetaTileEntityRocketFuelGenerator(794, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5).getStackForm(1L));
+		GregtechItemList.Rocket_Engine_LuV.set(new GregtechMetaTileEntityRocketFuelGenerator(795, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6).getStackForm(1L));
+
+        GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'), ItemList.Electric_Piston_LV, Character.valueOf('E'), ItemList.Electric_Motor_LV, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'), OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Titanium)});
+        GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'), ItemList.Electric_Piston_MV, Character.valueOf('E'), ItemList.Electric_Motor_MV, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'), OrePrefixes.cableGt01.get(Materials.Platinum), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.TungstenSteel)});
+        GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'), ItemList.Electric_Piston_HV, Character.valueOf('E'), ItemList.Electric_Motor_HV, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'), OrePrefixes.cableGt01.get(Materials.Tungsten), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Chrome)});
+
+	}
+	
+}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
index 652f089719..afc899410b 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
@@ -3,7 +3,7 @@ package miscutil.core.handler.registration.gregtech;
 import miscutil.core.util.Utils;
 import miscutil.gregtech.api.enums.GregtechItemList;
 import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
-import miscutil.gregtech.common.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
+import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
 
 public class GregtechSteamCondenser
 {