diff --git a/projects/common/src/main/java/dan200/computercraft/shared/media/MountMedia.java b/projects/common/src/main/java/dan200/computercraft/shared/media/MountMedia.java index e35d21d51..7f8a50ac1 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/media/MountMedia.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/media/MountMedia.java @@ -14,8 +14,8 @@ import dan200.computercraft.shared.media.items.DiskItem; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; +import org.jspecify.annotations.Nullable; -import javax.annotation.Nullable; import java.util.function.Supplier; import java.util.function.ToIntFunction; diff --git a/projects/common/src/main/java/dan200/computercraft/shared/media/items/TreasureDiskMedia.java b/projects/common/src/main/java/dan200/computercraft/shared/media/items/TreasureDiskMedia.java index f90f7dded..cc595a693 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/media/items/TreasureDiskMedia.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/media/items/TreasureDiskMedia.java @@ -10,8 +10,8 @@ import dan200.computercraft.api.media.IMedia; import dan200.computercraft.core.filesystem.SubMount; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; +import org.jspecify.annotations.Nullable; -import javax.annotation.Nullable; import java.io.IOException; /** diff --git a/projects/lints/src/main/kotlin/cc/tweaked/linter/ForbiddenImport.kt b/projects/lints/src/main/kotlin/cc/tweaked/linter/ForbiddenImport.kt index fa10f9795..be8c049e5 100644 --- a/projects/lints/src/main/kotlin/cc/tweaked/linter/ForbiddenImport.kt +++ b/projects/lints/src/main/kotlin/cc/tweaked/linter/ForbiddenImport.kt @@ -38,7 +38,7 @@ class ForbiddenImport : BugChecker(), BugChecker.ImportTreeMatcher { companion object { private val ALTERNATIVE_IMPORTS = mapOf( // Ban JSR 305 and JetBrains @Nullable, and prefer the JSpecify one. - "org.javax.annotation.Nullable" to "org.jspecify.annotations.Nullable", + "javax.annotation.Nullable" to "org.jspecify.annotations.Nullable", "org.jetbrains.annotations.Nullable" to "org.jspecify.annotations.Nullable", // Prefer ErrorProne annotations over JSR ones. "javax.annotation.CheckReturnValue" to "com.google.errorprone.annotations.CheckReturnValue",