ref: use default GlowKit BoundingBox & nullability annotations

src/main/java/net/glowstone/block/blocktype/BlockAnvil.java

@@ -28,7 +28,7 @@ public boolean blockInteract(GlowPlayer player, GlowBlock block, BlockFace face,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         // This is replicated from BlockNeedsTool and has been copy/pasted because classes cannot
         // extend 2 parents
         ToolType neededTool = ToolType.PICKAXE;

src/main/java/net/glowstone/block/blocktype/BlockBanner.java

@@ -68,7 +68,7 @@ public static List<Pattern> fromNbt(List<CompoundTag> tag) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         GlowBanner state = (GlowBanner) block.getState();
         ItemStack drop = new ItemStack(Material.LEGACY_BANNER, 1);
         BannerMeta meta = (BannerMeta) drop.getItemMeta();

src/main/java/net/glowstone/block/blocktype/BlockBed.java

@@ -228,7 +228,7 @@ public static Block getExitLocation(GlowBlock head, GlowBlock foot) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         return Collections.singletonList(new ItemStack(block.getType(), 1,
             (((GlowBed) block.getState()).getColor().getWoolData())));
     }

src/main/java/net/glowstone/block/blocktype/BlockCactus.java

@@ -134,7 +134,7 @@ private boolean canPlaceNear(Material type) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock me, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock me, ItemStack tool) {
         // Overridden for cactus to remove data from the dropped item
         return Collections.unmodifiableList(Arrays.asList(new ItemStack(Material.CACTUS)));
     }

src/main/java/net/glowstone/block/blocktype/BlockCarrot.java

@@ -15,7 +15,7 @@ public class BlockCarrot extends BlockCrops {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (block.getData() >= CropState.RIPE.ordinal()) {
             return Collections.unmodifiableList(Arrays.asList(
                 new ItemStack(Material.CARROT, ThreadLocalRandom.current().nextInt(4) + 1)));

src/main/java/net/glowstone/block/blocktype/BlockChorusPlant.java

@@ -17,7 +17,7 @@ public class BlockChorusPlant extends BlockType {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (ThreadLocalRandom.current().nextBoolean()) {
             return Collections
                 .unmodifiableList(Arrays.asList(new ItemStack(Material.CHORUS_FRUIT, 1)));

src/main/java/net/glowstone/block/blocktype/BlockCocoa.java

@@ -49,7 +49,7 @@ public boolean canPlaceAt(GlowPlayer player, GlowBlock block, BlockFace against)
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         MaterialData data = block.getState().getData();
         if (data instanceof CocoaPlant) {
             int amount = 1;

src/main/java/net/glowstone/block/blocktype/BlockContainer.java

@@ -60,7 +60,7 @@ public boolean blockInteract(GlowPlayer player, GlowBlock block, BlockFace face,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         Collection<ItemStack> drops = getContentDrops(block);
 
         MaterialMatcher neededTool = getNeededMiningTool(block);

src/main/java/net/glowstone/block/blocktype/BlockCrops.java

@@ -25,7 +25,7 @@ public boolean canPlaceAt(GlowPlayer player, GlowBlock block, BlockFace against)
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (block.getData() >= CropState.RIPE.ordinal()) {
             return Collections.unmodifiableList(
                 Arrays.asList(

src/main/java/net/glowstone/block/blocktype/BlockDeadBush.java

@@ -32,7 +32,7 @@ public boolean canPlaceAt(GlowPlayer player, GlowBlock block, BlockFace against)
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock me, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock me, ItemStack tool) {
         // If the block below the dead bush is removed,
         // the bush will simply disappear without dropping anything.
         if (tool == null) {

src/main/java/net/glowstone/block/blocktype/BlockDirt.java

@@ -12,7 +12,7 @@ public class BlockDirt extends BlockType {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         //TODO switch to MaterialData instead of using magic values
         if (block.getData() == 1) {
             //Coarse dirt

src/main/java/net/glowstone/block/blocktype/BlockDoublePlant.java

@@ -37,7 +37,7 @@ public void afterPlace(GlowPlayer player, GlowBlock block, ItemStack holding,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         Bisected data = getCastedBlockData(Bisected.class, block.getBlockData());
         if (block.getType() != Material.TALL_GRASS
             && block.getType() != Material.LARGE_FERN

src/main/java/net/glowstone/block/blocktype/BlockDoubleSlab.java

@@ -27,7 +27,7 @@ private ItemStack getDrops(GlowBlock block) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (Tag.WOODEN_SLABS.isTagged(block.getType())
                 || tool != null && ToolType.PICKAXE.matches(tool.getType())) {
             return getMinedDrops(block);

src/main/java/net/glowstone/block/blocktype/BlockDropless.java

@@ -11,7 +11,7 @@ public class BlockDropless extends BlockType {
 
     @NotNull
     @Override
-    public final Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public final Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         return Collections.emptyList();
     }
 }

src/main/java/net/glowstone/block/blocktype/BlockFenceGate.java

@@ -72,7 +72,7 @@ protected void onOpened(GlowPlayer player, GlowBlock block, BlockFace face, Vect
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         return Arrays.asList(new ItemStack(block.getType()));
     }
 

src/main/java/net/glowstone/block/blocktype/BlockFire.java

@@ -57,7 +57,7 @@ public void placeBlock(GlowPlayer player, GlowBlockState state, BlockFace face,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         return Collections.emptyList();
     }
 

src/main/java/net/glowstone/block/blocktype/BlockFlowerPot.java

@@ -1,5 +1,10 @@
 package net.glowstone.block.blocktype;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.block.entity.BlockEntity;
@@ -15,17 +20,11 @@
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
 public class BlockFlowerPot extends BlockType {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         List<ItemStack> drops = new LinkedList<>(Arrays.asList(new ItemStack(Material.FLOWER_POT)));
         GlowBlockState state = block.getState();
 

src/main/java/net/glowstone/block/blocktype/BlockGravel.java

@@ -18,7 +18,7 @@ public BlockGravel() {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         return Collections.unmodifiableList(Arrays.asList(new ItemStack(
             ThreadLocalRandom.current().nextInt(10) == 1 ? Material.FLINT : Material.GRAVEL, 1)));
     }

src/main/java/net/glowstone/block/blocktype/BlockHugeMushroom.java

@@ -30,7 +30,7 @@ public BlockHugeMushroom(boolean isRedMushroom) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         int rnd = ThreadLocalRandom.current().nextInt(100);
         if (rnd < 80) {
             return Collections.emptyList();

src/main/java/net/glowstone/block/blocktype/BlockIce.java

@@ -17,7 +17,7 @@ public class BlockIce extends BlockType {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock me, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock me, ItemStack tool) {
         return Collections.emptyList();
     }
 

src/main/java/net/glowstone/block/blocktype/BlockJukebox.java

@@ -55,7 +55,7 @@ public void blockDestroy(GlowPlayer player, GlowBlock block, BlockFace face) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         ItemStack disk = ((GlowJukebox) block.getState()).getRecord();
         if (disk == null) {
             return Arrays.asList(new ItemStack(block.getType()));

src/main/java/net/glowstone/block/blocktype/BlockLeaves.java

@@ -1,5 +1,11 @@
 package net.glowstone.block.blocktype;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 import net.glowstone.EventFactory;
 import net.glowstone.GlowWorld;
 import net.glowstone.block.GlowBlock;
@@ -12,13 +18,6 @@
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
-
 public class BlockLeaves extends BlockType {
 
     private static final int LEAVE_BLOCK_DECAY_RANGE = 6;
@@ -36,7 +35,7 @@ public void placeBlock(GlowPlayer player, GlowBlockState state, BlockFace face,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         int data = block.getData() & 0x03; //ignore "non-decay" and "check-decay" data.
 
         if (tool != null && tool.getType() == Material.SHEARS) {

src/main/java/net/glowstone/block/blocktype/BlockLog.java

@@ -35,7 +35,7 @@ public void placeBlock(GlowPlayer player, GlowBlockState state, BlockFace face,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         // TODO: 1.13 log types
         return Arrays
             .asList(new ItemStack(Material.LEGACY_LOG, 1, (short) (block.getData() & 0x03)));

src/main/java/net/glowstone/block/blocktype/BlockMelon.java

@@ -14,7 +14,7 @@ public class BlockMelon extends BlockType {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         return Collections.unmodifiableList(Arrays
             .asList(new ItemStack(Material.MELON, ThreadLocalRandom.current().nextInt(5) + 3)));
     }

src/main/java/net/glowstone/block/blocktype/BlockMonsterEgg.java

@@ -25,7 +25,7 @@ public void blockDestroy(GlowPlayer player, GlowBlock block, BlockFace face) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         // monster egg blocks do not drop blocks
         return new ArrayList<>();
     }

src/main/java/net/glowstone/block/blocktype/BlockNeedsTool.java

@@ -12,7 +12,7 @@ public abstract class BlockNeedsTool extends BlockType {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         MaterialMatcher neededTool = getNeededMiningTool(block);
         if (neededTool != null
             && (tool == null || !neededTool.matches(tool.getType()))) {

src/main/java/net/glowstone/block/blocktype/BlockOre.java

@@ -78,7 +78,7 @@ public BlockOre(Material dropType, MaterialMatcher neededTool) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         // TODO: Implement Silk Touch
         ThreadLocalRandom random = ThreadLocalRandom.current();
         int count = minCount;

src/main/java/net/glowstone/block/blocktype/BlockPotato.java

@@ -15,7 +15,7 @@ public class BlockPotato extends BlockCrops {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (block.getData() >= CropState.RIPE.ordinal()) {
             if (ThreadLocalRandom.current().nextInt(100) < 2) {
                 return Collections.unmodifiableList(Arrays.asList(

src/main/java/net/glowstone/block/blocktype/BlockRails.java

@@ -1,5 +1,11 @@
 package net.glowstone.block.blocktype;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.entity.GlowPlayer;
@@ -8,13 +14,6 @@
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 public class BlockRails extends BlockNeedsAttached {
 
     private static final int NORTH = 0;
@@ -145,7 +144,7 @@ private static boolean isRailBlock(GlowBlock block) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         return Arrays.asList(new ItemStack(block.getType()));
     }
 

src/main/java/net/glowstone/block/blocktype/BlockSapling.java

@@ -174,7 +174,7 @@ && isMatchingSapling(b.getRelative(BlockFace.SOUTH_EAST), data)) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         // TODO: 1.13 sapling types
         return Arrays
             .asList(new ItemStack(Material.LEGACY_SAPLING, 1, (short) (block.getData() % 8)));

src/main/java/net/glowstone/block/blocktype/BlockSkull.java

@@ -134,7 +134,7 @@ public void afterPlace(GlowPlayer player, GlowBlock block, ItemStack holding,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         GlowSkull skull = (GlowSkull) block.getState();
         Material skullMaterial = SKULL_MATERIALS.get(skull.getSkullType());
         ItemStack drop = new ItemStack(skullMaterial, 1);

src/main/java/net/glowstone/block/blocktype/BlockSlab.java

@@ -68,7 +68,7 @@ public boolean canAbsorb(GlowBlock block, BlockFace face, ItemStack holding) {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         // todo: 1.13 new slab types
         if (block.getType() == Material.LEGACY_WOOD_STEP
             || tool != null && ToolType.PICKAXE.matches(tool.getType())) {

src/main/java/net/glowstone/block/blocktype/BlockSnow.java

@@ -56,7 +56,7 @@ public void placeBlock(GlowPlayer player, GlowBlockState state, BlockFace face,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (tool != null && ToolType.SHOVEL.matches(tool.getType())) {
             return Arrays.asList(new ItemStack(Material.SNOWBALL, block.getData() + 1));
         } else {

src/main/java/net/glowstone/block/blocktype/BlockSnowBlock.java

@@ -18,7 +18,7 @@ public class BlockSnowBlock extends BlockType {
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (tool != null && ToolType.SHOVEL.matches(tool.getType())) {
             return Arrays.asList(new ItemStack(Material.SNOWBALL, 4));
         } else {

src/main/java/net/glowstone/block/blocktype/BlockStairs.java

@@ -39,7 +39,7 @@ public void placeBlock(GlowPlayer player, GlowBlockState state, BlockFace face,
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (isWoodenStair(block.getType())
             || tool != null && ToolType.PICKAXE.matches(tool.getType())) {
             return getMinedDrops(block);

src/main/java/net/glowstone/block/blocktype/BlockStem.java

@@ -44,7 +44,7 @@ public boolean canPlaceAt(GlowPlayer player, GlowBlock block, BlockFace against)
 
     @NotNull
     @Override
-    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
+    public Collection<ItemStack> getDrops(@NotNull GlowBlock block, ItemStack tool) {
         if (block.getState().getRawData() >= CropState.RIPE.ordinal()) {
             return Collections.unmodifiableList(
                 Arrays.asList(new ItemStack(seedsType, ThreadLocalRandom.current().nextInt(4))));