Intellij based corrections

Author: jtljac

build.gradle

@@ -109,7 +109,7 @@ repositories {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
-    implementation 'org.spongepowered:spongeapi:8.1.0'
+    implementation 'org.spongepowered:spongeapi:9.0.0'
 }
 
 // Example for how to get properties into the manifest for reading at runtime.

src/main/java/com/datdeveloper/datmoddingapi/Datmoddingapi.java

@@ -4,32 +4,17 @@
 import com.datdeveloper.datmoddingapi.command.arguments.DatArguments;
 import com.datdeveloper.datmoddingapi.permissions.DatPermissions;
 import com.mojang.logging.LogUtils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.Material;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.InterModComms;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
-import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
 import org.slf4j.Logger;
 
 // The value here should match an entry in the META-INF/mods.toml file

src/main/java/com/datdeveloper/datmoddingapi/command/arguments/LimitedStringArgument.java

@@ -13,6 +13,7 @@
 import net.minecraft.commands.synchronization.ArgumentTypeInfo;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -88,14 +89,14 @@ public void serializeToNetwork(final Template pTemplate, final FriendlyByteBuf p
         }
 
         @Override
-        public Template deserializeFromNetwork(final FriendlyByteBuf pBuffer) {
+        public @NotNull Template deserializeFromNetwork(final FriendlyByteBuf pBuffer) {
             final StringArgumentType.StringType type = pBuffer.readEnum(StringArgumentType.StringType.class);
             final int maxLength = pBuffer.readInt();
             return new Template(type, maxLength);
         }
 
         @Override
-        public void serializeToJson(final Template pTemplate, final JsonObject pJson) {
+        public void serializeToJson(final Template pTemplate, final @NotNull JsonObject pJson) {
             final String s = switch (pTemplate.type) {
                 case SINGLE_WORD -> "word";
                 case QUOTABLE_PHRASE -> "phrase";
@@ -107,7 +108,7 @@ public void serializeToJson(final Template pTemplate, final JsonObject pJson) {
         }
 
         @Override
-        public Template unpack(final LimitedStringArgument pArgument) {
+        public @NotNull Template unpack(final LimitedStringArgument pArgument) {
             return new Template(pArgument.delegate.getType(), pArgument.maxLength);
         }
 
@@ -121,12 +122,12 @@ public Template(final StringArgumentType.StringType type, final int maxLength) {
             }
 
             @Override
-            public LimitedStringArgument instantiate(final CommandBuildContext pContext) {
+            public @NotNull LimitedStringArgument instantiate(final @NotNull CommandBuildContext pContext) {
                 return new LimitedStringArgument(type, maxLength);
             }
 
             @Override
-            public ArgumentTypeInfo<LimitedStringArgument, ?> type() {
+            public @NotNull ArgumentTypeInfo<LimitedStringArgument, ?> type() {
                 return Info.this;
             }
         }

src/main/java/com/datdeveloper/datmoddingapi/delayedEvents/DelayedTeleportEvent.java

@@ -36,7 +36,7 @@ public class DelayedTeleportEvent extends TimeDelayedEvent {
      */
     public BlockPos startingPos;
 
-    public DelayedTeleportEvent(BlockPos destinationPos, ResourceKey<Level> destinationWorld, ServerPlayer player, int Delay) {
+    public DelayedTeleportEvent(final BlockPos destinationPos, final ResourceKey<Level> destinationWorld, final ServerPlayer player, final int Delay) {
         super(Delay);
         this.destinationPos = destinationPos;
         this.destinationWorld = destinationWorld;
@@ -47,8 +47,7 @@ public DelayedTeleportEvent(BlockPos destinationPos, ResourceKey<Level> destinat
 
     @Override
     public void execute() {
-        @SuppressWarnings("ConstantConditions")
-        ServerLevel level = player.getServer().getLevel(destinationWorld);
+        @SuppressWarnings("ConstantConditions") final ServerLevel level = player.getServer().getLevel(destinationWorld);
         if (level == null) {
             player.sendSystemMessage(Component.literal(ChatFormatting.RED + "Failed to find level"));
             return;
@@ -58,7 +57,7 @@ public void execute() {
     }
 
     @Override
-    public boolean shouldRequeue(boolean hasFinished) {
+    public boolean shouldRequeue(final boolean hasFinished) {
         if (!hasFinished && startingPos.distToCenterSqr(player.position()) > 1) {
             player.sendSystemMessage(Component.literal(DatChatFormatting.TextColour.ERROR + "Teleport cancelled"));
             return false;

src/main/java/com/datdeveloper/datmoddingapi/permissions/DatPermissions.java

@@ -8,8 +8,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import java.util.stream.Stream;
 
 /**

src/main/java/com/datdeveloper/datmoddingapi/util/DatTeleporter.java

@@ -19,7 +19,7 @@ public class DatTeleporter implements ITeleporter {
     /**
      * The position to telepor the entity to
      */
-    BlockPos destination;
+    final BlockPos destination;
 
     public DatTeleporter(final BlockPos destination) {
         this.destination = destination;