diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-09-22 07:58:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 08:58:35 +0200 |
| commit | 5e918fa2738af7eaab3e2ffdfb007208a6d89294 (patch) | |
| tree | 26f2c933b295bc36938bb3e6fbf04258d14d63b4 /src/main/java/gtPlusPlus/core/material | |
| parent | 1925c00f24f04900d630129d9e337748fe3dc557 (diff) | |
| download | GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.tar.gz GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.tar.bz2 GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.zip | |
Some more RA2 conversions (#752)
* remove deprecated methods
* laser engraving
* fluid utils cleanup
* more deprecations
* biorecipes
* RA2 rocketfuel
* rare earth
* typo
* more rareearth cleanup
* nuclear fuel processing
* Update RecipeLoader_NuclearFuelProcessing.java
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
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; |