BlueGit

timfa copper-key

Add lock feedback, advancements, and key cloning.

Smoke on denied opens, Burglar/Oops advancements, and blank+bound crafting that yields two bound keys.

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

timfa Tim Falken · pushed by timfa

Authored 2026-08-21 · 2 months ago

Hash
69b64ee9570c8290780dde048faab6387fbcbd9c
Parent
8e4bb9d7
4 files changed +237 −13
src/main/java/nl/timfalken/copperkeys/CopperKeysPlugin.java +185 −13
@@ -5,8 +5,12 @@ import io.papermc.paper.event.entity.ItemTransportingEntityValidateTargetEvent;
5 5 import net.kyori.adventure.text.Component;
6 6 import net.kyori.adventure.text.format.NamedTextColor;
7 7 import org.bukkit.Bukkit;
8 import org.bukkit.Location;
8 9 import org.bukkit.Material;
9 10 import org.bukkit.NamespacedKey;
11 import org.bukkit.Particle;
12 import org.bukkit.advancement.Advancement;
13 import org.bukkit.advancement.AdvancementProgress;
10 14 import org.bukkit.block.Block;
11 15 import org.bukkit.block.BlockState;
12 16 import org.bukkit.block.DoubleChest;
@@ -26,8 +30,10 @@ import org.bukkit.event.block.BlockRedstoneEvent;
26 30 import org.bukkit.event.block.CrafterCraftEvent;
27 31 import org.bukkit.event.entity.EntityExplodeEvent;
28 32 import org.bukkit.event.entity.EntityPickupItemEvent;
33 import org.bukkit.event.inventory.CraftItemEvent;
29 34 import org.bukkit.event.inventory.HopperInventorySearchEvent;
30 35 import org.bukkit.event.inventory.InventoryClickEvent;
36 import org.bukkit.event.inventory.InventoryCloseEvent;
31 37 import org.bukkit.event.inventory.InventoryDragEvent;
32 38 import org.bukkit.event.inventory.InventoryMoveItemEvent;
33 39 import org.bukkit.event.inventory.InventoryOpenEvent;
@@ -42,19 +48,28 @@ import org.bukkit.inventory.Inventory;
42 48 import org.bukkit.inventory.InventoryHolder;
43 49 import org.bukkit.inventory.ItemStack;
44 50 import org.bukkit.inventory.ShapedRecipe;
51 import org.bukkit.inventory.ShapelessRecipe;
45 52 import org.bukkit.plugin.java.JavaPlugin;
46 53
54 import java.io.IOException;
55 import java.io.InputStream;
56 import java.nio.charset.StandardCharsets;
57 import java.util.HashMap;
47 58 import java.util.ArrayList;
48 59 import java.util.LinkedHashSet;
49 60 import java.util.List;
50 61 import java.util.Locale;
51 62 import java.util.Set;
52 63 import java.util.UUID;
64 import java.util.logging.Level;
53 65
54 66 public final class CopperKeysPlugin extends JavaPlugin implements Listener {
55 67 private LockStore lockStore;
56 68 private KeyItems keyItems;
57 69 private NamespacedKey recipeKey;
70 private NamespacedKey copyRecipeKey;
71 private NamespacedKey burglarAdvancementKey;
72 private NamespacedKey oopsAdvancementKey;
58 73
59 74 @Override
60 75 public void onEnable() {
@@ -62,8 +77,13 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
62 77 lockStore.load();
63 78 keyItems = new KeyItems(this);
64 79 recipeKey = new NamespacedKey(this, "blank_key");
80 copyRecipeKey = new NamespacedKey(this, "copy_key");
81 burglarAdvancementKey = new NamespacedKey(this, "burglar");
82 oopsAdvancementKey = new NamespacedKey(this, "oops");
65 83
66 registerRecipe();
84 registerRecipes();
85 registerAdvancement(burglarAdvancementKey, "advancements/burglar.json", "Burglar");
86 registerAdvancement(oopsAdvancementKey, "advancements/oops.json", "Oops");
67 87 getServer().getPluginManager().registerEvents(this, this);
68 88 getLogger().info("CopperKeys 1.0.0 enabled with event-driven lock handling.");
69 89 }
@@ -72,12 +92,54 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
72 92 return lockStore;
73 93 }
74 94
75 private void registerRecipe() {
95 private void registerRecipes() {
76 96 Bukkit.removeRecipe(recipeKey);
77 ShapedRecipe recipe = new ShapedRecipe(recipeKey, keyItems.createBlankKey());
78 recipe.shape("N ", " N");
79 recipe.setIngredient('N', Material.COPPER_NUGGET);
80 Bukkit.addRecipe(recipe);
97 Bukkit.removeRecipe(copyRecipeKey);
98
99 ShapedRecipe blankRecipe = new ShapedRecipe(recipeKey, keyItems.createBlankKey());
100 blankRecipe.shape("N ", " N");
101 blankRecipe.setIngredient('N', Material.COPPER_NUGGET);
102 Bukkit.addRecipe(blankRecipe);
103
104 // Ingredient match is material-only; PrepareItemCraftEvent validates blank + bound keys.
105 ShapelessRecipe copyRecipe = new ShapelessRecipe(copyRecipeKey, keyItems.createBlankKey());
106 copyRecipe.addIngredient(Material.CLOCK);
107 copyRecipe.addIngredient(Material.CLOCK);
108 Bukkit.addRecipe(copyRecipe);
109 }
110
111 private void registerAdvancement(NamespacedKey key, String resourcePath, String label) {
112 if (Bukkit.getAdvancement(key) != null) {
113 return;
114 }
115 try (InputStream in = getResource(resourcePath)) {
116 if (in == null) {
117 getLogger().warning("Missing " + resourcePath + "; " + label + " advancement not registered.");
118 return;
119 }
120 String json = new String(in.readAllBytes(), StandardCharsets.UTF_8);
121 @SuppressWarnings("deprecation")
122 Advancement loaded = Bukkit.getUnsafe().loadAdvancement(key, json);
123 if (loaded == null) {
124 getLogger().warning("Could not register " + label + " advancement.");
125 }
126 } catch (IOException | RuntimeException ex) {
127 getLogger().log(Level.WARNING, "Could not register " + label + " advancement", ex);
128 }
129 }
130
131 private void awardAdvancement(Player player, NamespacedKey key) {
132 Advancement advancement = Bukkit.getAdvancement(key);
133 if (advancement == null) {
134 return;
135 }
136 AdvancementProgress progress = player.getAdvancementProgress(advancement);
137 if (progress.isDone()) {
138 return;
139 }
140 for (String criterion : progress.getRemainingCriteria()) {
141 progress.awardCriteria(criterion);
142 }
81 143 }
82 144
83 145 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -98,7 +160,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
98 160 }
99 161 if (!playerHasKey(event.getPlayer(), existing.bindingId())) {
100 162 event.setCancelled(true);
101 lockedMessage(event.getPlayer());
163 denyOpen(event.getPlayer(), clicked);
102 164 }
103 165 // Already locked: never bind a second key. Allow open/use only when the key check passed.
104 166 return;
@@ -113,7 +175,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
113 175 for (BlockKey member : members) {
114 176 if (lockStore.get(member) != null) {
115 177 event.setCancelled(true);
116 lockedMessage(event.getPlayer());
178 denyOpen(event.getPlayer(), clicked);
117 179 return;
118 180 }
119 181 }
@@ -138,7 +200,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
138 200 }
139 201 event.setCancelled(true);
140 202 if (human instanceof Player player) {
141 lockedMessage(player);
203 denyOpen(player, blockForInventory(event.getInventory()));
142 204 }
143 205 }
144 206
@@ -220,7 +282,12 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
220 282
221 283 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
222 284 public void onPlayerBreak(BlockBreakEvent event) {
223 handleDestroyed(event.getBlock());
285 Block block = event.getBlock();
286 LockRecord lock = lockStore.get(BlockKey.of(block));
287 if (lock != null && !playerHasKey(event.getPlayer(), lock.bindingId())) {
288 awardAdvancement(event.getPlayer(), burglarAdvancementKey);
289 }
290 handleDestroyed(block);
224 291 }
225 292
226 293 @EventHandler(priority = EventPriority.MONITOR)
@@ -247,6 +314,24 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
247 314 }
248 315 }
249 316
317 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
318 public void onInventoryClose(InventoryCloseEvent event) {
319 if (!(event.getPlayer() instanceof Player player)) {
320 return;
321 }
322 LockRecord lock = lockForInventory(event.getInventory());
323 if (lock == null) {
324 return;
325 }
326 if (playerHasKey(player, lock.bindingId())) {
327 return;
328 }
329 if (!keyItems.inventoryHasBinding(event.getInventory(), lock.bindingId())) {
330 return;
331 }
332 awardAdvancement(player, oopsAdvancementKey);
333 }
334
250 335 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
251 336 public void onPickup(EntityPickupItemEvent event) {
252 337 ItemStack stack = event.getItem().getItemStack();
@@ -263,6 +348,12 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
263 348 @EventHandler(priority = EventPriority.HIGHEST)
264 349 public void onPrepareCraft(PrepareItemCraftEvent event) {
265 350 CraftingInventory inv = event.getInventory();
351 ItemStack clone = keyCloneResult(inv);
352 if (clone != null) {
353 inv.setResult(clone);
354 return;
355 }
356
266 357 boolean containsKey = false;
267 358 for (ItemStack item : inv.getMatrix()) {
268 359 if (keyItems.isKey(item)) {
@@ -273,10 +364,26 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
273 364 if (!containsKey) {
274 365 return;
275 366 }
276 if (!(inv.getRecipe() instanceof org.bukkit.inventory.CraftingRecipe recipe)
277 || !recipeKey.equals(recipe.getKey())) {
278 inv.setResult(null);
367 if (inv.getRecipe() instanceof org.bukkit.inventory.CraftingRecipe recipe
368 && recipeKey.equals(recipe.getKey())) {
369 return;
279 370 }
371 inv.setResult(null);
372 }
373
374 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
375 public void onCraftItem(CraftItemEvent event) {
376 ItemStack clone = keyCloneResult(event.getInventory());
377 if (clone == null || !(event.getWhoClicked() instanceof Player player)) {
378 return;
379 }
380 ItemStack second = clone.clone();
381 getServer().getScheduler().runTask(this, () -> {
382 HashMap<Integer, ItemStack> leftover = player.getInventory().addItem(second);
383 for (ItemStack drop : leftover.values()) {
384 player.getWorld().dropItemNaturally(player.getLocation(), drop);
385 }
386 });
280 387 }
281 388
282 389 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -295,6 +402,37 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
295 402 }
296 403 }
297 404
405 private ItemStack keyCloneResult(CraftingInventory inventory) {
406 ItemStack blank = null;
407 ItemStack bound = null;
408 for (ItemStack item : inventory.getMatrix()) {
409 if (item == null || item.getType().isAir()) {
410 continue;
411 }
412 if (keyItems.isBlank(item)) {
413 if (blank != null) {
414 return null;
415 }
416 blank = item;
417 } else if (keyItems.isKey(item)) {
418 if (keyItems.getBinding(item) == null || bound != null) {
419 return null;
420 }
421 bound = item;
422 } else {
423 return null;
424 }
425 }
426 if (blank == null || bound == null) {
427 return null;
428 }
429 LockRecord lock = lockStore.get(keyItems.getBinding(bound));
430 if (lock == null) {
431 return null;
432 }
433 return keyItems.createBoundKey(lock);
434 }
435
298 436 private void handleDestroyed(Block block) {
299 437 LockRecord removed = lockStore.removeByBlock(BlockKey.of(block));
300 438 if (removed == null) {
@@ -373,6 +511,31 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
373 511 return null;
374 512 }
375 513
514 private Block blockForInventory(Inventory inventory) {
515 InventoryHolder holder = inventory.getHolder();
516 if (holder instanceof DoubleChest doubleChest) {
517 InventoryHolder left = doubleChest.getLeftSide();
518 if (left instanceof BlockState state) {
519 return state.getBlock();
520 }
521 InventoryHolder right = doubleChest.getRightSide();
522 if (right instanceof BlockState state) {
523 return state.getBlock();
524 }
525 }
526 if (holder instanceof BlockState state) {
527 return state.getBlock();
528 }
529 if (inventory instanceof DoubleChestInventory doubleInventory
530 && doubleInventory.getHolder() instanceof DoubleChest doubleChest) {
531 InventoryHolder left = doubleChest.getLeftSide();
532 if (left instanceof BlockState state) {
533 return state.getBlock();
534 }
535 }
536 return null;
537 }
538
376 539 private void setUsedHandItem(Player player, EquipmentSlot hand, ItemStack item) {
377 540 if (hand == EquipmentSlot.OFF_HAND) {
378 541 player.getInventory().setItemInOffHand(item);
@@ -381,6 +544,15 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
381 544 }
382 545 }
383 546
547 private void denyOpen(Player player, Block block) {
548 lockedMessage(player);
549 if (block == null) {
550 return;
551 }
552 Location at = block.getLocation().add(0.5, 0.6, 0.5);
553 block.getWorld().spawnParticle(Particle.SMOKE, at, 16, 0.28, 0.4, 0.28, 0.01);
554 }
555
384 556 private void lockedMessage(Player player) {
385 557 player.sendActionBar(Component.text("Locked — matching key required", NamedTextColor.RED));
386 558 }
@@ -5,8 +5,12 @@ import io.papermc.paper.event.entity.ItemTransportingEntityValidateTargetEvent;
5import net.kyori.adventure.text.Component;
5import net.kyori.adventure.text.Component;
6import net.kyori.adventure.text.format.NamedTextColor;
6import net.kyori.adventure.text.format.NamedTextColor;
7import org.bukkit.Bukkit;
7import org.bukkit.Bukkit;
8import org.bukkit.Location;
8import org.bukkit.Material;
9import org.bukkit.Material;
9import org.bukkit.NamespacedKey;
10import org.bukkit.NamespacedKey;
11import org.bukkit.Particle;
12import org.bukkit.advancement.Advancement;
13import org.bukkit.advancement.AdvancementProgress;
10import org.bukkit.block.Block;
14import org.bukkit.block.Block;
11import org.bukkit.block.BlockState;
15import org.bukkit.block.BlockState;
12import org.bukkit.block.DoubleChest;
16import org.bukkit.block.DoubleChest;
@@ -26,8 +30,10 @@ import org.bukkit.event.block.BlockRedstoneEvent;
26import org.bukkit.event.block.CrafterCraftEvent;
30import org.bukkit.event.block.CrafterCraftEvent;
27import org.bukkit.event.entity.EntityExplodeEvent;
31import org.bukkit.event.entity.EntityExplodeEvent;
28import org.bukkit.event.entity.EntityPickupItemEvent;
32import org.bukkit.event.entity.EntityPickupItemEvent;
33import org.bukkit.event.inventory.CraftItemEvent;
29import org.bukkit.event.inventory.HopperInventorySearchEvent;
34import org.bukkit.event.inventory.HopperInventorySearchEvent;
30import org.bukkit.event.inventory.InventoryClickEvent;
35import org.bukkit.event.inventory.InventoryClickEvent;
36import org.bukkit.event.inventory.InventoryCloseEvent;
31import org.bukkit.event.inventory.InventoryDragEvent;
37import org.bukkit.event.inventory.InventoryDragEvent;
32import org.bukkit.event.inventory.InventoryMoveItemEvent;
38import org.bukkit.event.inventory.InventoryMoveItemEvent;
33import org.bukkit.event.inventory.InventoryOpenEvent;
39import org.bukkit.event.inventory.InventoryOpenEvent;
@@ -42,19 +48,28 @@ import org.bukkit.inventory.Inventory;
42import org.bukkit.inventory.InventoryHolder;
48import org.bukkit.inventory.InventoryHolder;
43import org.bukkit.inventory.ItemStack;
49import org.bukkit.inventory.ItemStack;
44import org.bukkit.inventory.ShapedRecipe;
50import org.bukkit.inventory.ShapedRecipe;
51import org.bukkit.inventory.ShapelessRecipe;
45import org.bukkit.plugin.java.JavaPlugin;
52import org.bukkit.plugin.java.JavaPlugin;
46
53
54import java.io.IOException;
55import java.io.InputStream;
56import java.nio.charset.StandardCharsets;
57import java.util.HashMap;
47import java.util.ArrayList;
58import java.util.ArrayList;
48import java.util.LinkedHashSet;
59import java.util.LinkedHashSet;
49import java.util.List;
60import java.util.List;
50import java.util.Locale;
61import java.util.Locale;
51import java.util.Set;
62import java.util.Set;
52import java.util.UUID;
63import java.util.UUID;
64import java.util.logging.Level;
53
65
54public final class CopperKeysPlugin extends JavaPlugin implements Listener {
66public final class CopperKeysPlugin extends JavaPlugin implements Listener {
55 private LockStore lockStore;
67 private LockStore lockStore;
56 private KeyItems keyItems;
68 private KeyItems keyItems;
57 private NamespacedKey recipeKey;
69 private NamespacedKey recipeKey;
70 private NamespacedKey copyRecipeKey;
71 private NamespacedKey burglarAdvancementKey;
72 private NamespacedKey oopsAdvancementKey;
58
73
59 @Override
74 @Override
60 public void onEnable() {
75 public void onEnable() {
@@ -62,8 +77,13 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
62 lockStore.load();
77 lockStore.load();
63 keyItems = new KeyItems(this);
78 keyItems = new KeyItems(this);
64 recipeKey = new NamespacedKey(this, "blank_key");
79 recipeKey = new NamespacedKey(this, "blank_key");
80 copyRecipeKey = new NamespacedKey(this, "copy_key");
81 burglarAdvancementKey = new NamespacedKey(this, "burglar");
82 oopsAdvancementKey = new NamespacedKey(this, "oops");
65
83
66 registerRecipe();
84 registerRecipes();
85 registerAdvancement(burglarAdvancementKey, "advancements/burglar.json", "Burglar");
86 registerAdvancement(oopsAdvancementKey, "advancements/oops.json", "Oops");
67 getServer().getPluginManager().registerEvents(this, this);
87 getServer().getPluginManager().registerEvents(this, this);
68 getLogger().info("CopperKeys 1.0.0 enabled with event-driven lock handling.");
88 getLogger().info("CopperKeys 1.0.0 enabled with event-driven lock handling.");
69 }
89 }
@@ -72,12 +92,54 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
72 return lockStore;
92 return lockStore;
73 }
93 }
74
94
75 private void registerRecipe() {
95 private void registerRecipes() {
76 Bukkit.removeRecipe(recipeKey);
96 Bukkit.removeRecipe(recipeKey);
77 ShapedRecipe recipe = new ShapedRecipe(recipeKey, keyItems.createBlankKey());
97 Bukkit.removeRecipe(copyRecipeKey);
78 recipe.shape("N ", " N");
98
79 recipe.setIngredient('N', Material.COPPER_NUGGET);
99 ShapedRecipe blankRecipe = new ShapedRecipe(recipeKey, keyItems.createBlankKey());
80 Bukkit.addRecipe(recipe);
100 blankRecipe.shape("N ", " N");
101 blankRecipe.setIngredient('N', Material.COPPER_NUGGET);
102 Bukkit.addRecipe(blankRecipe);
103
104 // Ingredient match is material-only; PrepareItemCraftEvent validates blank + bound keys.
105 ShapelessRecipe copyRecipe = new ShapelessRecipe(copyRecipeKey, keyItems.createBlankKey());
106 copyRecipe.addIngredient(Material.CLOCK);
107 copyRecipe.addIngredient(Material.CLOCK);
108 Bukkit.addRecipe(copyRecipe);
109 }
110
111 private void registerAdvancement(NamespacedKey key, String resourcePath, String label) {
112 if (Bukkit.getAdvancement(key) != null) {
113 return;
114 }
115 try (InputStream in = getResource(resourcePath)) {
116 if (in == null) {
117 getLogger().warning("Missing " + resourcePath + "; " + label + " advancement not registered.");
118 return;
119 }
120 String json = new String(in.readAllBytes(), StandardCharsets.UTF_8);
121 @SuppressWarnings("deprecation")
122 Advancement loaded = Bukkit.getUnsafe().loadAdvancement(key, json);
123 if (loaded == null) {
124 getLogger().warning("Could not register " + label + " advancement.");
125 }
126 } catch (IOException | RuntimeException ex) {
127 getLogger().log(Level.WARNING, "Could not register " + label + " advancement", ex);
128 }
129 }
130
131 private void awardAdvancement(Player player, NamespacedKey key) {
132 Advancement advancement = Bukkit.getAdvancement(key);
133 if (advancement == null) {
134 return;
135 }
136 AdvancementProgress progress = player.getAdvancementProgress(advancement);
137 if (progress.isDone()) {
138 return;
139 }
140 for (String criterion : progress.getRemainingCriteria()) {
141 progress.awardCriteria(criterion);
142 }
81 }
143 }
82
144
83 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
145 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -98,7 +160,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
98 }
160 }
99 if (!playerHasKey(event.getPlayer(), existing.bindingId())) {
161 if (!playerHasKey(event.getPlayer(), existing.bindingId())) {
100 event.setCancelled(true);
162 event.setCancelled(true);
101 lockedMessage(event.getPlayer());
163 denyOpen(event.getPlayer(), clicked);
102 }
164 }
103 // Already locked: never bind a second key. Allow open/use only when the key check passed.
165 // Already locked: never bind a second key. Allow open/use only when the key check passed.
104 return;
166 return;
@@ -113,7 +175,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
113 for (BlockKey member : members) {
175 for (BlockKey member : members) {
114 if (lockStore.get(member) != null) {
176 if (lockStore.get(member) != null) {
115 event.setCancelled(true);
177 event.setCancelled(true);
116 lockedMessage(event.getPlayer());
178 denyOpen(event.getPlayer(), clicked);
117 return;
179 return;
118 }
180 }
119 }
181 }
@@ -138,7 +200,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
138 }
200 }
139 event.setCancelled(true);
201 event.setCancelled(true);
140 if (human instanceof Player player) {
202 if (human instanceof Player player) {
141 lockedMessage(player);
203 denyOpen(player, blockForInventory(event.getInventory()));
142 }
204 }
143 }
205 }
144
206
@@ -220,7 +282,12 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
220
282
221 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
283 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
222 public void onPlayerBreak(BlockBreakEvent event) {
284 public void onPlayerBreak(BlockBreakEvent event) {
223 handleDestroyed(event.getBlock());
285 Block block = event.getBlock();
286 LockRecord lock = lockStore.get(BlockKey.of(block));
287 if (lock != null && !playerHasKey(event.getPlayer(), lock.bindingId())) {
288 awardAdvancement(event.getPlayer(), burglarAdvancementKey);
289 }
290 handleDestroyed(block);
224 }
291 }
225
292
226 @EventHandler(priority = EventPriority.MONITOR)
293 @EventHandler(priority = EventPriority.MONITOR)
@@ -247,6 +314,24 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
247 }
314 }
248 }
315 }
249
316
317 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
318 public void onInventoryClose(InventoryCloseEvent event) {
319 if (!(event.getPlayer() instanceof Player player)) {
320 return;
321 }
322 LockRecord lock = lockForInventory(event.getInventory());
323 if (lock == null) {
324 return;
325 }
326 if (playerHasKey(player, lock.bindingId())) {
327 return;
328 }
329 if (!keyItems.inventoryHasBinding(event.getInventory(), lock.bindingId())) {
330 return;
331 }
332 awardAdvancement(player, oopsAdvancementKey);
333 }
334
250 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
335 @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
251 public void onPickup(EntityPickupItemEvent event) {
336 public void onPickup(EntityPickupItemEvent event) {
252 ItemStack stack = event.getItem().getItemStack();
337 ItemStack stack = event.getItem().getItemStack();
@@ -263,6 +348,12 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
263 @EventHandler(priority = EventPriority.HIGHEST)
348 @EventHandler(priority = EventPriority.HIGHEST)
264 public void onPrepareCraft(PrepareItemCraftEvent event) {
349 public void onPrepareCraft(PrepareItemCraftEvent event) {
265 CraftingInventory inv = event.getInventory();
350 CraftingInventory inv = event.getInventory();
351 ItemStack clone = keyCloneResult(inv);
352 if (clone != null) {
353 inv.setResult(clone);
354 return;
355 }
356
266 boolean containsKey = false;
357 boolean containsKey = false;
267 for (ItemStack item : inv.getMatrix()) {
358 for (ItemStack item : inv.getMatrix()) {
268 if (keyItems.isKey(item)) {
359 if (keyItems.isKey(item)) {
@@ -273,10 +364,26 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
273 if (!containsKey) {
364 if (!containsKey) {
274 return;
365 return;
275 }
366 }
276 if (!(inv.getRecipe() instanceof org.bukkit.inventory.CraftingRecipe recipe)
367 if (inv.getRecipe() instanceof org.bukkit.inventory.CraftingRecipe recipe
277 || !recipeKey.equals(recipe.getKey())) {
368 && recipeKey.equals(recipe.getKey())) {
278 inv.setResult(null);
369 return;
279 }
370 }
371 inv.setResult(null);
372 }
373
374 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
375 public void onCraftItem(CraftItemEvent event) {
376 ItemStack clone = keyCloneResult(event.getInventory());
377 if (clone == null || !(event.getWhoClicked() instanceof Player player)) {
378 return;
379 }
380 ItemStack second = clone.clone();
381 getServer().getScheduler().runTask(this, () -> {
382 HashMap<Integer, ItemStack> leftover = player.getInventory().addItem(second);
383 for (ItemStack drop : leftover.values()) {
384 player.getWorld().dropItemNaturally(player.getLocation(), drop);
385 }
386 });
280 }
387 }
281
388
282 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
389 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -295,6 +402,37 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
295 }
402 }
296 }
403 }
297
404
405 private ItemStack keyCloneResult(CraftingInventory inventory) {
406 ItemStack blank = null;
407 ItemStack bound = null;
408 for (ItemStack item : inventory.getMatrix()) {
409 if (item == null || item.getType().isAir()) {
410 continue;
411 }
412 if (keyItems.isBlank(item)) {
413 if (blank != null) {
414 return null;
415 }
416 blank = item;
417 } else if (keyItems.isKey(item)) {
418 if (keyItems.getBinding(item) == null || bound != null) {
419 return null;
420 }
421 bound = item;
422 } else {
423 return null;
424 }
425 }
426 if (blank == null || bound == null) {
427 return null;
428 }
429 LockRecord lock = lockStore.get(keyItems.getBinding(bound));
430 if (lock == null) {
431 return null;
432 }
433 return keyItems.createBoundKey(lock);
434 }
435
298 private void handleDestroyed(Block block) {
436 private void handleDestroyed(Block block) {
299 LockRecord removed = lockStore.removeByBlock(BlockKey.of(block));
437 LockRecord removed = lockStore.removeByBlock(BlockKey.of(block));
300 if (removed == null) {
438 if (removed == null) {
@@ -373,6 +511,31 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
373 return null;
511 return null;
374 }
512 }
375
513
514 private Block blockForInventory(Inventory inventory) {
515 InventoryHolder holder = inventory.getHolder();
516 if (holder instanceof DoubleChest doubleChest) {
517 InventoryHolder left = doubleChest.getLeftSide();
518 if (left instanceof BlockState state) {
519 return state.getBlock();
520 }
521 InventoryHolder right = doubleChest.getRightSide();
522 if (right instanceof BlockState state) {
523 return state.getBlock();
524 }
525 }
526 if (holder instanceof BlockState state) {
527 return state.getBlock();
528 }
529 if (inventory instanceof DoubleChestInventory doubleInventory
530 && doubleInventory.getHolder() instanceof DoubleChest doubleChest) {
531 InventoryHolder left = doubleChest.getLeftSide();
532 if (left instanceof BlockState state) {
533 return state.getBlock();
534 }
535 }
536 return null;
537 }
538
376 private void setUsedHandItem(Player player, EquipmentSlot hand, ItemStack item) {
539 private void setUsedHandItem(Player player, EquipmentSlot hand, ItemStack item) {
377 if (hand == EquipmentSlot.OFF_HAND) {
540 if (hand == EquipmentSlot.OFF_HAND) {
378 player.getInventory().setItemInOffHand(item);
541 player.getInventory().setItemInOffHand(item);
@@ -381,6 +544,15 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
381 }
544 }
382 }
545 }
383
546
547 private void denyOpen(Player player, Block block) {
548 lockedMessage(player);
549 if (block == null) {
550 return;
551 }
552 Location at = block.getLocation().add(0.5, 0.6, 0.5);
553 block.getWorld().spawnParticle(Particle.SMOKE, at, 16, 0.28, 0.4, 0.28, 0.01);
554 }
555
384 private void lockedMessage(Player player) {
556 private void lockedMessage(Player player) {
385 player.sendActionBar(Component.text("Locked — matching key required", NamedTextColor.RED));
557 player.sendActionBar(Component.text("Locked — matching key required", NamedTextColor.RED));
386 }
558 }
src/main/java/nl/timfalken/copperkeys/KeyItems.java +6 −0
@@ -39,6 +39,12 @@ final class KeyItems {
39 39 return item;
40 40 }
41 41
42 ItemStack createBoundKey(LockRecord lock) {
43 ItemStack item = new ItemStack(Material.CLOCK);
44 bind(item, lock);
45 return item;
46 }
47
42 48 boolean isKey(ItemStack item) {
43 49 if (item == null || item.getType() != Material.CLOCK || !item.hasItemMeta()) {
44 50 return false;
@@ -39,6 +39,12 @@ final class KeyItems {
39 return item;
39 return item;
40 }
40 }
41
41
42 ItemStack createBoundKey(LockRecord lock) {
43 ItemStack item = new ItemStack(Material.CLOCK);
44 bind(item, lock);
45 return item;
46 }
47
42 boolean isKey(ItemStack item) {
48 boolean isKey(ItemStack item) {
43 if (item == null || item.getType() != Material.CLOCK || !item.hasItemMeta()) {
49 if (item == null || item.getType() != Material.CLOCK || !item.hasItemMeta()) {
44 return false;
50 return false;
src/main/resources/advancements/burglar.json added +23 −0
@@ -0,0 +1,23 @@
1 {
2 "parent": "minecraft:adventure/root",
3 "display": {
4 "icon": {
5 "id": "minecraft:iron_door"
6 },
7 "title": {
8 "text": "Burglar"
9 },
10 "description": {
11 "text": "A lock only stops honest people..."
12 },
13 "frame": "goal",
14 "show_toast": true,
15 "announce_to_chat": false,
16 "hidden": true
17 },
18 "criteria": {
19 "burglar": {
20 "trigger": "minecraft:impossible"
21 }
22 }
23 }
@@ -0,0 +1,23 @@
1{
2 "parent": "minecraft:adventure/root",
3 "display": {
4 "icon": {
5 "id": "minecraft:iron_door"
6 },
7 "title": {
8 "text": "Burglar"
9 },
10 "description": {
11 "text": "A lock only stops honest people..."
12 },
13 "frame": "goal",
14 "show_toast": true,
15 "announce_to_chat": false,
16 "hidden": true
17 },
18 "criteria": {
19 "burglar": {
20 "trigger": "minecraft:impossible"
21 }
22 }
23}
src/main/resources/advancements/oops.json added +23 −0
@@ -0,0 +1,23 @@
1 {
2 "parent": "minecraft:adventure/root",
3 "display": {
4 "icon": {
5 "id": "minecraft:chest"
6 },
7 "title": {
8 "text": "Oops..."
9 },
10 "description": {
11 "text": "Lock yourself out of a container"
12 },
13 "frame": "goal",
14 "show_toast": true,
15 "announce_to_chat": false,
16 "hidden": true
17 },
18 "criteria": {
19 "oops": {
20 "trigger": "minecraft:impossible"
21 }
22 }
23 }
@@ -0,0 +1,23 @@
1{
2 "parent": "minecraft:adventure/root",
3 "display": {
4 "icon": {
5 "id": "minecraft:chest"
6 },
7 "title": {
8 "text": "Oops..."
9 },
10 "description": {
11 "text": "Lock yourself out of a container"
12 },
13 "frame": "goal",
14 "show_toast": true,
15 "announce_to_chat": false,
16 "hidden": true
17 },
18 "criteria": {
19 "oops": {
20 "trigger": "minecraft:impossible"
21 }
22 }
23}