Skip to content

Commit

Permalink
no more heal when interact with certain blocks
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@xsmeths
xsmeths committed May 8, 2021
1 parent 22ef12e commit 532c198
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
8 changes: 8 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/main/java/me/smeths/and/rhetorical/ItemManager/ItemLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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")));
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/me/smeths/and/rhetorical/Listeners/MedCraftListeners.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
Expand All @@ -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));
Expand All @@ -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);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/me/smeths/and/rhetorical/MedCraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 532c198

Please sign in to comment.