From cb29ea469f306e6d289fbd2bf6fcb65701ffcfc5 Mon Sep 17 00:00:00 2001 From: Glease <4586901+glease@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:06:32 +0800 Subject: [PATCH] patch weird NPE --- dependencies.gradle | 2 +- .../multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 2f96160a3..5fc9fecfd 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.12:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.29:dev') api('com.github.GTNewHorizons:Yamcl:0.5.86:dev') implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.1.3:dev') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index bc60e9993..ff0922d09 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -1164,6 +1164,7 @@ public CheckRecipeResult processRecipe(EyeOfHarmonyRecipe recipeObject) { } successChance = recipeChanceCalculator(); + currentRecipeRocketTier = currentRecipe.getRocketTier(); // Determine EU recipe output. euOutput = (long) (recipeObject.getEUOutput() * pow(0.77, currentCircuitMultiplier)); @@ -1235,12 +1236,13 @@ private void createRenderBlock(final EyeOfHarmonyRecipe currentRecipe) { } private double successChance; + private long currentRecipeRocketTier; private void outputFailedChance() { // 2^Tier spacetime released upon recipe failure. mOutputFluids = new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten( (long) (successChance * MOLTEN_SPACETIME_PER_FAILURE_TIER - * pow(SPACETIME_FAILURE_BASE, currentRecipe.getRocketTier() + 1))) }; + * pow(SPACETIME_FAILURE_BASE, currentRecipeRocketTier + 1))) }; super.outputAfterRecipe_EM(); } @@ -1401,6 +1403,7 @@ public String[] getStructureDescription(ItemStack stackSize) { private static final String RECIPE_RUNNING_NBT_TAG = EYE_OF_HARMONY + "recipeRunning"; private static final String RECIPE_EU_OUTPUT_NBT_TAG = EYE_OF_HARMONY + "euOutput"; private static final String RECIPE_SUCCESS_CHANCE_NBT_TAG = EYE_OF_HARMONY + "recipeSuccessChance"; + private static final String ROCKET_TIER_NBT_TAG = EYE_OF_HARMONY + "rocketTier"; private static final String CURRENT_CIRCUIT_MULTIPLIER_TAG = EYE_OF_HARMONY + "currentCircuitMultiplier"; private static final String ANIMATIONS_ENABLED = EYE_OF_HARMONY + "animationsEnabled"; @@ -1416,6 +1419,7 @@ public void saveNBTData(NBTTagCompound aNBT) { aNBT.setBoolean(RECIPE_RUNNING_NBT_TAG, recipeRunning); aNBT.setLong(RECIPE_EU_OUTPUT_NBT_TAG, euOutput); aNBT.setDouble(RECIPE_SUCCESS_CHANCE_NBT_TAG, successChance); + aNBT.setLong(ROCKET_TIER_NBT_TAG, currentRecipeRocketTier); aNBT.setLong(CURRENT_CIRCUIT_MULTIPLIER_TAG, currentCircuitMultiplier); aNBT.setBoolean(ANIMATIONS_ENABLED, animationsEnabled); @@ -1450,6 +1454,7 @@ public void loadNBTData(final NBTTagCompound aNBT) { recipeRunning = aNBT.getBoolean(RECIPE_RUNNING_NBT_TAG); euOutput = aNBT.getLong(RECIPE_EU_OUTPUT_NBT_TAG); successChance = aNBT.getDouble(RECIPE_SUCCESS_CHANCE_NBT_TAG); + currentRecipeRocketTier = aNBT.getLong(ROCKET_TIER_NBT_TAG); currentCircuitMultiplier = aNBT.getLong(CURRENT_CIRCUIT_MULTIPLIER_TAG); animationsEnabled = aNBT.getBoolean(ANIMATIONS_ENABLED);