diff --git a/paper-api/src/main/java/org/bukkit/Achievement.java b/paper-api/src/main/java/org/bukkit/Achievement.java
index 5c5a72c070..edc388ffe1 100644
--- a/paper-api/src/main/java/org/bukkit/Achievement.java
+++ b/paper-api/src/main/java/org/bukkit/Achievement.java
@@ -50,7 +50,7 @@ public enum Achievement {
         parent = null;
     }
 
-    private Achievement(@Nullable Achievement parent) {
+    private Achievement(/*@Nullable*/ Achievement parent) {
         this.parent = parent;
     }
 
diff --git a/paper-api/src/main/java/org/bukkit/DyeColor.java b/paper-api/src/main/java/org/bukkit/DyeColor.java
index 6f23582285..ac75be6577 100644
--- a/paper-api/src/main/java/org/bukkit/DyeColor.java
+++ b/paper-api/src/main/java/org/bukkit/DyeColor.java
@@ -85,7 +85,7 @@ public enum DyeColor {
     private final static Map<Color, DyeColor> BY_COLOR;
     private final static Map<Color, DyeColor> BY_FIREWORK;
 
-    private DyeColor(final int woolData, final int dyeData, @NotNull Color color, @NotNull Color firework) {
+    private DyeColor(final int woolData, final int dyeData, /*@NotNull*/ Color color, /*@NotNull*/ Color firework) {
         this.woolData = (byte) woolData;
         this.dyeData = (byte) dyeData;
         this.color = color;
diff --git a/paper-api/src/main/java/org/bukkit/Effect.java b/paper-api/src/main/java/org/bukkit/Effect.java
index dd17003dc7..e476de6589 100644
--- a/paper-api/src/main/java/org/bukkit/Effect.java
+++ b/paper-api/src/main/java/org/bukkit/Effect.java
@@ -205,11 +205,11 @@ public enum Effect {
     private final Class<?> data;
     private static final Map<Integer, Effect> BY_ID = Maps.newHashMap();
 
-    Effect(int id, @NotNull Type type) {
+    Effect(int id, /*@NotNull*/ Type type) {
         this(id, type, null);
     }
 
-    Effect(int id, @NotNull Type type, @Nullable Class<?> data) {
+    Effect(int id, /*@NotNull*/ Type type, /*@Nullable*/ Class<?> data) {
         this.id = id;
         this.type = type;
         this.data = data;
diff --git a/paper-api/src/main/java/org/bukkit/EntityEffect.java b/paper-api/src/main/java/org/bukkit/EntityEffect.java
index 6b43d5abb2..b7576f6811 100644
--- a/paper-api/src/main/java/org/bukkit/EntityEffect.java
+++ b/paper-api/src/main/java/org/bukkit/EntityEffect.java
@@ -155,7 +155,7 @@ public enum EntityEffect {
     private final Class<? extends Entity> applicable;
     private final static Map<Byte, EntityEffect> BY_DATA = Maps.newHashMap();
 
-    EntityEffect(final int data, @NotNull Class<? extends Entity> clazz) {
+    EntityEffect(final int data, /*@NotNull*/ Class<? extends Entity> clazz) {
         this.data = (byte) data;
         this.applicable = clazz;
     }
diff --git a/paper-api/src/main/java/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java
index f8e78da069..6120955b1c 100644
--- a/paper-api/src/main/java/org/bukkit/Material.java
+++ b/paper-api/src/main/java/org/bukkit/Material.java
@@ -2957,15 +2957,15 @@ public enum Material implements Keyed {
         this(id, stack, durability, MaterialData.class);
     }
 
-    private Material(final int id, @NotNull final Class<?> data) {
+    private Material(final int id, /*@NotNull*/ final Class<?> data) {
         this(id, 64, data);
     }
 
-    private Material(final int id, final int stack, @NotNull final Class<?> data) {
+    private Material(final int id, final int stack, /*@NotNull*/ final Class<?> data) {
         this(id, stack, 0, data);
     }
 
-    private Material(final int id, final int stack, final int durability, @NotNull final Class<?> data) {
+    private Material(final int id, final int stack, final int durability, /*@NotNull*/ final Class<?> data) {
         this.id = id;
         this.durability = (short) durability;
         this.maxStack = stack;
diff --git a/paper-api/src/main/java/org/bukkit/Particle.java b/paper-api/src/main/java/org/bukkit/Particle.java
index a376e52f4d..3b2314a94e 100644
--- a/paper-api/src/main/java/org/bukkit/Particle.java
+++ b/paper-api/src/main/java/org/bukkit/Particle.java
@@ -71,7 +71,7 @@ public enum Particle {
         dataType = Void.class;
     }
 
-    Particle(@NotNull Class<?> data) {
+    Particle(/*@NotNull*/ Class<?> data) {
         dataType = data;
     }
 
diff --git a/paper-api/src/main/java/org/bukkit/Statistic.java b/paper-api/src/main/java/org/bukkit/Statistic.java
index 4f414e82e9..f5a834fea4 100644
--- a/paper-api/src/main/java/org/bukkit/Statistic.java
+++ b/paper-api/src/main/java/org/bukkit/Statistic.java
@@ -82,7 +82,7 @@ public enum Statistic {
         this(Type.UNTYPED);
     }
 
-    private Statistic(@NotNull Type type) {
+    private Statistic(/*@NotNull*/ Type type) {
         this.type = type;
     }
 
diff --git a/paper-api/src/main/java/org/bukkit/WorldType.java b/paper-api/src/main/java/org/bukkit/WorldType.java
index d3be76363a..e82fe0767a 100644
--- a/paper-api/src/main/java/org/bukkit/WorldType.java
+++ b/paper-api/src/main/java/org/bukkit/WorldType.java
@@ -21,7 +21,7 @@ public enum WorldType {
     private final static Map<String, WorldType> BY_NAME = Maps.newHashMap();
     private final String name;
 
-    private WorldType(@NotNull String name) {
+    private WorldType(/*@NotNull*/ String name) {
         this.name = name;
     }
 
diff --git a/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java b/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
index 5c3a902387..95f55a4468 100644
--- a/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
+++ b/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
@@ -57,7 +57,7 @@ public enum PatternType {
         }
     }
 
-    private PatternType(@NotNull String key) {
+    private PatternType(/*@NotNull*/ String key) {
         this.identifier = key;
     }
 
diff --git a/paper-api/src/main/java/org/bukkit/entity/EntityType.java b/paper-api/src/main/java/org/bukkit/entity/EntityType.java
index 510dcfd9de..395f74c1cd 100644
--- a/paper-api/src/main/java/org/bukkit/entity/EntityType.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EntityType.java
@@ -311,11 +311,11 @@ public enum EntityType {
         NAME_MAP.put("ender_crystal", ENDER_CRYSTAL);
     }
 
-    private EntityType(@Nullable String name, @Nullable Class<? extends Entity> clazz, int typeId) {
+    private EntityType(/*@Nullable*/ String name, /*@Nullable*/ Class<? extends Entity> clazz, int typeId) {
         this(name, clazz, typeId, true);
     }
 
-    private EntityType(@Nullable String name, @Nullable Class<? extends Entity> clazz, int typeId, boolean independent) {
+    private EntityType(/*@Nullable*/ String name, /*@Nullable*/ Class<? extends Entity> clazz, int typeId, boolean independent) {
         this.name = name;
         this.clazz = clazz;
         this.typeId = (short) typeId;
diff --git a/paper-api/src/main/java/org/bukkit/entity/Villager.java b/paper-api/src/main/java/org/bukkit/entity/Villager.java
index 4f6e1ca188..d8dfb43888 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Villager.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Villager.java
@@ -236,7 +236,7 @@ public interface Villager extends Ageable, NPC, InventoryHolder, Merchant {
         private static final Multimap<Profession, Career> careerMap = LinkedListMultimap.create();
         private final Profession profession;
 
-        private Career(@NotNull Profession profession) {
+        private Career(/*@NotNull*/ Profession profession) {
             this.profession = profession;
         }
 
diff --git a/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java
index 6216e64112..d69ce3ec78 100644
--- a/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java
@@ -98,11 +98,11 @@ public enum InventoryType {
     private final String title;
     private final boolean isCreatable;
 
-    private InventoryType(int defaultSize, @NotNull String defaultTitle) {
+    private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
         this(defaultSize, defaultTitle, true);
     }
 
-    private InventoryType(int defaultSize, @NotNull String defaultTitle, boolean isCreatable) {
+    private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle, boolean isCreatable) {
         size = defaultSize;
         title = defaultTitle;
         this.isCreatable = isCreatable;
diff --git a/paper-api/src/main/java/org/bukkit/inventory/InventoryView.java b/paper-api/src/main/java/org/bukkit/inventory/InventoryView.java
index bc2b4da34e..38b9132f48 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/InventoryView.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/InventoryView.java
@@ -101,7 +101,7 @@ public abstract class InventoryView {
         REPAIR_COST(0, InventoryType.ANVIL);
         int id;
         InventoryType style;
-        private Property(int id, @NotNull InventoryType appliesTo) {
+        private Property(int id, /*@NotNull*/ InventoryType appliesTo) {
             this.id = id;
             style = appliesTo;
         }
diff --git a/paper-api/src/main/java/org/bukkit/loot/LootTables.java b/paper-api/src/main/java/org/bukkit/loot/LootTables.java
index f2591d3c08..7b7dcfa273 100644
--- a/paper-api/src/main/java/org/bukkit/loot/LootTables.java
+++ b/paper-api/src/main/java/org/bukkit/loot/LootTables.java
@@ -119,7 +119,7 @@ public enum LootTables implements Keyed {
 
     private final String location;
 
-    private LootTables(@NotNull String location) {
+    private LootTables(/*@NotNull*/ String location) {
         this.location = location;
     }
 
diff --git a/paper-api/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java b/paper-api/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
index 55ccca92ae..b36a10bfbf 100644
--- a/paper-api/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
+++ b/paper-api/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
@@ -72,7 +72,7 @@ public enum MushroomBlockTexture {
     private final Byte data;
     private final BlockFace capFace;
 
-    private MushroomBlockTexture(final int data, @Nullable final BlockFace capFace) {
+    private MushroomBlockTexture(final int data, /*@Nullable*/ final BlockFace capFace) {
         this.data = (byte) data;
         this.capFace = capFace;
     }
diff --git a/paper-api/src/main/java/org/bukkit/permissions/PermissionDefault.java b/paper-api/src/main/java/org/bukkit/permissions/PermissionDefault.java
index dfd7a12c41..c36f52f95d 100644
--- a/paper-api/src/main/java/org/bukkit/permissions/PermissionDefault.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/PermissionDefault.java
@@ -18,7 +18,7 @@ public enum PermissionDefault {
     private final String[] names;
     private final static Map<String, PermissionDefault> lookup = new HashMap<String, PermissionDefault>();
 
-    private PermissionDefault(@NotNull String... names) {
+    private PermissionDefault(/*@NotNull*/ String... names) {
         this.names = names;
     }
 
diff --git a/paper-api/src/main/java/org/bukkit/potion/PotionType.java b/paper-api/src/main/java/org/bukkit/potion/PotionType.java
index 1a82fe7cec..9b0fcf2dad 100644
--- a/paper-api/src/main/java/org/bukkit/potion/PotionType.java
+++ b/paper-api/src/main/java/org/bukkit/potion/PotionType.java
@@ -35,7 +35,7 @@ public enum PotionType {
     private final boolean upgradeable;
     private final boolean extendable;
 
-    PotionType(@Nullable PotionEffectType effect, boolean upgradeable, boolean extendable) {
+    PotionType(/*@Nullable*/ PotionEffectType effect, boolean upgradeable, boolean extendable) {
         this.effect = effect;
         this.upgradeable = upgradeable;
         this.extendable = extendable;