Upstream/UltimateRepairing
1
0
Fork 0
mirror of https://github.com/songoda/UltimateRepairing.git synced 2025-02-20 14:32:06 +01:00
Code Issues Projects Releases Wiki Activity

Few fixes.

Browse Source
This commit is contained in:
Brianna 2019-07-02 14:56:10 -04:00
parent aa8b924244
commit cd2eb787ea
6 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java
View File

@ -4,10 +4,10 @@ import com.songoda.ultimaterepairing.anvil.AnvilManager;
import com.songoda.ultimaterepairing.anvil.UAnvil;
import com.songoda.ultimaterepairing.anvil.editor.Editor;
import com.songoda.ultimaterepairing.command.CommandManager;
import com.songoda.ultimaterepairing.events.BlockListeners;
import com.songoda.ultimaterepairing.events.InteractListeners;
import com.songoda.ultimaterepairing.events.InventoryListeners;
import com.songoda.ultimaterepairing.events.PlayerListeners;
import com.songoda.ultimaterepairing.listeners.BlockListeners;
import com.songoda.ultimaterepairing.listeners.InteractListeners;
import com.songoda.ultimaterepairing.listeners.InventoryListeners;
import com.songoda.ultimaterepairing.listeners.PlayerListeners;
import com.songoda.ultimaterepairing.handlers.ParticleHandler;
import com.songoda.ultimaterepairing.handlers.RepairHandler;
import com.songoda.ultimaterepairing.hologram.Hologram;

59
src/main/java/com/songoda/ultimaterepairing/handlers/RepairHandler.java
View File

@ -203,11 +203,11 @@ public class RepairHandler {
else if (type == RepairType.ITEM)
cost = price + " " + name;
Inventory i = Bukkit.createInventory(null, 27, Methods.formatTitle(instance.getLocale().getMessage("interface.yesno.title", cost)));
Inventory inventory = Bukkit.createInventory(null, 27, Methods.formatTitle(instance.getLocale().getMessage("interface.yesno.title", cost)));
int nu = 0;
while (nu != 27) {
i.setItem(nu, Methods.getGlass());
inventory.setItem(nu, Methods.getGlass());
nu++;
}
@ -221,31 +221,31 @@ public class RepairHandler {
itemmeta3.setDisplayName(instance.getLocale().getMessage("interface.yesno.no"));
item3.setItemMeta(itemmeta3);
i.setItem(4, item);
i.setItem(11, item2);
i.setItem(15, item3);
inventory.setItem(4, item);
inventory.setItem(11, item2);
inventory.setItem(15, item3);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> p.openInventory(i), 1);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> p.openInventory(inventory), 1);
playerData.setType(type);
playerData.setPrice(price);
i.setItem(0, Methods.getBackgroundGlass(true));
i.setItem(1, Methods.getBackgroundGlass(true));
i.setItem(2, Methods.getBackgroundGlass(false));
i.setItem(6, Methods.getBackgroundGlass(false));
i.setItem(7, Methods.getBackgroundGlass(true));
i.setItem(8, Methods.getBackgroundGlass(true));
i.setItem(9, Methods.getBackgroundGlass(true));
i.setItem(10, Methods.getBackgroundGlass(false));
i.setItem(16, Methods.getBackgroundGlass(false));
i.setItem(17, Methods.getBackgroundGlass(true));
i.setItem(18, Methods.getBackgroundGlass(true));
i.setItem(19, Methods.getBackgroundGlass(true));
i.setItem(20, Methods.getBackgroundGlass(false));
i.setItem(24, Methods.getBackgroundGlass(false));
i.setItem(25, Methods.getBackgroundGlass(true));
i.setItem(26, Methods.getBackgroundGlass(true));
inventory.setItem(0, Methods.getBackgroundGlass(true));
inventory.setItem(1, Methods.getBackgroundGlass(true));
inventory.setItem(2, Methods.getBackgroundGlass(false));
inventory.setItem(6, Methods.getBackgroundGlass(false));
inventory.setItem(7, Methods.getBackgroundGlass(true));
inventory.setItem(8, Methods.getBackgroundGlass(true));
inventory.setItem(9, Methods.getBackgroundGlass(true));
inventory.setItem(10, Methods.getBackgroundGlass(false));
inventory.setItem(16, Methods.getBackgroundGlass(false));
inventory.setItem(17, Methods.getBackgroundGlass(true));
inventory.setItem(18, Methods.getBackgroundGlass(true));
inventory.setItem(19, Methods.getBackgroundGlass(true));
inventory.setItem(20, Methods.getBackgroundGlass(false));
inventory.setItem(24, Methods.getBackgroundGlass(false));
inventory.setItem(25, Methods.getBackgroundGlass(true));
inventory.setItem(26, Methods.getBackgroundGlass(true));
} catch (Exception ex) {
Debugger.runReport(ex);
@ -311,7 +311,8 @@ public class RepairHandler {
Location location = playerData.getLocations();
player.getWorld().playEffect(location, effect, blockType);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> player.getWorld().playEffect(location, effect, blockTypeFinal), 5L);
Runnable runnable = () -> player.getWorld().playEffect(location, effect, blockTypeFinal);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, runnable, 5L);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> {
player.getWorld().playEffect(location, effect, blockTypeFinal);
player.getWorld().playEffect(location, effect, Material.STONE);
@ -320,8 +321,8 @@ public class RepairHandler {
else
player.playSound(location, Sound.valueOf("BLOCK_ANVIL_LAND"), 1L, 1L);
}, 10L);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> player.getWorld().playEffect(location, effect, blockTypeFinal), 15L);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> player.getWorld().playEffect(location, effect, blockTypeFinal), 20L);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, runnable, 15L);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, runnable, 20L);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> {
if (instance.isServerVersion(ServerVersion.V1_8))
player.playSound(location, Sound.valueOf("ANVIL_LAND"), 1L, 1L);
@ -364,19 +365,19 @@ public class RepairHandler {
}
}
public void removeItem(PlayerAnvilData playerData, Player p) {
public void removeItem(PlayerAnvilData playerData, Player player) {
try {
p.getInventory().addItem(playerData.getToBeRepaired());
player.getInventory().addItem(playerData.getToBeRepaired());
playerData.getItem().remove();
this.playerAnvilData.remove(p.getUniqueId());
this.playerAnvilData.remove(player.getUniqueId());
} catch (Exception ex) {
Debugger.runReport(ex);
}
}
public boolean hasInstance(Player player) {
return playerAnvilData.containsKey(player);
return playerAnvilData.containsKey(player.getUniqueId());
}
public PlayerAnvilData getDataFor(Player player) {

2
src/main/java/com/songoda/ultimaterepairing/events/BlockListeners.java → src/main/java/com/songoda/ultimaterepairing/listeners/BlockListeners.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimaterepairing.events;
package com.songoda.ultimaterepairing.listeners;
import com.songoda.ultimaterepairing.UltimateRepairing;
import com.songoda.ultimaterepairing.anvil.UAnvil;

2
src/main/java/com/songoda/ultimaterepairing/events/InteractListeners.java → src/main/java/com/songoda/ultimaterepairing/listeners/InteractListeners.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimaterepairing.events;
package com.songoda.ultimaterepairing.listeners;
import com.songoda.ultimaterepairing.UltimateRepairing;
import com.songoda.ultimaterepairing.anvil.UAnvil;

6
src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java → src/main/java/com/songoda/ultimaterepairing/listeners/InventoryListeners.java
View File

@ -1,7 +1,8 @@
package com.songoda.ultimaterepairing.events;
package com.songoda.ultimaterepairing.listeners;
import com.songoda.ultimaterepairing.UltimateRepairing;
import com.songoda.ultimaterepairing.anvil.PlayerAnvilData.RepairType;
import com.songoda.ultimaterepairing.handlers.RepairHandler;
import com.songoda.ultimaterepairing.utils.Debugger;
import com.songoda.ultimaterepairing.utils.Methods;
import org.bukkit.Location;
@ -10,6 +11,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.inventory.InventoryOpenEvent;
import org.bukkit.event.inventory.InventoryPickupItemEvent;
/**
@ -24,7 +26,7 @@ public class InventoryListeners implements Listener {
}
@EventHandler
public void OnPickup(InventoryPickupItemEvent event) {
public void onPickup(InventoryPickupItemEvent event) {
if (event.getItem().hasMetadata("UltimateRepairing"))
event.setCancelled(true);
}

5
src/main/java/com/songoda/ultimaterepairing/events/PlayerListeners.java → src/main/java/com/songoda/ultimaterepairing/listeners/PlayerListeners.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimaterepairing.events;
package com.songoda.ultimaterepairing.listeners;
import com.songoda.ultimaterepairing.UltimateRepairing;
import com.songoda.ultimaterepairing.anvil.PlayerAnvilData;
@ -18,7 +18,8 @@ public class PlayerListeners implements Listener {
@EventHandler
public void onLeave(PlayerQuitEvent event) {
if (!instance.getRepairHandler().hasInstance(event.getPlayer()) || !instance.getRepairHandler().getDataFor(event.getPlayer()).getInRepair())
if (!instance.getRepairHandler().hasInstance(event.getPlayer())
|| !instance.getRepairHandler().getDataFor(event.getPlayer()).getInRepair())
return;
PlayerAnvilData playerData = instance.getRepairHandler().getDataFor(event.getPlayer());