BlueGit

timfa copperfarmer

Accept ItemStack PDC views so farmer data compiles on Paper 26.2.

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

timfa Tim Falken · pushed by timfa

Authored 2026-08-14 · 3 months ago

Hash
6676813efa7f9b5ebd3659db35e6003b399d6cb7
Parent
2dadfcc5
1 file changed +4 −3
src/main/java/nl/timfalken/copperfarmer/FarmerPersistence.java +4 −3
@@ -3,16 +3,17 @@ package nl.timfalken.copperfarmer;
3 3 import org.bukkit.block.Block;
4 4 import org.bukkit.block.CopperGolemStatue;
5 5 import org.bukkit.persistence.PersistentDataContainer;
6 import org.bukkit.persistence.PersistentDataContainerView;
6 7 import org.bukkit.persistence.PersistentDataType;
7 8
8 9 final class FarmerPersistence {
9 10 private FarmerPersistence() {}
10 11
11 static boolean isFarmerItem(PersistentDataContainer pdc, FarmerKeys keys) {
12 static boolean isFarmerItem(PersistentDataContainerView pdc, FarmerKeys keys) {
12 13 return pdc.has(keys.farmerItem, PersistentDataType.BYTE);
13 14 }
14 15
15 static boolean isFarmerEntity(PersistentDataContainer pdc, FarmerKeys keys) {
16 static boolean isFarmerEntity(PersistentDataContainerView pdc, FarmerKeys keys) {
16 17 return pdc.has(keys.farmerEntity, PersistentDataType.BYTE);
17 18 }
18 19
@@ -21,7 +22,7 @@ final class FarmerPersistence {
21 22 && isFarmerEntity(statue.getPersistentDataContainer(), keys);
22 23 }
23 24
24 static FarmerSnapshot capture(PersistentDataContainer pdc, FarmerKeys keys) {
25 static FarmerSnapshot capture(PersistentDataContainerView pdc, FarmerKeys keys) {
25 26 return new FarmerSnapshot(
26 27 pdc.get(keys.tool, PersistentDataType.BYTE_ARRAY),
27 28 pdc.get(keys.cargo, PersistentDataType.BYTE_ARRAY),
@@ -3,16 +3,17 @@ package nl.timfalken.copperfarmer;
3import org.bukkit.block.Block;
3import org.bukkit.block.Block;
4import org.bukkit.block.CopperGolemStatue;
4import org.bukkit.block.CopperGolemStatue;
5import org.bukkit.persistence.PersistentDataContainer;
5import org.bukkit.persistence.PersistentDataContainer;
6import org.bukkit.persistence.PersistentDataContainerView;
6import org.bukkit.persistence.PersistentDataType;
7import org.bukkit.persistence.PersistentDataType;
7
8
8final class FarmerPersistence {
9final class FarmerPersistence {
9 private FarmerPersistence() {}
10 private FarmerPersistence() {}
10
11
11 static boolean isFarmerItem(PersistentDataContainer pdc, FarmerKeys keys) {
12 static boolean isFarmerItem(PersistentDataContainerView pdc, FarmerKeys keys) {
12 return pdc.has(keys.farmerItem, PersistentDataType.BYTE);
13 return pdc.has(keys.farmerItem, PersistentDataType.BYTE);
13 }
14 }
14
15
15 static boolean isFarmerEntity(PersistentDataContainer pdc, FarmerKeys keys) {
16 static boolean isFarmerEntity(PersistentDataContainerView pdc, FarmerKeys keys) {
16 return pdc.has(keys.farmerEntity, PersistentDataType.BYTE);
17 return pdc.has(keys.farmerEntity, PersistentDataType.BYTE);
17 }
18 }
18
19
@@ -21,7 +22,7 @@ final class FarmerPersistence {
21 && isFarmerEntity(statue.getPersistentDataContainer(), keys);
22 && isFarmerEntity(statue.getPersistentDataContainer(), keys);
22 }
23 }
23
24
24 static FarmerSnapshot capture(PersistentDataContainer pdc, FarmerKeys keys) {
25 static FarmerSnapshot capture(PersistentDataContainerView pdc, FarmerKeys keys) {
25 return new FarmerSnapshot(
26 return new FarmerSnapshot(
26 pdc.get(keys.tool, PersistentDataType.BYTE_ARRAY),
27 pdc.get(keys.tool, PersistentDataType.BYTE_ARRAY),
27 pdc.get(keys.cargo, PersistentDataType.BYTE_ARRAY),
28 pdc.get(keys.cargo, PersistentDataType.BYTE_ARRAY),