diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index e02d76dc5..f213a218d 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -1206,7 +1206,7 @@ "network.messages.occultism.request_order.order_received": "Order received!", "occultism.jei.crushing": "Crusher Spirit", "occultism.jei.miner": "Dimensional Mineshaft", - "occultism.jei.miner.chance": "Chance: %d%%", + "occultism.jei.miner.chance": "Weight: %d", "occultism.jei.pentacle": "Pentacle", "occultism.jei.ritual": "Occult Ritual", "occultism.jei.spirit_fire": "Spiritfire", diff --git a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java index dd6492012..5d52897d5 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java @@ -2708,7 +2708,7 @@ private void addJeiTranslations() { this.add("occultism.jei.spirit_fire", "Spiritfire"); this.add("occultism.jei.crushing", "Crusher Spirit"); this.add("occultism.jei.miner", "Dimensional Mineshaft"); - this.add("occultism.jei.miner.chance", "Chance: %d%%"); + this.add("occultism.jei.miner.chance", "Weight: %d"); this.add("occultism.jei.ritual", "Occult Ritual"); this.add("occultism.jei.pentacle", "Pentacle"); diff --git a/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java index 798f3b166..14b44258d 100644 --- a/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java @@ -103,9 +103,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, MinerRecipe recipe, IFocusGr new RecipeWrapper(simulatedHandler), level); List possibleResults = recipes.stream().map(MinerRecipe::getWeightedOutput).collect(Collectors.toList()); - float chance = (float) recipe.getWeightedOutput().getWeight().asInt() / (float) WeightedRandom.getTotalWeight(possibleResults) * 100.0F; - //reduce to two decimals - chance = Math.round(chance * 10) / 10.0f; + float chance = (float) recipe.getWeightedOutput().getWeight().asInt()/100; this.chances.put(recipe, chance); builder.addSlot(RecipeIngredientRole.INPUT, 56, 12) diff --git a/src/main/resources/data/apotheosis/enchanting_stats/spirit_attuned_crystal.json b/src/main/resources/data/apotheosis/enchanting_stats/spirit_attuned_crystal.json new file mode 100644 index 000000000..4ddc3aea4 --- /dev/null +++ b/src/main/resources/data/apotheosis/enchanting_stats/spirit_attuned_crystal.json @@ -0,0 +1,11 @@ +{ + "block": "occultism:spirit_attuned_crystal", + "stats": { + "maxEterna": 22.5, + "eterna": 1, + "quanta": 0, + "arcana": 0, + "rectification": 0, + "clues": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/apotheosis/enchanting_stats/white_candle.json b/src/main/resources/data/apotheosis/enchanting_stats/white_candle.json index ec22743bd..2e4542098 100644 --- a/src/main/resources/data/apotheosis/enchanting_stats/white_candle.json +++ b/src/main/resources/data/apotheosis/enchanting_stats/white_candle.json @@ -1,9 +1,11 @@ { - "block": "occultism:white_candle", + "block": "occultism:candle_white", "stats": { "maxEterna": 0, "eterna": 0, "quanta": 0, - "arcana": 0.3 + "arcana": 3, + "rectification": 0, + "clues": 0 } } \ No newline at end of file