diff --git a/src/main/java/net/minecraft/command/ServerCommandManager.java b/src/main/java/net/minecraft/command/ServerCommandManager.java index fc21385..4845604 100644 --- a/src/main/java/net/minecraft/command/ServerCommandManager.java +++ b/src/main/java/net/minecraft/command/ServerCommandManager.java @@ -41,8 +41,7 @@ public class ServerCommandManager extends CommandHandler implements IAdminCommand { private static final String __OBFID = "CL_00000922"; - @InjectService - private static Permissions perms; + @InjectService private static Permissions perms; public ServerCommandManager() { diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java index 7e61337..f7f6db1 100644 --- a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java +++ b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java @@ -1001,10 +1001,8 @@ private int renderDistance; private final ChunkSendManager chunkMgr = new ChunkSendManager(this); private PlayerData playerData; - @InjectService - private static Permissions perms; - @InjectService - private static Economy economy; + @InjectService private static Permissions perms; + @InjectService private static Economy economy; public boolean hasPermission(String permission) { diff --git a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java b/src/main/java/net/minecraft/network/NetHandlerPlayServer.java index 7d2f892..2a4ba15 100644 --- a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java +++ b/src/main/java/net/minecraft/network/NetHandlerPlayServer.java @@ -124,8 +124,7 @@ private double lastPosZ; private boolean hasMoved = true; private static final String __OBFID = "CL_00001452"; - @InjectService - private static Permissions perms; + @InjectService private static Permissions perms; public NetHandlerPlayServer(MinecraftServer p_i1530_1_, NetworkManager p_i1530_2_, EntityPlayerMP p_i1530_3_) { diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java index 172091d..4571e98 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -574,8 +574,7 @@ /* ======================================== ULTRAMINE START =====================================*/ - @InjectService - private static Permissions perms; + @InjectService private static Permissions perms; private final BackupManager backupMgr = new BackupManager(this); @Override diff --git a/src/main/java/org/ultramine/commands/CommandContext.java b/src/main/java/org/ultramine/commands/CommandContext.java index 4dab2e5..baaf3a3 100644 --- a/src/main/java/org/ultramine/commands/CommandContext.java +++ b/src/main/java/org/ultramine/commands/CommandContext.java @@ -41,10 +41,8 @@ public class CommandContext { - @InjectService - private static Permissions perms; - @InjectService - private static Economy economy; + @InjectService private static Permissions perms; + @InjectService private static Economy economy; private static final Logger log = LogManager.getLogger(); private ICommandSender sender; private String[] args; diff --git a/src/main/java/org/ultramine/commands/HandlerBasedCommand.java b/src/main/java/org/ultramine/commands/HandlerBasedCommand.java index a83abd9..fa18771 100644 --- a/src/main/java/org/ultramine/commands/HandlerBasedCommand.java +++ b/src/main/java/org/ultramine/commands/HandlerBasedCommand.java @@ -18,8 +18,7 @@ public class HandlerBasedCommand implements IExtendedCommand { - @InjectService - private static Permissions perms; + @InjectService private static Permissions perms; private String name; private String usage; private String group; diff --git a/src/main/java/org/ultramine/commands/VanillaCommandWrapper.java b/src/main/java/org/ultramine/commands/VanillaCommandWrapper.java index d4cb221..e4b960e 100644 --- a/src/main/java/org/ultramine/commands/VanillaCommandWrapper.java +++ b/src/main/java/org/ultramine/commands/VanillaCommandWrapper.java @@ -10,8 +10,7 @@ public class VanillaCommandWrapper implements IExtendedCommand { - @InjectService - private static Permissions perms; + @InjectService private static Permissions perms; private final ICommand wrappedCommand; private final String permission; private final String description; diff --git a/src/main/java/org/ultramine/commands/basic/FastWarpCommand.java b/src/main/java/org/ultramine/commands/basic/FastWarpCommand.java index d2ffabb..d256b22 100644 --- a/src/main/java/org/ultramine/commands/basic/FastWarpCommand.java +++ b/src/main/java/org/ultramine/commands/basic/FastWarpCommand.java @@ -14,8 +14,7 @@ public class FastWarpCommand implements IExtendedCommand { - @InjectService - private static Permissions perms; + @InjectService private static Permissions perms; private final String name; public FastWarpCommand(String name) diff --git a/src/main/java/org/ultramine/commands/basic/VanillaCommands.java b/src/main/java/org/ultramine/commands/basic/VanillaCommands.java index 8fc3e35..8d3fe9a 100644 --- a/src/main/java/org/ultramine/commands/basic/VanillaCommands.java +++ b/src/main/java/org/ultramine/commands/basic/VanillaCommands.java @@ -28,8 +28,7 @@ public class VanillaCommands { - @InjectService - private static Permissions perms; + @InjectService private static Permissions perms; @Command( name = "help", diff --git a/src/main/java/org/ultramine/server/data/player/PlayerCoreData.java b/src/main/java/org/ultramine/server/data/player/PlayerCoreData.java index 0a4acdb..80dac55 100644 --- a/src/main/java/org/ultramine/server/data/player/PlayerCoreData.java +++ b/src/main/java/org/ultramine/server/data/player/PlayerCoreData.java @@ -223,10 +223,8 @@ private static class PlayerAccountHolder { - @InjectService - private static EconomyRegistry economyRegistry; - @InjectService - private static Economy economy; + @InjectService private static EconomyRegistry economyRegistry; + @InjectService private static Economy economy; private final Map holdingsMap = new HashMap<>(); private final PlayerData data; diff --git a/src/main/java/org/ultramine/server/economy/UMEconomyRegistry.java b/src/main/java/org/ultramine/server/economy/UMEconomyRegistry.java index 1fa47e4..5df006c 100644 --- a/src/main/java/org/ultramine/server/economy/UMEconomyRegistry.java +++ b/src/main/java/org/ultramine/server/economy/UMEconomyRegistry.java @@ -20,8 +20,7 @@ public class UMEconomyRegistry implements EconomyRegistry { private static final Double DEFAULT_PLAYER_BALANCE = 0.0d; - @InjectService - private static ServiceManager services; + @InjectService private static ServiceManager services; private final Map currencies = new ConcurrentHashMap<>(); private final Map startPlayerBalances = new ConcurrentHashMap<>(); diff --git a/src/main/java/org/ultramine/server/economy/UMIntegratedPlayerHoldingsFactory.java b/src/main/java/org/ultramine/server/economy/UMIntegratedPlayerHoldingsFactory.java index 27eb3cb..2a5ccc3 100644 --- a/src/main/java/org/ultramine/server/economy/UMIntegratedPlayerHoldingsFactory.java +++ b/src/main/java/org/ultramine/server/economy/UMIntegratedPlayerHoldingsFactory.java @@ -15,8 +15,7 @@ public class UMIntegratedPlayerHoldingsFactory implements HoldingsFactory { - @InjectService - private static EconomyRegistry economyRegistry; + @InjectService private static EconomyRegistry economyRegistry; @Nonnull @Override diff --git a/src/main/java/org/ultramine/server/internal/UMEventHandler.java b/src/main/java/org/ultramine/server/internal/UMEventHandler.java index 89c0663..b9fdde4 100644 --- a/src/main/java/org/ultramine/server/internal/UMEventHandler.java +++ b/src/main/java/org/ultramine/server/internal/UMEventHandler.java @@ -50,8 +50,7 @@ public class UMEventHandler { - @InjectService - private static Permissions perms; + @InjectService private static Permissions perms; @SideOnly(Side.SERVER) @SubscribeEvent(priority = EventPriority.HIGH)