From e171d0eabc513f3838fe79be301bd066acdffb72 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 13 Dec 2019 10:00:59 +0000 Subject: [PATCH] Remove duplicate annotations. --- build.gradle | 7 ++----- .../basic/SolidFuelGeneratorBlockEntity.java | 4 ++-- .../blockentity/storage/idsu/IDSUManager.java | 14 +++++++------- src/main/java/techreborn/utils/FluidUtils.java | 8 ++++---- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 5598620e2..c76b81c35 100644 --- a/build.gradle +++ b/build.gradle @@ -84,16 +84,13 @@ dependencies { } include rcVersion - compile 'org.checkerframework:checker-qual:2.10.0' - - compile 'org.checkerframework:checker-qual:2.10.0' - compileOnly "com.google.code.findbugs:jsr305:+" + compileOnly "com.google.code.findbugs:jsr305:3.0.2" modCompileOnly ('curse.maven:towelette:2834316') { transitive = false } - compile 'teamreborn:energy:0.0.7' + compile 'teamreborn:energy:0.0.8' } processResources { diff --git a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java index f72713f37..0ed092ab9 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java @@ -32,7 +32,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.math.Direction; -import org.checkerframework.checker.nullness.qual.NonNull; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; @@ -45,6 +44,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; +import javax.annotation.Nonnull; import java.util.Map; public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, IContainerProvider { @@ -63,7 +63,7 @@ public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity impl super(TRBlockEntities.SOLID_FUEL_GENEREATOR); } - public static int getItemBurnTime(@NonNull ItemStack stack) { + public static int getItemBurnTime(@Nonnull ItemStack stack) { Map burnMap = AbstractFurnaceBlockEntity.createFuelTimeMap(); if(burnMap.containsKey(stack.getItem())){ return burnMap.get(stack.getItem()) / 4; diff --git a/src/main/java/techreborn/blockentity/storage/idsu/IDSUManager.java b/src/main/java/techreborn/blockentity/storage/idsu/IDSUManager.java index fe465e347..fd8baafe9 100644 --- a/src/main/java/techreborn/blockentity/storage/idsu/IDSUManager.java +++ b/src/main/java/techreborn/blockentity/storage/idsu/IDSUManager.java @@ -26,16 +26,16 @@ package techreborn.blockentity.storage.idsu; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.World; -import org.checkerframework.checker.nullness.qual.NonNull; import reborncore.common.util.NBTSerializable; import reborncore.common.world.DataAttachment; import reborncore.common.world.DataAttachmentProvider; +import javax.annotation.Nonnull; import java.util.HashMap; public class IDSUManager implements DataAttachment { - @NonNull + @Nonnull public static IDSUPlayer getPlayer(World world, String uuid){ return get(world).getPlayer(uuid); } @@ -46,19 +46,19 @@ public class IDSUManager implements DataAttachment { private final HashMap playerHashMap = new HashMap<>(); - @NonNull + @Nonnull public IDSUPlayer getPlayer(String uuid){ return playerHashMap.computeIfAbsent(uuid, s -> new IDSUPlayer()); } @Override - public void read(@NonNull CompoundTag tag) { + public void read(@Nonnull CompoundTag tag) { for(String uuid : tag.getKeys()){ playerHashMap.put(uuid, new IDSUPlayer(tag.getCompound(uuid))); } } - @NonNull + @Nonnull @Override public CompoundTag write() { CompoundTag tag = new CompoundTag(); @@ -77,7 +77,7 @@ public class IDSUManager implements DataAttachment { read(compoundTag); } - @NonNull + @Nonnull @Override public CompoundTag write() { CompoundTag tag = new CompoundTag(); @@ -86,7 +86,7 @@ public class IDSUManager implements DataAttachment { } @Override - public void read(@NonNull CompoundTag tag) { + public void read(@Nonnull CompoundTag tag) { energy = tag.getDouble("energy"); } diff --git a/src/main/java/techreborn/utils/FluidUtils.java b/src/main/java/techreborn/utils/FluidUtils.java index 5adc4b88e..f5ac57743 100644 --- a/src/main/java/techreborn/utils/FluidUtils.java +++ b/src/main/java/techreborn/utils/FluidUtils.java @@ -31,19 +31,19 @@ import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import net.minecraft.util.registry.Registry; -import org.checkerframework.checker.nullness.qual.NonNull; import reborncore.common.fluid.FluidValue; import reborncore.common.fluid.container.FluidInstance; import reborncore.common.fluid.container.GenericFluidContainer; import reborncore.common.fluid.container.ItemFluidInfo; import reborncore.mixin.extensions.FluidBlockExtensions; +import javax.annotation.Nonnull; import java.util.List; import java.util.stream.Collectors; public class FluidUtils { - @NonNull + @Nonnull public static Fluid fluidFromBlock(Block block){ if(block instanceof FluidBlockExtensions){ return ((FluidBlockExtensions) block).getFluid(); @@ -131,11 +131,11 @@ public class FluidUtils { return false; } - public static boolean fluidEquals(@NonNull Fluid fluid, @NonNull Fluid fluid1) { + public static boolean fluidEquals(@Nonnull Fluid fluid, @Nonnull Fluid fluid1) { return fluid == fluid1; } - public static FluidInstance getFluidStackInContainer(@NonNull ItemStack invStack) { + public static FluidInstance getFluidStackInContainer(@Nonnull ItemStack invStack) { return null; }