diff --git a/gradle.properties b/gradle.properties index 32154ad..2433d0c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -53,7 +53,7 @@ mod_name=Ascend: SbA # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=2.0.0 +mod_version=2.0.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/net/fretux/ascend/item/RemembranceEssenceItem.java b/src/main/java/net/fretux/ascend/item/RemembranceEssenceItem.java index f628bb1..6b254c6 100644 --- a/src/main/java/net/fretux/ascend/item/RemembranceEssenceItem.java +++ b/src/main/java/net/fretux/ascend/item/RemembranceEssenceItem.java @@ -26,8 +26,7 @@ public class RemembranceEssenceItem extends Item { } return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } - - // Essence is consumed after the action is performed + public static void consume(Player player) { for (InteractionHand hand : InteractionHand.values()) { ItemStack item = player.getItemInHand(hand); diff --git a/src/main/java/net/fretux/ascend/network/ServerboundShrineChoicePacket.java b/src/main/java/net/fretux/ascend/network/ServerboundShrineChoicePacket.java index c1c5201..5bedafc 100644 --- a/src/main/java/net/fretux/ascend/network/ServerboundShrineChoicePacket.java +++ b/src/main/java/net/fretux/ascend/network/ServerboundShrineChoicePacket.java @@ -1,6 +1,9 @@ package net.fretux.ascend.network; +import net.fretux.ascend.compat.AscendMMCompat; +import net.fretux.ascend.item.RemembranceEssenceItem; import net.fretux.ascend.player.PlayerStatsProvider; +import net.fretux.mindmotion.player.PlayerCapabilityProvider; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; @@ -36,6 +39,7 @@ public class ServerboundShrineChoicePacket { stats.addKnowledge(-15); stats.refundAllPoints(); player.sendSystemMessage(Component.literal("YOU ARE A BLANK SLATE. EMPTY. FORGOTTEN.")); + RemembranceEssenceItem.consume(player); } else { player.sendSystemMessage(Component.literal("YOUR MIND IS TOO EMPTY TO BE WORTH MY TOUCH.")); player.hurt(player.level().damageSources().magic(), 4.0F); @@ -45,46 +49,35 @@ public class ServerboundShrineChoicePacket { } PlayerStatsProvider.sync(player); } - case "understand" -> { - if (!net.fretux.ascend.compat.AscendMMCompat.isMindMotionPresent()) - return; - - player.getCapability(net.fretux.mindmotion.player.PlayerCapabilityProvider.SANITY).ifPresent(sanity -> { - + if (!AscendMMCompat.isMindMotionPresent()) return; + player.getCapability(PlayerCapabilityProvider.SANITY).ifPresent(sanity -> { float sanityPercent = sanity.getSanity() / sanity.getMaxSanity(); - if (sanityPercent >= 0.90f) { stats.addKnowledge(5); sanity.setSanity(0); sanity.setInsanity(0); - player.sendSystemMessage(Component.literal("YOUR MIND EXPANDS AS IT BREAKS.")); + RemembranceEssenceItem.consume(player); } else { player.sendSystemMessage(Component.literal("YOUR MIND IS NOT YET CLEAR ENOUGH.")); } }); - PlayerStatsProvider.sync(player); } - case "rest" -> { - if (!net.fretux.ascend.compat.AscendMMCompat.isMindMotionPresent()) - return; - + if (!AscendMMCompat.isMindMotionPresent()) return; if (stats.getKnowledge() >= 10) { stats.addKnowledge(-10); - - player.getCapability(net.fretux.mindmotion.player.PlayerCapabilityProvider.SANITY).ifPresent(sanity -> { + player.getCapability(PlayerCapabilityProvider.SANITY).ifPresent(sanity -> { sanity.setSanity(sanity.getMaxSanity()); sanity.setInsanity(0); }); - player.sendSystemMessage(Component.literal("THE SHRINE RESTORES YOUR FRACTURED MIND.")); + RemembranceEssenceItem.consume(player); } else { player.sendSystemMessage(Component.literal("YOU LACK THE KNOWLEDGE TO REST.")); } - PlayerStatsProvider.sync(player); } } diff --git a/src/main/resources/assets/ascend/lang/en_us.json b/src/main/resources/assets/ascend/lang/en_us.json index 2737ed2..1ff9c57 100644 --- a/src/main/resources/assets/ascend/lang/en_us.json +++ b/src/main/resources/assets/ascend/lang/en_us.json @@ -32,6 +32,7 @@ "item.ascend.moonseye_tome.used": "You gained %s Knowledge from the Moonseye Tome!", "itemGroup.ascend": "Ascend", "ascend.attribute.display": "%s: %s", - "ascend.stats.knowledge": "Knowledge: %s" + "ascend.stats.knowledge": "Knowledge: %s", + "item.ascend.remembrance_essence": "Remembrance Essence" }