this repo has no description

Updated inventory checker and added server resource pack requirement

+1
src/main/java/dev/keii/keiicore/KeiiCore.java
··· 42 42 pm.registerEvents(new PlayerMove(), this); 43 43 pm.registerEvents(new EntityExplode(), this); 44 44 pm.registerEvents(new PlayerChat(), this); 45 + pm.registerEvents(new PlayerResourcePack(), this); 45 46 } 46 47 47 48 public void registerCommands() {
+7 -5
src/main/java/dev/keii/keiicore/events/InventoryClick.java
··· 8 8 import dev.keii.keiicore.inventories.InventoryModifyChunkPermission; 9 9 import net.kyori.adventure.text.Component; 10 10 import net.kyori.adventure.text.format.NamedTextColor; 11 + import org.bukkit.Bukkit; 11 12 import org.bukkit.Chunk; 12 13 import org.bukkit.entity.Player; 13 14 import org.bukkit.event.EventHandler; 14 15 import org.bukkit.event.Listener; 15 16 import org.bukkit.event.inventory.InventoryClickEvent; 17 + import org.bukkit.inventory.Inventory; 16 18 import org.bukkit.inventory.InventoryHolder; 17 19 import org.joml.Vector2i; 18 20 ··· 28 30 @EventHandler 29 31 public void onInventoryClick(InventoryClickEvent event) 30 32 { 31 - InventoryHolder holder = Objects.requireNonNull(event.getClickedInventory()).getHolder(); 33 + Inventory inventory = event.getInventory(); 32 34 33 - if(holder instanceof InventoryMap) { 35 + if(inventory.getHolder() instanceof InventoryMap) { 34 36 event.setCancelled(true); 35 37 Player player = (Player)event.getWhoClicked(); 36 38 ··· 73 75 InventoryMap map = new InventoryMap(player); 74 76 player.openInventory(map.getInventory()); 75 77 } 76 - } else if(holder instanceof InventoryModifyChunk) { 78 + } else if(inventory.getHolder() instanceof InventoryModifyChunk) { 77 79 event.setCancelled(true); 78 80 79 81 int slot = event.getSlot(); ··· 124 126 player.openInventory(cp.getInventory()); 125 127 } 126 128 127 - } else if(holder instanceof InventoryChunkPermission) 129 + } else if(inventory.getHolder() instanceof InventoryChunkPermission) 128 130 { 129 131 event.setCancelled(true); 130 132 ··· 166 168 player.sendMessage(Component.text("Type name of player you wish to add permissions for in chat!").color(NamedTextColor.YELLOW)); 167 169 player.closeInventory(); 168 170 } 169 - } else if(holder instanceof InventoryModifyChunkPermission) 171 + } else if(inventory.getHolder() instanceof InventoryModifyChunkPermission) 170 172 { 171 173 event.setCancelled(true); 172 174
+25
src/main/java/dev/keii/keiicore/events/PlayerResourcePack.java
··· 1 + package dev.keii.keiicore.events; 2 + 3 + import dev.keii.keiicore.PlayerChunk; 4 + import net.kyori.adventure.text.Component; 5 + import net.kyori.adventure.text.format.NamedTextColor; 6 + import org.bukkit.entity.Player; 7 + import org.bukkit.event.EventHandler; 8 + import org.bukkit.event.Listener; 9 + import org.bukkit.event.player.PlayerMoveEvent; 10 + import org.bukkit.event.player.PlayerResourcePackStatusEvent; 11 + 12 + public class PlayerResourcePack implements Listener { 13 + @EventHandler 14 + public void onPlayerUpdateServerResourcePack(PlayerResourcePackStatusEvent event) 15 + { 16 + Player player = event.getPlayer(); 17 + if(event.getStatus() == PlayerResourcePackStatusEvent.Status.DECLINED) 18 + { 19 + player.kick(Component.text("You must accept the server resource pack!\n").color(NamedTextColor.RED)); 20 + } else if(event.getStatus() == PlayerResourcePackStatusEvent.Status.FAILED_DOWNLOAD) 21 + { 22 + player.kick(Component.text("Server resource pack download failed!\n").color(NamedTextColor.RED)); 23 + } 24 + } 25 + }
+2 -2
src/main/java/dev/keii/keiicore/inventories/InventoryChunkPermission.java
··· 44 44 @Override 45 45 public @NotNull Inventory getInventory() 46 46 { 47 - Inventory inventory = Bukkit.createInventory(null, 27, Name); 47 + Inventory inventory = Bukkit.createInventory(this, 27, Name); 48 48 49 49 try { 50 50 Connection connection = DatabaseConnector.getConnection(); ··· 99 99 } 100 100 101 101 meta.displayName(Component.text(username).color(NamedTextColor.YELLOW)); 102 - List<Component> lore = getChunkPermissions(claimPermissionEveryoneResultSet); 102 + List<Component> lore = getChunkPermissions(claimPermissionResultSet); 103 103 lore.add(Component.text("User: " + claimPermissionResultSet.getInt("user_id"))); 104 104 meta.setCustomModelData(1001); 105 105 meta.lore(lore);
+5 -4
src/main/java/dev/keii/keiicore/inventories/InventoryMap.java
··· 279 279 this.player = player; 280 280 } 281 281 282 - public static final Component Name = Component.text("\uF809\uEff3\uF80B\uF80B\uF80A\uF809\uF806").color(NamedTextColor.WHITE); 282 + public static final String Name = "\uF809\uEff3\uF80B\uF80B\uF80A\uF809\uF806"; 283 283 284 284 public char getLetterOfBiome(Block block) 285 285 { 286 - if(block.getType() == Material.WATER || block.getType() == Material.ICE || block.getType() == Material.PACKED_ICE) { 286 + Material highestBlockType = block.getWorld().getBlockAt(block.getX(), block.getWorld().getHighestBlockYAt(block.getLocation()), block.getZ()).getType(); 287 + if(highestBlockType == Material.WATER || highestBlockType == Material.ICE || highestBlockType == Material.PACKED_ICE) { 287 288 return 'w'; 288 - } else if(block.getType() == Material.SAND) { 289 + } else if(highestBlockType == Material.SAND) { 289 290 return 's'; 290 291 } 291 292 ··· 412 413 413 414 Vector2i claimPower = getClaimPower(); 414 415 415 - Inventory mapInventory = Bukkit.createInventory(null, 54, Component.text(Name + getDirectionMarker()).append(Component.text(" Power " + claimPower.x + "/" + claimPower.y).color(NamedTextColor.BLACK))); 416 + Inventory mapInventory = Bukkit.createInventory(this, 54, Component.text(Name + getDirectionMarker()).color(NamedTextColor.WHITE).append(Component.text(" Power " + claimPower.x + "/" + claimPower.y).color(NamedTextColor.BLACK))); 416 417 417 418 for(int i = 0; i < 54; i++) 418 419 {
+1 -1
src/main/java/dev/keii/keiicore/inventories/InventoryModifyChunk.java
··· 28 28 @NotNull 29 29 public Inventory getInventory() 30 30 { 31 - Inventory inventory = Bukkit.createInventory(null, 27, Name); 31 + Inventory inventory = Bukkit.createInventory(this, 27, Name); 32 32 33 33 for(int i = 0; i < 27; i++) 34 34 {
+1 -1
src/main/java/dev/keii/keiicore/inventories/InventoryModifyChunkPermission.java
··· 33 33 @Override 34 34 public @NotNull Inventory getInventory() 35 35 { 36 - Inventory inventory = Bukkit.createInventory(null, 27, Name.append(Component.text(Name + (uuid != null ? User.getNicknameFromUUID(uuid) : "Everyone") + "'s permissions").color(NamedTextColor.DARK_GRAY))); 36 + Inventory inventory = Bukkit.createInventory(this, 27, Name.append(Component.text((uuid != null ? User.getNicknameFromUUID(uuid) : "Everyone") + "'s permissions").color(NamedTextColor.DARK_GRAY))); 37 37 38 38 if(uuid != null) { 39 39 Bukkit.getConsoleSender().sendMessage(Component.text(uuid));