SteamWar/SteamWar
9
1
Fork 0
Code Issues 50 Pull Requests 12 Packages Projects 3 Releases Wiki Activity

Merge pull request 'Remove Now Unused Wrappers' (#66) from fixes into main

Browse Source 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/66
Reviewed-by: Lixfel <lixfel@steamwar.de>
This commit is contained in:
Lixfel
2024-12-01 22:10:12 +01:00
parent e16410fd65 66d417a210
commit d57d73c488
5 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
View File

@@ -55,7 +55,7 @@ public abstract class SimulatorBaseGui {
inv.setItem(i, null); inv.setItem(i, null);
} }
setup(); setup();
if (TrickyTrialsWrapper.impl.getTopInventory(player.getOpenInventory()) != inv) { if (player.getOpenInventory().getTopInventory() != inv) {
inventory.open(); inventory.open();
SimulatorWatcher.watch(player, simulator, this::open); SimulatorWatcher.watch(player, simulator, this::open);
} }
@@ -63,7 +63,7 @@ public abstract class SimulatorBaseGui {
player.getOpenInventory().setTitle(title()); player.getOpenInventory().setTitle(title());
} }
populate(); populate();
if (TrickyTrialsWrapper.impl.getTopInventory(player.getOpenInventory()) == inv) { if (player.getOpenInventory().getTopInventory() == inv) {
inventory.open(); inventory.open();
SimulatorWatcher.watch(player, simulator, this::open); SimulatorWatcher.watch(player, simulator, this::open);
} }

10
SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java
View File

@@ -40,14 +40,4 @@ public class TrickyTrialsWrapper21 implements TrickyTrialsWrapper {
public Material getTurtleScute() { public Material getTurtleScute() {
return Material.TURTLE_SCUTE; return Material.TURTLE_SCUTE;
} }
@Override
public String getInventoryTitle(InventoryView view) {
return view.getTitle();
}
@Override
public Inventory getTopInventory(InventoryView view) {
return view.getTopInventory();
}
} }

10
SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java
View File

@@ -40,14 +40,4 @@ public class TrickyTrialsWrapper8 implements TrickyTrialsWrapper {
public Material getTurtleScute() { public Material getTurtleScute() {
return Material.STONE; return Material.STONE;
} }
@Override
public String getInventoryTitle(InventoryView view) {
return view.getTitle();
}
@Override
public Inventory getTopInventory(InventoryView view) {
return view.getTopInventory();
}
} }

4
SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java
View File

@@ -33,8 +33,4 @@ public interface TrickyTrialsWrapper {
Enchantment getUnbreakingEnchantment(); Enchantment getUnbreakingEnchantment();
Material getTurtleScute(); Material getTurtleScute();
String getInventoryTitle(InventoryView view);
Inventory getTopInventory(InventoryView view);
} }

4
SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java
View File

@@ -139,7 +139,7 @@ public class SWInventory implements Listener {
public void open() { public void open() {
InventoryView view = player.openInventory(inventory); InventoryView view = player.openInventory(inventory);
title = TrickyTrialsWrapper.impl.getInventoryTitle(view); title = view.getTitle();
Core.getInstance().getLogger().info("[SWINV] Opened " + title + " for " + player.getName()); Core.getInstance().getLogger().info("[SWINV] Opened " + title + " for " + player.getName());
if(!open) { if(!open) {
Bukkit.getPluginManager().registerEvents(this, Core.getInstance()); Bukkit.getPluginManager().registerEvents(this, Core.getInstance());
@@ -154,7 +154,7 @@ public class SWInventory implements Listener {
if (callbacks.containsKey(e.getRawSlot()) && callbacks.get(e.getRawSlot()) != null) { if (callbacks.containsKey(e.getRawSlot()) && callbacks.get(e.getRawSlot()) != null) {
e.setCancelled(true); e.setCancelled(true);
Core.getInstance().getLogger().info("[SWINV] " + e.getWhoClicked().getName() + " " + e.getClick().name() + " clicked " + e.getRawSlot() + " on " + (e.getCurrentItem() != null ? e.getCurrentItem().getItemMeta().getDisplayName() : "[EMPTY]") + " in " + TrickyTrialsWrapper.impl.getInventoryTitle(e.getView())); Core.getInstance().getLogger().info("[SWINV] " + e.getWhoClicked().getName() + " " + e.getClick().name() + " clicked " + e.getRawSlot() + " on " + (e.getCurrentItem() != null ? e.getCurrentItem().getItemMeta().getDisplayName() : "[EMPTY]") + " in " + e.getView().getTitle());
callbacks.get(e.getRawSlot()).accept(e); callbacks.get(e.getRawSlot()).accept(e);
} }
} }