diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/material')
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/MaterialGenerator.java | 13 |
2 files changed, 4 insertions, 17 deletions
diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java index c829f49bfc..a4bf4fbd87 100644 --- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java +++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java @@ -10,7 +10,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils; public final class MISC_MATERIALS { /* - * Some of these materials purely exist as data objects, items will most likely be assigned seperately. Most are + * Some of these materials purely exist as data objects, items will most likely be assigned separately. Most are * just compositions which will have dusts assigned to them. */ @@ -314,12 +314,6 @@ public final class MISC_MATERIALS { new MaterialStack(ELEMENT.getInstance().SODIUM, 1), new MaterialStack(ELEMENT.getInstance().CHLORINE, 1)); - public static final Material SODIUM_HYDROXIDE = new Material( - "Sodium Hydroxide", - MaterialState.PURE_GAS, - new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(HYDROXIDE, 1)); - public static final Material SALT_WATER = new Material( "Salt Water", MaterialState.PURE_LIQUID, diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index 3cebd55e00..62fe3440ec 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -68,23 +68,16 @@ public class MaterialGenerator { @SuppressWarnings("unused") private static volatile Block tempBlock; + @Deprecated public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut) { return addFluidCannerRecipe(aEmpty, aFullContainer, aFluidIn, rFluidOut, null, null); } - /** - * Called Reflectively from CORE.RA.addFluidCannerRecipe - * - * @return - */ + @Deprecated public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut, Integer aTime, Integer aEu) { - /* - * GT_Recipe r = new Recipe_GT( true, new ItemStack[] {aEmpty}, new ItemStack[] {aFullContainer}, null, new - * int[] {}, new FluidStack[] {rFluidIn}, new FluidStack[] {rFluidOut}, 0, 0, 0); - */ - // new RecipeGen_FluidCanning(r, false); + RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0); if (g != null && g.valid()) { return true; |