aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-06-29 22:28:02 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-06-29 22:28:02 +1000
commit26d1edb9ada7a3b961ce06194230d172d38a536d (patch)
tree228f7c0e294473a47ce2c971e64d783e57b609ee /src/Java
parentf0418333ed443ceddf78c7658737dac697462b59 (diff)
downloadGT5-Unofficial-26d1edb9ada7a3b961ce06194230d172d38a536d.tar.gz
GT5-Unofficial-26d1edb9ada7a3b961ce06194230d172d38a536d.tar.bz2
GT5-Unofficial-26d1edb9ada7a3b961ce06194230d172d38a536d.zip
+Added A FluidUtils Class
$Fixed TF Recipes for GT Machines.
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/miscutil/core/creative/AddToCreativeTab.java5
-rw-r--r--src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabOther.java18
-rw-r--r--src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java3
-rw-r--r--src/Java/miscutil/core/util/fluid/FluidUtils.java20
4 files changed, 44 insertions, 2 deletions
diff --git a/src/Java/miscutil/core/creative/AddToCreativeTab.java b/src/Java/miscutil/core/creative/AddToCreativeTab.java
index 869f2c4925..7655a639ad 100644
--- a/src/Java/miscutil/core/creative/AddToCreativeTab.java
+++ b/src/Java/miscutil/core/creative/AddToCreativeTab.java
@@ -3,6 +3,7 @@ package miscutil.core.creative;
import miscutil.core.creative.tabs.MiscUtilCreativeTabBlock;
import miscutil.core.creative.tabs.MiscUtilCreativeTabMachines;
import miscutil.core.creative.tabs.MiscUtilCreativeTabMisc;
+import miscutil.core.creative.tabs.MiscUtilCreativeTabOther;
import miscutil.core.creative.tabs.MiscUtilCreativeTabTools;
import miscutil.core.lib.CORE;
import net.minecraft.creativetab.CreativeTabs;
@@ -14,13 +15,15 @@ public class AddToCreativeTab {
public static CreativeTabs tabCombat;
public static CreativeTabs tabTools;
public static CreativeTabs tabMachines;
+ public static CreativeTabs tabOther;
public static void initialiseTabs(){
tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab");
tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab");
tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab");
tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab");
-
+ tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab");
+
if (CORE.DEBUG){
//tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab");
}
diff --git a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabOther.java
new file mode 100644
index 0000000000..02f1ecb15e
--- /dev/null
+++ b/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabOther.java
@@ -0,0 +1,18 @@
+package miscutil.core.creative.tabs;
+
+import miscutil.core.item.ModItems;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+public class MiscUtilCreativeTabOther extends CreativeTabs {
+
+ public MiscUtilCreativeTabOther(String lable) {
+ super(lable);
+ }
+
+ @Override
+ public Item getTabIconItem() {
+ return ModItems.itemHeliumBlob;
+ }
+
+}
diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index ff4ff29641..527c9e947d 100644
--- a/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -38,6 +38,7 @@ public class TF_Gregtech_Recipes {
//Blizz Rod
Utils.LOG_INFO("Adding Recipes for Blizz Rod");
+ GT_Values.RA.addVacuumFreezerRecipe(new ItemStack(Items.blaze_rod), rod_Blizz, (int) Math.max((Materials.Blaze.getMass()*4) * 3L, 1L));
GT_ModHandler.addPulverisationRecipe(rod_Blizz, dust_Blizz3, new ItemStack(Items.snowball, 1), 50, false);
//Blazing Pyrotheum
@@ -47,7 +48,7 @@ public class TF_Gregtech_Recipes {
}
private static FluidStack getFluidStack(String fluidName, int amount){
- Utils.LOG_INFO("Trying to get a fluid stack of "+fluidName);
+ Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName);
try {
return FluidRegistry.getFluidStack(fluidName, amount);
}
diff --git a/src/Java/miscutil/core/util/fluid/FluidUtils.java b/src/Java/miscutil/core/util/fluid/FluidUtils.java
new file mode 100644
index 0000000000..978839ec5c
--- /dev/null
+++ b/src/Java/miscutil/core/util/fluid/FluidUtils.java
@@ -0,0 +1,20 @@
+package miscutil.core.util.fluid;
+
+import miscutil.core.util.Utils;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+public class FluidUtils {
+
+ public static FluidStack getFluidStack(String fluidName, int amount){
+ Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName);
+ try {
+ return FluidRegistry.getFluidStack(fluidName, amount);
+ }
+ catch (Throwable e){
+ return null;
+ }
+
+ }
+
+}