mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 04:00:30 +00:00
Code Issues Releases Wiki Activity

Move null checks from Preconditions to Objects

Browse Source
This commit is contained in:
SquidDev 2019-04-08 14:54:57 +01:00
parent f3ce44042f
commit 34602ec4be
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/core/apis/ApiFactories.java
View File

@ -6,13 +6,13 @@
package dan200.computercraft.core.apis; package dan200.computercraft.core.apis;
import com.google.common.base.Preconditions;
import dan200.computercraft.api.lua.ILuaAPIFactory; import dan200.computercraft.api.lua.ILuaAPIFactory;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Objects;
public final class ApiFactories public final class ApiFactories
{ {
@ -25,7 +25,7 @@ public final class ApiFactories
public static void register( @Nonnull ILuaAPIFactory factory ) public static void register( @Nonnull ILuaAPIFactory factory )
{ {
Preconditions.checkNotNull( factory, "provider cannot be null" ); Objects.requireNonNull( factory, "provider cannot be null" );
factories.add( factory ); factories.add( factory );
} }

3
src/main/java/dan200/computercraft/core/apis/ComputerAccess.java
View File

@ -6,7 +6,6 @@
package dan200.computercraft.core.apis; package dan200.computercraft.core.apis;
import com.google.common.base.Preconditions;
import dan200.computercraft.api.filesystem.IMount; import dan200.computercraft.api.filesystem.IMount;
import dan200.computercraft.api.filesystem.IWritableMount; import dan200.computercraft.api.filesystem.IWritableMount;
import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IComputerAccess;
@ -121,7 +120,7 @@ public abstract class ComputerAccess implements IComputerAccess
@Override @Override
public void queueEvent( @Nonnull final String event, final Object[] arguments ) public void queueEvent( @Nonnull final String event, final Object[] arguments )
{ {
Preconditions.checkNotNull( event, "event cannot be null" ); Objects.requireNonNull( event, "event cannot be null" );
m_environment.queueEvent( event, arguments ); m_environment.queueEvent( event, arguments );
} }

4
src/main/java/dan200/computercraft/shared/BundledRedstone.java
View File

@ -6,7 +6,6 @@
package dan200.computercraft.shared; package dan200.computercraft.shared;
import com.google.common.base.Preconditions;
import dan200.computercraft.ComputerCraft; import dan200.computercraft.ComputerCraft;
import dan200.computercraft.api.redstone.IBundledRedstoneProvider; import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
import dan200.computercraft.shared.common.DefaultBundledRedstoneProvider; import dan200.computercraft.shared.common.DefaultBundledRedstoneProvider;
@ -16,6 +15,7 @@ import net.minecraft.world.World;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Objects;
import java.util.Set; import java.util.Set;
public final class BundledRedstone public final class BundledRedstone
@ -26,7 +26,7 @@ public final class BundledRedstone
public static void register( @Nonnull IBundledRedstoneProvider provider ) public static void register( @Nonnull IBundledRedstoneProvider provider )
{ {
Preconditions.checkNotNull( provider, "provider cannot be null" ); Objects.requireNonNull( provider, "provider cannot be null" );
providers.add( provider ); providers.add( provider );
} }

4
src/main/java/dan200/computercraft/shared/TurtlePermissions.java
View File

@ -6,7 +6,6 @@
package dan200.computercraft.shared; package dan200.computercraft.shared;
import com.google.common.base.Preconditions;
import dan200.computercraft.ComputerCraft; import dan200.computercraft.ComputerCraft;
import dan200.computercraft.api.permissions.ITurtlePermissionProvider; import dan200.computercraft.api.permissions.ITurtlePermissionProvider;
import dan200.computercraft.api.turtle.event.TurtleActionEvent; import dan200.computercraft.api.turtle.event.TurtleActionEvent;
@ -20,6 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Objects;
@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID ) @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID )
public final class TurtlePermissions public final class TurtlePermissions
@ -32,7 +32,7 @@ public final class TurtlePermissions
public static void register( @Nonnull ITurtlePermissionProvider upgrade ) public static void register( @Nonnull ITurtlePermissionProvider upgrade )
{ {
Preconditions.checkNotNull( upgrade, "upgrade cannot be null" ); Objects.requireNonNull( upgrade, "upgrade cannot be null" );
providers.add( upgrade ); providers.add( upgrade );
} }