Merge pull request #5 from alkcorp/master

sync fork

8 files changed, 271 insertions, 53 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
index 9053875058..fa10f4def3 100644
--- a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
@@ -17,6 +17,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
@@ -74,7 +75,9 @@ public class AchievementHandler {
 		this.registerAchievement("semifluid", -14, -10, GregtechItemList.Generator_SemiFluid_HV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("earlywasher", -13, -10, GregtechItemList.SimpleDustWasher_ULV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("advancedsteam", -12, -10, GregtechItemList.Boiler_Advanced_MV.get(1), aBaseAchievementName, false);
-		this.registerAchievement("pollutionremoval", -11, -10, GregtechItemList.Pollution_Cleaner_IV.get(1), aBaseAchievementName, false);
+		if (PollutionUtils.isPollutionEnabled()) {
+			this.registerAchievement("pollutionremoval", -11, -10, GregtechItemList.Pollution_Cleaner_IV.get(1), aBaseAchievementName, false);			
+		}
 		this.registerAchievement("hiampxform", -10, -10, GregtechItemList.Transformer_HA_HV_MV.get(1), aBaseAchievementName, false);		
 		
 		
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index fd30457b46..be02e352c7 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -2,7 +2,9 @@ package gtPlusPlus.core.handler;
 
 import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.Set;
 
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import gregtech.api.enums.GT_Values;
@@ -11,22 +13,99 @@ import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
-import gtPlusPlus.core.common.compat.*;
+import gtPlusPlus.core.common.compat.COMPAT_BigReactors;
+import gtPlusPlus.core.common.compat.COMPAT_CompactWindmills;
+import gtPlusPlus.core.common.compat.COMPAT_EnderIO;
+import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils;
+import gtPlusPlus.core.common.compat.COMPAT_HarvestCraft;
+import gtPlusPlus.core.common.compat.COMPAT_IC2;
+import gtPlusPlus.core.common.compat.COMPAT_MorePlanets;
+import gtPlusPlus.core.common.compat.COMPAT_OpenBlocks;
+import gtPlusPlus.core.common.compat.COMPAT_PneumaticCraft;
+import gtPlusPlus.core.common.compat.COMPAT_RFTools;
+import gtPlusPlus.core.common.compat.COMPAT_Railcraft;
+import gtPlusPlus.core.common.compat.COMPAT_SimplyJetpacks;
+import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft;
+import gtPlusPlus.core.common.compat.COMPAT_Witchery;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.recipe.*;
+import gtPlusPlus.core.recipe.RECIPES_Extruder;
+import gtPlusPlus.core.recipe.RECIPES_GREGTECH;
+import gtPlusPlus.core.recipe.RECIPES_LaserEngraver;
+import gtPlusPlus.core.recipe.ShapedRecipeObject;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionCreator;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
-import gtPlusPlus.xmod.gregtech.registration.gregtech.*;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.Gregtech4Content;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedMixer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAlgaeContent;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAmazonWarehouse;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechBedrockPlatforms;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechBufferDynamos;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechComponentAssembler;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCustomHatches;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCyclotron;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFactoryGradeReplacementMultis;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFluidReactor;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeneratorsULV;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeothermalThermalGenerator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechHiAmpTransformer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialArcFurnace;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialBlastSmelter;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCuttingFactory;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialExtruder;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFishPond;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFuelRefinery;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialGeneratorArray;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMixer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMultiMachine;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMultiTank;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialSifter;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialThermalCentrifuge;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialTreeFarm;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWashPlant;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHeatExchanger;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMiniRaFusion;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechNaqReactor;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPollutionDevices;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerBreakers;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRTG;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSafeBlock;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSemiFluidgenerators;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSimpleWasher;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarGenerators;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamCondenser;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTeslaTower;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThaumcraftDevices;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThreadedBuffers;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredChunkloaders;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredFluidTanks;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTreeFarmerTE;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWirelessChargers;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.NewHorizonsAccelerator;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_HANDLER {
@@ -135,6 +214,8 @@ public class COMPAT_HANDLER {
 			GregtechSolarTower.run();
 			GregtechLargeTurbinesAndHeatExchanger.run();
 			GregtechPowerBreakers.run();
+			GregtechFluidReactor.run();
+			GregtechAlgaeContent.run();
 
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
@@ -211,6 +292,7 @@ public class COMPAT_HANDLER {
 			for (RunnableWithInfo<Material> r : m) {
 				try {
 					r.run();
+					Logger.INFO("[FIND] "+r.getInfoData().getLocalizedName()+" recipes generated.");
 				}
 				catch (Throwable t) {
 					t.printStackTrace();
@@ -220,6 +302,9 @@ public class COMPAT_HANDLER {
 		}
 		RecipeGen_Recycling.executeGenerators();	
 		runQueuedMisc();
+		
+		// Do Fluid Canning Last, because they're not executed on demand, but rather queued.
+		RecipeGen_FluidCanning.init();
 	}
 	
 
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index 0f689325a3..b7efcf08ea 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -12,6 +12,8 @@ import gtPlusPlus.xmod.galacticraft.HANDLER_GalactiCraft;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
+import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft;
+import gtPlusPlus.xmod.reliquary.HANDLER_Reliquary;
 import gtPlusPlus.xmod.sc2.HANDLER_SC2;
 import gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft;
 import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
@@ -33,6 +35,8 @@ public class COMPAT_IntermodStaging {
 		HANDLER_SC2.preInit();
 		HANDLER_GalactiCraft.preInit();
 		HANDLER_CropsPlusPlus.preInit(preinit);
+		HANDLER_Railcraft.preInit();
+		HANDLER_Reliquary.preInit();
 	}
 
 	public static void init(FMLInitializationEvent init){
@@ -49,6 +53,8 @@ public class COMPAT_IntermodStaging {
 		HANDLER_SC2.init();
 		HANDLER_GalactiCraft.init();
 		HANDLER_CropsPlusPlus.init(init);
+		HANDLER_Railcraft.init();
+		HANDLER_Reliquary.init();
 	}
 
 	public static void postInit(FMLPostInitializationEvent postinit){
@@ -65,6 +71,8 @@ public class COMPAT_IntermodStaging {
 		HANDLER_SC2.postInit();
 		HANDLER_GalactiCraft.postInit();
 		HANDLER_CropsPlusPlus.postInit(postinit);
+		HANDLER_Railcraft.postInit();
+		HANDLER_Reliquary.postInit();
 	}
 
 	public static void onLoadComplete(FMLLoadCompleteEvent event) {
diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
index 8448b738a2..e44c9a8f20 100644
--- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -2,16 +2,22 @@ package gtPlusPlus.core.handler;
 
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
-import gtPlusPlus.core.container.*;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.container.Container_CircuitProgrammer;
+import gtPlusPlus.core.container.Container_DecayablesChest;
+import gtPlusPlus.core.container.Container_FishTrap;
+import gtPlusPlus.core.container.Container_Grindle;
+import gtPlusPlus.core.container.Container_ModularityTable;
+import gtPlusPlus.core.container.Container_PestKiller;
+import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.container.Container_RoundRobinator;
+import gtPlusPlus.core.container.Container_SuperJukebox;
+import gtPlusPlus.core.container.Container_TradeTable;
+import gtPlusPlus.core.container.Container_Workbench;
+import gtPlusPlus.core.container.Container_WorkbenchAdvanced;
 import gtPlusPlus.core.container.box.LunchBoxContainer;
 import gtPlusPlus.core.container.box.MagicBagContainer;
 import gtPlusPlus.core.container.box.ToolBoxContainer;
@@ -22,20 +28,38 @@ import gtPlusPlus.core.gui.item.GuiBaseGrindle;
 import gtPlusPlus.core.gui.item.box.LunchBoxGui;
 import gtPlusPlus.core.gui.item.box.MagicBagGui;
 import gtPlusPlus.core.gui.item.box.ToolBoxGui;
-import gtPlusPlus.core.gui.machine.*;
+import gtPlusPlus.core.gui.machine.GUI_CircuitProgrammer;
+import gtPlusPlus.core.gui.machine.GUI_DecayablesChest;
+import gtPlusPlus.core.gui.machine.GUI_FishTrap;
+import gtPlusPlus.core.gui.machine.GUI_ModularityTable;
+import gtPlusPlus.core.gui.machine.GUI_PestKiller;
+import gtPlusPlus.core.gui.machine.GUI_ProjectTable;
+import gtPlusPlus.core.gui.machine.GUI_RoundRobinator;
+import gtPlusPlus.core.gui.machine.GUI_SuperJukebox;
+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;
 import gtPlusPlus.core.inventories.box.LunchBoxInventory;
 import gtPlusPlus.core.inventories.box.MagicBagInventory;
 import gtPlusPlus.core.inventories.box.ToolBoxInventory;
-import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
-import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
-import gtPlusPlus.core.tileentities.machines.*;
+import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
+import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
+import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
+import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
+import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
+import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
+import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.World;
 
 public class GuiHandler implements IGuiHandler {
 
@@ -53,6 +77,8 @@ public class GuiHandler implements IGuiHandler {
 	public static final int GUI12 = 11; // Bag for Magic Tools
 	public static final int GUI13 = 12; // Decayables Chest
 	public static final int GUI14 = 13; // Super Jukebox
+	public static final int GUI15 = 14; // Pest Killer
+	public static final int GUI16 = 15; // Round-Robinator
 
 	public static void init() {
 
@@ -97,9 +123,13 @@ public class GuiHandler implements IGuiHandler {
 				return new Container_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te);
 			} else if (ID == GUI13) {
 				return new Container_DecayablesChest(player.inventory, (TileEntityDecayablesChest) te);
-			}else if (ID == GUI14) {
+			} else if (ID == GUI14) {
 				return new Container_SuperJukebox(player.inventory, (TileEntitySuperJukebox) te);
-			}
+			} else if (ID == GUI15) {
+				return new Container_PestKiller(player.inventory, (TileEntityPestKiller) te);
+			}  else if (ID == GUI16) {
+				return new Container_RoundRobinator(player.inventory, (TileEntityRoundRobinator) te);
+			} 
 		}
 
 		if (ID == GUI9) {
@@ -157,7 +187,11 @@ public class GuiHandler implements IGuiHandler {
 				return new GUI_DecayablesChest(player.inventory, (TileEntityDecayablesChest) te);
 			} else if (ID == GUI14) {
 				return new GUI_SuperJukebox(player.inventory, (TileEntitySuperJukebox) te);
-			}
+			} else if (ID == GUI15) {
+				return new GUI_PestKiller(player.inventory, (TileEntityPestKiller) te);
+			}  else if (ID == GUI16) {
+				return new GUI_RoundRobinator(player.inventory, (TileEntityRoundRobinator) te);
+			} 
 		}
 
 		if (ID == GUI9) {
diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/Java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
new file mode 100644
index 0000000000..360b0440a2
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
@@ -0,0 +1,39 @@
+package gtPlusPlus.core.handler.Recipes;
+
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.ItemStack;
+
+public class DecayableRecipe {
+
+	public static final AutoMap<DecayableRecipe> mRecipes = new AutoMap<DecayableRecipe>();
+	
+	
+	public final int mTime;
+	public final ItemStack mInput;
+	public final ItemStack mOutput;
+
+	public DecayableRecipe(int time, ItemStack input, ItemStack output) {
+		mTime = time;
+		mInput = input;
+		mOutput = output;
+		mRecipes.put(this);
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o instanceof DecayableRecipe) {
+			DecayableRecipe i = (DecayableRecipe) o;
+			if (i.mTime == this.mTime && GT_Utility.areStacksEqual(mInput, i.mInput) && GT_Utility.areStacksEqual(mOutput, i.mOutput)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean isValid() {
+		return (mTime > 0 && ItemUtils.checkForInvalidItems(mInput) && ItemUtils.checkForInvalidItems(mOutput));
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
index b10e67aeaf..8853acd4b7 100644
--- a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
+++ b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.handler;
 
+import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.client.Minecraft;
 import net.minecraft.stats.AchievementList;
 import net.minecraftforge.event.entity.player.AchievementEvent;
 
@@ -12,12 +12,15 @@ public class StopAnnoyingFuckingAchievements {
 	 * Stops me getting fireworks every fucking time I open my inventory upon first loading a dev client.
 	 * @param event
 	 */
-	@SubscribeEvent
+	@SubscribeEvent(priority=EventPriority.HIGHEST)
 	public void FUCK_OFF(AchievementEvent event)	{
 		if (event.achievement.equals(AchievementList.openInventory)) {
-			if (MathUtils.randInt(0, 10) >= 9)
-				PlayerUtils.messagePlayer(event.entityPlayer, "Bang! Nah, Just joking, there's no fireworks. :)");
 			event.setCanceled(true);
+			if (Minecraft.getMinecraft() != null) {
+				if (Minecraft.getMinecraft().gameSettings != null) {
+					Minecraft.getMinecraft().gameSettings.showInventoryAchievementHint = false;
+				}
+			}
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java b/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java
index f1587fa82a..b70e58d009 100644
--- a/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java
@@ -61,7 +61,7 @@ public class CustomMovementHandler {
 		//
 
 		// Check to see if Enabled - Added 6/17/14 to provide option to disable Sneak Toggle
-		final boolean isSneaking = SneakManager.Sneaking();
+		final boolean isSneaking = SneakManager.get(thisPlayer).Sneaking();
 		//Utils.LOG_INFO("Can sneak: "+isSneaking);
 		//Utils.LOG_INFO("Can sprint: "+SneakManager.Sprinting());
 		if (isSneaking)
@@ -107,7 +107,7 @@ public class CustomMovementHandler {
 			options.sneak = settings.keyBindSneak.getIsKeyPressed();
 		}
 
-		if(options.sneak || SneakManager.Sneaking())
+		if(options.sneak || SneakManager.get(thisPlayer).Sneaking())
 		{
 			options.moveStrafe = (float)(options.moveStrafe * 0.3D);
 			options.moveForward = (float)(options.moveForward * 0.3D);
@@ -121,8 +121,8 @@ public class CustomMovementHandler {
 		final boolean enoughHunger = (thisPlayer.getFoodStats().getFoodLevel() > 6.0F) || thisPlayer.capabilities.isFlying;
 		final boolean canSprint = !options.sneak && !thisPlayer.isRiding() && !thisPlayer.capabilities.isFlying && enoughHunger;
 
-		this.isDisabled = !SneakManager.Sprinting();
-		this.canDoubleTap = SneakManager.optionDoubleTap;
+		this.isDisabled = !SneakManager.get(thisPlayer).Sprinting();
+		this.canDoubleTap = SneakManager.get(thisPlayer).optionDoubleTap;
 
 		// Key Pressed
 		if((canSprint || this.isDisabled) && settings.keyBindSprint.getIsKeyPressed() && !this.handledSprintPress)
@@ -149,8 +149,8 @@ public class CustomMovementHandler {
 
 	}
 
-	public void UpdateSprint(final boolean newValue, final boolean doubleTapped){
-		if (!SneakManager.Sprinting()){
+	public void UpdateSprint(final boolean newValue, final boolean doubleTapped, SneakManager aSneak){
+		if (!aSneak.Sprinting()){
 			this.sprint = false;
 			this.sprintDoubleTapped = doubleTapped;
 		}
diff --git a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
index e9c8c72934..3e51c6488a 100644
--- a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
+++ b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
@@ -1,47 +1,77 @@
 package gtPlusPlus.core.handler.events;
 
-import net.minecraft.client.Minecraft;
+import java.util.concurrent.ConcurrentHashMap;
 
 import gtPlusPlus.api.objects.Logger;
+import net.minecraft.entity.player.EntityPlayer;
 
 public class SneakManager {
 
 	//We make this a singleton for clientside data storage.
-	public static SneakManager instance = new SneakManager();
-	protected static final Minecraft mc = Minecraft.getMinecraft();
-	public static boolean		canSprint		= true;
-	public static boolean		isSneaking		= true;
-	public static boolean		optionDoubleTap			= true;
-	public static boolean		wasSprintDisabled		= false;
 
-	private static State Sprinting = State.ON;
-	private static State Crouching = State.OFF;
+	public static ConcurrentHashMap<String, SneakManager> mPlayerCache = new ConcurrentHashMap<String, SneakManager>();
+	
+	private static void addPlayer(EntityPlayer aPlayer) {
+		String aKey = getKey(aPlayer);
+		if (!mPlayerCache.containsKey(aKey)) {
+			mPlayerCache.put(aKey, new SneakManager(aPlayer));
+		}		
+	}
+	
+	public static SneakManager get(EntityPlayer aPlayer) {
+		
+		String aKey = getKey(aPlayer);
+		if (!mPlayerCache.containsKey(aKey)) {
+			addPlayer(aPlayer);
+		}		
+		return mPlayerCache.get(aKey);
+	}
+	
+	private static String getKey(EntityPlayer aPlayer) {
+		return ""+aPlayer.getGameProfile().getId().toString();
+	}
+	
+	
+	public SneakManager instance;
+	public EntityPlayer owner;
+	public boolean		canSprint		= true;
+	public boolean		isSneaking		= true;
+	public boolean		optionDoubleTap			= true;
+	public boolean		wasSprintDisabled		= false;	
+	public boolean		mIsWearingRing			= false;
+
+	private State Sprinting = State.ON;
+	private State Crouching = State.OFF;
+	
+	public SneakManager(EntityPlayer aPlayer) {
+		owner = aPlayer;
+	}
 
-	public static boolean Sneaking(){
+	public boolean Sneaking(){
 		return Crouching.getState();
 	}
 
-	public static boolean Sprinting(){
+	public boolean Sprinting(){
 		return Sprinting.getState();
 	}
 
-	public static State getSneakingState(){
+	public State getSneakingState(){
 		return Crouching;
 	}
 
-	public static State getSprintingDisabledState(){
+	public State getSprintingDisabledState(){
 		return Sprinting;
 	}
 
-	public static void toggleSneaking(){
+	public void toggleSneaking(){
 		toggleState(Crouching);
 	}
 
-	public static void toggleSprinting(){
+	public void toggleSprinting(){
 		toggleState(Sprinting);
 	}
 
-	private static State toggleState(final State state){
+	private State toggleState(final State state){
 		Logger.INFO("State Toggle");
 		if (state == State.ON) {
 			return State.OFF;
@@ -49,22 +79,38 @@ public class SneakManager {
 		return State.ON;
 	}
 
-	public static State setCrouchingStateON(){
+	private State setCrouchingStateON(){
 		return Crouching = State.ON;
 	}
 
-	public static State setCrouchingStateOFF(){
+	private State setCrouchingStateOFF(){
 		return Crouching = State.OFF;
 	}
 
-	public static State setSprintingStateON(){
+	private State setSprintingStateON(){
 		return Sprinting = State.ON;
 	}
 
-	public static State setSprintingStateOFF(){
+	private State setSprintingStateOFF(){
 		return Sprinting = State.OFF;
 	}
-
+	
+	public void putRingOn() {
+		mIsWearingRing = true;
+		setSprintingStateOFF();
+		setCrouchingStateON();
+	}
+	
+	public void takeRingOff() {
+		mIsWearingRing = false;
+		setSprintingStateON();
+		setCrouchingStateOFF();
+	}
+	
+	public boolean isWearingRing() {
+		return mIsWearingRing;
+	}	
+	
 	public static enum State {
 		ON(true),
 		OFF(false);