$ Fixed COFH OreDictionaryArbiter via ASM.

$ Cleaned up GC Fuel ASM, Rockets are now tiered.
% Added ability for Rover to use Diesel still.
% Added Tooltip to the GC Fuel Loader, showing what Tier requires which fuel.
> Bug still exists on sending packets, which may cause the client to boot the player back to the menu.

2 files changed, 15 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index bea8633a88..c9ea0f3e5b 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -25,7 +25,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.recipe.RECIPES_Old_Circuits;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.tileentities.ModTileEntities;
 import gtPlusPlus.core.util.Utils;
@@ -33,6 +32,7 @@ import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.player.PlayerCache;
 import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner;
 import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO;
+import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraftforge.common.ForgeChunkManager;
 
@@ -138,6 +138,8 @@ public class CommonProxy {
 		Utils.registerEvent(new GeneralTooltipEventHandler());
 		//Handles Custom tooltips for EIO.
 		Utils.registerEvent(new HandlerTooltip_EIO());
+		//Handles Custom Tooltips for GC
+		Utils.registerEvent(new HandlerTooltip_GC());
 		
 		//Register Chunkloader
 		ForgeChunkManager.setForcedChunkLoadingCallback(GTplusplus.instance, ChunkManager.getInstance());
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index b886d780a9..6b1a006098 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
 import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.ModItems;
@@ -309,11 +310,11 @@ public class RocketFuels {
 				new ItemStack[] {},
 				null,
 				new int[] {},
-				new FluidStack[] {FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 1000)},
+				new FluidStack[] {FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 1000)},
 				new FluidStack[] {},
 				0,
 				0,
-				1024)); //Fuel Value
+				512)); //Fuel Value
 		
 		mRocketFuels.put(new Recipe_GT(
 				true,
@@ -321,11 +322,11 @@ public class RocketFuels {
 				new ItemStack[] {},
 				null,
 				new int[] {},
-				new FluidStack[] {FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 1000)},
+				new FluidStack[] {FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 1000)},
 				new FluidStack[] {},
 				0,
 				0,
-				512)); //Fuel Value
+				768)); //Fuel Value
 		
 		mRocketFuels.put(new Recipe_GT(
 				true,
@@ -333,11 +334,16 @@ public class RocketFuels {
 				new ItemStack[] {},
 				null,
 				new int[] {},
-				new FluidStack[] {FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 1000)},
+				new FluidStack[] {FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 1000)},
 				new FluidStack[] {},
 				0,
 				0,
-				768)); //Fuel Value
+				1024)); //Fuel Value
+		
+		
+		//Add in default Diesel for the Buggy
+		mValidRocketFuelNames.add(Materials.Fuel.getFluid(1).getFluid().getName());
+		mValidRocketFuels.put(-1, Materials.Fuel.getFluid(1).getFluid());	
 		
 		int mID = 0;
 		for (Recipe_GT r : mRocketFuels) {