Keep farmer data when waxing statues and stop right-click from taking the hoe.
Co-authored-by: Cursor <cursoragent@cursor.com>
@@ -17,7 +17,10 @@ import org.bukkit.event.block.BlockPlaceEvent;
17
17
import org.bukkit.event.block.CrafterCraftEvent;
18
18
import org.bukkit.event.entity.EntityChangeBlockEvent;
19
19
import org.bukkit.event.entity.EntityDeathEvent;
20
import org.bukkit.event.entity.EntityDropItemEvent;
21
import org.bukkit.event.inventory.CraftItemEvent;
20
22
import org.bukkit.event.inventory.PrepareItemCraftEvent;
23
import org.bukkit.event.player.PlayerInteractEntityEvent;
21
24
import org.bukkit.event.player.PlayerInteractEvent;
22
25
import org.bukkit.event.world.EntitiesLoadEvent;
23
26
import org.bukkit.event.world.EntitiesUnloadEvent;
@@ -49,17 +52,28 @@ final class FarmerListener implements Listener {
49
52
50
53
@EventHandler(priority = EventPriority.HIGHEST)
51
54
public void onPrepareCraft(PrepareItemCraftEvent event) {
52
if (!isFarmerRecipe(event.getRecipe())) return;
53
ItemStack result = farmerResultFrom(event.getInventory().getMatrix());
55
ItemStack result = craftResult(
56
event.getRecipe(),
57
event.getInventory().getMatrix(),
58
event.getInventory().getResult()
59
);
54
60
if (result != null) event.getInventory().setResult(result);
55
61
}
56
62
63
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
64
public void onCraftItem(CraftItemEvent event) {
65
ItemStack vanilla = event.getRecipe() != null ? event.getRecipe().getResult() : event.getCurrentItem();
66
ItemStack result = craftResult(event.getRecipe(), event.getInventory().getMatrix(), vanilla);
67
if (result == null) return;
68
event.setCurrentItem(result);
69
event.getInventory().setResult(result);
70
}
71
57
72
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
58
73
public void onCrafterCraft(CrafterCraftEvent event) {
59
if (!isFarmerRecipe(event.getRecipe())) return;
60
74
BlockState state = event.getBlock().getState();
61
75
if (!(state instanceof InventoryHolder holder)) return;
62
ItemStack result = farmerResultFrom(holder.getInventory().getContents());
76
ItemStack result = craftResult(event.getRecipe(), holder.getInventory().getContents(), event.getResult());
63
77
if (result != null) event.setResult(result);
64
78
}
65
79
@@ -121,6 +135,24 @@ final class FarmerListener implements Listener {
121
135
});
122
136
}
123
137
138
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
139
public void onFarmerInteract(PlayerInteractEntityEvent event) {
140
if (!(event.getRightClicked() instanceof CopperGolem golem) || !manager.isFarmer(golem)) return;
141
142
ItemStack used = event.getPlayer().getInventory().getItem(event.getHand());
143
if (isOxidationTool(used) || isNameTag(used)) return;
144
145
event.setCancelled(true);
146
plugin.getServer().getScheduler().runTask(plugin, () -> restoreEquippedHoe(golem));
147
}
148
149
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
150
public void onFarmerDropItem(EntityDropItemEvent event) {
151
if (!(event.getEntity() instanceof CopperGolem golem) || !manager.isFarmer(golem)) return;
152
event.setCancelled(true);
153
restoreEquippedHoe(golem);
154
}
155
124
156
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
125
157
public void onStatueWaxOrScrape(PlayerInteractEvent event) {
126
158
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
@@ -180,6 +212,22 @@ final class FarmerListener implements Listener {
180
212
event.getDrops().addAll(manager.deathDrops(golem));
181
213
}
182
214
215
private ItemStack craftResult(Recipe recipe, ItemStack[] contents, ItemStack vanillaResult) {
216
if (isFarmerRecipe(recipe)) return farmerResultFrom(contents);
217
return preserveFarmerOnStatueResult(contents, vanillaResult);
218
}
219
220
private ItemStack preserveFarmerOnStatueResult(ItemStack[] contents, ItemStack vanillaResult) {
221
if (vanillaResult == null || !CopperStatueVariant.isStatue(vanillaResult.getType())) return null;
222
ItemStack farmer = findFarmerStatue(contents);
223
if (farmer == null) return null;
224
FarmerPersistence.FarmerSnapshot snapshot = FarmerPersistence.capture(
225
farmer.getPersistentDataContainer(),
226
keys
227
);
228
return itemCodec.createStatue(snapshot, vanillaResult.getType());
229
}
230
183
231
private ItemStack farmerResultFrom(ItemStack[] contents) {
184
232
ItemStack hoe = findCopperHoe(contents);
185
233
ItemStack statue = findStatue(contents);
@@ -247,11 +295,23 @@ final class FarmerListener implements Listener {
247
295
statue.update();
248
296
}
249
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
250
306
private boolean isOxidationTool(ItemStack item) {
251
307
if (item == null || item.isEmpty()) return false;
252
308
return item.getType() == Material.HONEYCOMB || Tag.ITEMS_AXES.isTagged(item.getType());
253
309
}
254
310
311
private boolean isNameTag(ItemStack item) {
312
return item != null && !item.isEmpty() && item.getType() == Material.NAME_TAG;
313
}
314
255
315
private boolean isFarmerRecipe(Recipe recipe) {
256
316
return recipe instanceof ShapelessRecipe shapeless && shapeless.getKey().equals(keys.recipe);
257
317
}
@@ -267,6 +327,11 @@ final class FarmerListener implements Listener {
267
327
return null;
268
328
}
269
329
330
private ItemStack findFarmerStatue(ItemStack[] contents) {
331
ItemStack statue = findStatue(contents);
332
return itemCodec.isFarmerItem(statue) ? statue : null;
333
}
334
270
335
private ItemStack findStatue(ItemStack[] contents) {
271
336
if (contents == null) return null;
272
337
for (ItemStack item : contents) {
@@ -17,7 +17,10 @@ import org.bukkit.event.block.BlockPlaceEvent;17
import org.bukkit.event.block.CrafterCraftEvent;17
import org.bukkit.event.block.CrafterCraftEvent;18
import org.bukkit.event.entity.EntityChangeBlockEvent;18
import org.bukkit.event.entity.EntityChangeBlockEvent;19
import org.bukkit.event.entity.EntityDeathEvent;19
import org.bukkit.event.entity.EntityDeathEvent;20
import org.bukkit.event.entity.EntityDropItemEvent;21
import org.bukkit.event.inventory.CraftItemEvent;20
import org.bukkit.event.inventory.PrepareItemCraftEvent;22
import org.bukkit.event.inventory.PrepareItemCraftEvent;23
import org.bukkit.event.player.PlayerInteractEntityEvent;21
import org.bukkit.event.player.PlayerInteractEvent;24
import org.bukkit.event.player.PlayerInteractEvent;22
import org.bukkit.event.world.EntitiesLoadEvent;25
import org.bukkit.event.world.EntitiesLoadEvent;23
import org.bukkit.event.world.EntitiesUnloadEvent;26
import org.bukkit.event.world.EntitiesUnloadEvent;@@ -49,17 +52,28 @@ final class FarmerListener implements Listener {49
52
50
@EventHandler(priority = EventPriority.HIGHEST)53
@EventHandler(priority = EventPriority.HIGHEST)51
public void onPrepareCraft(PrepareItemCraftEvent event) {54
public void onPrepareCraft(PrepareItemCraftEvent event) {52
if (!isFarmerRecipe(event.getRecipe())) return;55
ItemStack result = craftResult(53
ItemStack result = farmerResultFrom(event.getInventory().getMatrix());56
event.getRecipe(),57
event.getInventory().getMatrix(),58
event.getInventory().getResult()59
);54
if (result != null) event.getInventory().setResult(result);60
if (result != null) event.getInventory().setResult(result);55
}61
}56
62
63
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)64
public void onCraftItem(CraftItemEvent event) {65
ItemStack vanilla = event.getRecipe() != null ? event.getRecipe().getResult() : event.getCurrentItem();66
ItemStack result = craftResult(event.getRecipe(), event.getInventory().getMatrix(), vanilla);67
if (result == null) return;68
event.setCurrentItem(result);69
event.getInventory().setResult(result);70
}71
57
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)72
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)58
public void onCrafterCraft(CrafterCraftEvent event) {73
public void onCrafterCraft(CrafterCraftEvent event) {59
if (!isFarmerRecipe(event.getRecipe())) return;60
BlockState state = event.getBlock().getState();74
BlockState state = event.getBlock().getState();61
if (!(state instanceof InventoryHolder holder)) return;75
if (!(state instanceof InventoryHolder holder)) return;62
ItemStack result = farmerResultFrom(holder.getInventory().getContents());76
ItemStack result = craftResult(event.getRecipe(), holder.getInventory().getContents(), event.getResult());63
if (result != null) event.setResult(result);77
if (result != null) event.setResult(result);64
}78
}65
79
@@ -121,6 +135,24 @@ final class FarmerListener implements Listener {121
});135
});122
}136
}123
137
138
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)139
public void onFarmerInteract(PlayerInteractEntityEvent event) {140
if (!(event.getRightClicked() instanceof CopperGolem golem) || !manager.isFarmer(golem)) return;141
142
ItemStack used = event.getPlayer().getInventory().getItem(event.getHand());143
if (isOxidationTool(used) || isNameTag(used)) return;144
145
event.setCancelled(true);146
plugin.getServer().getScheduler().runTask(plugin, () -> restoreEquippedHoe(golem));147
}148
149
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)150
public void onFarmerDropItem(EntityDropItemEvent event) {151
if (!(event.getEntity() instanceof CopperGolem golem) || !manager.isFarmer(golem)) return;152
event.setCancelled(true);153
restoreEquippedHoe(golem);154
}155
124
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)156
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)125
public void onStatueWaxOrScrape(PlayerInteractEvent event) {157
public void onStatueWaxOrScrape(PlayerInteractEvent event) {126
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;158
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;@@ -180,6 +212,22 @@ final class FarmerListener implements Listener {180
event.getDrops().addAll(manager.deathDrops(golem));212
event.getDrops().addAll(manager.deathDrops(golem));181
}213
}182
214
215
private ItemStack craftResult(Recipe recipe, ItemStack[] contents, ItemStack vanillaResult) {216
if (isFarmerRecipe(recipe)) return farmerResultFrom(contents);217
return preserveFarmerOnStatueResult(contents, vanillaResult);218
}219
220
private ItemStack preserveFarmerOnStatueResult(ItemStack[] contents, ItemStack vanillaResult) {221
if (vanillaResult == null || !CopperStatueVariant.isStatue(vanillaResult.getType())) return null;222
ItemStack farmer = findFarmerStatue(contents);223
if (farmer == null) return null;224
FarmerPersistence.FarmerSnapshot snapshot = FarmerPersistence.capture(225
farmer.getPersistentDataContainer(),226
keys227
);228
return itemCodec.createStatue(snapshot, vanillaResult.getType());229
}230
183
private ItemStack farmerResultFrom(ItemStack[] contents) {231
private ItemStack farmerResultFrom(ItemStack[] contents) {184
ItemStack hoe = findCopperHoe(contents);232
ItemStack hoe = findCopperHoe(contents);185
ItemStack statue = findStatue(contents);233
ItemStack statue = findStatue(contents);@@ -247,11 +295,23 @@ final class FarmerListener implements Listener {247
statue.update();295
statue.update();248
}296
}249
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
250
private boolean isOxidationTool(ItemStack item) {306
private boolean isOxidationTool(ItemStack item) {251
if (item == null || item.isEmpty()) return false;307
if (item == null || item.isEmpty()) return false;252
return item.getType() == Material.HONEYCOMB || Tag.ITEMS_AXES.isTagged(item.getType());308
return item.getType() == Material.HONEYCOMB || Tag.ITEMS_AXES.isTagged(item.getType());253
}309
}254
310
311
private boolean isNameTag(ItemStack item) {312
return item != null && !item.isEmpty() && item.getType() == Material.NAME_TAG;313
}314
255
private boolean isFarmerRecipe(Recipe recipe) {315
private boolean isFarmerRecipe(Recipe recipe) {256
return recipe instanceof ShapelessRecipe shapeless && shapeless.getKey().equals(keys.recipe);316
return recipe instanceof ShapelessRecipe shapeless && shapeless.getKey().equals(keys.recipe);257
}317
}@@ -267,6 +327,11 @@ final class FarmerListener implements Listener {267
return null;327
return null;268
}328
}269
329
330
private ItemStack findFarmerStatue(ItemStack[] contents) {331
ItemStack statue = findStatue(contents);332
return itemCodec.isFarmerItem(statue) ? statue : null;333
}334
270
private ItemStack findStatue(ItemStack[] contents) {335
private ItemStack findStatue(ItemStack[] contents) {271
if (contents == null) return null;336
if (contents == null) return null;272
for (ItemStack item : contents) {337
for (ItemStack item : contents) {