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>
@@ -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.111
# CopperFarmer 0.1.122
2
3
First-version Paper 26.2 / Java 25 plugin for autonomous Copper Farmer Golems.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 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 test1
# CopperFarmer 0.1.12 smoke test2
2
3
Use this checklist on a Paper 26.2 server before treating 0.1.0 as production-ready.3
Use this checklist on a Paper 26.2 server before treating 0.1.0 as production-ready.4
4
@@ -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
5
group = "nl.timfalken"5
group = "nl.timfalken"6
version = "0.1.11"6
version = "0.1.12"7
7
8
repositories {8
repositories {9
mavenCentral()9
mavenCentral()@@ -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;5
import org.bukkit.World;5
import org.bukkit.World;6
import org.bukkit.entity.CopperGolem;6
import org.bukkit.entity.CopperGolem;7
import org.bukkit.entity.Entity;7
import org.bukkit.entity.Entity;8
import org.bukkit.entity.Player;8
import org.bukkit.inventory.ItemStack;9
import org.bukkit.inventory.ItemStack;9
import org.bukkit.inventory.ShapelessRecipe;10
import org.bukkit.inventory.ShapelessRecipe;10
import org.bukkit.plugin.java.JavaPlugin;11
import 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
@Override55
@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 may71
// 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
}@@ -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;22
import org.bukkit.event.inventory.PrepareItemCraftEvent;22
import org.bukkit.event.inventory.PrepareItemCraftEvent;23
import org.bukkit.event.player.PlayerInteractEntityEvent;23
import org.bukkit.event.player.PlayerInteractEntityEvent;24
import org.bukkit.event.player.PlayerInteractEvent;24
import org.bukkit.event.player.PlayerInteractEvent;25
import org.bukkit.event.player.PlayerJoinEvent;25
import org.bukkit.event.world.EntitiesLoadEvent;26
import org.bukkit.event.world.EntitiesLoadEvent;26
import org.bukkit.event.world.EntitiesUnloadEvent;27
import org.bukkit.event.world.EntitiesUnloadEvent;27
import org.bukkit.inventory.EntityEquipment;28
import 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
@EventHandler55
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(@@ -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 {@@ -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 @@1
name: CopperFarmer1
name: CopperFarmer2
version: 0.1.112
version: 0.1.123
main: nl.timfalken.copperfarmer.CopperFarmerPlugin3
main: nl.timfalken.copperfarmer.CopperFarmerPlugin4
api-version: '26.2'4
api-version: '26.2'5
author: Tim Falken5
author: Tim Falken