aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-03 16:47:35 +0100
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-03 16:47:35 +0100
commit734e7a1498ef6ca48f95f075aaa66372639c9618 (patch)
treee18d6ec9acaf4aee2d85155d03a91df9769fe9be /src/Java/gtPlusPlus/core/item
parenta5d2b84eabdd5b75d409d8519b7831ecfd0061b9 (diff)
downloadGT5-Unofficial-734e7a1498ef6ca48f95f075aaa66372639c9618.tar.gz
GT5-Unofficial-734e7a1498ef6ca48f95f075aaa66372639c9618.tar.bz2
GT5-Unofficial-734e7a1498ef6ca48f95f075aaa66372639c9618.zip
$ 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.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java18
1 files changed, 12 insertions, 6 deletions
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) {