Merge pull request #50 from GTNewHorizons/gtnh-milling

Milling/Nuclear Sciences revamp + Lots of minor fixes

58 files changed, 2265 insertions, 1762 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
index fe8120e635..021279f820 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
@@ -532,14 +532,12 @@ public class Machine_SuperJukebox extends BlockJukebox
 			}			
 			return this.getInventory().isItemValidForSlot(slot, itemstack);
 		}
+		
+		private final static int[] SIDED_SLOTS = new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
 
 		@Override
 		public int[] getAccessibleSlotsFromSide(final int p_94128_1_) {
-			final int[] accessibleSides = new int[this.getSizeInventory()];
-			for (int r = 0; r < this.getInventory().getSizeInventory(); r++) {
-				accessibleSides[r] = r;
-			}
-			return accessibleSides;
+			return SIDED_SLOTS;
 
 		}
 
diff --git a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index c9cdc41424..493b7d415d 100644
--- a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -4,8 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -105,6 +107,20 @@ public class CommandEnableDebugWhileRunning implements ICommand
 						PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen));
 					}			
 				}*/
+
+		else if (argString[0].toLowerCase().equals("inv")) {
+			final EntityPlayer P = CommandUtils.getPlayer(S);	
+			if (P != null && !P.worldObj.isRemote) {
+				ItemStack[] aInv = P.inventory.mainInventory;
+				for (ItemStack aItem : aInv) {
+					if (aItem != null) {
+						String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId;
+						String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name;
+						Logger.INFO(aModID+":"+aRegistryName);
+					}
+				}
+			}
+		}
 		else if (argString[0].toLowerCase().equals("hand")) {
 			final EntityPlayer P = CommandUtils.getPlayer(S);	
 			if (P != null) {
@@ -133,15 +149,21 @@ public class CommandEnableDebugWhileRunning implements ICommand
 						}
 					}
 					
-					String aFluidContainerData = "";
+					AutoMap<String> aFluidContainerData = new AutoMap<String>();
 					FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem);
 					if (aHeldItemFluid != null) {
-						aFluidContainerData = "["+aHeldItemFluid.getUnlocalizedName()+"]["+aHeldItemFluid.getLocalizedName()+"]";
+						aFluidContainerData.put("FluidStack Unlocal Name: "+aHeldItemFluid.getUnlocalizedName());
+						aFluidContainerData.put("FluidStack Local Name: "+aHeldItemFluid.getLocalizedName());
+						aFluidContainerData.put("Fluid Unlocal Name: "+aHeldItemFluid.getFluid().getUnlocalizedName());
+						aFluidContainerData.put("Fluid Local Name: "+aHeldItemFluid.getFluid().getLocalizedName());
+						aFluidContainerData.put("Fluid Name: "+aHeldItemFluid.getFluid().getName());
 					}
 
 					PlayerUtils.messagePlayer(P, "["+aItemUnlocalName+"]"+"["+aItemDisplayName+"] ");
-					if (aFluidContainerData.length() > 0) {
-						PlayerUtils.messagePlayer(P, ""+aFluidContainerData);				
+					if (aFluidContainerData.size() > 0) {
+						for (String s : aFluidContainerData) {
+							PlayerUtils.messagePlayer(P, ""+s);							
+						}				
 					}
 					if (!aOreDictNames.isEmpty()) {
 						PlayerUtils.messagePlayer(P, ""+aOreDictData);
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 9565d242c4..c038afce8f 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.common;
 import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
@@ -51,8 +50,6 @@ import net.minecraftforge.client.IItemRenderer;
 
 public class CommonProxy {
 
-	private boolean mFluidsGenerated = false;
-
 	public CommonProxy() {
 		// Should Register Gregtech Materials I've Made
 		Utils.registerEvent(this);
@@ -99,11 +96,6 @@ public class CommonProxy {
 		Logger.INFO("[Proxy] Calling Render registrator.");
 		registerRenderThings();
 
-		if (!mFluidsGenerated && ItemList.Cell_Empty.hasBeenSet()) {
-			Material.generateQueuedFluids();
-			mFluidsGenerated = true;
-		}
-
 	}
 
 	public void init(final FMLInitializationEvent e) {
@@ -114,15 +106,6 @@ public class CommonProxy {
 
 		registerCustomItemsForMaterials();
 		ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner();
-
-		if (!mFluidsGenerated && ItemList.Cell_Empty.hasBeenSet()) {
-			Material.generateQueuedFluids();
-			mFluidsGenerated = true;
-		} else {
-			Logger.INFO("[ERROR] Did not generate fluids at all.");
-			Logger.WARNING("[ERROR] Did not generate fluids at all.");
-			Logger.ERROR("[ERROR] Did not generate fluids at all.");
-		}
 		CI.init();
 		FluidFactory.init();
 
@@ -236,7 +219,7 @@ public class CommonProxy {
 	}
 
 	public void registerCustomItemsForMaterials() {
-		Material.registerComponentForMaterial(GenericChem.CARBYNE, OrePrefixes.plate, GregtechItemList.Carbyne_Sheet_Finished.get(1));
+		//Material.registerComponentForMaterial(GenericChem.CARBYNE, OrePrefixes.plate, GregtechItemList.Carbyne_Sheet_Finished.get(1));
 	}
 
 	public void registerCustomMobDrops() {
diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index 7c1b584d87..61610a03e9 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -227,8 +227,6 @@ public class ConfigHandler {
 		//pollutionPerSecondMultiGeneratorArray;
 		pollutionPerSecondMultiTreeFarm = config.get("pollution", "pollutionPerSecondMultiTreeFarm", pollutionPerSecondMultiTreeFarm,"pollution rate in gibbl/s for the Tree growth simulator").getInt(pollutionPerSecondMultiTreeFarm);
 		pollutionPerSecondMultiFrothFlotationCell = config.get("pollution", "pollutionPerSecondMultiFrothFlotationCell", pollutionPerSecondMultiFrothFlotationCell,"pollution rate in gibbl/s for the Flotation cell regulator").getInt(pollutionPerSecondMultiFrothFlotationCell);
-		pollutionPerSecondMultiNuclearReactor_ModeBoosted = config.get("pollution", "pollutionPerSecondMultiNuclearReactor_ModeBoosted", pollutionPerSecondMultiNuclearReactor_ModeBoosted,"pollution rate in gibbl/s for the Thorium reactor when boosted").getInt(pollutionPerSecondMultiNuclearReactor_ModeBoosted);
-		pollutionPerSecondMultiNuclearReactor_ModeNormal = config.get("pollution", "pollutionPerSecondMultiNuclearReactor_ModeNormal", pollutionPerSecondMultiNuclearReactor_ModeNormal,"pollution rate in gibbl/s for the Thorium reactor").getInt(pollutionPerSecondMultiNuclearReactor_ModeNormal);
 		pollutionPerSecondMultiAutoCrafter = config.get("pollution", "pollutionPerSecondMultiAutoCrafter", pollutionPerSecondMultiAutoCrafter,"pollution rate in gibbl/s for the Large-Scale auto assembler v1.01").getInt(pollutionPerSecondMultiAutoCrafter);
 		pollutionPerSecondMultiThermalBoiler = config.get("pollution", "pollutionPerSecondMultiThermalBoiler", pollutionPerSecondMultiThermalBoiler,"pollution rate in gibbl/s for the Thermal boiler").getInt(pollutionPerSecondMultiThermalBoiler);
 		pollutionPerSecondMultiAlgaePond = config.get("pollution", "pollutionPerSecondMultiAlgaePond", pollutionPerSecondMultiAlgaePond,"pollution rate in gibbl/s for the Algae farm").getInt(pollutionPerSecondMultiAlgaePond);
diff --git a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java
index da23824c78..d94fa35af7 100644
--- a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java
+++ b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.fluids;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -12,11 +11,11 @@ import gtPlusPlus.GTplusplus.INIT_PHASE;
 import gtPlusPlus.api.objects.GregtechException;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.itemblock.FluidItemBlock;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -123,7 +122,8 @@ public class FluidFactory {
 			try {
 				throw new GregtechException("Cannot generate Fluid Packages outside of Pre-Init!");
 			} catch (GregtechException e) {
-				FMLCommonHandler.instance().exitJava(0, true);
+				e.printStackTrace();
+				CORE.crash("Cannot generate Fluid Packages outside of Pre-Init!");
 			}
 		}
 		
diff --git a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
index 680068402b..6354be632d 100644
--- a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
+++ b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;
 
 import cpw.mods.fml.common.eventhandler.Event;
-import cpw.mods.fml.common.FMLCommonHandler;
 import gtPlusPlus.api.objects.GregtechException;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
@@ -45,7 +44,8 @@ public class ItemGenericFluidBucket extends ItemBucket {
 			try {
 				throw new GregtechException(""+aID+" is already registered! Unable to register fluid: "+FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
 			} catch (GregtechException e) {
-				FMLCommonHandler.instance().exitJava(0, true);
+				e.printStackTrace();
+				CORE.crash(""+aID+" is already registered! Unable to register fluid: "+FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
 			}
 		}		
 		mInternalFluidCache.put(FluidFactory.mMetaToBlockMap.get(aID));
diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java
index 4bfd39e9a3..d85de925bf 100644
--- a/src/Java/gtPlusPlus/core/handler/BookHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java
@@ -288,49 +288,49 @@ public class BookHandler {
 										"XXXXXXX",
 
 								"Layer 2:" + "\n"  + "\n" +
-										"AAAAAAA" + "\n" +
+										"XAAAAAX" + "\n" +
 										"AMMMMMA" + "\n" +
 										"AMCCCMA" + "\n" +
 										"AMCCCMA" + "\n" +
 										"AMCCCMA" + "\n" +
 										"AMMMMMA" + "\n" +
-										"AAAAAAA",
+										"XAAAAAX",
 										
 								"Layer 3:" + "\n"  + "\n" +
-										"AAAAAAA" + "\n" +
+										"XAAAAAX" + "\n" +
 										"AAAAAAA" + "\n" +
 										"AAPPPAA" + "\n" +
 										"AAPPPAA" + "\n" +
 										"AAPPPAA" + "\n" +
 										"AAAAAAA" + "\n" +
-										"AAAAAAA",
+										"XAAAAAX",
 												
 								"Layer 4:" + "\n"  + "\n" +
-										"AAAAAAA" + "\n" +
+										"XAAAAAX" + "\n" +
 										"AAAAAAA" + "\n" +
 										"AACCCAA" + "\n" +
 										"AACCCAA" + "\n" +
 										"AACCCAA" + "\n" +
 										"AAAAAAA" + "\n" +
-										"AAAAAAA",
+										"XAAAAAX",
 														
 								"Layer 5:" + "\n"  + "\n" +
-										"AAAAAAA" + "\n" +
+										"XAAAAAX" + "\n" +
 										"AAAAAAA" + "\n" +
 										"AAPPPAA" + "\n" +
 										"AAPPPAA" + "\n" +
 										"AAPPPAA" + "\n" +
 										"AAAAAAA" + "\n" +
-										"AAAAAAA",
+										"XAAAAAX",
 										
 								"Layer 6:" + "\n"  + "\n" +
-										"AAAAAAA" + "\n" +
+										"XAAAAAX" + "\n" +
 										"AMMMMMA" + "\n" +
 										"AMCCCMA" + "\n" +
 										"AMCCCMA" + "\n" +
 										"AMCCCMA" + "\n" +
 										"AMMMMMA" + "\n" +
-										"AAAAAAA",
+										"XAAAAAX",
 						
 								"Layer 7:" + "\n"  + "\n" +
 										"XXXXXXX" + "\n" +
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 4fda17ee8a..53d63499a6 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -43,6 +43,8 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.*;
 import net.minecraft.item.ItemStack;
 
@@ -228,7 +230,9 @@ public class COMPAT_HANDLER {
 
 	public static void startLoadingGregAPIBasedRecipes(){
 		//Add hand-made recipes
-		RECIPES_GREGTECH.run();		
+		RECIPES_GREGTECH.run();	
+		RecipeLoader_GTNH.generate();
+		RecipeLoader_Nuclear.generate();	
 		//Add autogenerated Recipes from Item Components
 		for (Set<RunnableWithInfo<Material>> m : MaterialGenerator.mRecipeMapsToGenerate) {
 			for (RunnableWithInfo<Material> r : m) {
diff --git a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
index b3b720497e..8499f98525 100644
--- a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
+++ b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
@@ -38,7 +38,7 @@ public class StopAnnoyingFuckingAchievements {
 				Field aGameSettings = ReflectionUtils.getField(aClazz2, "gameSettings");
 				Object aGameSettingsObj = ReflectionUtils.getFieldValue(aInstanceMC, aGameSettings);
 				Class aClazz3 = aGameSettingsObj.getClass();
-				if (aClazz2 != null) {
+				if (aClazz3 != null) {
 					Field ainvHint = ReflectionUtils.getField(aClazz3, "showInventoryAchievementHint");
 					ReflectionUtils.setField(aGameSettingsObj, ainvHint, false);
 				}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 1e0b779bac..4c6f0dc712 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -5,6 +5,7 @@ import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
@@ -13,6 +14,7 @@ import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.*;
 import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
+import gtPlusPlus.core.item.base.dusts.BaseItemDust;
 import gtPlusPlus.core.item.base.foil.BaseItemFoil;
 import gtPlusPlus.core.item.base.foods.BaseItemFood;
 import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
@@ -231,7 +233,17 @@ public final class ModItems {
 	public static Item dustFertUN18;
 	public static Item dustFertUN32;
 
-	public static Fluid fluidFLiBeSalt;
+	//public static Fluid fluidFLiBeSalt;
+	//public static Fluid fluidFLiBeSaltBurnt;
+
+	public static Fluid fluidLftrCore1;
+	public static Fluid fluidLftrCore2;
+	public static Fluid fluidLftrCore3;
+	public static Fluid fluidLftrCore4;
+	public static Fluid fluidLftrBlanket1;
+	public static Fluid fluidLftrBlanket2;
+	public static Fluid fluidLftrBlanket3;
+	public static Fluid fluidNuclearWaste;
 
 
 	//Possibly missing base items that GT may be missing.
@@ -245,6 +257,7 @@ public final class ModItems {
 	public static Item itemDoublePlateClay;
 	public static Item itemDoublePlateEuropium;
 	public static Item itemFoilUranium235;
+	public static Item itemDustIndium;
 	public static BlockBaseModular blockRawMeat;
 	
 	public static Item itemBoilerChassis;
@@ -283,6 +296,7 @@ public final class ModItems {
 	public static Item dustNeptunium238;
 	public static Item dustDecayedRadium226;
 	public static Item dustRadium226;
+	public static Item dustProtactinium233;
 	
 	public static ItemGiantEgg itemBigEgg;
 
@@ -458,6 +472,8 @@ public final class ModItems {
 			MaterialGenerator.generate(ELEMENT.getInstance().IODINE); //LFTR byproduct
 			MaterialGenerator.generate(ELEMENT.getInstance().HAFNIUM);
 			MaterialGenerator.generate(ELEMENT.getInstance().DYSPROSIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().ERBIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().PRASEODYMIUM);
 			MaterialGenerator.generate(ELEMENT.getInstance().TELLURIUM); //LFTR byproduct
 			MaterialGenerator.generate(ELEMENT.getInstance().RHODIUM);
 			MaterialGenerator.generate(ELEMENT.getInstance().RHENIUM);
@@ -536,30 +552,31 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE);
 
 			//LFTR Fuel components
-			MaterialGenerator.generate(MISC_MATERIALS.HYDROXIDE); //LFTR fuel component
-			MaterialGenerator.generate(MISC_MATERIALS.AMMONIA); //LFTR fuel component
-			MaterialGenerator.generate(MISC_MATERIALS.AMMONIUM); //LFTR fuel component
-			MaterialGenerator.generate(FLUORIDES.AMMONIUM_BIFLUORIDE); //LFTR fuel component
-			MaterialGenerator.generate(FLUORIDES.BERYLLIUM_HYDROXIDE); //LFTR fuel component
-			MaterialGenerator.generate(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); //LFTR fuel component
+			//MaterialGenerator.generate(MISC_MATERIALS.HYDROXIDE); //LFTR fuel component
+			//MaterialGenerator.generate(MISC_MATERIALS.AMMONIA); //LFTR fuel component
+			/