BlueGit

timfa copperfarmer

Resync held items after right-click and show harvested crops when returning to a chest.

Co-authored-by: Cursor <cursoragent@cursor.com>

timfa Tim Falken · pushed by timfa

Authored 2026-08-14 · 3 months ago

Hash
36bde1ef4f4a58b5b61f120fe02b0fbecc6bdc6f
Parent
2c8b3215
2 files changed +87 −14
src/main/java/nl/timfalken/copperfarmer/FarmerListener.java +2 −10
@@ -143,14 +143,14 @@ final class FarmerListener implements Listener {
143 143 if (isOxidationTool(used) || isNameTag(used)) return;
144 144
145 145 event.setCancelled(true);
146 plugin.getServer().getScheduler().runTask(plugin, () -> restoreEquippedHoe(golem));
146 manager.resyncHeldItem(golem, event.getPlayer());
147 147 }
148 148
149 149 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
150 150 public void onFarmerDropItem(EntityDropItemEvent event) {
151 151 if (!(event.getEntity() instanceof CopperGolem golem) || !manager.isFarmer(golem)) return;
152 152 event.setCancelled(true);
153 restoreEquippedHoe(golem);
153 manager.resyncHeldItem(golem);
154 154 }
155 155
156 156 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -295,14 +295,6 @@ final class FarmerListener implements Listener {
295 295 statue.update();
296 296 }
297 297
298 private void restoreEquippedHoe(CopperGolem golem) {
299 if (!golem.isValid() || !manager.isFarmer(golem)) return;
300 EntityEquipment equipment = golem.getEquipment();
301 if (equipment == null) return;
302 equipment.setItemInMainHand(itemCodec.readTool(golem));
303 equipment.setItemInMainHandDropChance(0.0f);
304 }
305
306 298 private boolean isOxidationTool(ItemStack item) {
307 299 if (item == null || item.isEmpty()) return false;
308 300 return item.getType() == Material.HONEYCOMB || Tag.ITEMS_AXES.isTagged(item.getType());
@@ -143,14 +143,14 @@ final class FarmerListener implements Listener {
143 if (isOxidationTool(used) || isNameTag(used)) return;
143 if (isOxidationTool(used) || isNameTag(used)) return;
144
144
145 event.setCancelled(true);
145 event.setCancelled(true);
146 plugin.getServer().getScheduler().runTask(plugin, () -> restoreEquippedHoe(golem));
146 manager.resyncHeldItem(golem, event.getPlayer());
147 }
147 }
148
148
149 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
149 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
150 public void onFarmerDropItem(EntityDropItemEvent event) {
150 public void onFarmerDropItem(EntityDropItemEvent event) {
151 if (!(event.getEntity() instanceof CopperGolem golem) || !manager.isFarmer(golem)) return;
151 if (!(event.getEntity() instanceof CopperGolem golem) || !manager.isFarmer(golem)) return;
152 event.setCancelled(true);
152 event.setCancelled(true);
153 restoreEquippedHoe(golem);
153 manager.resyncHeldItem(golem);
154 }
154 }
155
155
156 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
156 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -295,14 +295,6 @@ final class FarmerListener implements Listener {
295 statue.update();
295 statue.update();
296 }
296 }
297
297
298 private void restoreEquippedHoe(CopperGolem golem) {
299 if (!golem.isValid() || !manager.isFarmer(golem)) return;
300 EntityEquipment equipment = golem.getEquipment();
301 if (equipment == null) return;
302 equipment.setItemInMainHand(itemCodec.readTool(golem));
303 equipment.setItemInMainHandDropChance(0.0f);
304 }
305
306 private boolean isOxidationTool(ItemStack item) {
298 private boolean isOxidationTool(ItemStack item) {
307 if (item == null || item.isEmpty()) return false;
299 if (item == null || item.isEmpty()) return false;
308 return item.getType() == Material.HONEYCOMB || Tag.ITEMS_AXES.isTagged(item.getType());
300 return item.getType() == Material.HONEYCOMB || Tag.ITEMS_AXES.isTagged(item.getType());
src/main/java/nl/timfalken/copperfarmer/FarmerManager.java +85 −4
@@ -17,6 +17,9 @@ import org.bukkit.block.data.Ageable;
17 17 import org.bukkit.block.data.BlockData;
18 18 import org.bukkit.entity.CopperGolem;
19 19 import org.bukkit.entity.Entity;
20 import org.bukkit.entity.Player;
21 import org.bukkit.inventory.EntityEquipment;
22 import org.bukkit.inventory.EquipmentSlot;
20 23 import org.bukkit.inventory.Inventory;
21 24 import org.bukkit.inventory.InventoryHolder;
22 25 import org.bukkit.inventory.ItemStack;
@@ -128,11 +131,44 @@ final class FarmerManager {
128 131 golem.getPathfinder().setCanOpenDoors(false);
129 132 golem.setGolemState(CopperGolem.State.IDLE);
130 133 if (preventOxidation) golem.setOxidizing(CopperGolem.Oxidizing.waxed());
131 var equipment = golem.getEquipment();
132 if (equipment != null) {
133 equipment.setItemInMainHand(itemCodec.readTool(golem));
134 equipment.setItemInMainHandDropChance(0.0f);
134 equipHand(golem, itemCodec.readTool(golem), false);
135 }
136
137 void resyncHeldItem(CopperGolem golem, Player viewer) {
138 ItemStack shown = heldAppearance(golem);
139 viewer.sendEquipmentChange(golem, EquipmentSlot.HAND, shown);
140 golem.sendEquipmentChange(EquipmentSlot.HAND, shown);
141 plugin.getServer().getScheduler().runTask(plugin, () -> {
142 if (golem.isValid() && isFarmer(golem)) resyncHeldItem(golem);
143 });
144 }
145
146 void resyncHeldItem(CopperGolem golem) {
147 Brain brain = brains.get(golem.getUniqueId());
148 if (brain != null) {
149 brain.applyHeldAppearance(true);
150 return;
135 151 }
152 equipHand(golem, itemCodec.readTool(golem), true);
153 }
154
155 private ItemStack heldAppearance(CopperGolem golem) {
156 Brain brain = brains.get(golem.getUniqueId());
157 return brain != null ? brain.heldAppearance() : itemCodec.readTool(golem);
158 }
159
160 private static void equipHand(CopperGolem golem, ItemStack item, boolean forcePacket) {
161 EntityEquipment equipment = golem.getEquipment();
162 if (equipment == null) return;
163 ItemStack current = equipment.getItemInMainHand();
164 boolean same = current != null && item != null
165 && current.getType() == item.getType()
166 && current.getType() != Material.AIR;
167 if (!forcePacket && same) return;
168 if (forcePacket) equipment.setItemInMainHand(null);
169 equipment.setItemInMainHand(item);
170 equipment.setItemInMainHandDropChance(0.0f);
171 golem.sendEquipmentChange(EquipmentSlot.HAND, item);
136 172 }
137 173
138 174 List<ItemStack> drainCargo(CopperGolem golem) {
@@ -176,6 +212,7 @@ final class FarmerManager {
176 212 private long animationHoldUntil;
177 213 private BlockRef openedLid;
178 214 private long closeLidAt;
215 private ItemStack carriedProduce;
179 216
180 217 Brain(CopperGolem golem) {
181 218 this.golem = golem;
@@ -208,6 +245,7 @@ final class FarmerManager {
208 245 case MOVING_TO_CHEST -> tickMovingToChest();
209 246 case WAITING_FOR_CHEST_SPACE -> tickWaitingForChestSpace();
210 247 }
248 applyHeldAppearance(false);
211 249 }
212 250
213 251 private void tickIdle() {
@@ -372,6 +410,7 @@ final class FarmerManager {
372 410
373 411 cropBlock.setType(Material.AIR, true);
374 412 List<ItemStack> overflow = cargo.addAll(calculatedDrops);
413 rememberCarriedProduce(calculatedDrops, crop);
375 414 for (ItemStack item : overflow) {
376 415 cropBlock.getWorld().dropItemNaturally(cropBlock.getLocation().add(0.5, 0.5, 0.5), item);
377 416 }
@@ -511,6 +550,7 @@ final class FarmerManager {
511 550 leftovers.addAll(notInserted.values());
512 551 }
513 552 cargo.replaceWith(leftovers);
553 if (cargo.isEmpty()) carriedProduce = null;
514 554
515 555 if (cargo.isEmpty()) {
516 556 this.state = State.IDLE;
@@ -669,6 +709,47 @@ final class FarmerManager {
669 709 golem.swingMainHand();
670 710 }
671 711
712 private ItemStack heldAppearance() {
713 if (state == State.MOVING_TO_CHEST || state == State.WAITING_FOR_CHEST_SPACE) {
714 ItemStack produce = carryDisplay();
715 if (produce != null) return produce;
716 }
717 return tool.clone();
718 }
719
720 private void applyHeldAppearance(boolean forcePacket) {
721 if (cargo.isEmpty()) carriedProduce = null;
722 FarmerManager.equipHand(golem, heldAppearance(), forcePacket);
723 }
724
725 private ItemStack carryDisplay() {
726 if (carriedProduce != null && cargo.count(carriedProduce.getType()) > 0) {
727 ItemStack shown = carriedProduce.clone();
728 shown.setAmount(1);
729 return shown;
730 }
731 List<ItemStack> items = cargo.snapshot();
732 if (items.isEmpty()) return null;
733 ItemStack shown = items.getFirst().clone();
734 shown.setAmount(1);
735 return shown;
736 }
737
738 private void rememberCarriedProduce(List<ItemStack> drops, CropRegistry.Crop crop) {
739 ItemStack fallback = null;
740 for (ItemStack drop : drops) {
741 if (drop == null || drop.isEmpty()) continue;
742 ItemStack shown = drop.clone();
743 shown.setAmount(1);
744 if (drop.getType() != crop.seed()) {
745 carriedProduce = shown;
746 return;
747 }
748 if (fallback == null) fallback = shown;
749 }
750 if (fallback != null) carriedProduce = fallback;
751 }
752
672 753 private void lookAt(Block target) {
673 754 golem.lookAt(target.getLocation().add(0.5, 0.5, 0.5));
674 755 }
@@ -17,6 +17,9 @@ import org.bukkit.block.data.Ageable;
17import org.bukkit.block.data.BlockData;
17import org.bukkit.block.data.BlockData;
18import org.bukkit.entity.CopperGolem;
18import org.bukkit.entity.CopperGolem;
19import org.bukkit.entity.Entity;
19import org.bukkit.entity.Entity;
20import org.bukkit.entity.Player;
21import org.bukkit.inventory.EntityEquipment;
22import org.bukkit.inventory.EquipmentSlot;
20import org.bukkit.inventory.Inventory;
23import org.bukkit.inventory.Inventory;
21import org.bukkit.inventory.InventoryHolder;
24import org.bukkit.inventory.InventoryHolder;
22import org.bukkit.inventory.ItemStack;
25import org.bukkit.inventory.ItemStack;
@@ -128,11 +131,44 @@ final class FarmerManager {
128 golem.getPathfinder().setCanOpenDoors(false);
131 golem.getPathfinder().setCanOpenDoors(false);
129 golem.setGolemState(CopperGolem.State.IDLE);
132 golem.setGolemState(CopperGolem.State.IDLE);
130 if (preventOxidation) golem.setOxidizing(CopperGolem.Oxidizing.waxed());
133 if (preventOxidation) golem.setOxidizing(CopperGolem.Oxidizing.waxed());
131 var equipment = golem.getEquipment();
134 equipHand(golem, itemCodec.readTool(golem), false);
132 if (equipment != null) {
135 }
133 equipment.setItemInMainHand(itemCodec.readTool(golem));
136
134 equipment.setItemInMainHandDropChance(0.0f);
137 void resyncHeldItem(CopperGolem golem, Player viewer) {
138 ItemStack shown = heldAppearance(golem);
139 viewer.sendEquipmentChange(golem, EquipmentSlot.HAND, shown);
140 golem.sendEquipmentChange(EquipmentSlot.HAND, shown);
141 plugin.getServer().getScheduler().runTask(plugin, () -> {
142 if (golem.isValid() && isFarmer(golem)) resyncHeldItem(golem);
143 });
144 }
145
146 void resyncHeldItem(CopperGolem golem) {
147 Brain brain = brains.get(golem.getUniqueId());
148 if (brain != null) {
149 brain.applyHeldAppearance(true);
150 return;
135 }
151 }
152 equipHand(golem, itemCodec.readTool(golem), true);
153 }
154
155 private ItemStack heldAppearance(CopperGolem golem) {
156 Brain brain = brains.get(golem.getUniqueId());
157 return brain != null ? brain.heldAppearance() : itemCodec.readTool(golem);
158 }
159
160 private static void equipHand(CopperGolem golem, ItemStack item, boolean forcePacket) {
161 EntityEquipment equipment = golem.getEquipment();
162 if (equipment == null) return;
163 ItemStack current = equipment.getItemInMainHand();
164 boolean same = current != null && item != null
165 && current.getType() == item.getType()
166 && current.getType() != Material.AIR;
167 if (!forcePacket && same) return;
168 if (forcePacket) equipment.setItemInMainHand(null);
169 equipment.setItemInMainHand(item);
170 equipment.setItemInMainHandDropChance(0.0f);
171 golem.sendEquipmentChange(EquipmentSlot.HAND, item);
136 }
172 }
137
173
138 List<ItemStack> drainCargo(CopperGolem golem) {
174 List<ItemStack> drainCargo(CopperGolem golem) {
@@ -176,6 +212,7 @@ final class FarmerManager {
176 private long animationHoldUntil;
212 private long animationHoldUntil;
177 private BlockRef openedLid;
213 private BlockRef openedLid;
178 private long closeLidAt;
214 private long closeLidAt;
215 private ItemStack carriedProduce;
179
216
180 Brain(CopperGolem golem) {
217 Brain(CopperGolem golem) {
181 this.golem = golem;
218 this.golem = golem;
@@ -208,6 +245,7 @@ final class FarmerManager {
208 case MOVING_TO_CHEST -> tickMovingToChest();
245 case MOVING_TO_CHEST -> tickMovingToChest();
209 case WAITING_FOR_CHEST_SPACE -> tickWaitingForChestSpace();
246 case WAITING_FOR_CHEST_SPACE -> tickWaitingForChestSpace();
210 }
247 }
248 applyHeldAppearance(false);
211 }
249 }
212
250
213 private void tickIdle() {
251 private void tickIdle() {
@@ -372,6 +410,7 @@ final class FarmerManager {
372
410
373 cropBlock.setType(Material.AIR, true);
411 cropBlock.setType(Material.AIR, true);
374 List<ItemStack> overflow = cargo.addAll(calculatedDrops);
412 List<ItemStack> overflow = cargo.addAll(calculatedDrops);
413 rememberCarriedProduce(calculatedDrops, crop);
375 for (ItemStack item : overflow) {
414 for (ItemStack item : overflow) {
376 cropBlock.getWorld().dropItemNaturally(cropBlock.getLocation().add(0.5, 0.5, 0.5), item);
415 cropBlock.getWorld().dropItemNaturally(cropBlock.getLocation().add(0.5, 0.5, 0.5), item);
377 }
416 }
@@ -511,6 +550,7 @@ final class FarmerManager {
511 leftovers.addAll(notInserted.values());
550 leftovers.addAll(notInserted.values());
512 }
551 }
513 cargo.replaceWith(leftovers);
552 cargo.replaceWith(leftovers);
553 if (cargo.isEmpty()) carriedProduce = null;
514
554
515 if (cargo.isEmpty()) {
555 if (cargo.isEmpty()) {
516 this.state = State.IDLE;
556 this.state = State.IDLE;
@@ -669,6 +709,47 @@ final class FarmerManager {
669 golem.swingMainHand();
709 golem.swingMainHand();
670 }
710 }
671
711
712 private ItemStack heldAppearance() {
713 if (state == State.MOVING_TO_CHEST || state == State.WAITING_FOR_CHEST_SPACE) {
714 ItemStack produce = carryDisplay();
715 if (produce != null) return produce;
716 }
717 return tool.clone();
718 }
719
720 private void applyHeldAppearance(boolean forcePacket) {
721 if (cargo.isEmpty()) carriedProduce = null;
722 FarmerManager.equipHand(golem, heldAppearance(), forcePacket);
723 }
724
725 private ItemStack carryDisplay() {
726 if (carriedProduce != null && cargo.count(carriedProduce.getType()) > 0) {
727 ItemStack shown = carriedProduce.clone();
728 shown.setAmount(1);
729 return shown;
730 }
731 List<ItemStack> items = cargo.snapshot();
732 if (items.isEmpty()) return null;
733 ItemStack shown = items.getFirst().clone();
734 shown.setAmount(1);
735 return shown;
736 }
737
738 private void rememberCarriedProduce(List<ItemStack> drops, CropRegistry.Crop crop) {
739 ItemStack fallback = null;
740 for (ItemStack drop : drops) {
741 if (drop == null || drop.isEmpty()) continue;
742 ItemStack shown = drop.clone();
743 shown.setAmount(1);
744 if (drop.getType() != crop.seed()) {
745 carriedProduce = shown;
746 return;
747 }
748 if (fallback == null) fallback = shown;
749 }
750 if (fallback != null) carriedProduce = fallback;
751 }
752
672 private void lookAt(Block target) {
753 private void lookAt(Block target) {
673 golem.lookAt(target.getLocation().add(0.5, 0.5, 0.5));
754 golem.lookAt(target.getLocation().add(0.5, 0.5, 0.5));
674 }
755 }