From 532c198c4fe3f28c8a14a74e37609bb5ba2e0bd1 Mon Sep 17 00:00:00 2001 From: xsmeths Date: Sat, 8 May 2021 04:30:11 +0100 Subject: [PATCH] no more heal when interact with certain blocks this was enirely pain and misery to get working how I wanted also tweaked stuff in project files and such might be something i forgot but i think that's all --- .idea/inspectionProfiles/Project_Default.xml | 8 ++++++++ .../smeths/and/rhetorical/ItemManager/ItemLoader.java | 4 ++-- .../and/rhetorical/Listeners/MedCraftListeners.java | 10 +++++----- src/main/java/me/smeths/and/rhetorical/MedCraft.java | 1 + 4 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..5abe40b --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/src/main/java/me/smeths/and/rhetorical/ItemManager/ItemLoader.java b/src/main/java/me/smeths/and/rhetorical/ItemManager/ItemLoader.java index 9ce44c8..8b46552 100644 --- a/src/main/java/me/smeths/and/rhetorical/ItemManager/ItemLoader.java +++ b/src/main/java/me/smeths/and/rhetorical/ItemManager/ItemLoader.java @@ -19,6 +19,7 @@ public class ItemLoader { private ItemStack craftedbandageItem; public NamespacedKey Medrecipekey = new NamespacedKey(medCraft, "MedKit"); + public NamespacedKey Bandagerecipekey = new NamespacedKey(medCraft, "Bandage"); public ItemLoader() { if (instance != null) { @@ -60,8 +61,7 @@ private void setupCraftedBandageItem() { craftedbandageItem.setItemMeta(craftedBandageMeta); } private void setupBandageRecipe() { - NamespacedKey recipekey = new NamespacedKey(medCraft, "Bandage"); - ShapedRecipe Bandagerecipe = new ShapedRecipe(recipekey, craftedbandageItem); + ShapedRecipe Bandagerecipe = new ShapedRecipe(Bandagerecipekey, craftedbandageItem); Bandagerecipe.shape("123", "456", "789"); Bandagerecipe.setIngredient('1', Material.getMaterial(MedCraft.getPlugin().getConfig().getString("Bandage.Crafting-Material-top-left"))); Bandagerecipe.setIngredient('2', Material.getMaterial(MedCraft.getPlugin().getConfig().getString("Bandage.Crafting-Material-top-middle"))); diff --git a/src/main/java/me/smeths/and/rhetorical/Listeners/MedCraftListeners.java b/src/main/java/me/smeths/and/rhetorical/Listeners/MedCraftListeners.java index e160521..e3da72f 100644 --- a/src/main/java/me/smeths/and/rhetorical/Listeners/MedCraftListeners.java +++ b/src/main/java/me/smeths/and/rhetorical/Listeners/MedCraftListeners.java @@ -22,7 +22,7 @@ public class MedCraftListeners implements Listener { @EventHandler public void onPlayerUseMedKit(PlayerInteractEvent e) { Player p = e.getPlayer(); - if (e.getAction() == Action.RIGHT_CLICK_BLOCK && e.getClickedBlock().getType() != Material.CHEST && e.getClickedBlock().getType() != Material.FURNACE && e.getClickedBlock().getType() != Material.BLAST_FURNACE && e.getClickedBlock().getType() != Material.SMOKER && e.getClickedBlock().getType() != Material.TRAPPED_CHEST && e.getClickedBlock().getType() != Material.CHEST_MINECART && e.getClickedBlock().getType() != Material.FURNACE_MINECART && e.getClickedBlock().getType() != Material.HOPPER_MINECART && e.getClickedBlock().getType() != Material.CRAFTING_TABLE && e.getClickedBlock().getType() != Material.HOPPER && e.getClickedBlock().getType() != Material.ENDER_CHEST && e.getClickedBlock().getType() != Material.BREWING_STAND && e.getClickedBlock().getType() != Material.BARREL && e.getClickedBlock().getType() != Material.FLETCHING_TABLE && e.getClickedBlock().getType() != Material.CARTOGRAPHY_TABLE && e.getClickedBlock().getType() != Material.GRINDSTONE && e.getClickedBlock().getType() != Material.STONECUTTER && e.getClickedBlock().getType() != Material.SMITHING_TABLE && e.getClickedBlock().getType() != Material.LOOM) { + if (e.getAction() == Action.RIGHT_CLICK_BLOCK) { return; } ItemStack[] toCheck; @@ -44,7 +44,7 @@ public void onPlayerUseMedKit(PlayerInteractEvent e) { toCheck[0] = p.getInventory().getItemInHand(); } for (ItemStack i : toCheck) - if ((i.getType().equals(ItemLoader.getMedKitItem().getType())) && i.getItemMeta().hasCustomModelData() && p.getGameMode() != GameMode.CREATIVE && (i.getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("MedKit.ModelData"))) { + if ((i.getType().equals(ItemLoader.getMedKitItem().getType())) && i.getItemMeta().hasCustomModelData() && e.getClickedBlock() != null && !e.getClickedBlock().getType().toString().contains("BED") && e.getClickedBlock().getType() != Material.CHEST && e.getClickedBlock().getType() != Material.FURNACE && e.getClickedBlock().getType() != Material.BLAST_FURNACE && e.getClickedBlock().getType() != Material.SMOKER && e.getClickedBlock().getType() != Material.TRAPPED_CHEST && e.getClickedBlock().getType() != Material.CHEST_MINECART && e.getClickedBlock().getType() != Material.FURNACE_MINECART && e.getClickedBlock().getType() != Material.HOPPER_MINECART && e.getClickedBlock().getType() != Material.CRAFTING_TABLE && e.getClickedBlock().getType() != Material.HOPPER && e.getClickedBlock().getType() != Material.ENDER_CHEST && e.getClickedBlock().getType() != Material.BREWING_STAND && e.getClickedBlock().getType() != Material.BARREL && e.getClickedBlock().getType() != Material.FLETCHING_TABLE && e.getClickedBlock().getType() != Material.CARTOGRAPHY_TABLE && e.getClickedBlock().getType() != Material.GRINDSTONE && e.getClickedBlock().getType() != Material.STONECUTTER && e.getClickedBlock().getType() != Material.SMITHING_TABLE && e.getClickedBlock().getType() != Material.LOOM && p.getGameMode() != GameMode.CREATIVE && (i.getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("MedKit.ModelData")) || (i.getType().equals(ItemLoader.getMedKitItem().getType())) && i.getItemMeta().hasCustomModelData() && e.getClickedBlock() == null && p.getGameMode() != GameMode.CREATIVE && (i.getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("MedKit.ModelData"))) { if (p.getInventory().getItemInMainHand().getAmount() == 1 && p.hasPermission("medkit.use")) { int heldslot = p.getInventory().getHeldItemSlot(); p.getInventory().setItem(heldslot, new ItemStack(Material.AIR)); @@ -65,7 +65,7 @@ public void onPlayerUseMedKit(PlayerInteractEvent e) { } } for (ItemStack i : toCheck) - if ((i.getType().equals(ItemLoader.getBandageItem().getType())) && i.getItemMeta().hasCustomModelData() && p.getGameMode() != GameMode.CREATIVE && (i.getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("Bandage.ModelData"))) { + if ((i.getType().equals(ItemLoader.getBandageItem().getType())) && e.getClickedBlock() != null && !e.getClickedBlock().getType().toString().contains("BED") && e.getClickedBlock().getType() != Material.CHEST && e.getClickedBlock().getType() != Material.FURNACE && e.getClickedBlock().getType() != Material.BLAST_FURNACE && e.getClickedBlock().getType() != Material.SMOKER && e.getClickedBlock().getType() != Material.TRAPPED_CHEST && e.getClickedBlock().getType() != Material.CHEST_MINECART && e.getClickedBlock().getType() != Material.FURNACE_MINECART && e.getClickedBlock().getType() != Material.HOPPER_MINECART && e.getClickedBlock().getType() != Material.CRAFTING_TABLE && e.getClickedBlock().getType() != Material.HOPPER && e.getClickedBlock().getType() != Material.ENDER_CHEST && e.getClickedBlock().getType() != Material.BREWING_STAND && e.getClickedBlock().getType() != Material.BARREL && e.getClickedBlock().getType() != Material.FLETCHING_TABLE && e.getClickedBlock().getType() != Material.CARTOGRAPHY_TABLE && e.getClickedBlock().getType() != Material.GRINDSTONE && e.getClickedBlock().getType() != Material.STONECUTTER && e.getClickedBlock().getType() != Material.SMITHING_TABLE && e.getClickedBlock().getType() != Material.LOOM && i.getItemMeta().hasCustomModelData() && p.getGameMode() != GameMode.CREATIVE && (i.getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("Bandage.ModelData")) || (i.getType().equals(ItemLoader.getBandageItem().getType())) && e.getClickedBlock() == null && i.getItemMeta().hasCustomModelData() && p.getGameMode() != GameMode.CREATIVE && (i.getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("Bandage.ModelData"))) { if (p.getInventory().getItemInMainHand().getAmount() == 1 && p.hasPermission("bandage.use")) { int heldslot = p.getInventory().getHeldItemSlot(); p.getInventory().setItem(heldslot, new ItemStack(Material.AIR)); @@ -86,14 +86,14 @@ public void onPlayerUseMedKit(PlayerInteractEvent e) { } @EventHandler public void StopCraftMedKit(CraftItemEvent e) { - if (e.getInventory().getResult().getType() == ItemLoader.getMedKitItem().getType() && e.getInventory().getResult().getItemMeta().hasCustomModelData() == true && e.getInventory().getResult().getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("MedKit.ModelData")) { + if (e.getInventory().getResult().getType() == ItemLoader.getMedKitItem().getType() && e.getInventory().getResult().getItemMeta().hasCustomModelData() && e.getInventory().getResult().getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("MedKit.ModelData")) { Player crafter = (Player) e.getWhoClicked(); if (!crafter.hasPermission("medkit.craft")) { e.setCancelled(true); PacketHandler.getInstance().sendActionBarMessage(crafter,ChatColor.RED + "No permissions: you need medkit.craft"); } } - if (e.getInventory().getResult().getType() == ItemLoader.getBandageItem().getType() && e.getInventory().getResult().getItemMeta().hasCustomModelData() == true && e.getInventory().getResult().getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("Bandage.ModelData")) { + if (e.getInventory().getResult().getType() == ItemLoader.getBandageItem().getType() && e.getInventory().getResult().getItemMeta().hasCustomModelData() && e.getInventory().getResult().getItemMeta().getCustomModelData() == MedCraft.getPlugin().getConfig().getInt("Bandage.ModelData")) { Player crafter = (Player) e.getWhoClicked(); if (!crafter.hasPermission("bandage.craft")) { e.setCancelled(true); diff --git a/src/main/java/me/smeths/and/rhetorical/MedCraft.java b/src/main/java/me/smeths/and/rhetorical/MedCraft.java index 2a4e92f..5efebac 100644 --- a/src/main/java/me/smeths/and/rhetorical/MedCraft.java +++ b/src/main/java/me/smeths/and/rhetorical/MedCraft.java @@ -48,6 +48,7 @@ public void loadConfiguration(){ public void onDisable() { Bukkit.removeRecipe(ItemLoader.getInstance().Medrecipekey); + Bukkit.removeRecipe(ItemLoader.getInstance().Bandagerecipekey); } public static JavaPlugin getPlugin() { return instance;