diff options
5 files changed, 45 insertions, 3 deletions
diff --git a/.classpath b/.classpath index a6c811e85b..4f5e6f0a1c 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="conduits/|miscutil/enderio/conduit/GregTech/|miscutil/gregtech/enums/Materials2.java|miscutil/gregtech/objects/GregMaterialStack.java|miscutil/core/util/Log.java|miscutil/enderio/|miscutil/core/item/tool/bloodsteel/|miscutil/core/block/reactor/|miscutil/gregtech/common/tools/GT_Tool_Turbine_Large.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Normal.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Small.java|miscutil/gregtech/api/enums/GregtechTextures.java|miscutil/gregtech/api/enums/GregtechTextureSet.java|miscutil/RTC/multiblock/" kind="src" path="src/Java"/> + <classpathentry excluding="conduits/|miscutil/enderio/conduit/GregTech/|miscutil/gregtech/enums/Materials2.java|miscutil/gregtech/objects/GregMaterialStack.java|miscutil/core/util/Log.java|miscutil/enderio/|miscutil/core/item/tool/bloodsteel/|miscutil/core/block/reactor/|miscutil/gregtech/common/tools/GT_Tool_Turbine_Large.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Normal.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Small.java|miscutil/gregtech/api/enums/GregtechTextures.java|miscutil/gregtech/api/enums/GregtechTextureSet.java|miscutil/RTC/" kind="src" path="src/Java"/> <classpathentry kind="src" path="src/resources"/> <classpathentry combineaccessrules="false" kind="src" path="/Forge"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> 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; + } + + } + +} |