diff options
author | boubou19 <miisterunknown@gmail.com> | 2024-08-29 19:49:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-29 17:49:24 +0000 |
commit | 8c128cd0c175f2e952ab6ade2a6ec9e71d56c443 (patch) | |
tree | 5b1300e99ca13310620785e882fd7c2b3eac8200 /src | |
parent | 1e017f854f0cf56882efb49f78527282db13f92f (diff) | |
download | GT5-Unofficial-8c128cd0c175f2e952ab6ade2a6ec9e71d56c443.tar.gz GT5-Unofficial-8c128cd0c175f2e952ab6ade2a6ec9e71d56c443.tar.bz2 GT5-Unofficial-8c128cd0c175f2e952ab6ade2a6ec9e71d56c443.zip |
move NEI capsule hidding from NHCore to GT5U (#2993)
* move capsule hidding from NHCore
* Spotless apply for branch fix/capsule_hiding for #2993 (#2994)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* fix silly
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src')
2 files changed, 17 insertions, 3 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java index 5b475dc069..1f22cbc761 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java @@ -16,6 +16,7 @@ package com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; import java.util.List; import java.util.stream.Collectors; @@ -27,6 +28,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import codechicken.nei.api.API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -92,6 +94,9 @@ public class GTMetaItemEnhancer { addFluidData(m, GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1), capsuls, 1000, i + 1001, true); // addFluidData(m, new ItemStack(Items.glass_bottle), bottles, 250, i + 1001, false); } + + API.hideItem(new ItemStack(capsuls, 1, WILDCARD)); + API.hideItem(new ItemStack(moltenCapsuls, 1, WILDCARD)); } private static void addFluidData(Materials m, ItemStack container, Item filled, int amount, int it, boolean empty) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 197ada7f22..2c032e0051 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -69,6 +69,7 @@ import static gregtech.api.enums.OrePrefixes.toolHeadWrench; import static gregtech.api.enums.OrePrefixes.turbineBlade; import static gregtech.api.enums.OrePrefixes.values; import static gregtech.api.enums.OrePrefixes.wireFine; +import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; import java.lang.reflect.Field; import java.util.Arrays; @@ -123,6 +124,7 @@ import com.github.bartimaeusnek.bartworks.util.log.DebugLog; import com.github.bartimaeusnek.crossmod.cls.CLSCompat; import com.google.common.collect.HashBiMap; +import codechicken.nei.api.API; import cpw.mods.fml.common.ProgressManager; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Element; @@ -1875,15 +1877,22 @@ public class WerkstoffLoader { } if ((WerkstoffLoader.toGenerateGlobal & 0b10000) != 0) { WerkstoffLoader.items.put(cell, new BW_MetaGenerated_Items(cell)); - if (Forestry.isModLoaded()) WerkstoffLoader.items.put(capsule, new BW_MetaGenerated_Items(capsule)); + if (Forestry.isModLoaded()) { + BW_MetaGenerated_Items capsuleClass = new BW_MetaGenerated_Items(capsule); + API.hideItem(new ItemStack(capsuleClass, 1, WILDCARD)); + WerkstoffLoader.items.put(capsule, capsuleClass); + } } if ((WerkstoffLoader.toGenerateGlobal & 0b100000) != 0) { WerkstoffLoader.items.put(cellPlasma, new BW_MetaGenerated_Items(cellPlasma)); } if ((WerkstoffLoader.toGenerateGlobal & 0b1000000) != 0) { WerkstoffLoader.items.put(OrePrefixes.cellMolten, new BW_MetaGenerated_Items(OrePrefixes.cellMolten)); - if (Forestry.isModLoaded()) WerkstoffLoader.items - .put(OrePrefixes.capsuleMolten, new BW_MetaGenerated_Items(OrePrefixes.capsuleMolten)); + if (Forestry.isModLoaded()) { + BW_MetaGenerated_Items capsuleMoltenClass = new BW_MetaGenerated_Items(OrePrefixes.capsuleMolten); + API.hideItem(new ItemStack(capsuleMoltenClass, 1, WILDCARD)); + WerkstoffLoader.items.put(OrePrefixes.capsuleMolten, capsuleMoltenClass); + } } if ((WerkstoffLoader.toGenerateGlobal & 0b10000000) != 0) { WerkstoffLoader.items.put(plate, new BW_MetaGenerated_Items(plate)); |