mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Apply suggestions from code review - 2
This commit is contained in:
parent
d15e02afbc
commit
809530fccd
@ -28,10 +28,10 @@ class TeleporterCommand extends SubCommand {
|
||||
} else if (args.length == 2) {
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(args[1]);
|
||||
OfflinePlayer targetPlayer = Bukkit.getOfflinePlayer(args[1]);
|
||||
|
||||
if (offlinePlayer.getName() != null) {
|
||||
Slimefun.getGPSNetwork().getTeleportationManager().openTeleporterGUI(player, offlinePlayer.getUniqueId(), player.getLocation().getBlock().getRelative(BlockFace.DOWN), 999999999);
|
||||
if (targetPlayer.getName() != null) {
|
||||
Slimefun.getGPSNetwork().getTeleportationManager().openTeleporterGUI(player, targetPlayer.getUniqueId(), player.getLocation().getBlock().getRelative(BlockFace.DOWN), 999999999);
|
||||
} else {
|
||||
Slimefun.getLocalization().sendMessage(sender, "messages.unknown-player", msg -> msg.replace("%player%", args[1]));
|
||||
}
|
||||
|
@ -70,6 +70,7 @@ final class CargoUtils {
|
||||
|
||||
Material type = block.getType();
|
||||
|
||||
// TODO: Add designated SlimefunTag
|
||||
return switch (type) {
|
||||
case CHEST,
|
||||
TRAPPED_CHEST,
|
||||
|
@ -137,6 +137,7 @@ public class BlockDataService implements Keyed {
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO: Add designated SlimefunTag
|
||||
return switch (type) {
|
||||
case PLAYER_HEAD,
|
||||
PLAYER_WALL_HEAD,
|
||||
|
@ -202,6 +202,7 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
|
||||
protected boolean isValidInventory(@Nonnull Block block) {
|
||||
Material type = block.getType();
|
||||
|
||||
// TODO: Add designated SlimefunTag
|
||||
return switch (type) {
|
||||
case CHEST,
|
||||
TRAPPED_CHEST,
|
||||
|
@ -34,17 +34,17 @@ public class MagicWorkbench extends AbstractCraftingTable {
|
||||
|
||||
@Override
|
||||
public void onInteract(Player p, Block b) {
|
||||
Block dispenser = locateDispenser(b);
|
||||
Block possibleDispener = locateDispenser(b);
|
||||
|
||||
if (dispenser == null) {
|
||||
if (possibleDispener == null) {
|
||||
// How even...
|
||||
return;
|
||||
}
|
||||
|
||||
BlockState state = PaperLib.getBlockState(dispenser, false).getState();
|
||||
BlockState state = PaperLib.getBlockState(possibleDispener, false).getState();
|
||||
|
||||
if (state instanceof Dispenser disp) {
|
||||
Inventory inv = disp.getInventory();
|
||||
if (state instanceof Dispenser dispenser) {
|
||||
Inventory inv = dispenser.getInventory();
|
||||
List<ItemStack[]> inputs = RecipeType.getRecipeInputList(this);
|
||||
|
||||
for (int i = 0; i < inputs.size(); i++) {
|
||||
@ -52,7 +52,7 @@ public class MagicWorkbench extends AbstractCraftingTable {
|
||||
ItemStack output = RecipeType.getRecipeOutputList(this, inputs.get(i)).clone();
|
||||
|
||||
if (SlimefunUtils.canPlayerUseItem(p, output, true)) {
|
||||
craft(inv, dispenser, p, b, output);
|
||||
craft(inv, possibleDispener, p, b, output);
|
||||
}
|
||||
|
||||
return;
|
||||
|
@ -20,9 +20,8 @@ class OreDictionary16 extends OreDictionary14 {
|
||||
@ParametersAreNonnullByDefault
|
||||
public @Nonnull ItemStack getDrops(Material material, Random random) {
|
||||
return switch (material) {
|
||||
case NETHER_GOLD_ORE ->
|
||||
// In 1.16, breaking nether gold ores should get gold nuggets
|
||||
new ItemStack(Material.GOLD_NUGGET, 2 + random.nextInt(4));
|
||||
case NETHER_GOLD_ORE -> new ItemStack(Material.GOLD_NUGGET, 2 + random.nextInt(4));
|
||||
case ANCIENT_DEBRIS -> new ItemStack(Material.ANCIENT_DEBRIS);
|
||||
default -> super.getDrops(material, random);
|
||||
};
|
||||
|
@ -28,13 +28,13 @@ public class AnvilListener implements SlimefunCraftingListener {
|
||||
|
||||
@EventHandler(ignoreCancelled = true)
|
||||
public void onAnvil(InventoryClickEvent e) {
|
||||
if (e.getRawSlot() == 2 && e.getInventory().getType() == InventoryType.ANVIL && e.getWhoClicked() instanceof Player) {
|
||||
if (e.getRawSlot() == 2 && e.getInventory().getType() == InventoryType.ANVIL && e.getWhoClicked() instanceof Player player) {
|
||||
ItemStack item1 = e.getInventory().getContents()[0];
|
||||
ItemStack item2 = e.getInventory().getContents()[1];
|
||||
|
||||
if (hasUnallowedItems(item1, item2)) {
|
||||
e.setResult(Result.DENY);
|
||||
Slimefun.getLocalization().sendMessage(e.getWhoClicked(), "anvil.not-working", true);
|
||||
Slimefun.getLocalization().sendMessage(player, "anvil.not-working", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -28,13 +28,13 @@ public class CartographyTableListener implements SlimefunCraftingListener {
|
||||
|
||||
@EventHandler(ignoreCancelled = true)
|
||||
public void onCartographyTable(InventoryClickEvent e) {
|
||||
if (e.getRawSlot() == 2 && e.getInventory().getType() == InventoryType.CARTOGRAPHY && e.getWhoClicked() instanceof Player) {
|
||||
if (e.getRawSlot() == 2 && e.getInventory().getType() == InventoryType.CARTOGRAPHY && e.getWhoClicked() instanceof Player player) {
|
||||
ItemStack item1 = e.getInventory().getContents()[0];
|
||||
ItemStack item2 = e.getInventory().getContents()[1];
|
||||
|
||||
if (hasUnallowedItems(item1, item2)) {
|
||||
e.setResult(Result.DENY);
|
||||
Slimefun.getLocalization().sendMessage(e.getWhoClicked(), "cartography_table.not-working", true);
|
||||
Slimefun.getLocalization().sendMessage(player, "cartography_table.not-working", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -36,9 +36,9 @@ public class WitherListener implements Listener {
|
||||
SlimefunItem item = BlockStorage.check(e.getBlock());
|
||||
|
||||
// Hardened Glass is excluded from here
|
||||
if (item instanceof WitherProof witherProof && !item.getId().equals(SlimefunItems.HARDENED_GLASS.getItemId())) {
|
||||
if (item instanceof WitherProof witherProofBlock && !item.getId().equals(SlimefunItems.HARDENED_GLASS.getItemId())) {
|
||||
e.setCancelled(true);
|
||||
witherProof.onAttack(e.getBlock(), (Wither) e.getEntity());
|
||||
witherProofBlock.onAttack(e.getBlock(), (Wither) e.getEntity());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -50,8 +50,8 @@ public class MenuListener implements Listener {
|
||||
|
||||
if (handler == null) {
|
||||
e.setCancelled(!menu.isEmptySlotsClickable() && (e.getCurrentItem() == null || e.getCurrentItem().getType() == Material.AIR));
|
||||
} else if (handler instanceof AdvancedMenuClickHandler advancedMenuClickHandler) {
|
||||
e.setCancelled(!advancedMenuClickHandler.onClick(e, (Player) e.getWhoClicked(), e.getSlot(), e.getCursor(), new ClickAction(e.isRightClick(), e.isShiftClick())));
|
||||
} else if (handler instanceof AdvancedMenuClickHandler) {
|
||||
e.setCancelled(!((AdvancedMenuClickHandler) handler).onClick(e, (Player) e.getWhoClicked(), e.getSlot(), e.getCursor(), new ClickAction(e.isRightClick(), e.isShiftClick())));
|
||||
} else {
|
||||
e.setCancelled(!handler.onClick((Player) e.getWhoClicked(), e.getSlot(), e.getCurrentItem(), new ClickAction(e.isRightClick(), e.isShiftClick())));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user