diff options
author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-08-11 04:10:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-11 09:10:55 +0700 |
commit | 1d2b10a41722ff9e0340061879f069792936b13c (patch) | |
tree | c7cfdbe606bf0b22e25606b9e619d9e23541b966 /src/main/java/gtPlusPlus/xmod | |
parent | 7fd5dc39f9335f870c62e89fd88bc6ef21daab46 (diff) | |
download | GT5-Unofficial-1d2b10a41722ff9e0340061879f069792936b13c.tar.gz GT5-Unofficial-1d2b10a41722ff9e0340061879f069792936b13c.tar.bz2 GT5-Unofficial-1d2b10a41722ff9e0340061879f069792936b13c.zip |
Fix QFT recipes (#2862)
* fix qft chances in recipes
* fix qft frontend
* remove cry about it catch
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
2 files changed, 5 insertions, 17 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java index 5532cd5691..d6e8fc728a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java @@ -654,6 +654,11 @@ public class GregtechMetaTileEntity_QuantumForceTransformer return false; } + public static int getBaseOutputChance(GT_Recipe tRecipe) { + int aOutputsAmount = tRecipe.mOutputs.length + tRecipe.mFluidOutputs.length; + return 10000 / aOutputsAmount; + } + private int[] getOutputChances(GT_Recipe tRecipe, int aChanceIncreased) { int difference = getFocusingTier() - tRecipe.mSpecialValue; int aOutputsAmount = tRecipe.mOutputs.length + tRecipe.mFluidOutputs.length; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java index a991d1152a..e4071c018d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java @@ -81,7 +81,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Osmium.getDust(64), WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64), WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64)) - .outputChances(1667, 1667, 1667, 1667, 1667, 1667) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) @@ -95,7 +94,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Palladium.getDust(64), Materials.Platinum.getDust(64), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 64)) - .outputChances(3333, 3333, 3333) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) @@ -108,7 +106,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Iridium.getDust(64), Materials.Platinum.getDust(64), Materials.Osmiridium.getDust(64)) - .outputChances(3333, 3333, 3333) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) @@ -118,7 +115,6 @@ public class RecipeLoader_ChemicalSkips { WerkstoffLoader.IrOsLeachResidue.get(OrePrefixes.dust, 32), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) .itemOutputs(Materials.Osmium.getDust(64), Materials.Iridium.getDust(64), Materials.Osmiridium.getDust(64)) - .outputChances(3333, 3333, 3333) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) @@ -132,7 +128,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Palladium.getDust(64), Materials.Platinum.getDust(64), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 64)) - .outputChances(2500, 2500, 2500, 2500) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) @@ -146,7 +141,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Osmium.getDust(64), WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64), WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64)) - .outputChances(2500, 2500, 2500, 2500) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) @@ -193,7 +187,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Bismuth.getDust(32), ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 0)) .itemOutputs(ItemList.StableAdhesive.get(1)) - .outputChances(2000) .fluidInputs(Materials.Oxygen.getGas(10000), Materials.Hydrogen.getGas(10000)) .fluidOutputs( MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32), @@ -216,7 +209,6 @@ public class RecipeLoader_ChemicalSkips { Materials.TungstenSteel.getDust(64), Materials.TungstenCarbide.getDust(64), Materials.Indium.getDust(64)) - .outputChances(2500, 2500, 2500, 2500) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) @@ -234,7 +226,6 @@ public class RecipeLoader_ChemicalSkips { ELEMENT.getInstance().PLUTONIUM238.getDust(64), Materials.Plutonium.getDust(64), Materials.Plutonium241.getDust(64)) - .outputChances(1667, 1667, 1667, 1667, 1667, 1667) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) @@ -251,7 +242,6 @@ public class RecipeLoader_ChemicalSkips { getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 11002), getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 11007), ItemList.SuperconductorComposite.get(1)) - .outputChances(1667, 1667, 1667, 1667, 1667, 1667) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UHV) .metadata(QFT_FOCUS_TIER, 2) @@ -267,7 +257,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Samarium.getDust(64), Materials.Gadolinium.getDust(64), Materials.Lanthanum.getDust(64)) - .outputChances(2000, 2000, 2000, 2000, 2000) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UHV) .metadata(QFT_FOCUS_TIER, 2) @@ -283,7 +272,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Samarium.getDust(64), Materials.Gadolinium.getDust(64), Materials.Lanthanum.getDust(64)) - .outputChances(2000, 2000, 2000, 2000, 2000) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UHV) .metadata(QFT_FOCUS_TIER, 2) @@ -309,7 +297,6 @@ public class RecipeLoader_ChemicalSkips { getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 32, 2), ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0)) .itemOutputs(stemcells) - .outputChances(3333) .fluidOutputs( Materials.GrowthMediumRaw.getFluid(1000 * 1024), Materials.GrowthMediumSterilized.getFluid(1000 * 512)) @@ -325,7 +312,6 @@ public class RecipeLoader_ChemicalSkips { Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.ELECTRON)) - .outputChances(2000, 2000, 2000, 2000) .fluidInputs(Materials.Hydrogen.getGas(10000L), Materials.Deuterium.getGas(1000L)) .fluidOutputs(FluidUtils.getFluidStack("plasma.hydrogen", 1000)) .duration(5 * SECONDS) @@ -387,7 +373,6 @@ public class RecipeLoader_ChemicalSkips { Materials.InfinityCatalyst.getDust(4), ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0)) .itemOutputs(biocells) - .outputChances(2500) .fluidOutputs( MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128), Materials.BioMediumSterilized.getFluid(1000 * 256), @@ -420,7 +405,6 @@ public class RecipeLoader_ChemicalSkips { Particle.getBaseParticle(Particle.LAMBDA), Particle.getBaseParticle(Particle.OMEGA), Particle.getBaseParticle(Particle.HIGGS_BOSON)) - .outputChances(2000, 2000, 2000, 2000, 2000) .fluidInputs( FluidUtils.getFluidStack("plasma.hydrogen", 30000), Materials.Helium.getPlasma(30000L), @@ -441,7 +425,6 @@ public class RecipeLoader_ChemicalSkips { Materials.Mytryl.getDust(16), ItemUtils.getSimpleStack(GenericChem.mAlgagenicGrowthPromoterCatalyst, 0)) .itemOutputs(seaweed, getModItem(NewHorizonsCoreMod.ID, "item.TCetiESeaweedExtract", 16)) - .outputChances(25_00, 25_00) .fluidInputs(FluidUtils.getFluidStack("unknowwater", 25_000)) .fluidOutputs( FluidUtils.getFluidStack("seaweedbroth", 50_000), |