Working UUID matched Player safes.

Cleaned up a few other things too, which is always good.

This mod will in future versions begin to benefit more and more from using my own compiled version of gregtech as opposed to using V5.8.33 from Blood-asp which was the final release of 5.8.

9 files changed, 107 insertions, 43 deletions

diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index 1495db158c..4455e38a57 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -6,8 +6,8 @@ import java.awt.event.ActionListener;
 import miscutil.core.commands.CommandMath;
 import miscutil.core.common.CommonProxy;
 import miscutil.core.creativetabs.AddToCreativeTab;
-import miscutil.core.lib.LoadedMods;
 import miscutil.core.lib.CORE;
+import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -21,7 +21,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 
-@Mod(modid=CORE.MODID, name="Misc. Utils", version=CORE.VERSION, dependencies="required-after:gregtech")
+@Mod(modid=CORE.MODID, name="Misc. Utils", version=CORE.VERSION, dependencies="required-after:gregtech; after:Thaumcraft;")
 public class MiscUtils
 implements ActionListener
 { 
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java
index 7471425283..9a288c0e79 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -11,6 +11,7 @@ import miscutil.core.lib.LoadedMods;
 import miscutil.core.tileentities.ModTileEntities;
 import miscutil.core.util.Utils;
 import miscutil.gregtech.init.InitGregtech;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -91,8 +92,9 @@ public class CommonProxy {
 	}
 
 	public void registerOreDict(){
-		
+
 		Utils.LOG_INFO("Registering Ingots & Plates with OreDict.");
+		//In-house
 		//Ingots
 		//OreDictionary.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel));
 		GT_OreDictUnificator.registerOre("ingotBloodSteel", new ItemStack(ModItems.itemIngotBloodSteel));
@@ -100,49 +102,91 @@ public class CommonProxy {
 		GT_OreDictUnificator.registerOre("ingotStaballoy", new ItemStack(ModItems.itemIngotStaballoy));
 
 		//Plates
+		GT_OreDictUnificator.registerOre("plateBloodSteel", new ItemStack(ModItems.itemPlateBloodSteel));
+		GT_OreDictUnificator.registerOre("plateStaballoy", new ItemStack(ModItems.itemPlateStaballoy));
+
+		//Blocks
+		GT_OreDictUnificator.registerOre("blockStaballoy", new ItemStack(Item.getItemFromBlock(ModBlocks.blockStaballoy)));
+		OreDictionary.registerOre("blockBloodSteel", new ItemStack(ModBlocks.blockBloodSteel));
+
+
 		//InterMod
 		if (LoadedMods.Big_Reactors){
-			OreDictionary.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium));
-			OreDictionary.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite));
-			OreDictionary.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite));
+			GT_OreDictUnificator.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium));
+			GT_OreDictUnificator.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite));
+			GT_OreDictUnificator.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite));
 		}
 		if (LoadedMods.EnderIO){
-			OreDictionary.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron));
-			OreDictionary.registerOre("plateDarkSteel", new ItemStack(ModItems.itemPlateDarkSteel));
-			OreDictionary.registerOre("plateElectricalSteel", new ItemStack(ModItems.itemPlateElectricalSteel));
-			OreDictionary.registerOre("plateEnergeticAlloy", new ItemStack(ModItems.itemPlateEnergeticAlloy));
-			OreDictionary.registerOre("platePulsatingIron", new ItemStack(ModItems.itemPlatePulsatingIron));
-			OreDictionary.registerOre("plateRedstoneAlloy", new ItemStack(ModItems.itemPlateRedstoneAlloy));
-			OreDictionary.registerOre("plateSoularium", new ItemStack(ModItems.itemPlateSoularium));
-			OreDictionary.registerOre("plateVibrantAlloy", new ItemStack(ModItems.itemPlateVibrantAlloy));
+			GT_OreDictUnificator.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron));
+			GT_OreDictUnificator.registerOre("plateDarkSteel", new ItemStack(ModItems.itemPlateDarkSteel));
+			GT_OreDictUnificator.registerOre("plateElectricalSteel", new ItemStack(ModItems.itemPlateElectricalSteel));
+			GT_OreDictUnificator.registerOre("plateEnergeticAlloy", new ItemStack(ModItems.itemPlateEnergeticAlloy));
+			GT_OreDictUnificator.registerOre("platePulsatingIron", new ItemStack(ModItems.itemPlatePulsatingIron));
+			GT_OreDictUnificator.registerOre("plateRedstoneAlloy", new ItemStack(ModItems.itemPlateRedstoneAlloy));
+			GT_OreDictUnificator.registerOre("plateSoularium", new ItemStack(ModItems.itemPlateSoularium));
+			GT_OreDictUnificator.registerOre("plateVibrantAlloy", new ItemStack(ModItems.itemPlateVibrantAlloy));
 		}
 		if (LoadedMods.Simply_Jetpacks){
-			OreDictionary.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium));
+			GT_OreDictUnificator.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium));
 
 		}
 		if (LoadedMods.RFTools){
-			OreDictionary.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard));
+			GT_OreDictUnificator.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard));
 
 		}
 		if (LoadedMods.Thaumcraft){
-			OreDictionary.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
-
+			try{
+			Item em = null;
+			//Item em1 = GameRegistry.findItem("ThaumCraft", "ItemResource:16");
+			//Item em2 = GameRegistry.findItem("ThaumCraft", "<ItemResource:16>");
+			
+			Item em1 = Utils.getItem("Thaumcraft:ItemResource:16");
+			Utils.LOG_WARNING("Found: "+em1.toString());
+			if (!em1.equals(null)){
+				em = em1;
+			}			
+			else {
+				em = null;
+			}			
+			if (!em.equals(null)){
+				ItemStack voidIngot = new ItemStack(em,1,16);
+				//GT_OreDictUnificator.registerOre("ingotVoidMetal", new ItemStack(em));
+				//GameRegistry.registerCustomItemStack("ingotVoidMetal", voidIngot);
+				GT_OreDictUnificator.registerOre("ingotVoidMetal", voidIngot);
+			}
+			else {
+				Utils.LOG_WARNING("Void Metal Ingot not found.");
+			}
+			} catch (NullPointerException e) {
+				Utils.LOG_ERROR("Void Metal Ingot not found. [NULL]");
+	        }
+			GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
+			//System.exit(0);
+			
 		}
 		if (LoadedMods.Extra_Utils){
-			OreDictionary.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium));
+			try {
+			Item em = null;			
+			Item em1 = Utils.getItem("ExtraUtilities:bedrockiumIngot");
+			Utils.LOG_WARNING("Found: "+em1.toString());
+			if (!em1.equals(null)){
+				em = em1;
+			}
+			if (!em.equals(null)){
+				GT_OreDictUnificator.registerOre("ingotBedrockium", new ItemStack(em));
+			}
+			else {
+				Utils.LOG_WARNING("Bedrockium Ingot not found.");
+			}
+			} catch (NullPointerException e) {
+				Utils.LOG_ERROR("Bedrockium Ingot not found. [NULL]");
+	        }
+			
+			GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium));
 		}
 		if (LoadedMods.PneumaticCraft){
-			OreDictionary.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron));
+			GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron));
 		}
-		//In-house
-		OreDictionary.registerOre("plateBloodSteel", new ItemStack(ModItems.itemPlateBloodSteel));
-		OreDictionary.registerOre("plateStaballoy", new ItemStack(ModItems.itemPlateStaballoy));
-
-
-		//Blocks
-		//OreDictionary.registerOre("blockBloodSteel", new ItemStack(ModBlocks.blockBloodSteel.ge)));
-
-
 		//Misc
 	}
 
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 93ff389810..12be9e9a03 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -7,7 +7,7 @@ public class CORE {
 	public static final String name = "Misc. Utils";	
 	public static final String MODID = "miscutils";
 	public static final String VERSION = "0.9.6";
-	public static final boolean DEBUG = false;	
+	public static final boolean DEBUG = true;	
 	public static final boolean LOAD_ALL_CONTENT = false;
 	public static final int GREG_FIRST_ID = 760;
 	
diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java
index 57c4399708..ab60de8557 100644
--- a/src/Java/miscutil/core/util/Utils.java
+++ b/src/Java/miscutil/core/util/Utils.java
@@ -7,10 +7,12 @@ import java.util.Random;
 
 import miscutil.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class Utils {
 
@@ -127,6 +129,11 @@ public class Utils {
 		return FluidRegistry.getFluidStack("ic2steam", (int)aAmount);
 	}
 
+	public static Item getItem(String fqrn) // fqrn = fully qualified resource name
+	{
+	 String[] fqrnSplit = fqrn.split(":");
+	 return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]);
+	}
 	
     
 }
diff --git a/src/Java/miscutil/gregtech/enums/GregtechItemList.java b/src/Java/miscutil/gregtech/enums/GregtechItemList.java
index 9e663e05c8..1e980a3c5d 100644
--- a/src/Java/miscutil/gregtech/enums/GregtechItemList.java
+++ b/src/Java/miscutil/gregtech/enums/GregtechItemList.java
@@ -28,15 +28,19 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Credit_Greg_Platinum,
 	Credit_Greg_Osmium,
 	Credit_Greg_Naquadah,
- Energy_Buffer_CREATIVE,
+	Energy_Buffer_CREATIVE,
 	//Energy Buffes
 	Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV, Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV, Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM, Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX,
+	//Cobble Generators
 	Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX,
-	Condensor_MAX;
+	//The max Steam condenser
+	Condensor_MAX, 
+	//Player owned Safes
+	GT_Safe_ULV, GT_Safe_LV, GT_Safe_MV, GT_Safe_HV, GT_Safe_EV, GT_Safe_IV, GT_Safe_LuV, GT_Safe_ZPM, GT_Safe_UV, GT_Safe_MAX;
 
 	public static final GregtechItemList[]
- DYE_ONLY_ITEMS = {
-			Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV };
+			DYE_ONLY_ITEMS = {
+		Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV };
 	private ItemStack mStack;
 	private boolean mHasNotBeenSet = true;
 
diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java b/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java
index c466839c9d..26715d0801 100644
--- a/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java
+++ b/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java
@@ -20,7 +20,8 @@ public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine
     this.mSteamCapacity = aSteamCapacity;
   }
   
-  public void addSlots(InventoryPlayer aInventoryPlayer)
+  @Override
+public void addSlots(InventoryPlayer aInventoryPlayer)
   {
     addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));
     addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));
@@ -28,12 +29,14 @@ public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine
     addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));
   }
   
-  public int getSlotCount()
+  @Override
+public int getSlotCount()
   {
     return 4;
   }
   
-  public int getShiftClickSlotCount()
+  @Override
+public int getShiftClickSlotCount()
   {
     return 1;
   }
@@ -45,7 +48,8 @@ public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine
   private final int mSteamCapacity;
   public long mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
   
-  public void detectAndSendChanges()
+  @Override
+public void detectAndSendChanges()
   {
     super.detectAndSendChanges();
     if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
@@ -73,7 +77,8 @@ public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine
     }
   }
   
-  @SideOnly(Side.CLIENT)
+  @Override
+@SideOnly(Side.CLIENT)
   public void updateProgressBar(int par1, int par2)
   {
     super.updateProgressBar(par1, par2);
diff --git a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java b/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java
index 3825acd239..0b57023286 100644
--- a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java
+++ b/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java
@@ -14,7 +14,8 @@ public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
     super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity, aSteamCapacity), CORE.MODID + ":" + "textures/gui/" + aTextureName);
   }
   
-  protected void drawGuiContainerForegroundLayer(int par1, int par2)
+  @Override
+protected void drawGuiContainerForegroundLayer(int par1, int par2)
   {
     this.fontRendererObj.drawString("Condenser", 8, 4, 4210752);
     if (!CORE.DEBUG){
@@ -23,7 +24,8 @@ public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
     }
   }
   
-  protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
+  @Override
+protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
   {
     super.drawGuiContainerBackgroundLayer(par1, par2, par3);
     int x = (this.width - this.xSize) / 2;
diff --git a/src/Java/miscutil/gregtech/init/InitGregtech.java b/src/Java/miscutil/gregtech/init/InitGregtech.java
index 635443e70d..a6b6277e9d 100644
--- a/src/Java/miscutil/gregtech/init/InitGregtech.java
+++ b/src/Java/miscutil/gregtech/init/InitGregtech.java
@@ -4,6 +4,7 @@ import static miscutil.core.lib.LoadedMods.Gregtech;
 import miscutil.core.util.Utils;
 import miscutil.gregtech.init.machines.GregtechConduits;
 import miscutil.gregtech.init.machines.GregtechEnergyBuffer;
+import miscutil.gregtech.init.machines.GregtechSafeBlock;
 import miscutil.gregtech.init.machines.GregtechSteamCondenser;
 
 public class InitGregtech {
@@ -24,6 +25,7 @@ public class InitGregtech {
 		GregtechEnergyBuffer.run();
 		GregtechConduits.run();
 		GregtechSteamCondenser.run();
+		GregtechSafeBlock.run();
 
 	}
 }
diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java b/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java
index 767321de7b..79abce9fce 100644
--- a/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java
+++ b/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java
@@ -25,8 +25,8 @@ public class GregtechSteamCondenser
 	private static void run1()
 	{
 		//Steam Condensors
-		GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensor(780, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L));
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Condensor_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'),OrePrefixes.wireGt04.get(Materials.Nickel),Character.valueOf('T'), ItemList.Pump_MV });
+		GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L));
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Condensor_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'),OrePrefixes.wireGt04.get(Materials.ElectricalSteel),Character.valueOf('T'), ItemList.Electric_Pump_MV });
 		/*Steam Condensors
 		GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensorII(780, "steamcondensor.01.tier.single", "Steam CondensorII").getStackForm(1L));
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Condensor_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'),OrePrefixes.wireGt04.get(Materials.Nickel),Character.valueOf('T'), ItemList.Pump_MV });