Skip to content

Correctif de la Singularité/Meteo Wand où on pouvait pas cliquer dans l'air #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iambibi wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −57
Open

Correctif de la Singularité/Meteo Wand où on pouvait pas cliquer dans l'air #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions ...main/java/fr/openmc/core/features/dream/mecanism/metaldetector/MetalDetectorListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,16 @@
package fr.openmc.core.features.dream.mecanism.metaldetector;

import fr.openmc.core.OMCPlugin;
import fr.openmc.core.features.dream.DreamUtils;
import fr.openmc.core.features.dream.events.MetalDetectorLootEvent;
import fr.openmc.core.features.dream.generation.DreamBiome;
import fr.openmc.core.registry.loottable.CustomLootTable;
import fr.openmc.core.utils.LocationUtils;
import fr.openmc.core.utils.messages.MessageType;
import fr.openmc.core.utils.messages.MessagesManager;
import fr.openmc.core.utils.messages.Prefix;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;

import java.util.List;
import java.util.Random;
import java.util.UUID;

Expand Down Expand Up @@ -57,44 +41,6 @@ public void onQuit(PlayerQuitEvent event) {
hiddenChests.remove(uuid).cancel();
}

@EventHandler
public void onChestClick(PlayerInteractEvent event) {
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
if (event.getHand() != EquipmentSlot.HAND) return;

Block clicked = event.getClickedBlock();
if (clicked == null) return;

if (!DreamUtils.isDreamWorld(event.getClickedBlock().getLocation())) return;
Player player = event.getPlayer();
UUID uuid = player.getUniqueId();
if (!hiddenChests.containsKey(uuid)) return;

if (clicked.getType() == Material.CHEST) {
event.setCancelled(true);
MetalDetectorTask task = hiddenChests.remove(uuid);
task.cancel();
Location chestLoc = task.getChestLocation();

if (LocationUtils.isSameLocation(clicked.getLocation(), chestLoc)) {
event.setCancelled(true);
clicked.setType(Material.MUD);
CustomLootTable lootTable = MetalDetectorManager.METAL_DETECTOR_LOOT_TABLE;
if (lootTable == null) return;
List<ItemStack> rewards = lootTable.rollLoots();

for (ItemStack item : rewards) {
player.getInventory().addItem(item);
}

Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () ->
Bukkit.getServer().getPluginManager().callEvent(new MetalDetectorLootEvent(player, rewards))
);
MessagesManager.sendMessage(player, Component.text("Vous avez découvert §e" + rewards.size() + " §fobjet(s) dans vos rêves !"), Prefix.DREAM, MessageType.SUCCESS, false);
}
}
}

@EventHandler
public void onInventoryClose(InventoryCloseEvent event) {
Player player = (Player) event.getPlayer();
Expand Down
41 changes: 41 additions & 0 deletions src/main/java/fr/openmc/core/features/dream/registries/items/tools/MetalDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,28 @@

import fr.openmc.core.OMCPlugin;
import fr.openmc.core.features.dream.DreamUtils;
import fr.openmc.core.features.dream.events.MetalDetectorLootEvent;
import fr.openmc.core.features.dream.mecanism.metaldetector.MetalDetectorManager;
import fr.openmc.core.features.dream.mecanism.metaldetector.MetalDetectorTask;
import fr.openmc.core.features.dream.models.registry.items.DreamItem;
import fr.openmc.core.features.dream.models.registry.items.DreamRarity;
import fr.openmc.core.registry.items.options.UsableItem;
import fr.openmc.core.registry.loottable.CustomLootTable;
import fr.openmc.core.utils.LocationUtils;
import fr.openmc.core.utils.messages.MessageType;
import fr.openmc.core.utils.messages.MessagesManager;
import fr.openmc.core.utils.messages.Prefix;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;

import java.util.List;
import java.util.UUID;

import static fr.openmc.core.features.dream.mecanism.metaldetector.MetalDetectorListener.findRandomChestLocation;
Expand Down Expand Up @@ -50,6 +57,40 @@ public ItemStack getVanilla() {
return item;
}

@Override
public void onRightClick(Player player, PlayerInteractEvent event) {
Block clicked = event.getClickedBlock();
if (clicked == null) return;

if (!DreamUtils.isDreamWorld(event.getClickedBlock().getLocation())) return;
UUID uuid = player.getUniqueId();
if (!hiddenChests.containsKey(uuid)) return;

if (clicked.getType() == Material.CHEST) {
event.setCancelled(true);
MetalDetectorTask task = hiddenChests.remove(uuid);
task.cancel();
Location chestLoc = task.getChestLocation();

if (LocationUtils.isSameLocation(clicked.getLocation(), chestLoc)) {
event.setCancelled(true);
clicked.setType(Material.MUD);
CustomLootTable lootTable = MetalDetectorManager.METAL_DETECTOR_LOOT_TABLE;
if (lootTable == null) return;
List<ItemStack> rewards = lootTable.rollLoots();

for (ItemStack item : rewards) {
player.getInventory().addItem(item);
}

Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () ->
Bukkit.getServer().getPluginManager().callEvent(new MetalDetectorLootEvent(player, rewards))
);
MessagesManager.sendMessage(player, Component.text("Vous avez découvert §e" + rewards.size() + " §fobjet(s) dans vos rêves !"), Prefix.DREAM, MessageType.SUCCESS, false);
}
}
}

@Override
public void onSneakClick(Player player, PlayerInteractEvent event) {
if (!event.getAction().isRightClick()) return;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/fr/openmc/core/listeners/InteractListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import fr.openmc.core.registry.items.CustomItemRegistry;
import fr.openmc.core.registry.items.options.UsableItem;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand All @@ -14,10 +13,9 @@

public class InteractListener implements Listener {

@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
@EventHandler(priority = EventPriority.LOWEST)
void onInteract(PlayerInteractEvent event) {
Player player = event.getPlayer();
if (event.useInteractedBlock() == Event.Result.DENY) return;

ItemStack itemInHand = player.getInventory().getItemInMainHand();
CustomItem item = CustomItemRegistry.getByItemStack(itemInHand);
Expand Down
Loading