aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items/ItemComb.java
diff options
context:
space:
mode:
authorRunakai1 <48415331+Runakai1@users.noreply.github.com>2022-08-21 14:42:09 +0200
committerGitHub <noreply@github.com>2022-08-21 14:42:09 +0200
commita3cca999b5445a253e9445bed1b00ca7d5e8321a (patch)
treea8fbf68aaa23f8ac715aaa807c2e236625b6535c /src/main/java/gregtech/common/items/ItemComb.java
parent5d64687a0cb474af97b75229f22015bd23332147 (diff)
downloadGT5-Unofficial-a3cca999b5445a253e9445bed1b00ca7d5e8321a.tar.gz
GT5-Unofficial-a3cca999b5445a253e9445bed1b00ca7d5e8321a.tar.bz2
GT5-Unofficial-a3cca999b5445a253e9445bed1b00ca7d5e8321a.zip
Centrifuge Changes (#1280)
* Centrifuge Changes All of the Centrifuge recipes for bees were a joke. Thus, I kept chances and made it output a full dust instead. Also, Infinity Catalyst, Cosmic Neutronium and Infinity are properly integrated into their respective tiers with better chances. + fixed spelling mistake * Dependencies and Neutronium removed dependencies I added made neutronium bee output 1 nugget instead of dust- was a mistake by me in bees balance changes. Should have been a nugget from the beginning.
Diffstat (limited to 'src/main/java/gregtech/common/items/ItemComb.java')
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 9fcc50c313..7957bdd33a 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -404,9 +404,9 @@ public class ItemComb extends Item {
addCentrifugeToItemStack(CombType.SEAWEED, new ItemStack[]{ItemList.FR_Wax.get(1L), GT_ModHandler.getModItem("GalaxySpace", "tcetiedandelions", 1L, 0)}, new int[]{50 * 100, 100 * 100}, Voltage.UV, 100);
}
//Infinity Line
- addCentrifugeToMaterial(CombType.COSMICNEUTRONIUM, new Materials[] {Materials.CosmicNeutronium, Materials.Neutronium}, new int[] {(int) (0.5 * 100), 1 * 100}, new int[] {}, Voltage.UHV, 12000, NI, 50 * 100);
- addCentrifugeToMaterial(CombType.INFINITYCATALYST, new Materials[] {Materials.InfinityCatalyst, Materials.Neutronium}, new int[] {(int) (0.05 * 100), 1 * 100}, new int[] {}, Voltage.UEV, 48000, NI, 50 * 100);
- addCentrifugeToMaterial(CombType.INFINITY, new Materials[] {Materials.Infinity, Materials.InfinityCatalyst}, new int[] {(int) (0.01 * 100), (int) (0.05 * 100)}, new int[] {}, Voltage.UIV, 96000, NI, 50 * 100);
+ addCentrifugeToMaterial(CombType.COSMICNEUTRONIUM, new Materials[] {Materials.CosmicNeutronium, Materials.Neutronium}, new int[] {(int) (15 * 100), 1 * 100}, new int[] {}, Voltage.UHV, 1200, NI, 50 * 100);
+ addCentrifugeToMaterial(CombType.INFINITYCATALYST, new Materials[] {Materials.InfinityCatalyst, Materials.Neutronium}, new int[] {(int) (25 * 100), 20 * 100}, new int[] {}, Voltage.ZPM, 100, NI, 50 * 100);
+ addCentrifugeToMaterial(CombType.INFINITY, new Materials[] {Materials.Infinity, Materials.InfinityCatalyst}, new int[] {(int) (20 * 100), (int) (0.05 * 100)}, new int[] {}, Voltage.UV, 1000, NI, 50 * 100);
//(Noble)gas Line
addFluidExtractorProcess(CombType.HELIUM, Materials.Helium.getGas(250), Voltage.HV);
@@ -456,7 +456,7 @@ public class ItemComb extends Item {
switch(comb) {
case NEUTRONIUM:
RA.addAutoclaveRecipe(GT_Utility.copyAmount(9, tComb), GT_Utility.getIntegratedCircuit(i+1), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial[i].getMass()+volt.getUUAmplifier())/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial[i], 4), 10000, (int) (aMaterial[i].getMass() * 128), volt.getAutoClaveEnergy(), volt.compareTo(Voltage.HV) > 0);
- RA.addChemicalRecipe(GT_Utility.copyAmount(4, tComb), null, volt.getFluidAccordingToCombTier(), Materials.Neutronium.getMolten(576l), Materials.Neutronium.getDustSmall(1), NI, volt.getComplexTime()*17, volt.getChemicalEnergy(), volt.compareTo(Voltage.IV) > 0);
+ RA.addChemicalRecipe(GT_Utility.copyAmount(4, tComb), null, volt.getFluidAccordingToCombTier(), Materials.Neutronium.getMolten(576l), Materials.Neutronium.getNuggets(1), NI, volt.getComplexTime()*17, volt.getChemicalEnergy(), volt.compareTo(Voltage.IV) > 0);
case OSMIUM:
RA.addAutoclaveRecipe(GT_Utility.copyAmount(9, tComb), GT_Utility.getIntegratedCircuit(i+1), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial[i].getMass()+volt.getUUAmplifier())/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial[i], 4), 10000, (int) (aMaterial[i].getMass() * 128), volt.getAutoClaveEnergy(), volt.compareTo(Voltage.HV) > 0);
RA.addChemicalRecipe(GT_Utility.copyAmount(4, tComb), null, volt.getFluidAccordingToCombTier(), Materials.Osmium.getMolten(288l), Materials.Osmium.getNuggets(1), NI, volt.getComplexTime()*17, volt.getChemicalEnergy(), volt.compareTo(Voltage.IV) > 0);
@@ -481,7 +481,7 @@ public class ItemComb extends Item {
* @param chance chance to get result, 10000 == 100%
* @param volt required Voltage Tier for this recipe, this also affect the duration, amount of UU-Matter, and needed liquid type and amount for chemical reactor
* @param stackSize This parameter can be null, in that case stack size will be just 1. This handle the stackSize of the resulting Item, and Also the Type of Item. if this value is multiple of 9, than related Material output will be dust, if this value is multiple of 4 than output will be Small dust, else the output will be Tiny dust
- * @param beeWax if this is null, than the comb will product default Bee wax. But if aMaterial is more than 5, beeWax will be ignored in Gregtech Centrifuge.
+ * @param beeWax if this is null, then the comb will product default Bee wax. But if aMaterial is more than 5, beeWax will be ignored in Gregtech Centrifuge.
* @param waxChance have same format like "chance"
**/
public void addCentrifugeToMaterial(CombType comb, Materials[] aMaterial, int[] chance, int[] stackSize, Voltage volt, ItemStack beeWax, int waxChance) {
@@ -499,9 +499,9 @@ public class ItemComb extends Item {
if(Math.max(1, stackSize[i]) % 9 == 0) {
aOutPut[i] = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial[i], (Math.max(1, stackSize[i])/9) );
}else if(Math.max(1, stackSize[i]) % 4 == 0) {
- aOutPut[i] = GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial[i], (Math.max(1, stackSize[i])/4) );
+ aOutPut[i] = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial[i], (Math.max(1, stackSize[i])/4) );
}else {
- aOutPut[i] = GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial[i], Math.max(1, stackSize[i]));
+ aOutPut[i] = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial[i], Math.max(1, stackSize[i]));
}
}
if(beeWax != NI) {