Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Commit

Permalink
patch weird NPE
Browse files Browse the repository at this point in the history
  • Loading branch information
Glease committed Oct 3, 2023
1 parent 14ff8f4 commit cb29ea4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -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";

Expand All @@ -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);

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit cb29ea4

Please sign in to comment.