fix: add hint if beaver is not upgraded

klikli-dev · Aug 9, 2024 · 571e839 · 571e839
1 parent f4ab99e
commit 571e839
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json
@@ -843,6 +843,7 @@
   "debug.occultism.debug_wand.printed_glyphs": "Printed glyphs",
   "debug.occultism.debug_wand.spirit_selected": "Selected spirit with id %s",
   "debug.occultism.debug_wand.spirit_tamed": "Tamed spirit with id %s",
+  "dialog.occultism.beaver.no_upgrade": "A Blacksmith Familiar needs to upgrade the Beaver before he dispenses snacks!",
   "dialog.occultism.beaver.snack_on_cooldown": "Hey now, don't be greedy!",
   "dialog.occultism.dragon.pet": "purrr",
   "dialog.occultism.mummy.kapow": "KAPOW!",

diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BeaverFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BeaverFamiliarEntity.java
@@ -128,7 +128,9 @@ public InteractionResult mobInteract(Player pPlayer, InteractionHand pHand) {
         if (this.getOwner() == pPlayer) {
 
             if (!pPlayer.isShiftKeyDown() && itemstack.isEmpty()) {
-                if(this.level().getGameTime() > this.lastSnackTime + SNACK_INTERVAL){
+                if (!this.hasBlacksmithUpgrade()) {
+                    pPlayer.displayClientMessage(Component.translatable("dialog.occultism.beaver.no_upgrade"), true);
+                } else if (this.level().getGameTime() > this.lastSnackTime + SNACK_INTERVAL) {
                     this.lastSnackTime = this.level().getGameTime();
                     ItemHandlerHelper.giveItemToPlayer(pPlayer, new ItemStack(OccultismItems.BEAVER_NUGGET.get()));
                 } else {

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
@@ -3191,6 +3191,7 @@ private void addDialogs() {
         this.add("dialog.occultism.dragon.pet", "purrr");
         this.add("dialog.occultism.mummy.kapow", "KAPOW!");
         this.add("dialog.occultism.beaver.snack_on_cooldown", "Hey now, don't be greedy!");
+        this.add("dialog.occultism.beaver.no_upgrade", "A Blacksmith Familiar needs to upgrade the Beaver before he dispenses snacks!");
     }
 
     private void addModonomiconIntegration() {