Adjustment for issue #13

GameduJS · Jul 20, 2023 · 0ca7bae · 0ca7bae
1 parent f493d2e
commit 0ca7bae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/de/gamedude/easyvillagertrade/core/EasyVillagerTradeBase.java b/src/main/java/de/gamedude/easyvillagertrade/core/EasyVillagerTradeBase.java
@@ -22,6 +22,7 @@
 import net.minecraft.util.math.random.LocalRandom;
 import net.minecraft.village.TradeOffer;
 import net.minecraft.village.TradeOfferList;
+import net.minecraft.village.VillagerProfession;
 import net.minecraft.world.World;
 
 import java.util.Map;
@@ -75,6 +76,10 @@ public void handle() {
             case SELECT_TRADE -> tradeInterface.selectTrade();
             case APPLY_TRADE -> tradeInterface.applyTrade();
             case PICKUP_TRADE -> tradeInterface.pickupBook();
+            case WAIT_JOB_LOSS -> {
+                if(selectionInterface.getVillager().getVillagerData().getProfession() == VillagerProfession.NONE)
+                    setState(TradingState.PLACE_WORKSTATION);
+            }
         }
     }
 
@@ -120,8 +125,9 @@ private void handleBreak() {
             minecraftClient.interactionManager.updateBlockBreakingProgress(getSelectionInterface().getLecternPos(), Direction.UP);
             player.swingHand(Hand.MAIN_HAND, true);
             player.networkHandler.sendPacket(new HandSwingC2SPacket(Hand.MAIN_HAND));
-        } else
-            state = TradingState.PLACE_WORKSTATION;
+        } else {
+            state = TradingState.WAIT_JOB_LOSS;
+        }
     }
 
     public void checkVillagerOffers(TradeOfferList tradeOffers) {

diff --git a/src/main/java/de/gamedude/easyvillagertrade/utils/TradingState.java b/src/main/java/de/gamedude/easyvillagertrade/utils/TradingState.java
@@ -2,6 +2,7 @@
 
 public enum TradingState {
     CHECK_OFFERS(),
+    WAIT_JOB_LOSS(),
     WAIT_PROFESSION(),
     BREAK_WORKSTATION(),
     PLACE_WORKSTATION(),