BlueGit

timfa copperfarmer

Fix farmer tick CME and rediscover the crafting recipe.

Iterate brains from a snapshot during ticks, and ensure players rediscover the farmer recipe after reload or join.

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

timfa Tim Falken · pushed by timfa

Authored 2026-08-15 · 3 months ago

Hash
002758a5f22cde240aca2689567d9c4e3ff0047b
Parent
5e8b6610
7 files changed +24 −10
README.md +1 −1
@@ -1,4 +1,4 @@
1 # CopperFarmer 0.1.11
1 # CopperFarmer 0.1.12
2 2
3 3 First-version Paper 26.2 / Java 25 plugin for autonomous Copper Farmer Golems.
4 4
@@ -1,4 +1,4 @@
1# CopperFarmer 0.1.11
1# CopperFarmer 0.1.12
2
2
3First-version Paper 26.2 / Java 25 plugin for autonomous Copper Farmer Golems.
3First-version Paper 26.2 / Java 25 plugin for autonomous Copper Farmer Golems.
4
4
TESTING.md +1 −1
@@ -1,4 +1,4 @@
1 # CopperFarmer 0.1.11 smoke test
1 # CopperFarmer 0.1.12 smoke test
2 2
3 3 Use this checklist on a Paper 26.2 server before treating 0.1.0 as production-ready.
4 4
@@ -1,4 +1,4 @@
1# CopperFarmer 0.1.11 smoke test
1# CopperFarmer 0.1.12 smoke test
2
2
3Use this checklist on a Paper 26.2 server before treating 0.1.0 as production-ready.
3Use this checklist on a Paper 26.2 server before treating 0.1.0 as production-ready.
4
4
build.gradle.kts +1 −1
@@ -3,7 +3,7 @@ plugins {
3 3 }
4 4
5 5 group = "nl.timfalken"
6 version = "0.1.11"
6 version = "0.1.12"
7 7
8 8 repositories {
9 9 mavenCentral()
@@ -3,7 +3,7 @@ plugins {
3}
3}
4
4
5group = "nl.timfalken"
5group = "nl.timfalken"
6version = "0.1.11"
6version = "0.1.12"
7
7
8repositories {
8repositories {
9 mavenCentral()
9 mavenCentral()
src/main/java/nl/timfalken/copperfarmer/CopperFarmerPlugin.java +11 −2
@@ -5,6 +5,7 @@ import org.bukkit.Material;
5 5 import org.bukkit.World;
6 6 import org.bukkit.entity.CopperGolem;
7 7 import org.bukkit.entity.Entity;
8 import org.bukkit.entity.Player;
8 9 import org.bukkit.inventory.ItemStack;
9 10 import org.bukkit.inventory.ShapelessRecipe;
10 11 import org.bukkit.plugin.java.JavaPlugin;
@@ -48,7 +49,7 @@ public final class CopperFarmerPlugin extends JavaPlugin {
48 49 long interval = Math.max(1L, getConfig().getLong("brain-tick-interval", 5L));
49 50 brainTask = getServer().getScheduler().runTaskTimer(this, () -> manager.tick(interval), interval, interval);
50 51
51 getLogger().info("CopperFarmer 0.1.11 enabled for Paper 26.2.");
52 getLogger().info("CopperFarmer 0.1.12 enabled for Paper 26.2.");
52 53 }
53 54
54 55 @Override
@@ -62,7 +63,15 @@ public final class CopperFarmerPlugin extends JavaPlugin {
62 63 ShapelessRecipe recipe = new ShapelessRecipe(keys.recipe, result);
63 64 recipe.addIngredient(CopperStatueVariant.recipeChoice());
64 65 recipe.addIngredient(Material.COPPER_HOE);
65 Bukkit.addRecipe(recipe);
66 if (!Bukkit.addRecipe(recipe)) {
67 getLogger().warning("Failed to register Copper Farmer crafting recipe.");
68 return;
69 }
70 // After a plugin reload the recipe exists server-side, but online players may
71 // not have rediscovered it until they reconnect.
72 for (Player player : Bukkit.getOnlinePlayers()) {
73 player.discoverRecipe(keys.recipe);
74 }
66 75 }
67 76
68 77 }
@@ -5,6 +5,7 @@ import org.bukkit.Material;
5import org.bukkit.World;
5import org.bukkit.World;
6import org.bukkit.entity.CopperGolem;
6import org.bukkit.entity.CopperGolem;
7import org.bukkit.entity.Entity;
7import org.bukkit.entity.Entity;
8import org.bukkit.entity.Player;
8import org.bukkit.inventory.ItemStack;
9import org.bukkit.inventory.ItemStack;
9import org.bukkit.inventory.ShapelessRecipe;
10import org.bukkit.inventory.ShapelessRecipe;
10import org.bukkit.plugin.java.JavaPlugin;
11import org.bukkit.plugin.java.JavaPlugin;
@@ -48,7 +49,7 @@ public final class CopperFarmerPlugin extends JavaPlugin {
48 long interval = Math.max(1L, getConfig().getLong("brain-tick-interval", 5L));
49 long interval = Math.max(1L, getConfig().getLong("brain-tick-interval", 5L));
49 brainTask = getServer().getScheduler().runTaskTimer(this, () -> manager.tick(interval), interval, interval);
50 brainTask = getServer().getScheduler().runTaskTimer(this, () -> manager.tick(interval), interval, interval);
50
51
51 getLogger().info("CopperFarmer 0.1.11 enabled for Paper 26.2.");
52 getLogger().info("CopperFarmer 0.1.12 enabled for Paper 26.2.");
52 }
53 }
53
54
54 @Override
55 @Override
@@ -62,7 +63,15 @@ public final class CopperFarmerPlugin extends JavaPlugin {
62 ShapelessRecipe recipe = new ShapelessRecipe(keys.recipe, result);
63 ShapelessRecipe recipe = new ShapelessRecipe(keys.recipe, result);
63 recipe.addIngredient(CopperStatueVariant.recipeChoice());
64 recipe.addIngredient(CopperStatueVariant.recipeChoice());
64 recipe.addIngredient(Material.COPPER_HOE);
65 recipe.addIngredient(Material.COPPER_HOE);
65 Bukkit.addRecipe(recipe);
66 if (!Bukkit.addRecipe(recipe)) {
67 getLogger().warning("Failed to register Copper Farmer crafting recipe.");
68 return;
69 }
70 // After a plugin reload the recipe exists server-side, but online players may
71 // not have rediscovered it until they reconnect.
72 for (Player player : Bukkit.getOnlinePlayers()) {
73 player.discoverRecipe(keys.recipe);
74 }
66 }
75 }
67
76
68}
77}
src/main/java/nl/timfalken/copperfarmer/FarmerListener.java +6 −0
@@ -22,6 +22,7 @@ import org.bukkit.event.inventory.CraftItemEvent;
22 22 import org.bukkit.event.inventory.PrepareItemCraftEvent;
23 23 import org.bukkit.event.player.PlayerInteractEntityEvent;
24 24 import org.bukkit.event.player.PlayerInteractEvent;
25 import org.bukkit.event.player.PlayerJoinEvent;
25 26 import org.bukkit.event.world.EntitiesLoadEvent;
26 27 import org.bukkit.event.world.EntitiesUnloadEvent;
27 28 import org.bukkit.inventory.EntityEquipment;
@@ -50,6 +51,11 @@ final class FarmerListener implements Listener {
50 51 this.itemCodec = itemCodec;
51 52 }
52 53
54 @EventHandler
55 public void onPlayerJoin(PlayerJoinEvent event) {
56 event.getPlayer().discoverRecipe(keys.recipe);
57 }
58
53 59 @EventHandler(priority = EventPriority.HIGHEST)
54 60 public void onPrepareCraft(PrepareItemCraftEvent event) {
55 61 ItemStack result = craftResult(
@@ -22,6 +22,7 @@ import org.bukkit.event.inventory.CraftItemEvent;
22import org.bukkit.event.inventory.PrepareItemCraftEvent;
22import org.bukkit.event.inventory.PrepareItemCraftEvent;
23import org.bukkit.event.player.PlayerInteractEntityEvent;
23import org.bukkit.event.player.PlayerInteractEntityEvent;
24import org.bukkit.event.player.PlayerInteractEvent;
24import org.bukkit.event.player.PlayerInteractEvent;
25import org.bukkit.event.player.PlayerJoinEvent;
25import org.bukkit.event.world.EntitiesLoadEvent;
26import org.bukkit.event.world.EntitiesLoadEvent;
26import org.bukkit.event.world.EntitiesUnloadEvent;
27import org.bukkit.event.world.EntitiesUnloadEvent;
27import org.bukkit.inventory.EntityEquipment;
28import org.bukkit.inventory.EntityEquipment;
@@ -50,6 +51,11 @@ final class FarmerListener implements Listener {
50 this.itemCodec = itemCodec;
51 this.itemCodec = itemCodec;
51 }
52 }
52
53
54 @EventHandler
55 public void onPlayerJoin(PlayerJoinEvent event) {
56 event.getPlayer().discoverRecipe(keys.recipe);
57 }
58
53 @EventHandler(priority = EventPriority.HIGHEST)
59 @EventHandler(priority = EventPriority.HIGHEST)
54 public void onPrepareCraft(PrepareItemCraftEvent event) {
60 public void onPrepareCraft(PrepareItemCraftEvent event) {
55 ItemStack result = craftResult(
61 ItemStack result = craftResult(
src/main/java/nl/timfalken/copperfarmer/FarmerManager.java +3 −4
@@ -105,11 +105,10 @@ final class FarmerManager {
105 105
106 106 void tick(long elapsedTicks) {
107 107 clock += elapsedTicks;
108 var iterator = brains.entrySet().iterator();
109 while (iterator.hasNext()) {
110 Brain brain = iterator.next().getValue();
108 // Snapshot: register/unregister can run mid-tick (chunk entity load/unload).
109 for (Brain brain : List.copyOf(brains.values())) {
111 110 if (!brain.golem.isValid() || brain.golem.isDead()) {
112 iterator.remove();
111 brains.remove(brain.golem.getUniqueId());
113 112 continue;
114 113 }
115 114 try {
@@ -105,11 +105,10 @@ final class FarmerManager {
105
105
106 void tick(long elapsedTicks) {
106 void tick(long elapsedTicks) {
107 clock += elapsedTicks;
107 clock += elapsedTicks;
108 var iterator = brains.entrySet().iterator();
108 // Snapshot: register/unregister can run mid-tick (chunk entity load/unload).
109 while (iterator.hasNext()) {
109 for (Brain brain : List.copyOf(brains.values())) {
110 Brain brain = iterator.next().getValue();
111 if (!brain.golem.isValid() || brain.golem.isDead()) {
110 if (!brain.golem.isValid() || brain.golem.isDead()) {
112 iterator.remove();
111 brains.remove(brain.golem.getUniqueId());
113 continue;
112 continue;
114 }
113 }
115 try {
114 try {
src/main/resources/plugin.yml +1 −1
@@ -1,5 +1,5 @@
1 1 name: CopperFarmer
2 version: 0.1.11
2 version: 0.1.12
3 3 main: nl.timfalken.copperfarmer.CopperFarmerPlugin
4 4 api-version: '26.2'
5 5 author: Tim Falken
@@ -1,5 +1,5 @@
1name: CopperFarmer
1name: CopperFarmer
2version: 0.1.11
2version: 0.1.12
3main: nl.timfalken.copperfarmer.CopperFarmerPlugin
3main: nl.timfalken.copperfarmer.CopperFarmerPlugin
4api-version: '26.2'
4api-version: '26.2'
5author: Tim Falken
5author: Tim Falken