v1.0.0

Author: gabehxd

build.gradle

@@ -12,10 +12,8 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle'
 
 group = 'services.headpat'
-version = '1.0-SNAPSHOT'
-archivesBaseName = 'forgeextensions'
+version = '1.0.0'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 compileJava.options.encoding = 'UTF-8'
 
 minecraft {

src/main/java/services/headpat/forgeextensions/brigadier/BrigadierBase.java

@@ -6,12 +6,12 @@
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
 import lombok.Getter;
+import lombok.NonNull;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextComponentString;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import services.headpat.forgeextensions.ColorCode;
 
@@ -20,6 +20,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+@SuppressWarnings("NullableProblems")
 public class BrigadierBase extends CommandBase {
 	@Getter
 	private final String name;
@@ -36,39 +37,39 @@ public BrigadierBase(String name, Consumer<CommandDispatcher<ICommandSender>> di
 	}
 
 	@Override
-	public final @NotNull String getUsage(@NotNull ICommandSender sender) {
+	public final @NonNull String getUsage(@NonNull ICommandSender sender) {
 		StringBuilder builder = new StringBuilder();
-		builder.append(ColorCode.RED.getColorCodeString()).append("Usages:");
+		builder.append(ColorCode.RED).append("Usages:");
 		for (String s : commandDispatcher.getAllUsage(commandDispatcher.getRoot(), sender, true))
-			builder.append("\n").append(ColorCode.RED.getColorCodeString()).append("/").append(s);
+			builder.append("\n").append(ColorCode.RED).append("/").append(s);
 		return builder.toString();
 	}
 
 	@Override
-	public final void execute(@NotNull MinecraftServer server, @NotNull ICommandSender sender, String @NotNull [] args) {
+	public final void execute(@NonNull MinecraftServer server, @NonNull ICommandSender sender, String @NonNull [] args) {
 		try {
 			int result = this.commandDispatcher.execute(getCommandString(args), sender);
 			if (result <= 0) {
 				sender.sendMessage(new TextComponentString(getUsage(sender)));
 			}
 		} catch (CommandSyntaxException e) {
 			if (e.getMessage() != null)
-				sender.sendMessage(new TextComponentString(ColorCode.RED.getColorCodeString() + e.getMessage()));
+				sender.sendMessage(new TextComponentString(ColorCode.RED + e.getMessage()));
 
 			sender.sendMessage(new TextComponentString(getUsage(sender)));
 		}
 	}
 
 	@Override
-	public final @NotNull List<String> getTabCompletions(@NotNull MinecraftServer server, @NotNull ICommandSender sender, String @NotNull [] args, @Nullable BlockPos targetPos) {
+	public final @NonNull List<String> getTabCompletions(@NonNull MinecraftServer server, @NonNull ICommandSender sender, String @NonNull [] args, @Nullable BlockPos targetPos) {
 		String commandString = getCommandString(args);
 		Suggestions suggestions = this.commandDispatcher.getCompletionSuggestions(this.commandDispatcher.parse(commandString, sender)).join();
 		return suggestions.getList().stream().map(Suggestion::getText).collect(Collectors.toList());
 	}
 
 	//The way they implement execute doesnt allow for BrigadierBase to work with aliases :(.
 	@Override
-	public final @NotNull List<String> getAliases() {
+	public final @NonNull List<String> getAliases() {
 		return Collections.emptyList();
 	}
 

src/main/java/services/headpat/forgeextensions/brigadier/arguments/PlayerArgumentType.java

@@ -6,10 +6,10 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import lombok.NonNull;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
 import services.headpat.forgeextensions.utils.PlayerUtils;
 
 import java.util.Collection;
@@ -26,7 +26,7 @@ private PlayerArgumentType() {
 	 * @return {@link PlayerArgumentType} instance.
 	 */
 	@Contract(value = " -> new", pure = true)
-	public static @NotNull
+	public static @NonNull
 	PlayerArgumentType player() {
 		return new PlayerArgumentType();
 	}
@@ -38,7 +38,7 @@ PlayerArgumentType player() {
 	 * @param name    Name of the argument.
 	 * @return The player specified by the argument name in the command context.
 	 */
-	public static EntityPlayerMP getPlayer(@NotNull CommandContext<?> context, String name) {
+	public static EntityPlayerMP getPlayer(@NonNull CommandContext<?> context, String name) {
 		return context.getArgument(name, EntityPlayerMP.class);
 	}
 

src/main/java/services/headpat/forgeextensions/utils/ChatUtils.java

@@ -1,10 +1,12 @@
 package services.headpat.forgeextensions.utils;
 
+import lombok.NonNull;
+import lombok.experimental.UtilityClass;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.nbt.NBTTagString;
-import org.jetbrains.annotations.NotNull;
 import services.headpat.forgeextensions.ColorCode;
 
+@UtilityClass
 public class ChatUtils {
 	/**
 	 * Wraps text that will displayed in a lore to the best of its ability.
@@ -14,7 +16,7 @@ public class ChatUtils {
 	 * @param loreColorCode Color code to make the lore
 	 * @return The text-wrapped lore NBT Tag.
 	 */
-	public static @NotNull NBTTagList wrapLore(@NotNull String lore, int lineLength, ColorCode loreColorCode) {
+	public static @NonNull NBTTagList wrapLore(@NonNull String lore, int lineLength, ColorCode loreColorCode) {
 		String[] words = lore.split(" ");
 
 		NBTTagList nbtLore = new NBTTagList();
@@ -44,7 +46,7 @@ public class ChatUtils {
 	 * @param lore The full length lore with no breaks.
 	 * @return The text-wrapped lore.
 	 */
-	public static @NotNull NBTTagList wrapLore(String lore) {
+	public static @NonNull NBTTagList wrapLore(String lore) {
 		return (ChatUtils.wrapLore(lore, 25, ColorCode.DARK_PURPLE));
 	}
 
@@ -55,7 +57,7 @@ public class ChatUtils {
 	 * @param loreColorCode The color of the lore.
 	 * @return The text-wrapped lore.
 	 */
-	public static @NotNull NBTTagList wrapLore(String lore, ColorCode loreColorCode) {
+	public static @NonNull NBTTagList wrapLore(String lore, ColorCode loreColorCode) {
 		return (ChatUtils.wrapLore(lore, 25, loreColorCode));
 	}
 }

src/main/java/services/headpat/forgeextensions/utils/MiscUtils.java

@@ -1,5 +1,8 @@
 package services.headpat.forgeextensions.utils;
 
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
 public class MiscUtils {
 	/**
 	 * @param chance Integer percentage.

src/main/java/services/headpat/forgeextensions/utils/PlayerUtils.java

@@ -1,25 +1,27 @@
 package services.headpat.forgeextensions.utils;
 
+import lombok.NonNull;
+import lombok.experimental.UtilityClass;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.management.PlayerList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.FMLCommonHandler;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+@UtilityClass
 public class PlayerUtils {
 	/**
 	 * Quick shortcut. Works on both server and client.
 	 *
 	 * @return returns Server list players.
 	 */
-	@NotNull
+	@NonNull
 	public static PlayerList getPlayerList() {
 		return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList();
 	}