diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2022-11-07 23:09:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 16:09:55 +0100 |
| commit | 6c3d4537f1f98d66f09436a9fae99a7b4644ecf5 (patch) | |
| tree | adf57af6bd219bd80157800a24c0758e58ab1de3 /src/main/java/gregtech/loaders | |
| parent | acfa3dfed94b0e8c69ab6439593197338701b1c4 (diff) | |
| download | GT5-Unofficial-6c3d4537f1f98d66f09436a9fae99a7b4644ecf5.tar.gz GT5-Unofficial-6c3d4537f1f98d66f09436a9fae99a7b4644ecf5.tar.bz2 GT5-Unofficial-6c3d4537f1f98d66f09436a9fae99a7b4644ecf5.zip | |
remove compat with IC2 fuel can (#1506)
* remove compat with IC2 fuel can
* Spotless apply for branch feature/remove-ic2-fuel-can for #1506 (#1507)
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java | 13 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java | 1 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java index f9e55088ee..53887e2788 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java @@ -16,18 +16,7 @@ public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre( OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (aOreDictName.equals("sandCracked")) { - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.copyAmount(16L, aStack), - -1, - gregtech.api.util.GT_ModHandler.getFuelCan(25000), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 8L), - null, - null, - null, - new ItemStack(Blocks.sand, 10), - 2500); - } else if (aOreDictName.equals("sandOil")) { + if (aOreDictName.equals("sandOil")) { GT_Values.RA.addCentrifugeRecipe( GT_Utility.copyAmount(2L, aStack), 1, diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java index 8057a2efea..a8d29940b4 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java @@ -151,7 +151,6 @@ public class GT_Loader_ItemData implements Runnable { GT_ModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Food_Can_Empty.get(1L), new ItemData(Materials.Tin, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Fuel_Rod_Empty.get(1L), new ItemData(Materials.Iron, 3628800L)); - GT_OreDictUnificator.addItemData(ItemList.IC2_Fuel_Can_Empty.get(1L), new ItemData(Materials.Tin, 25401600L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), new ItemData(Materials.Gold, 7257600L)); GT_OreDictUnificator.addItemData( |