diff options
| author | botn365 <42187820+botn365@users.noreply.github.com> | 2020-01-08 16:48:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 16:48:18 +0100 |
| commit | a3a9d4a5c2e466db33879176626670f2f07b635a (patch) | |
| tree | 8176e79d6be425dc28cc3a612416b832a5bed3c5 /src/Java/gtPlusPlus/core/recipe/common | |
| parent | d7c83c3cd1036668c1f520f144c08de444f675a4 (diff) | |
| parent | 6bb3c6872c97b36c84f32bf730eee31206728c74 (diff) | |
| download | GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.tar.gz GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.tar.bz2 GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.zip | |
Merge pull request #7 from alkcorp/master
sync
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe/common')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index be1089a72a..6b8f992266 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -592,7 +592,7 @@ public class CI { }; private static final Materials[] aMaterial_Cables = new Materials[] { - (CORE.ConfigSwitches.enableCustom_Cables && LoadedMods.EnderIO) ? Materials.RedstoneAlloy : CORE.GTNH ? Materials.Lead : Materials.Tin, + !CORE.GTNH ? Materials.Lead : Materials.Tin, Materials.Cobalt, Materials.AnnealedCopper, Materials.Gold, @@ -1244,4 +1244,24 @@ public class CI { return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, i, 0); } + public static ItemStack getTieredGTPPMachineCasing(int aTier, int aAmount) { + GregtechItemList[] aHulls = new GregtechItemList[] { + GregtechItemList.GTPP_Casing_ULV, + GregtechItemList.GTPP_Casing_LV, + GregtechItemList.GTPP_Casing_MV, + GregtechItemList.GTPP_Casing_HV, + GregtechItemList.GTPP_Casing_EV, + GregtechItemList.GTPP_Casing_IV, + GregtechItemList.GTPP_Casing_LuV, + GregtechItemList.GTPP_Casing_ZPM, + GregtechItemList.GTPP_Casing_UV, + GregtechItemList.GTPP_Casing_MAX + }; + return aHulls[aTier].get(aAmount); + } + + public static ItemStack getTieredComponentOfMaterial(Materials aMaterial, OrePrefixes aPrefix, int aAmount) { + return ItemUtils.getOrePrefixStack(aPrefix, aMaterial, aAmount); + } + } |