From cb9f0c4abfe54ef509165b13881cbd511ce946bb Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Wed, 15 Nov 2017 00:50:31 +1000
Subject: + Added 3 alternative recipes for obtaining Zirconium. (Sifting
 Tin/Cassiterite & Electromagnetic separation of Bauxite.)

---
 .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java   | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 427eb19c9a..7f0bc7a8ca 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -52,6 +52,8 @@ public class RECIPES_GREGTECH {
 		cyclotronRecipes();
 		blastSmelterRecipes();
 		advancedMixerRecipes();
+		sifterRecipes();
+		electroMagneticSeperatorRecipes();
 		addFuels();
 	}	
 
@@ -956,6 +958,49 @@ public class RECIPES_GREGTECH {
 				500*20);		
 	}
 	
+	private static void sifterRecipes() {
+		//Zirconium
+		GT_Values.RA.addSifterRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1),
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZinc", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)
+						},
+				new int[]{10000, 5000, 1500, 1000, 500, 500},
+				20*30,
+				60);	
+
+		//Zirconium
+		GT_Values.RA.addSifterRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1),
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)
+						},
+				new int[]{10000, 5000, 1500, 1000, 500, 500},
+				20*30,
+				60);
+	}
+	
+	private static void electroMagneticSeperatorRecipes(){
+		GT_Values.RA.addElectromagneticSeparatorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1),
+				new int[]{10000, 2500, 4000},
+				20*20,
+				24);
+	}
+	
 	private static void advancedMixerRecipes(){
 		//HgBa2Ca2Cu3O8
 		CORE.RA.addMixerRecipe(
-- 
cgit 


From 5c2b131a29c3ea0871ecbd400635ca0be3ebdfbe Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Wed, 15 Nov 2017 03:25:34 +1000
Subject: $ Fixed Power Sub-Station not providing very good scanner info. +
 Added stats for nerds to the PSS. + Added custom (dis)charge hatches for use
 with the PSS.

---
 .../gtPlusPlus/core/handler/COMPAT_HANDLER.java    |  2 +-
 src/Java/gtPlusPlus/core/slots/SlotElectric.java   | 43 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/Java/gtPlusPlus/core/slots/SlotElectric.java

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 9236aa53e5..788d011733 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -55,7 +55,7 @@ public class COMPAT_HANDLER {
 			to
 			868
 			---
-			886
+			890
 			to
 			950
 			*/
diff --git a/src/Java/gtPlusPlus/core/slots/SlotElectric.java b/src/Java/gtPlusPlus/core/slots/SlotElectric.java
new file mode 100644
index 0000000000..6b11cf5264
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/slots/SlotElectric.java
@@ -0,0 +1,43 @@
+package gtPlusPlus.core.slots;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import ic2.api.info.Info;
+import ic2.api.item.ElectricItem;
+import ic2.api.item.IElectricItem;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class SlotElectric extends Slot {
+	
+	public SlotElectric(final IInventory inventory, final int x, final int y, final int z) {
+		super(inventory, x, y, z);
+	}
+
+	public SlotElectric(IGregTechTileEntity mTileEntity, int i, int j, int k) {
+		this(mTileEntity.getIInventory(mTileEntity.getXCoord(), mTileEntity.getYCoord(), mTileEntity.getZCoord()), i, j, k);
+	}
+
+	@Override
+	public boolean isItemValid(final ItemStack itemstack) {
+		if ((accepts(itemstack)) || (itemstack.getItem() instanceof GT_MetaGenerated_Tool) || (itemstack.getItem() instanceof IElectricItem)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public boolean accepts(final ItemStack stack) {
+		if (stack == null) {
+			return false;
+		}
+		return (Info.itemEnergy.getEnergyValue(stack) > 0.0D)
+				|| (ElectricItem.manager.discharge(stack, (1.0D / 0.0D), 4, true, true, true) > 0.0D);
+	}
+
+	@Override
+	public int getSlotStackLimit() {
+		return 1;
+	}
+
+}
-- 
cgit 


From f480dbdd4b4750e966900f942a9dbad65202ec8b Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Wed, 15 Nov 2017 06:35:52 +1000
Subject: ^ Version bump.

---
 src/Java/gtPlusPlus/core/lib/CORE.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 95c4c7e84a..e9cddfecb8 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -35,7 +35,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.6.70-release";
+	public static final String VERSION = "1.6.90-release";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
-- 
cgit 


From 94d89124d139f6484d3d2fba0773ab9791ed1ef9 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Wed, 15 Nov 2017 09:09:09 +1000
Subject: $ Fix crashes related to client side calls from the server side. -
 Removed RFTools additions.

---
 .../core/handler/COMPAT_IntermodStaging.java          |  4 ----
 .../gtPlusPlus/core/item/bauble/ModularBauble.java    |  2 +-
 .../core/item/general/books/ItemBaseBook.java         | 19 ++++++++++++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index b833ab023a..fe46e2befa 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -7,7 +7,6 @@ import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
 import gtPlusPlus.xmod.mekanism.HANDLER_Mekanism;
-import gtPlusPlus.xmod.rftools.HANDLER_RfTools;
 import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
 
 public class COMPAT_IntermodStaging {
@@ -20,7 +19,6 @@ public class COMPAT_IntermodStaging {
 		HANDLER_IC2.preInit();
 		HANDLER_Computronics.preInit();
 		HANDLER_BiomesOPlenty.preInit();
-		HANDLER_RfTools.preInit();
 		HANDLER_Mekanism.preInit();
 
 	}
@@ -33,7 +31,6 @@ public class COMPAT_IntermodStaging {
 		HANDLER_IC2.init();
 		HANDLER_Computronics.init();
 		HANDLER_BiomesOPlenty.init();
-		HANDLER_RfTools.init();
 		HANDLER_Mekanism.init();
 	}
 
@@ -45,7 +42,6 @@ public class COMPAT_IntermodStaging {
 		HANDLER_IC2.postInit();
 		HANDLER_Computronics.postInit();
 		HANDLER_BiomesOPlenty.postInit();
-		HANDLER_RfTools.postInit();
 		HANDLER_Mekanism.postInit();
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
index 0e7df1703c..de12a77c27 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
@@ -36,7 +36,6 @@ public class ModularBauble extends BaseBauble {
 	private IIcon mTextureRing;
 	@SideOnly(Side.CLIENT)
 	private IIcon mTextureBelt;
-	@SideOnly(Side.CLIENT)
 	private IIcon iconArray[] = new IIcon[3];
 	@SideOnly(Side.CLIENT)
 	private IIcon mfallback;
@@ -342,6 +341,7 @@ public class ModularBauble extends BaseBauble {
 	}*/
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public IIcon getIconFromDamage(int meta) {
 		if (meta < this.iconArray.length && this.iconArray[meta] != null){
 			return this.iconArray[meta];
diff --git a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
index 8c4a262c32..fe0405d175 100644
--- a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
+++ b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
@@ -2,18 +2,21 @@ package gtPlusPlus.core.item.general.books;
 
 import static gtPlusPlus.core.handler.BookHandler.mBookMap;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.nbt.NBTUtils;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiScreenBook;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -96,6 +99,7 @@ public class ItemBaseBook extends ItemWritableBook{
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) {
 		//player.displayGUIBook(item);
 		int i = item.getItemDamage();
@@ -106,7 +110,16 @@ public class ItemBaseBook extends ItemWritableBook{
 				mBookMap.get(i).mPages);
 		
 		if (player.worldObj.isRemote){
-			Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBook(player, bookstack, false));
+			try {
+				Class<?> clazz = Class.forName("net.minecraft.client.gui.GuiScreenBook");
+				Constructor<?> ctor = clazz.getConstructor(EntityPlayer.class, ItemStack.class, boolean.class);
+				Object object = ctor.newInstance(new Object[] { player, bookstack, false });
+				Minecraft.getMinecraft().displayGuiScreen((GuiScreen) object);
+			} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			//Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBook(player, bookstack, false));
 		}
         return item;
 	}
-- 
cgit 


From 2cbc0ee9f27bc1d2a21d44d1b4a0c248a315c316 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Wed, 15 Nov 2017 10:26:36 +1000
Subject: + Added Wireless Chargers. > These are a basic design-only
 implementation for reference, so they may never be completed and are more of
 a proof of concept.

---
 src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 1 +
 src/Java/gtPlusPlus/core/lib/CORE.java               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 788d011733..23b2ad8e1a 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -97,6 +97,7 @@ public class COMPAT_HANDLER {
 			GregtechIndustrialWashPlant.run();
 			GregtechSemiFluidgenerators.run();
 			GregtechAdvancedMixer.run();
+			GregtechWirelessChargers.run();
 
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index e9cddfecb8..71119ee00e 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -35,7 +35,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.6.90-release";
+	public static final String VERSION = "1.6.91-release";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
-- 
cgit 


From af9369d63b91b26515a45f7a3419c98e4d6f8f05 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Thu, 16 Nov 2017 17:50:23 +1000
Subject: + Added recipes for Wireless Chargers. $ Fixed exploit using
 Long-Range mode, temporarily disabled.

---
 .../gtPlusPlus/core/recipe/RECIPES_Machines.java   | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 124e109f25..a8a4e5ad13 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1053,6 +1053,53 @@ public class RECIPES_Machines {
 						"plateStainlessSteel",CI.emitter_ULV,"plateStainlessSteel",
 						ItemUtils.getSimpleStack(ModBlocks.blockProjectTable));
 			}
+			
+			//Wireless Chargers
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_LV, CI.circuitTier1, CI.emitter_LV,
+					CI.component_Plate[3], CI.machineHull_LV, CI.component_Plate[3],
+					CI.sensor_LV, CI.fieldGenerator_LV, CI.sensor_LV, 
+					GregtechItemList.Charger_LV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_MV, CI.circuitTier2, CI.emitter_MV,
+					CI.component_Plate[4], CI.machineHull_MV, CI.component_Plate[4],
+					CI.sensor_MV, CI.fieldGenerator_MV, CI.sensor_MV, 
+					GregtechItemList.Charger_MV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_HV, CI.circuitTier3, CI.emitter_HV,
+					CI.component_Plate[5], CI.machineHull_HV, CI.component_Plate[5],
+					CI.sensor_HV, CI.fieldGenerator_HV, CI.sensor_HV, 
+					GregtechItemList.Charger_HV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_EV, CI.circuitTier4, CI.emitter_EV,
+					CI.component_Plate[6], CI.machineHull_EV, CI.component_Plate[6],
+					CI.sensor_EV, CI.fieldGenerator_EV, CI.sensor_EV, 
+					GregtechItemList.Charger_EV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_IV, CI.circuitTier5, CI.emitter_IV,
+					CI.component_Plate[7], CI.machineHull_IV, CI.component_Plate[7],
+					CI.sensor_IV, CI.fieldGenerator_IV, CI.sensor_IV, 
+					GregtechItemList.Charger_IV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_LuV, CI.circuitTier6, CI.emitter_LuV,
+					CI.component_Plate[8], CI.machineHull_LuV, CI.component_Plate[8],
+					CI.sensor_LuV, CI.fieldGenerator_LuV, CI.sensor_LuV, 
+					GregtechItemList.Charger_LuV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_ZPM, CI.circuitTier7, CI.emitter_ZPM,
+					CI.component_Plate[9], CI.machineHull_ZPM, CI.component_Plate[9],
+					CI.sensor_ZPM, CI.fieldGenerator_ZPM, CI.sensor_ZPM, 
+					GregtechItemList.Charger_ZPM.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_UV, CI.circuitTier8, CI.emitter_UV,
+					CI.component_Plate[10], CI.machineHull_UV, CI.component_Plate[10],
+					CI.sensor_UV, CI.fieldGenerator_UV, CI.sensor_UV, 
+					GregtechItemList.Charger_UV.get(1));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.emitter_MAX, CI.circuitTier9, CI.emitter_MAX,
+					CI.component_Plate[11], CI.machineHull_MAX, CI.component_Plate[11],
+					CI.sensor_MAX, CI.fieldGenerator_MAX, CI.sensor_MAX, 
+					GregtechItemList.Charger_MAX.get(1));
 
 
 		}
-- 
cgit 


From d7897d548e0d377df56a33b4be4a60717d97dd97 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Fri, 17 Nov 2017 01:20:46 +1000
Subject: + Added the Generator Array.

---
 src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java  | 2 +-
 src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 23b2ad8e1a..c59798ce21 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -6,7 +6,6 @@ import java.util.LinkedList;
 import java.util.Queue;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.MultiblockRecipeMapHandler;
 import gtPlusPlus.core.common.compat.*;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
@@ -98,6 +97,7 @@ public class COMPAT_HANDLER {
 			GregtechSemiFluidgenerators.run();
 			GregtechAdvancedMixer.run();
 			GregtechWirelessChargers.run();
+			GregtechIndustrialGeneratorArray.run();
 
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 7f0bc7a8ca..623e5651e5 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -704,6 +704,7 @@ public class RECIPES_GREGTECH {
 				new int[]{},
 				0);*/
 
+		ThermalFuel.addSteamTurbineFuel(FluidUtils.getFluidStack("steam", 1024));
 
 		//CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
 		GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2);
-- 
cgit 


From 94389c154e4d517e4fcdebdacc3da9be414e8c75 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Fri, 17 Nov 2017 10:58:02 +1000
Subject: + Added the Cutting Factory Multiblock. + Added a config for the
 Cutting Factory. % Hid Generator Array Logging.

---
 src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 3 ++-
 src/Java/gtPlusPlus/core/lib/CORE.java               | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index c59798ce21..e504e16761 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -98,7 +98,8 @@ public class COMPAT_HANDLER {
 			GregtechAdvancedMixer.run();
 			GregtechWirelessChargers.run();
 			GregtechIndustrialGeneratorArray.run();
-
+			GregtechIndustrialCuttingFactory.run();
+			
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
 		}
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 71119ee00e..6cb37837aa 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -164,6 +164,7 @@ public class CORE {
 		public static boolean enableMultiblock_IndustrialWashPlant = true;
 		public static boolean enableMultiblock_LargeAutoCrafter = true;
 		public static boolean enableMultiblock_ThermalBoiler = true;
+		public static boolean enableMultiblock_IndustrialCuttingMachine = true;
 
 		//Visuals
 		public static boolean enableTreeFarmerParticles = true;
@@ -171,6 +172,7 @@ public class CORE {
 
 
 
+
 	}
 
 }
-- 
cgit 


From a9f330848748bf4c75fab648407124f70c70e462 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Fri, 17 Nov 2017 15:47:20 +1000
Subject: + Added in the Compact Fusion Reactor. % Did work on the CFR. $ Fixed
 a tooltip on the Pollution Detector.

---
 src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index e504e16761..eecbcec9e9 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -99,6 +99,7 @@ public class COMPAT_HANDLER {
 			GregtechWirelessChargers.run();
 			GregtechIndustrialGeneratorArray.run();
 			GregtechIndustrialCuttingFactory.run();
+			GregtechMiniRaFusion.run();
 			
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
-- 
cgit 


From 4487354c88d814123e1374198d96275ac8c85406 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Fri, 17 Nov 2017 15:54:35 +1000
Subject: ^ Version Bump. % Tweaked SFR side texture when active.

---
 src/Java/gtPlusPlus/core/lib/CORE.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 6cb37837aa..cdccd4164f 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -35,7 +35,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.6.91-release";
+	public static final String VERSION = "1.6.93-release";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
-- 
cgit 


From e8fa34d3ba219a21bcce0cdb07ede8dcdfe9dcb9 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Fri, 17 Nov 2017 18:38:00 +1000
Subject: $ Fixed capes. My bad. + Added new textures for capes. ^ Version
 bump.

---
 src/Java/gtPlusPlus/core/lib/CORE.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index cdccd4164f..1099679f5e 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -35,7 +35,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.6.93-release";
+	public static final String VERSION = "1.6.94-release";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
-- 
cgit 


From 04344136279524749cc07dc979c18baee6a72e4d Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Sat, 18 Nov 2017 05:46:28 +1000
Subject: + Added the Grindle, a portable E-reader for Data-Sticks.

---
 .../core/container/Container_Grindle.java          | 182 ++++++++++++++++
 .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java   | 141 ++++++++++++
 src/Java/gtPlusPlus/core/handler/GuiHandler.java   |  11 +
 .../core/inventories/BaseInventoryGrindle.java     | 240 +++++++++++++++++++++
 src/Java/gtPlusPlus/core/item/ModItems.java        |   4 +
 .../core/item/general/BaseItemGrindle.java         |  87 ++++++++
 6 files changed, 665 insertions(+)
 create mode 100644 src/Java/gtPlusPlus/core/container/Container_Grindle.java
 create mode 100644 src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
 create mode 100644 src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
 create mode 100644 src/Java/gtPlusPlus/core/item/general/BaseItemGrindle.java

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/container/Container_Grindle.java b/src/Java/gtPlusPlus/core/container/Container_Grindle.java
new file mode 100644
index 0000000000..8b218f5993
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/container/Container_Grindle.java
@@ -0,0 +1,182 @@
+package gtPlusPlus.core.container;
+
+import gtPlusPlus.core.inventories.BaseInventoryGrindle;
+import gtPlusPlus.core.slots.SlotDataStick;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class Container_Grindle extends Container
+{
+	/** The Item Inventory for this Container, only needed if you want to reference isUseableByPlayer */
+	public final BaseInventoryGrindle inventory;
+
+	/** Using these will make transferStackInSlot easier to understand and implement
+	 * INV_START is the index of the first slot in the Player's Inventory, so our
+	 * BaseInventoryBackpack's number of slots (e.g. 5 slots is array indices 0-4, so start at 5)
+	 * Notice how we don't have to remember how many slots we made? We can just use
+	 * BaseInventoryBackpack.INV_SIZE and if we ever change it, the Container updates automatically. */
+	private static final int INV_START = BaseInventoryGrindle.INV_SIZE, INV_END = INV_START+0,
+			HOTBAR_START = INV_END, HOTBAR_END = HOTBAR_START+8;
+
+	// If you're planning to add armor slots, put those first like this:
+	// ARMOR_START = BaseInventoryBackpack.INV_SIZE, ARMOR_END = ARMOR_START+3,
+	// INV_START = ARMOR_END+1, and then carry on like above.
+
+	public Container_Grindle(final EntityPlayer par1Player, final InventoryPlayer inventoryPlayer, final BaseInventoryGrindle inventoryItem)
+	{
+		this.inventory = inventoryItem;
+
+		int i;
+		
+		//Actual Scan Slot
+		this.addSlotToContainer(new SlotDataStick(this.inventory, 0, 152, 5));
+		
+		for (i = 1; i < BaseInventoryGrindle.INV_SIZE; ++i){
+			this.addSlotToContainer(new SlotDataStick(this.inventory, i, 153, 30+(18*i)));
+		}
+
+		// PLAYER ACTION BAR - uses default locations for standard action bar texture file
+		for (i = 0; i < 9; ++i)
+		{
+			this.addSlotToContainer(new Slot(inventoryPlayer, i, 8 + (i * 18), 142));
+		}
+	}
+
+	@Override
+	public boolean canInteractWith(final EntityPlayer entityplayer)
+	{
+		// be sure to return the inventory's isUseableByPlayer method
+		// if you defined special behavior there:
+		return this.inventory.isUseableByPlayer(entityplayer);
+	}
+
+	/**
+	 * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that.
+	 */
+	@Override
+	public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int index)
+	{
+		ItemStack itemstack = null;
+		final Slot slot = (Slot) this.inventorySlots.get(index);
+
+		if ((slot != null) && slot.getHasStack())
+		{
+			final ItemStack itemstack1 = slot.getStack();
+			itemstack = itemstack1.copy();
+
+			// If item is in our custom Inventory or armor slot
+			if (index < INV_START)
+			{
+				// try to place in player inventory / action bar
+				if (!this.mergeItemStack(itemstack1, INV_START, HOTBAR_END+1, true))
+				{
+					return null;
+				}
+
+				slot.onSlotChange(itemstack1, itemstack);
+			}
+			// Item is in inventory / hotbar, try to place in custom inventory or armor slots
+			else
+			{
+				/*
+				If your inventory only stores certain instances of Items,
+				you can implement shift-clicking to your inventory like this:
+
+				// Check that the item is the right type
+				if (itemstack1.getItem() instanceof ItemCustom)
+				{
+					// Try to merge into your custom inventory slots
+					// We use 'BaseInventoryBackpack.INV_SIZE' instead of INV_START just in case
+					// you also add armor or other custom slots
+					if (!this.mergeItemStack(itemstack1, 0, BaseInventoryBackpack.INV_SIZE, false))
+					{
+						return null;
+					}
+				}
+				// If you added armor slots, check them here as well:
+				// Item being shift-clicked is armor - try to put in armor slot
+				if (itemstack1.getItem() instanceof ItemArmor)
+				{
+					int type = ((ItemArmor) itemstack1.getItem()).armorType;
+					if (!this.mergeItemStack(itemstack1, ARMOR_START + type, ARMOR_START + type + 1, false))
+					{
+						return null;
+					}
+				}
+				Otherwise, you have basically 2 choices:
+				1. shift-clicking between player inventory and custom inventory
+				2. shift-clicking between action bar and inventory
+
+				Be sure to choose only ONE of the following implementations!!!
+				 */
+				/**
+				 * Implementation number 1: Shift-click into your custom inventory
+				 */
+				if (index >= INV_START)
+				{
+					// place in custom inventory
+					if (!this.mergeItemStack(itemstack1, 0, INV_START, false))
+					{
+						return null;
+					}
+				}
+
+				/**
+				 * Implementation number 2: Shift-click items between action bar and inventory
+				 */
+				// item is in player's inventory, but not in action bar
+				if ((index >= INV_START) && (index < HOTBAR_START))
+				{
+					// place in action bar
+					if (!this.mergeItemStack(itemstack1, HOTBAR_START, HOTBAR_END+1, false))
+					{
+						return null;
+					}
+				}
+				// item in action bar - place in player inventory
+				else if ((index >= HOTBAR_START) && (index < (HOTBAR_END+1)))
+				{
+					if (!this.mergeItemStack(itemstack1, INV_START, INV_END+1, false))
+					{
+						return null;
+					}
+				}
+			}
+
+			if (itemstack1.stackSize == 0)
+			{
+				slot.putStack((ItemStack) null);
+			}
+			else
+			{
+				slot.onSlotChanged();
+			}
+
+			if (itemstack1.stackSize == itemstack.stackSize)
+			{
+				return null;
+			}
+
+			slot.onPickupFromSlot(par1EntityPlayer, itemstack1);
+		}
+
+		return itemstack;
+	}
+
+	/**
+	 * You should override this method to prevent the player from moving the stack that
+	 * opened the inventory, otherwise if the player moves it, the inventory will not
+	 * be able to save properly
+	 */
+	@Override
+	public ItemStack slotClick(final int slot, final int button, final int flag, final EntityPlayer player) {
+		// this will prevent the player from interacting with the item that opened the inventory:
+		if ((slot >= 0) && (this.getSlot(slot) != null) && (this.getSlot(slot).getStack() == player.getHeldItem())) {
+			return null;
+		}
+		return super.slotClick(slot, button, flag, player);
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
new file mode 100644
index 0000000000..798b74b48f
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
@@ -0,0 +1,141 @@
+package gtPlusPlus.core.gui.item;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GT_Utility.ItemNBT;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.container.Container_Grindle;
+import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.inventories.BaseInventoryGrindle;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.nbt.NBTUtils;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiBaseGrindle extends GuiContainer {
+
+	/** The FontRenderer used by GuiScreen */
+	protected FontRenderer fontRenderer;
+
+	private static final ResourceLocation iconLocation = new ResourceLocation(CORE.MODID, "textures/gui/itemGrindle.png");
+
+	/** The inventory to render on screen */
+	private final BaseInventoryGrindle inventory;
+
+	public GuiBaseGrindle(final Container_Grindle containerItem){
+		super(containerItem);
+		this.inventory = containerItem.inventory;
+	}
+
+	/**
+	 * Draws the screen and all the components in it.
+	 */
+	@Override
+	public void drawScreen(final int par1, final int par2, final float par3){
+		super.drawScreen(par1, par2, par3);
+	}
+
+	/**
+	 * Draw the foreground layer for the GuiContainer (everything in front of the items)
+	 */
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2){
+		final String s = "Git";
+		//Title
+		this.fontRendererObj.drawStringWithShadow(I18n.format("Gregtech Information Transponder", new Object[0]), 0, -12, Utils.rgbtoHexValue(255, 255, 255));
+
+		if (this.inventory.getStackInSlot(0) != null){
+			this.fontRendererObj.drawString(I18n.format(""+NBTUtils.getBookTitle(this.inventory.getStackInSlot(0)), new Object[0]), 10, 8, Utils.rgbtoHexValue(125, 255, 125));
+
+			if (!NBTUtils.tryIterateNBTData(this.inventory.getStackInSlot(0))){
+				this.fontRendererObj.drawString(I18n.format("Very Bad prospection data.", new Object[0]), 10, 38, Utils.rgbtoHexValue(255, 125, 125));
+			}
+			
+			NBTTagCompound tNBT = ItemNBT.getNBT(this.inventory.getStackInSlot(0));
+			byte tTier = tNBT.getByte("prospection_tier");
+			//List Tier
+			//this.fontRendererObj.drawStringWithShadow(I18n.format("Tier: "+tTier, new Object[0]), 10, 18, Utils.rgbtoHexValue(125, 255, 125));
+
+			if (tTier == 0) { // basic prospection data
+				String tData = tNBT.getString("prospection");
+				//List prospection
+				//this.fontRendererObj.drawStringWithShadow(I18n.format("Prospection : "+tData, new Object[0]), 10, 28, Utils.rgbtoHexValue(125, 255, 125));
+
+				String[] tDataArray = tData.split(",");
+				if (tDataArray.length > 6) {
+					tNBT.setString("author", "X: " + tDataArray[0] + " Y: " + tDataArray[1] + " Z: " + tDataArray[2] + " Dim: " + tDataArray[3]);
+					//List prospection
+					this.fontRendererObj.drawString(I18n.format("X: " + tDataArray[0], new Object[0]), 10, 28, Utils.rgbtoHexValue(125, 125, 255));
+					this.fontRendererObj.drawString(I18n.format("Y: " + tDataArray[1], new Object[0]), 10, 38, Utils.rgbtoHexValue(125, 125, 255));
+					this.fontRendererObj.drawString(I18n.format("Z: " + tDataArray[2], new Object[0]), 10, 48, Utils.rgbtoHexValue(125, 125, 255));
+					this.fontRendererObj.drawString(I18n.format("Dim: " + tDataArray[3], new Object[0]), 10, 58, Utils.rgbtoHexValue(125, 125, 255));
+					
+					//Divider
+					this.fontRendererObj.drawString(I18n.format("-------------------", new Object[0]), 10, 63, Utils.rgbtoHexValue(125, 125, 255));
+					
+					NBTTagList tNBTList = new NBTTagList();
+					String[] mOreTypes = new String[50];
+					String tOres = " Prospected Ores: ";
+					for (int i = 6; tDataArray.length > i; i++) {
+						mOreTypes[i] = (tDataArray[i] + " ");
+						if ((68+(i-6)*8) < (68+56)){
+							this.fontRendererObj.drawString(I18n.format(mOreTypes[i], new Object[0]), 10, 68+((i-6)*8), Utils.rgbtoHexValue(125, 255, 125));
+						}						
+					}
+					Utils.LOG_INFO("test - "+tOres);
+					tNBTList.appendTag(new NBTTagString("Prospection Data From: X" + tDataArray[0] + " Z:" + tDataArray[2] + " Dim:" + tDataArray[3] + " Produces " + tDataArray[4] + "L " + tDataArray[5] + " " + tOres));
+					tNBT.setTag("pages", tNBTList);
+					
+					
+					//List prospection
+					this.fontRendererObj.drawString(I18n.format("Tier: "+tTier+ " | Pages: "+tNBTList.tagCount(), new Object[0]), 10, 18, Utils.rgbtoHexValue(125, 255, 125));
+					//Divider
+					this.fontRendererObj.drawString(I18n.format("-------------------", new Object[0]), 10, 23, Utils.rgbtoHexValue(125, 125, 255));
+					
+				}
+				else {
+					this.fontRendererObj.drawString(I18n.format("Bad prospection data.", new Object[0]), 10, 68, Utils.rgbtoHexValue(255, 125, 125));
+				}
+			}
+		}
+		else {
+			//Valid Datastick?
+			this.fontRendererObj.drawStringWithShadow(I18n.format("Insert device into port.", new Object[0]), 10, 8, Utils.rgbtoHexValue(255, 125, 125));
+		}
+
+
+
+		//Inventory Label
+		this.fontRendererObj.drawStringWithShadow(I18n.format("container.inventory", new Object[0]), 8, 131, Utils.rgbtoHexValue(255, 255, 255));
+
+		//this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 0, 4210752);
+		//this.fontRenderer.drawString(I18n.translate("container.inventory"), 26, this.ySize - 96 + 4, 4210752);
+	}
+
+	/**
+	 * Draw the background layer for the GuiContainer (everything behind the items)
+	 */
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3)
+	{
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		this.mc.getTextureManager().bindTexture(iconLocation);
+		final int k = (this.width - this.xSize) / 2;
+		final int l = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
+		final int i1;
+		//drawPlayerModel(k + 51, l + 75, 30, k + 51 - this.xSize_lo, (l + 75) - 50 - this.ySize_lo, this.mc.thePlayer);
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
index 70e2934349..124b01a2c0 100644
--- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -7,9 +7,11 @@ import gtPlusPlus.core.container.*;
 import gtPlusPlus.core.gui.beta.Gui_ID_Registry;
 import gtPlusPlus.core.gui.beta.MU_GuiId;
 import gtPlusPlus.core.gui.item.GuiBaseBackpack;
+import gtPlusPlus.core.gui.item.GuiBaseGrindle;
 import gtPlusPlus.core.gui.machine.*;
 import gtPlusPlus.core.interfaces.IGuiManager;
 import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.inventories.BaseInventoryGrindle;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
@@ -33,6 +35,7 @@ public class GuiHandler implements IGuiHandler {
 	public static final int GUI6 = 5;      //Fish trap
 	public static final int GUI7 = 6;      //Trade table
 	public static final int GUI8 = 7;      //
+	public static final int GUI9 = 8;      //
 
 
 
@@ -80,6 +83,10 @@ public class GuiHandler implements IGuiHandler {
 				return new Container_TradeTable(player.inventory, (TileEntityTradeTable)te);
 			}
 		}
+		
+		if (ID == GUI9){
+			return new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem()));
+		}
 
 
 
@@ -125,6 +132,10 @@ public class GuiHandler implements IGuiHandler {
 				return new GUI_TradeTable(player.inventory, (TileEntityTradeTable)te, ((TileEntityBase) te).getOwner());
 			}
 		}
+		
+		if (ID == GUI9){
+			return new GuiBaseGrindle(new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem())));
+		}
 
 		return null;
 	}
diff --git a/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java b/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
new file mode 100644
index 0000000000..ca7fcd6d03
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
@@ -0,0 +1,240 @@
+package gtPlusPlus.core.inventories;
+
+import java.util.UUID;
+
+import gtPlusPlus.core.item.base.BaseItemBackpack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraftforge.common.util.Constants;
+
+public class BaseInventoryGrindle implements IInventory{
+
+	private final String name = "Inventory Item";
+
+	/** Provides NBT Tag Compound to reference */
+	private final ItemStack invItem;
+
+	/** Defining your inventory size this way is handy */
+	public static final int INV_SIZE = 6;
+
+	/** Inventory's size must be same as number of slots you add to the Container class */
+	private final ItemStack[] inventory = new ItemStack[INV_SIZE];
+
+	// declaration of variable:
+	protected String uniqueID;
+
+	/**
+	 * @param itemstack - the ItemStack to which this inventory belongs
+	 */
+	public BaseInventoryGrindle(final ItemStack stack)
+	{
+		this.invItem = stack;
+
+		/** initialize variable within the constructor: */
+		this.uniqueID = "";
+
+		if (!stack.hasTagCompound())
+		{
+			stack.setTagCompound(new NBTTagCompound());
+			// no tag compound means the itemstack does not yet have a UUID, so assign one:
+			this.uniqueID = UUID.randomUUID().toString();
+		}
+
+		// Create a new NBT Tag Compound if one doesn't already exist, or you will crash
+		if (!stack.hasTagCompound()) {
+			stack.setTagCompound(new NBTTagCompound());
+		}
+		// note that it's okay to use stack instead of invItem right there
+		// both reference the same memory location, so whatever you change using
+		// either reference will change in the other
+
+		// Read the inventory contents from NBT
+		this.readFromNBT(stack.getTagCompound());
+	}
+	@Override
+	public int getSizeInventory()
+	{
+		return this.inventory.length;
+	}
+
+	@Override
+	public ItemStack getStackInSlot(final int slot)
+	{
+		return this.inventory[slot];
+	}
+
+	@Override
+	public ItemStack decrStackSize(final int slot, final int amount)
+	{
+		ItemStack stack = this.getStackInSlot(slot);
+		if(stack != null)
+		{
+			if(stack.stackSize > amount)
+			{
+				stack = stack.splitStack(amount);
+				// Don't forget this line or your inventory will not be saved!
+				this.markDirty();
+			}
+			else
+			{
+				// this method also calls markDirty, so we don't need to call it again
+				this.setInventorySlotContents(slot, null);
+			}
+		}
+		return stack;
+	}
+
+	@Override
+	public ItemStack getStackInSlotOnClosing(final int slot)
+	{
+		final ItemStack stack = this.getStackInSlot(slot);
+		this.setInventorySlotContents(slot, null);
+		return stack;
+	}
+
+	@Override
+	public void setInventorySlotContents(final int slot, final ItemStack stack)
+	{
+		this.inventory[slot] = stack;
+
+		if ((stack != null) && (stack.stackSize > this.getInventoryStackLimit()))
+		{
+			stack.stackSize = this.getInventoryStackLimit();
+		}
+
+		// Don't forget this line or your inventory will not be saved!
+		this.markDirty();
+	}
+
+	// 1.7.2+ renamed to getInventoryName
+	@Override
+	public String getInventoryName()
+	{
+		return this.name;
+	}
+
+	// 1.7.2+ renamed to hasCustomInventoryName
+	@Override
+	public boolean hasCustomInventoryName()
+	{
+		return this.name.length() > 0;
+	}
+
+	@Override
+	public int getInventoryStackLimit()
+	{
+		return 1;
+	}
+
+	/**
+	 * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
+	 * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
+	 * let you change things in your inventory without ever opening a Gui, if you want.
+	 */
+	// 1.7.2+ renamed to markDirty
+	@Override
+	public void markDirty()
+	{
+		for (int i = 0; i < this.getSizeInventory(); ++i)
+		{
+			if ((this.getStackInSlot(i) != null) && (this.getStackInSlot(i).stackSize == 0)) {
+				this.inventory[i] = null;
+			}
+		}
+
+		// This line here does the work:
+		this.writeToNBT(this.invItem.getTagCompound());
+	}
+
+	@Override
+	public boolean isUseableByPlayer(final EntityPlayer entityplayer)
+	{
+		return true;
+	}
+
+	// 1.7.2+ renamed to openInventory(EntityPlayer player)
+	@Override
+	public void openInventory() {}
+
+	// 1.7.2+ renamed to closeInventory(EntityPlayer player)
+	@Override
+	public void closeInventory() {}
+
+	/**
+	 * This method doesn't seem to do what it claims to do, as
+	 * items can still be left-clicked and placed in the inventory
+	 * even when this returns false
+	 */
+	@Override
+	public boolean isItemValidForSlot(final int slot, final ItemStack itemstack)
+	{
+		// Don't want to be able to store the inventory item within itself
+		// Bad things will happen, like losing your inventory
+		// Actually, this needs a custom Slot to work
+		return !(itemstack.getItem() instanceof BaseItemBackpack);
+	}
+
+	/**
+	 * A custom method to read our inventory from an ItemStack's NBT compound
+	 */
+	public void readFromNBT(final NBTTagCompound compound)
+	{
+		// Gets the custom taglist we wrote to this compound, if any
+		// 1.7.2+ change to compound.getTagList("ItemInventory", Constants.NBT.TAG_COMPOUND);
+		final NBTTagList items = compound.getTagList("ItemInventory", Constants.NBT.TAG_COMPOUND);
+
+		if ("".equals(this.uniqueID))
+		{
+			// try to read unique ID from NBT
+			this.uniqueID = compound.getString("uniqueID");
+			// if it's still "", assign a new one:
+			if ("".equals(this.uniqueID))
+			{
+				this.uniqueID = UUID.randomUUID().toString();
+			}
+		}
+
+		for (int i = 0; i < items.tagCount(); ++i)
+		{
+			// 1.7.2+ change to items.getCompoundTagAt(i)
+			final NBTTagCompound item = items.getCompoundTagAt(i);
+			final int slot = item.getInteger("Slot");
+
+			// Just double-checking that the saved slot index is within our inventory array bounds
+			if ((slot >= 0) && (slot < this.getSizeInventory())) {
+				this.inventory[slot] = ItemStack.loadItemStackFromNBT(item);
+			}
+		}
+	}
+
+	/**
+	 * A custom method to write our inventory to an ItemStack's NBT compound
+	 */
+	public void writeToNBT(final NBTTagCompound tagcompound)
+	{
+		// Create a new NBT Tag List to store itemstacks as NBT Tags
+		final NBTTagList items = new NBTTagList();
+
+		for (int i = 0; i < this.getSizeInventory(); ++i)
+		{
+			// Only write stacks that contain items
+			if (this.getStackInSlot(i) != null)
+			{
+				// Make a new NBT Tag Compound to write the itemstack and slot index to
+				final NBTTagCompound item = new NBTTagCompound();
+				item.setInteger("Slot", i);
+				// Writes the itemstack in slot(i) to the Tag Compound we just made
+				this.getStackInSlot(i).writeToNBT(item);
+
+				// add the tag compound to our tag list
+				items.appendTag(item);
+			}
+		}
+		tagcompound.setString("uniqueID", this.uniqueID);
+		// Add the TagList to the ItemStack's Tag Compound with the name "ItemInventory"
+		tagcompound.setTag("ItemInventory", items);
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index ec0e21c7bb..851db25325 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -240,6 +240,8 @@ public final class ModItems {
 
 	public static Item itemModularBauble;
 	public static Item itemCustomBook;
+	
+	public static Item itemGrindleTablet;
 
 	public static final void init(){
 
@@ -616,6 +618,8 @@ public final class ModItems {
 
 		itemAirFilter = new ItemAirFilter();
 		itemLavaFilter = new ItemLavaFilter();
+		
+		itemGrindleTablet = new BaseItemGrindle();
 
 		//Chemistry
 		CoalTar.run();
diff --git a/src/Java/gtPlusPlus/core/item/general/BaseItemGrindle.java b/src/Java/gtPlusPlus/core/item/general/BaseItemGrindle.java
new file mode 100644
index 0000000000..66fd6968e4
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/general/BaseItemGrindle.java
@@ -0,0 +1,87 @@
+package gtPlusPlus.core.item.general;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.item.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class BaseItemGrindle extends Item{
+
+	protected final String unlocalName;
+
+
+	public BaseItemGrindle(){
+		this.unlocalName = "itemGrindleTablet";
+		this.setUnlocalizedName("itemGrindleTablet");
+		this.setTextureName(CORE.MODID + ":" + "itemTablet");
+		GameRegistry.registerItem(this, "itemGrindleTablet");
+		GT_OreDictUnificator.registerOre("tabletGit", ItemUtils.getSimpleStack(this));
+		this.setMaxStackSize(1);
+		this.setCreativeTab(AddToCreativeTab.tabOther);
+	}
+
+	@Override
+	public int getMaxItemUseDuration(final ItemStack stack) {
+		return 1; 
+	}
+
+	@Override
+	public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player)
+	{
+		if (!world.isRemote){
+			if (!player.isSneaking()) {
+				player.openGui(GTplusplus.instance, GuiHandler.GUI9, world, 0, 0, 0);
+			}
+		}
+
+		return itemstack;
+	}
+
+	@Override
+	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
+		return ("Git");
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(final IIconRegister iconRegister)
+	{
+		this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + "itemTablet");
+	}
+
+	@Override
+	public String getPotionEffect(ItemStack p_150896_1_) {
+		// TODO Auto-generated method stub
+		return super.getPotionEffect(p_150896_1_);
+	}
+
+	@Override
+	public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_,
+			List p_77624_3_, boolean p_77624_4_) {
+		// TODO Auto-generated method stub
+		super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_);
+	}
+
+	@Override
+	public EnumRarity getRarity(ItemStack i) {
+		return EnumRarity.uncommon;
+	}
+
+	@Override
+	public boolean isRepairable() {
+		return false;
+	}
+}
-- 
cgit 


From fd15ae499c11112c282a93c6cf342bc88698e8ac Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Mon, 20 Nov 2017 16:48:02 +1000
Subject: + Added a faster TC Alchemical Furnace. + Added a Wither-Proof block.
 % Tweaked Grindle GUI.

---
 src/Java/gtPlusPlus/core/block/ModBlocks.java      |   4 +
 .../block/general/antigrief/BlockWitherProof.java  | 104 +++++++++++++++++++++
 .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java   |   7 +-
 .../core/handler/COMPAT_IntermodStaging.java       |   4 +
 4 files changed, 115 insertions(+), 4 deletions(-)
 create mode 100644 src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index a469acfc49..6ebb21bb9c 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.block.general.*;
+import gtPlusPlus.core.block.general.antigrief.BlockWitherProof;
 import gtPlusPlus.core.block.machine.*;
 import gtPlusPlus.core.fluids.FluidRegistryHandler;
 import gtPlusPlus.core.lib.CORE;
@@ -45,6 +46,8 @@ public final class ModBlocks {
 	public static Block blockProjectTable;
 	public static Block blockTradeTable;
 	public static Block blockModularTable;
+	
+	public static Block blockWitherGuard;
 
 	public static void init() {
 		Utils.LOG_INFO("Initializing Blocks.");
@@ -74,6 +77,7 @@ public final class ModBlocks {
 		blockProjectTable =  new Machine_ProjectTable();
 		blockTradeTable =  new Machine_TradeTable();
 		blockModularTable =  new Machine_ModularityTable();
+		blockWitherGuard = new BlockWitherProof();
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
new file mode 100644
index 0000000000..297bcb3061
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
@@ -0,0 +1,104 @@
+package gtPlusPlus.core.block.general.antigrief;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.entity.boss.IBossDisplayData;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockWitherProof extends Block{
+
+	public BlockWitherProof(){
+		super(Material.redstoneLight);
+		this.setBlockName(Utils.sanitizeString("blockBlackGate"));
+		this.setBlockTextureName(CORE.MODID + ":" + "blockFrameGt");
+		this.setCreativeTab(AddToCreativeTab.tabBlock);
+		this.setHardness(-1F);
+		this.setResistance(5000.0F);
+		this.setHarvestLevel("pickaxe", 3);
+		this.setStepSound(soundTypeMetal);
+		LanguageRegistry.addName(this, "Wither Cage");
+		GameRegistry.registerBlock(this, Utils.sanitizeString("blockBlackGate"));
+
+	}
+
+	public String GetProperName(){
+		return "Wither Cage";
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int getRenderBlockPass(){
+		return 1;
+	}
+
+	@Override
+	public boolean isOpaqueCube(){
+		return false;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister iIcon){
+		this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockFrameGt");
+	}
+
+	public void onBlockExploded(World world, int x, int y, int z, Explosion explosion){
+		//prevent from being destroyed by wither and nukes.
+	}
+
+	@Override
+	public void onBlockDestroyedByExplosion(World p_149723_1_, int p_149723_2_,
+			int p_149723_3_, int p_149723_4_, Explosion p_149723_5_) {
+		
+	}
+
+	@Override
+	public boolean canDropFromExplosion(Explosion p_149659_1_) {
+		return false;
+	}
+
+	@Override
+	public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z,
+			Entity entity) {
+		if (entity == null || !entity.isEntityAlive()){
+			return false;
+		}		
+		if (entity instanceof EntityWither || entity instanceof EntityDragon || entity instanceof IBossDisplayData){
+			return false;
+		}
+		else {
+			return super.canEntityDestroy(world, x, y, z, entity);			
+		}		
+	}
+	
+	
+	//Colour Handling
+	private static final int mWitherColour = Utils.rgbtoHexValue(32, 32, 32);
+	
+	@Override
+	public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){
+		return mWitherColour;
+	}
+
+	@Override
+	public int getRenderColor(final int aMeta) {
+		return mWitherColour;
+	}
+
+
+
+}
diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
index 798b74b48f..c7c14e9103 100644
--- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
+++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
@@ -59,9 +59,9 @@ public class GuiBaseGrindle extends GuiContainer {
 		if (this.inventory.getStackInSlot(0) != null){
 			this.fontRendererObj.drawString(I18n.format(""+NBTUtils.getBookTitle(this.inventory.getStackInSlot(0)), new Object[0]), 10, 8, Utils.rgbtoHexValue(125, 255, 125));
 
-			if (!NBTUtils.tryIterateNBTData(this.inventory.getStackInSlot(0))){
-				this.fontRendererObj.drawString(I18n.format("Very Bad prospection data.", new Object[0]), 10, 38, Utils.rgbtoHexValue(255, 125, 125));
-			}
+			//if (!NBTUtils.tryIterateNBTData(this.inventory.getStackInSlot(0))){
+			//	this.fontRendererObj.drawString(I18n.format("Very Bad prospection data.", new Object[0]), 10, 38, Utils.rgbtoHexValue(255, 125, 125));
+			//}
 			
 			NBTTagCompound tNBT = ItemNBT.getNBT(this.inventory.getStackInSlot(0));
 			byte tTier = tNBT.getByte("prospection_tier");
@@ -94,7 +94,6 @@ public class GuiBaseGrindle extends GuiContainer {
 							this.fontRendererObj.drawString(I18n.format(mOreTypes[i], new Object[0]), 10, 68+((i-6)*8), Utils.rgbtoHexValue(125, 255, 125));
 						}						
 					}
-					Utils.LOG_INFO("test - "+tOres);
 					tNBTList.appendTag(new NBTTagString("Prospection Data From: X" + tDataArray[0] + " Z:" + tDataArray[2] + " Dim:" + tDataArray[3] + " Produces " + tDataArray[4] + "L " + tDataArray[5] + " " + tOres));
 					tNBT.setTag("pages", tNBTList);
 					
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index fe46e2befa..1bf729cdc6 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -7,6 +7,7 @@ import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
 import gtPlusPlus.xmod.mekanism.HANDLER_Mekanism;
+import gtPlusPlus.xmod.thaumcraft.common.HANDLER_Thaumcraft;
 import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
 
 public class COMPAT_IntermodStaging {
@@ -20,6 +21,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Computronics.preInit();
 		HANDLER_BiomesOPlenty.preInit();
 		HANDLER_Mekanism.preInit();
+		HANDLER_Thaumcraft.preInit();
 
 	}
 
@@ -32,6 +34,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Computronics.init();
 		HANDLER_BiomesOPlenty.init();
 		HANDLER_Mekanism.init();
+		HANDLER_Thaumcraft.init();
 	}
 
 	public static void postInit(){
@@ -43,6 +46,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Computronics.postInit();
 		HANDLER_BiomesOPlenty.postInit();
 		HANDLER_Mekanism.postInit();
+		HANDLER_Thaumcraft.postInit();
 	}
 
 
-- 
cgit 


From 3a7576cc5a52ce052c1bc40ddb7dbcb63e2a6381 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Mon, 20 Nov 2017 17:11:11 +1000
Subject: + Added recipe for Wither Cage.

---
 src/Java/gtPlusPlus/core/recipe/RECIPES_General.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 67b9107b28..e9a2ee86b4 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -139,6 +139,12 @@ public class RECIPES_General {
 					new ItemStack(ModItems.itemAlkalusDisk, 1, OreDictionary.WILDCARD_VALUE));
 			l++;
 		}
+		
+		RecipeUtils.addShapedGregtechRecipe(
+				"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
+				"plateTungstenSteel", "blockIron", "plateTungstenSteel",
+				"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel", 
+				ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard));
 
 		//Alkalus Coin		
 		/*AddGregtechRecipe.addAssemblylineRecipe(
-- 
cgit 


From e480daed410bd80d5eda9abbd37f7bd96021e911 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Mon, 20 Nov 2017 20:19:10 +1000
Subject: $ Fixed the Upgraded Alchemical Furnace being built from heavily
 obfuscated code. % Adjusted Wither Guard recipe to now output 32x per craft,
 at the added cost of a Netherstar per craft. % Small formatting changes.

---
 src/Java/gtPlusPlus/core/handler/GuiHandler.java   | 24 +++++++++---
 .../gtPlusPlus/core/recipe/RECIPES_General.java    | 41 ++++++++------------
 src/Java/gtPlusPlus/core/util/item/ItemUtils.java  | 45 ++++++++++++----------
 3 files changed, 58 insertions(+), 52 deletions(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
index 124b01a2c0..6791289f9f 100644
--- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -3,12 +3,24 @@ package gtPlusPlus.core.handler;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.container.*;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.container.Container_FishTrap;
+import gtPlusPlus.core.container.Container_Grindle;
+import gtPlusPlus.core.container.Container_ModularityTable;
+import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.container.Container_TradeTable;
+import gtPlusPlus.core.container.Container_Workbench;
+import gtPlusPlus.core.container.Container_WorkbenchAdvanced;
 import gtPlusPlus.core.gui.beta.Gui_ID_Registry;
 import gtPlusPlus.core.gui.beta.MU_GuiId;
 import gtPlusPlus.core.gui.item.GuiBaseBackpack;
 import gtPlusPlus.core.gui.item.GuiBaseGrindle;
-import gtPlusPlus.core.gui.machine.*;
+import gtPlusPlus.core.gui.machine.GUI_FishTrap;
+import gtPlusPlus.core.gui.machine.GUI_ModularityTable;
+import gtPlusPlus.core.gui.machine.GUI_ProjectTable;
+import gtPlusPlus.core.gui.machine.GUI_TradeTable;
+import gtPlusPlus.core.gui.machine.GUI_Workbench;
+import gtPlusPlus.core.gui.machine.GUI_WorkbenchAdvanced;
 import gtPlusPlus.core.interfaces.IGuiManager;
 import gtPlusPlus.core.inventories.BaseInventoryBackpack;
 import gtPlusPlus.core.inventories.BaseInventoryGrindle;
@@ -34,8 +46,8 @@ public class GuiHandler implements IGuiHandler {
 	public static final int GUI5 = 4;      //Workbench Adv
 	public static final int GUI6 = 5;      //Fish trap
 	public static final int GUI7 = 6;      //Trade table
-	public static final int GUI8 = 7;      //
-	public static final int GUI9 = 8;      //
+	public static final int GUI8 = 7;      //Alchemical Furnace
+	public static final int GUI9 = 8;      //Grindle
 
 
 
@@ -83,7 +95,7 @@ public class GuiHandler implements IGuiHandler {
 				return new Container_TradeTable(player.inventory, (TileEntityTradeTable)te);
 			}
 		}
-		
+
 		if (ID == GUI9){
 			return new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem()));
 		}
@@ -132,7 +144,7 @@ public class GuiHandler implements IGuiHandler {
 				return new GUI_TradeTable(player.inventory, (TileEntityTradeTable)te, ((TileEntityBase) te).getOwner());
 			}
 		}
-		
+
 		if (ID == GUI9){
 			return new GuiBaseGrindle(new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem())));
 		}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index e9a2ee86b4..f5f793da77 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -1,28 +1,19 @@
 package gtPlusPlus.core.recipe;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.recipe.RecipeUtils;
-import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class RECIPES_General {
@@ -102,18 +93,18 @@ public class RECIPES_General {
 				"stickWood", "treeSapling", "stickWood",
 				"stickWood", "dustBone", "stickWood",
 				ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))){
-			Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings.");	
+			Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings.");
 		}
 
 		//Iron bars
-		ItemStack ironBar