diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-13 16:45:57 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-13 16:45:57 +0100 |
| commit | 70e652420da93c399458f781acc884398ad866ea (patch) | |
| tree | 92277aef9f91bf6770dee907ba653293c6bd19db /src/main/java/gregtech/common/items/ItemComb.java | |
| parent | 0bdf8a2e401e622eadcefe7f546f3fb0226e5481 (diff) | |
| download | GT5-Unofficial-70e652420da93c399458f781acc884398ad866ea.tar.gz GT5-Unofficial-70e652420da93c399458f781acc884398ad866ea.tar.bz2 GT5-Unofficial-70e652420da93c399458f781acc884398ad866ea.zip | |
change crop drop processing like bee comb processing
Diffstat (limited to 'src/main/java/gregtech/common/items/ItemComb.java')
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 23c869f398..dff47eeeda 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -155,13 +155,14 @@ public class ItemComb extends Item { // // Metals Line tComb = getStackForType(CombType.SLAG); - addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 50); + addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 50); 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); 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); @@ -169,9 +170,11 @@ public class ItemComb extends Item { addProcess(tComb, Materials.Pyrite, 100); addProcess(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); tComb = getStackForType(CombType.LEAD); + addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1), 45); addProcess(tComb, Materials.Lead, 100); addProcess(tComb, Materials.Galena, 100); tComb = getStackForType(CombType.IRON); @@ -206,6 +209,7 @@ public class ItemComb extends Item { addProcess(tComb, Materials.Sphalerite, 100); addProcess(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); tComb = getStackForType(CombType.GOLD); @@ -267,7 +271,7 @@ public class ItemComb extends Item { public void addProcess(ItemStack tComb, Materials aMaterial, int chance){ if(GT_Mod.gregtechproxy.mNervedCombs){ 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, 300); - GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(1), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 1000, 1000, 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), 1000, 1000, 24); }else{ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), 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); RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); @@ -277,7 +281,7 @@ public class ItemComb extends Item { public void addProcess(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance){ if(GT_Mod.gregtechproxy.mNervedCombs){ 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, 300); - GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(1), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1), 1000, 1000, 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), 1000, 1000, 24); }else{ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), 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); RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); |