aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/items/CombType.java75
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java284
2 files changed, 220 insertions, 139 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index ffde997fb9..57d7086f2f 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -4,11 +4,43 @@ import gregtech.api.enums.Materials;
import gregtech.api.util.GT_LanguageManager;
public enum CombType {
- //Organic
+ //Organic Line
LIGNIE("lignite", true, Materials.Lignite, 100),
COAL("coal", true, Materials.Coal, 100),
STICKY("stickyresin", true, Materials._NULL, 50),
OIL("oil", true, Materials._NULL, 100),
+
+ //IC2 Line
+ COOLANT("coolant", true, Materials._NULL, 100),
+ ENERGY("energy", true, Materials._NULL, 80),
+ LAPOTRON("lapotron", true, Materials._NULL, 60),
+
+ //Alloy Line
+ REDALLOY("redalloy", true, Materials.RedAlloy, 100),
+ REDSTONEALLOY("redstonealloy", true, Materials.RedstoneAlloy, 90),
+ CONDUCTIVEIRON("conductiveiron", true, Materials.ConductiveIron, 80),
+ VIBRANTALLOY("vibrantalloy", true, Materials.VibrantAlloy, 50),
+ ENERGETICALLOY("energeticalloy", true, Materials.EnergeticAlloy, 70),
+ ELECTRICALSTEEL("electricalsteel", true, Materials.ElectricalSteel, 90),
+ DARKSTEEL("darksteel", true, Materials.DarkSteel, 80),
+ PULSATINGIRON("pulsatingiron", true, Materials.PulsatingIron, 80),
+ STAINLESSSTEL("steainlesssteel", true, Materials.StainlessSteel, 75),
+ ENDERIUM("enderium", true, Materials.Enderium, 40),
+
+ //Thaumcraft Line
+ THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100),
+ THAUMIUMSHARD("tahumiumshard", true, Materials._NULL, 85),
+ AMBER("amber", true, Materials.Amber, 90),
+ QUICKSILVER("quicksilver", true, Materials.Mercury, 90),
+ SALISMUNDUS("salismundus", true, Materials._NULL, 75),
+ TAINTED("tainted", true, Materials._NULL, 80),
+ MITHRIL("mithril", true, Materials.Mithril, 70),
+ ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70),
+ THAUMINITE("thauminte", true, Materials._NULL, 50),
+ SCHADOWMETAL("shadowmetal", true, Materials.Shadow, 50),
+ DIVIDED("devided", true, Materials.Unstable, 40),
+ SPARKELING("sparkeling", true, Materials.NetherStar, 40),
+
//Gem Line
STONE("stone", true, Materials._NULL, 70),
CERTUS("certus", true, Materials.CertusQuartz, 100),
@@ -20,7 +52,7 @@ public enum CombType {
OLIVINE("olivine", true, Materials.Olivine, 100),
EMERALD("emerald", true, Materials.Emerald, 100),
- // Metals Line
+ //Metals Line
SLAG("slag", true, Materials._NULL, 50),
COPPER("coppon", true, Materials.Copper, 100),
TIN("tine", true, Materials.Tin, 100),
@@ -32,7 +64,7 @@ public enum CombType {
SILVER("argentia", true, Materials.Silver, 100),
GOLD("aurelia", true, Materials.Gold, 100),
- // Rare Metals Line
+ //Rare Metals Line
ALUMINIUM("bauxia", true, Materials.Aluminium, 60),
MANGANESE("pyrolusium", true, Materials.Manganese, 30),
TITANIUM("titanium", true, Materials.Ilmenite, 100),
@@ -41,17 +73,46 @@ public enum CombType {
PLATINUM("platina", true, Materials.Platinum, 40),
IRIDIUM("quantaria", true, Materials.Iridium, 20),
-
- // Radioactive Line
+ //Radioactive Line
URANIUM("urania", true, Materials.Uranium, 50),
PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
- NAQUADAH("stargatium", true, Materials.Naquadah, 10),;
+ NAQUADAH("stargatium", true, Materials.Naquadah, 10);
private static int[][] colours = new int[][]{
+ //organic
{0x906237, 0x58300B},
- {0x666666, 0x525252},
+ {0x525252, 0x666666},
{0x2E8F5B, 0xDCC289},
{0x4C4C4C, 0x333333},
+ //ic2
+ {0x144F5A, 0x2494A2},
+ {0xC11F1F, 0xEBB9B9},
+ {0x6478FF, 0x1414FF},
+ //alloy
+ {0xE60000, 0xB80000},
+ {0xB80000, 0xA50808},
+ {0xCEADA3, 0x817671},
+ {0x86A12D, 0xC4F2AE},
+ {0xFF9933, 0xFFAD5C},
+ {0x787878, 0xD8D8D8},
+ {0x252525, 0x443B44},
+ {0x6DD284, 0x006600},
+ {0x778899, 0xC8C8DC},
+ {0x2E8B57, 0x599087},
+ //Thaumcraft
+ {0x7A007A, 0x5C005C},
+ {0x9966FF, 0xAD85FF},
+ {0xE60000, 0x774B15},
+ {0x7A007A, 0x5C005C},
+ {0xF7ADDE, 0x592582},
+ {0x904BB8, 0xE800FF},
+ {0xF0E68C, 0xFFFFD2},
+ {0xAFEEEE, 0xE6E6FF},
+ {0x2E2D79, 0x7581E0},
+ {0x2E2D79, 0x7581E0},
+ {0xF0F0F0, 0xDCDCDC},
+ {0x7A007A, 0xFFFFFF},
+ //gems
{0x808080, 0x999999},
{0x57CFFB, 0xBBEEFF},
{0x7D0F0F, 0xD11919},
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 33a558542e..4085934989 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -11,6 +11,7 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gregtech.loaders.materialprocessing.ProcessingModSupport;
@@ -93,191 +94,210 @@ public class ItemComb extends Item {
public String getItemStackDisplayName(ItemStack stack) {
return CombType.values()[stack.getItemDamage()].getName();
}
-
public void initCombsRecipes() {
ItemStack tComb;
//Organic
tComb = getStackForType(CombType.LIGNIE);
- addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), 90);
- addProcess(tComb, Materials.Lignite, 100);
+ addSpecialCentLV(tComb,GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), 90);
+ addProcessLV(tComb, Materials.Lignite, 100);
tComb = getStackForType(CombType.COAL);
- addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), 40);
- addProcess(tComb, Materials.Coal, 100);
+ addSpecialCentLV(tComb,GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), 5, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Coal, 1), 100);
+ addProcessLV(tComb, Materials.Coal, 100);
tComb = getStackForType(CombType.STICKY);
- addSpecialCent(tComb, ItemList.IC2_Resin.get(1, new Object[0]), 70);
+ addSpecialCentLV(tComb, ItemList.IC2_Resin.get(1, new Object[0]), 50, ItemList.IC2_Plantball.get(1, new Object[0]), 15);
tComb = getStackForType(CombType.OIL);
- addSpecialCent(tComb, ItemList.Crop_Drop_OilBerry.get(2, new Object[0]), 70);
- addProcess(tComb, Materials.Oilsands, 100);
-
- //Gem Line
+ addSpecialCentLV(tComb, ItemList.Crop_Drop_OilBerry.get(2, new Object[0]), 70);
+ addProcessLV(tComb, Materials.Oilsands, 100);
+
+ //ic2
+ tComb = getStackForType(CombType.COOLANT);
+ addSpecialCentHV(tComb, GT_ModHandler.getModItem("gendustry", "HoneyDrop", 1, 2002), 100, ItemList.FR_Wax.get(1, new Object[0]), 100);
+ tComb = getStackForType(CombType.ENERGY);
+ addSpecialCentHV(tComb, GT_ModHandler.getModItem("gendustry", "HoneyDrop", 1, 2003), 20, ItemList.IC2_Energium_Dust.get(1L), 20, ItemList.FR_RefractoryWax.get(1, new Object[0]), 50);
+ tComb = getStackForType(CombType.LAPOTRON);
+ addSpecialCentHV(tComb, GT_ModHandler.getModItem("gendustry", "HoneyDrop", 1, 2007), 20, GT_ModHandler.getModItem("dreamcraft", "item.LapotronDust", 1, 0), 15, GT_ModHandler.getModItem("MagicBees", "wax", 1, 2), 40);
+
+ //Gem Line
tComb = getStackForType(CombType.STONE);
- addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 70,GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Salt,1),20,GT_OreDictUnificator.get(OrePrefixes.dust,Materials.RockSalt,1),20);
- addProcess(tComb, Materials.Soapstone, 100);
- addProcess(tComb, Materials.Talc, 100);
- addProcess(tComb, Materials.Apatite, 100);
- addProcess(tComb, Materials.Phosphate, 100);
- addProcess(tComb, Materials.Phosphorus, 100);
+ addSpecialCentLV(tComb,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 70,GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Salt,1),20,GT_OreDictUnificator.get(OrePrefixes.dust,Materials.RockSalt,1),20);
+ addProcessLV(tComb, Materials.Soapstone, 100);
+ addProcessLV(tComb, Materials.Talc, 100);
+ addProcessLV(tComb, Materials.Apatite, 100);
+ addProcessLV(tComb, Materials.Phosphate, 100);
+ addProcessLV(tComb, Materials.Phosphorus, 100);
tComb = getStackForType(CombType.CERTUS);
- addProcess(tComb, Materials.CertusQuartz, 100);
- addProcess(tComb, Materials.Quartzite, 100);
- addProcess(tComb, Materials.Barite, 100);
+ addProcessLV(tComb, Materials.CertusQuartz, 100);
+ addProcessLV(tComb, Materials.Quartzite, 100);
+ addProcessLV(tComb, Materials.Barite, 100);
tComb = getStackForType(CombType.REDSTONE);
- addProcess(tComb, Materials.Redstone, 100);
- addProcess(tComb, Materials.Cinnabar, 100);
+ addProcessLV(tComb, Materials.Redstone, 100);
+ addProcessLV(tComb, Materials.Cinnabar, 100);
tComb = getStackForType(CombType.LAPIS);
- addProcess(tComb, Materials.Lapis, 100);
- addProcess(tComb, Materials.Sodalite, 100);
- addProcess(tComb, Materials.Lazurite, 100);
- addProcess(tComb, Materials.Calcite, 100);
+ addProcessLV(tComb, Materials.Lapis, 100);
+ addProcessLV(tComb, Materials.Sodalite, 100);
+ addProcessLV(tComb, Materials.Lazurite, 100);
+ addProcessLV(tComb, Materials.Calcite, 100);
tComb = getStackForType(CombType.RUBY);
- addProcess(tComb, Materials.Ruby, 100);
- addProcess(tComb, Materials.Redstone, 100);
+ addProcessLV(tComb, Materials.Ruby, 100);
+ addProcessLV(tComb, Materials.Redstone, 100);
tComb = getStackForType(CombType.SAPPHIRE);
- addProcess(tComb, Materials.Sapphire, 100);
- addProcess(tComb, Materials.GreenSapphire, 100);
- addProcess(tComb, Materials.Almandine, 100);
- addProcess(tComb, Materials.Pyrope, 100);
+ addProcessLV(tComb, Materials.Sapphire, 100);
+ addProcessLV(tComb, Materials.GreenSapphire, 100);
+ addProcessLV(tComb, Materials.Almandine, 100);
+ addProcessLV(tComb, Materials.Pyrope, 100);
tComb = getStackForType(CombType.DIAMOND);
- addProcess(tComb, Materials.Diamond, 100);
- addProcess(tComb, Materials.Graphite, 100);
+ addProcessLV(tComb, Materials.Diamond, 100);
+ addProcessLV(tComb, Materials.Graphite, 100);
tComb = getStackForType(CombType.OLIVINE);
- addProcess(tComb, Materials.Olivine, 100);
- addProcess(tComb, Materials.Bentonite, 100);
- addProcess(tComb, Materials.Magnesite, 100);
- addProcess(tComb, Materials.Glauconite, 100);
+ addProcessLV(tComb, Materials.Olivine, 100);
+ addProcessLV(tComb, Materials.Bentonite, 100);
+ addProcessLV(tComb, Materials.Magnesite, 100);
+ addProcessLV(tComb, Materials.Glauconite, 100);
tComb = getStackForType(CombType.EMERALD);
- addProcess(tComb, Materials.Emerald, 100);
- addProcess(tComb, Materials.Beryllium, 100);
- addProcess(tComb, Materials.Thorium, 100);
+ addProcessLV(tComb, Materials.Emerald, 100);
+ addProcessLV(tComb, Materials.Beryllium, 100);
+ addProcessLV(tComb, Materials.Thorium, 100);
// // Metals Line
tComb = getStackForType(CombType.SLAG);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 50,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniteBlack, 1), 20,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniteRed, 1), 20);
- addProcess(tComb, Materials.Salt, 100);
- addProcess(tComb, Materials.RockSalt, 100);
- addProcess(tComb, Materials.Lepidolite, 100);
- addProcess(tComb, Materials.Spodumene, 100);
- addProcess(tComb, Materials.Monazite, 100);
+ addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 50,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniteBlack, 1), 20,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniteRed, 1), 20);
+ addProcessLV(tComb, Materials.Salt, 100);
+ addProcessLV(tComb, Materials.RockSalt, 100);
+ addProcessLV(tComb, Materials.Lepidolite, 100);
+ addProcessLV(tComb, Materials.Spodumene, 100);
+ addProcessLV(tComb, Materials.Monazite, 100);
tComb = getStackForType(CombType.COPPER);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1), 70);
- addProcess(tComb, Materials.Copper, 100);
- addProcess(tComb, Materials.Tetrahedrite, 100);
- addProcess(tComb, Materials.Chalcopyrite, 100);
- addProcess(tComb, Materials.Malachite, 100);
- addProcess(tComb, Materials.Pyrite, 100);
- addProcess(tComb, Materials.Stibnite, 100);
+ addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1), 70);
+ addProcessLV(tComb, Materials.Copper, 100);
+ addProcessLV(tComb, Materials.Tetrahedrite, 100);
+ addProcessLV(tComb, Materials.Chalcopyrite, 100);
+ addProcessLV(tComb, Materials.Malachite, 100);
+ addProcessLV(tComb, Materials.Pyrite, 100);
+ addProcessLV(tComb, Materials.Stibnite, 100);
tComb = getStackForType(CombType.TIN);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1), 60);
- addProcess(tComb, Materials.Tin, 100);
- addProcess(tComb, Materials.Cassiterite, 100);
+ addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1), 60);
+ addProcessLV(tComb, Materials.Tin, 100);
+ addProcessLV(tComb, Materials.Cassiterite, 100);
tComb = getStackForType(CombType.LEAD);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1), 45);
- addProcess(tComb, Materials.Lead, 100);
+ addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1), 45);
+ addProcessLV(tComb, Materials.Lead, 100);
tComb = getStackForType(CombType.IRON);
- addProcess(tComb, Materials.Iron, 100);
- addProcess(tComb, Materials.Magnetite, 100);
- addProcess(tComb, Materials.BrownLimonite, 100);
- addProcess(tComb, Materials.YellowLimonite, 100);
- addProcess(tComb, Materials.VanadiumMagnetite, 100);
- addProcess(tComb, Materials.BandedIron, 100);
- addProcess(tComb, Materials.Pyrite, 100);
+ addProcessLV(tComb, Materials.Iron, 100);
+ addProcessLV(tComb, Materials.Magnetite, 100);
+ addProcessLV(tComb, Materials.BrownLimonite, 100);
+ addProcessLV(tComb, Materials.YellowLimonite, 100);
+ addProcessLV(tComb, Materials.VanadiumMagnetite, 100);
+ addProcessLV(tComb, Materials.BandedIron, 100);
+ addProcessLV(tComb, Materials.Pyrite, 100);
if (ProcessingModSupport.aEnableGCMarsMats)
- addProcess(tComb, Materials.MeteoricIron, 100);
+ addProcessLV(tComb, Materials.MeteoricIron, 100);
tComb = getStackForType(CombType.STEEL);
- addProcess(tComb, Materials.Iron, Materials.Iron, 100);
- addProcess(tComb, Materials.Magnetite, Materials.Magnetite, 100);
- addProcess(tComb, Materials.BrownLimonite, Materials.BrownLimonite, 100);
- addProcess(tComb, Materials.YellowLimonite, Materials.YellowLimonite, 100);
- addProcess(tComb, Materials.VanadiumMagnetite, Materials.VanadiumMagnetite, 100);
- addProcess(tComb, Materials.BandedIron, Materials.BandedIron, 100);
- addProcess(tComb, Materials.Pyrite, Materials.Pyrite, 100);
+ addProcessLV(tComb, Materials.Iron, Materials.Iron, 100);
+ addProcessLV(tComb, Materials.Magnetite, Materials.Magnetite, 100);
+ addProcessLV(tComb, Materials.BrownLimonite, Materials.BrownLimonite, 100);
+ addProcessLV(tComb, Materials.YellowLimonite, Materials.YellowLimonite, 100);
+ addProcessLV(tComb, Materials.VanadiumMagnetite, Materials.VanadiumMagnetite, 100);
+ addProcessLV(tComb, Materials.BandedIron, Materials.BandedIron, 100);
+ addProcessLV(tComb, Materials.Pyrite, Materials.Pyrite, 100);
if (ProcessingModSupport.aEnableGCMarsMats)
- addProcess(tComb, Materials.MeteoricIron, Materials.MeteoricIron, 100);
- addProcess(tComb, Materials.Molybdenite, 100);
- addProcess(tComb, Materials.Molybdenum, 100);
+ addProcessLV(tComb, Materials.MeteoricIron, Materials.MeteoricIron, 100);
+ addProcessLV(tComb, Materials.Molybdenite, 100);
+ addProcessLV(tComb, Materials.Molybdenum, 100);
tComb = getStackForType(CombType.NICKEL);
- addProcess(tComb, Materials.Nickel, 100);
- addProcess(tComb, Materials.Garnierite, 100);
- addProcess(tComb, Materials.Pentlandite, 100);
- addProcess(tComb, Materials.Cobaltite, 100);
- addProcess(tComb, Materials.Wulfenite, 100);
- addProcess(tComb, Materials.Powellite, 100);
+ addProcessLV(tComb, Materials.Nickel, 100);
+ addProcessLV(tComb, Materials.Garnierite, 100);
+ addProcessLV(tComb, Materials.Pentlandite, 100);
+ addProcessLV(tComb, Materials.Cobaltite, 100);
+ addProcessLV(tComb, Materials.Wulfenite, 100);
+ addProcessLV(tComb, Materials.Powellite, 100);
tComb = getStackForType(CombType.ZINC);
- addProcess(tComb, Materials.Zinc, 100);
- addProcess(tComb, Materials.Sphalerite, 100);
- addProcess(tComb, Materials.Sulfur, 100);
+ addProcessLV(tComb, Materials.Zinc, 100);
+ addProcessLV(tComb, Materials.Sphalerite, 100);
+ addProcessLV(tComb, Materials.Sulfur, 100);
tComb = getStackForType(CombType.SILVER);
- addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1), 30);
- addProcess(tComb, Materials.Silver, 100);
- addProcess(tComb, Materials.Galena, 100);
+ addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1), 30);
+ addProcessLV(tComb, Materials.Silver, 100);
+ addProcessLV(tComb, Materials.Galena, 100);
tComb = getStackForType(CombType.GOLD);
- addProcess(tComb, Materials.Gold, 100);
- addProcess(tComb, Materials.Magnetite, Materials.Gold, 100);
+ addProcessLV(tComb, Materials.Gold, 100);
+ addProcessLV(tComb, Materials.Magnetite, Materials.Gold, 100);
// Rare Metals Line
tComb = getStackForType(CombType.ALUMINIUM);
- addProcess(tComb,Materials.Aluminium,60);
- addProcess(tComb,Materials.Bauxite,100);
+ addProcessLV(tComb,Materials.Aluminium,60);
+ addProcessLV(tComb,Materials.Bauxite,100);
tComb = getStackForType(CombType.MANGANESE);
- addProcess(tComb,Materials.Manganese,30);
- addProcess(tComb,Materials.Grossular,100);
- addProcess(tComb,Materials.Spessartine,100);
- addProcess(tComb,Materials.Pyrolusite,100);
- addProcess(tComb,Materials.Tantalite,100);
+ addProcessLV(tComb,Materials.Manganese,30);
+ addProcessLV(tComb,Materials.Grossular,100);
+ addProcessLV(tComb,Materials.Spessartine,100);
+ addProcessLV(tComb,Materials.Pyrolusite,100);
+ addProcessLV(tComb,Materials.Tantalite,100);
tComb = getStackForType(CombType.TITANIUM);
- addProcess(tComb,Materials.Titanium,100);
- addProcess(tComb,Materials.Ilmenite,100);
- addProcess(tComb,Materials.Bauxite,100);
+ addProcessLV(tComb,Materials.Titanium,100);
+ addProcessLV(tComb,Materials.Ilmenite,100);
+ addProcessLV(tComb,Materials.Bauxite,100);
tComb = getStackForType(CombType.CHROME);
- addProcess(tComb,Materials.Chrome,50);
- addProcess(tComb,Materials.Ruby,100);
- addProcess(tComb,Materials.Chromite,50);
- addProcess(tComb,Materials.Redstone,100);
- addProcess(tComb, Materials.Neodymium, 100);
- addProcess(tComb, Materials.Bastnasite, 100);
+ addProcessLV(tComb,Materials.Chrome,50);
+ addProcessLV(tComb,Materials.Ruby,100);
+ addProcessLV(tComb,Materials.Chromite,50);
+ addProcessLV(tComb,Materials.Redstone,100);
+ addProcessLV(tComb, Materials.Neodymium, 100);
+ addProcessLV(tComb, Materials.Bastnasite, 100);
tComb = getStackForType(CombType.TUNGSTEN);
- addProcess(tComb,Materials.Tungstate,100);
- addProcess(tComb,Materials.Scheelite,100);
- addProcess(tComb,Materials.Lithium,100);
+ addProcessLV(tComb,Materials.Tungstate,100);
+ addProcessLV(tComb,Materials.Scheelite,100);
+ addProcessLV(tComb,Materials.Lithium,100);
tComb = getStackForType(CombType.PLATINUM);
- addProcess(tComb,Materials.Platinum,40);
- addProcess(tComb,Materials.Cooperite,40);
- addProcess(tComb,Materials.Palladium,40);
+ addProcessLV(tComb,Materials.Platinum,40);
+ addProcessLV(tComb,Materials.Cooperite,40);
+ addProcessLV(tComb,Materials.Palladium,40);
tComb = getStackForType(CombType.IRIDIUM);
- addProcess(tComb,Materials.Iridium,20);
- addProcess(tComb,Materials.Osmium,20);
+ addProcessLV(tComb,Materials.Iridium,20);
+ addProcessLV(tComb,Materials.Osmium,20);
// Radioactive Line
tComb = getStackForType(CombType.URANIUM);
- addProcess(tComb,Materials.Uranium,50);
- addProcess(tComb,Materials.Pitchblende,50);
- addProcess(tComb,Materials.Uraninite,50);
- addProcess(tComb,Materials.Uranium235,50);
+ addProcessLV(tComb,Materials.Uranium,50);
+ addProcessLV(tComb,Materials.Pitchblende,50);
+ addProcessLV(tComb,Materials.Uraninite,50);
+ addProcessLV(tComb,Materials.Uranium235,50);
tComb = getStackForType(CombType.PLUTONIUM);
- addProcess(tComb,Materials.Plutonium,10);
- addProcess(tComb,Materials.Uranium235,Materials.Plutonium,5);
+ addProcessLV(tComb,Materials.Plutonium,10);
+ addProcessLV(tComb,Materials.Uranium235,Materials.Plutonium,5);
tComb = getStackForType(CombType.NAQUADAH);
- addProcess(tComb,Materials.Naquadah,10);
- addProcess(tComb,Materials.NaquadahEnriched,10);
- addProcess(tComb,Materials.Naquadria,10);
+ addProcessLV(tComb,Materials.Naquadah,10);
+ addProcessLV(tComb,Materials.NaquadahEnriched,10);
+ addProcessLV(tComb,Materials.Naquadria,10);
}
- public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance){
- GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5);
+ public void addSpecialCentLV(ItemStack tComb, ItemStack aOutput, int chance){
+ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 5000 }, 128, 5);
RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f));
}
- public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2){
- GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), aOutput2, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000, chance2 * 100 }, 128, 5);
+ public void addSpecialCentLV(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2){
+ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), aOutput2, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 5000, chance2 * 100 }, 128, 5);
RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f));
}
- public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2, ItemStack aOutput3, int chance3){
- GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), aOutput2, aOutput3, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000, chance2 * 100, chance3*100 }, 128, 5);
+ public void addSpecialCentLV(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2, ItemStack aOutput3, int chance3){
+ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), aOutput2, aOutput3, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 5000, chance2 * 100, chance3*100 }, 128, 5);
RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f,aOutput3,chance3*0.01f));
}
-
- public void addProcess(ItemStack tComb, Materials aMaterial, int chance){
+
+ public void addSpecialCentHV(ItemStack tComb, ItemStack aOutput, int chance){
+ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput,GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 7000 }, 300, 480);
+ }
+
+ public void addSpecialCentHV(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2){
+ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, aOutput2, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, chance2 * 100}, 300, 480);
+ }
+
+ public void addSpecialCentHV(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2, ItemStack aOutput3, int chance3){
+ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, aOutput2, aOutput3, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, chance2 * 100, chance3 * 100 }, 300, 480);
+ }
+
+ public void addProcessLV(ItemStack tComb, Materials aMaterial, int chance){
if(GT_Mod.gregtechproxy.mNerfedCombs){
GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 24);
GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384);
@@ -287,7 +307,7 @@ public class ItemComb extends Item {
}
}
- public void addProcess(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance){
+ public void addProcessLV(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance){
if(GT_Mod.gregtechproxy.mNerfedCombs){
GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aInMaterial, 1), Materials.Water.getFluid(1000), aInMaterial.mOreByProducts.isEmpty() ? null : aInMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 4), 96, 24);
GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aOutMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1), 10000, (int) (aOutMaterial.getMass() * 128), 384);
generated by cgit (git 2.46.0) at 2025-03-06 22:03:05 +0000