mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-06 07:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup sources

Browse Source
This commit is contained in:
Daniel Mills
2021-08-02 19:50:41 -04:00
parent 18c70002cb
commit 160bdf5472
20 changed files with 76 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/util/data/Cuboid.java
View File

@@ -24,7 +24,6 @@ import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.entity.Entity;
import org.jetbrains.annotations.NotNull;
import java.util.*;
@@ -158,7 +157,6 @@ public class Cuboid implements Iterable<Block>, Cloneable, ConfigurationSerializ
z2 = (Integer) map.get("z2");
}
@NotNull
@Override
public Map<String, Object> serialize() {
Map<String, Object> map = new HashMap<>();

9
src/main/java/com/volmit/iris/util/data/InvertedBiomeGrid.java
View File

@@ -20,7 +20,6 @@ package com.volmit.iris.util.data;
import org.bukkit.block.Biome;
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
import org.jetbrains.annotations.NotNull;
public class InvertedBiomeGrid implements BiomeGrid {
private final BiomeGrid grid;
@@ -29,14 +28,14 @@ public class InvertedBiomeGrid implements BiomeGrid {
this.grid = real;
}
@NotNull
@SuppressWarnings("deprecation")
@Override
public Biome getBiome(int arg0, int arg1) {
return grid.getBiome(arg0, arg1);
}
@NotNull
@Override
public Biome getBiome(int arg0, int arg1, int arg2) {
return grid.getBiome(arg0, 255 - arg1, arg2);
@@ -44,12 +43,12 @@ public class InvertedBiomeGrid implements BiomeGrid {
@SuppressWarnings("deprecation")
@Override
public void setBiome(int arg0, int arg1, @NotNull Biome arg2) {
public void setBiome(int arg0, int arg1, Biome arg2) {
grid.setBiome(arg0, arg1, arg2);
}
@Override
public void setBiome(int arg0, int arg1, int arg2, @NotNull Biome arg3) {
public void setBiome(int arg0, int arg1, int arg2, Biome arg3) {
grid.setBiome(arg0, 255 - arg1, arg2, arg3);
}
}

9
src/main/java/com/volmit/iris/util/plugin/RouterCommand.java
View File

@@ -21,7 +21,6 @@ package com.volmit.iris.util.plugin;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
/**
* Assistive command router
@@ -45,21 +44,21 @@ public class RouterCommand extends org.bukkit.command.Command {
this.ex = ex;
}
@NotNull
@Override
public Command setUsage(@NotNull String u) {
public Command setUsage(String u) {
this.usage = u;
return this;
}
@NotNull
@Override
public String getUsage() {
return usage;
}
@Override
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
return ex.onCommand(sender, this, commandLabel, args);
}
}

10
src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java
View File

@@ -37,8 +37,6 @@ import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredListener;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@@ -501,10 +499,10 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener {
}
}
@Nullable
@Override
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String alias, @NotNull String[] args) {
public List<String> onTabComplete(CommandSender sender, Command command,
String alias, String[] args) {
KList<String> chain = new KList<>();
for (String i : args) {
@@ -532,7 +530,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener {
}
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command command, @NotNull String label, @NotNull String[] args) {
public boolean onCommand(CommandSender sender, org.bukkit.command.Command command, String label, String[] args) {
if (bad) {
return false;
}

38
src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
View File

@@ -28,8 +28,6 @@ import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Set;
import java.util.UUID;
@@ -108,49 +106,49 @@ public class VolmitSender implements CommandSender {
}
@Override
public boolean isPermissionSet(@NotNull String name) {
public boolean isPermissionSet(String name) {
return s.isPermissionSet(name);
}
@Override
public boolean isPermissionSet(@NotNull Permission perm) {
public boolean isPermissionSet(Permission perm) {
return s.isPermissionSet(perm);
}
@Override
public boolean hasPermission(@NotNull String name) {
public boolean hasPermission(String name) {
return s.hasPermission(name);
}
@Override
public boolean hasPermission(@NotNull Permission perm) {
public boolean hasPermission(Permission perm) {
return s.hasPermission(perm);
}
@NotNull
@Override
public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {
return s.addAttachment(plugin, name, value);
}
@NotNull
@Override
public PermissionAttachment addAttachment(@NotNull Plugin plugin) {
public PermissionAttachment addAttachment(Plugin plugin) {
return s.addAttachment(plugin);
}
@Override
public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) {
return s.addAttachment(plugin, name, value, ticks);
}
@Override
public PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
return s.addAttachment(plugin, ticks);
}
@Override
public void removeAttachment(@NotNull PermissionAttachment attachment) {
public void removeAttachment(PermissionAttachment attachment) {
s.removeAttachment(attachment);
}
@@ -159,7 +157,7 @@ public class VolmitSender implements CommandSender {
s.recalculatePermissions();
}
@NotNull
@Override
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
return s.getEffectivePermissions();
@@ -180,7 +178,7 @@ public class VolmitSender implements CommandSender {
}
@Override
public void sendMessage(@NotNull String message) {
public void sendMessage(String message) {
s.sendMessage(C.translateAlternateColorCodes('&', getTag()) + message);
}
@@ -191,28 +189,28 @@ public class VolmitSender implements CommandSender {
}
@Override
public void sendMessage(@Nullable UUID uuid, @NotNull String message) {
public void sendMessage(UUID uuid, String message) {
sendMessage(message);
}
@Override
public void sendMessage(@Nullable UUID uuid, @NotNull String[] messages) {
public void sendMessage(UUID uuid, String[] messages) {
sendMessage(messages);
}
@NotNull
@Override
public Server getServer() {
return s.getServer();
}
@NotNull
@Override
public String getName() {
return s.getName();
}
@NotNull
@Override
public Spigot spigot() {
return s.spigot();