diff --git a/SpongeAPI b/SpongeAPI index 42178f27305..188f419477b 160000 --- a/SpongeAPI +++ b/SpongeAPI @@ -1 +1 @@ -Subproject commit 42178f27305a3541d030fe5f45ae8cb3e6e92d9e +Subproject commit 188f419477b929dbcc5c4f28a09bd4ae30b75e0a diff --git a/src/main/java/org/spongepowered/common/command/CommandSponge.java b/src/main/java/org/spongepowered/common/command/CommandSponge.java index 477ea8719b1..cfda05d225f 100644 --- a/src/main/java/org/spongepowered/common/command/CommandSponge.java +++ b/src/main/java/org/spongepowered/common/command/CommandSponge.java @@ -24,7 +24,6 @@ */ package org.spongepowered.common.command; -import static org.spongepowered.api.util.command.args.GenericArguments.choices; import static org.spongepowered.api.util.command.args.GenericArguments.dimension; import static org.spongepowered.api.util.command.args.GenericArguments.firstParsing; import static org.spongepowered.api.util.command.args.GenericArguments.flags; @@ -35,10 +34,8 @@ import static org.spongepowered.api.util.command.args.GenericArguments.world; import com.google.common.base.Function; -import com.google.common.base.Functions; import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldServer; import ninja.leaping.configurate.commented.CommentedConfigurationNode; @@ -46,12 +43,10 @@ import org.spongepowered.api.text.Text; import org.spongepowered.api.text.TextBuilder; import org.spongepowered.api.text.Texts; -import org.spongepowered.api.text.action.TextAction; import org.spongepowered.api.text.action.TextActions; import org.spongepowered.api.text.format.TextColors; import org.spongepowered.api.text.format.TextStyles; import org.spongepowered.api.util.annotation.NonnullByDefault; -import org.spongepowered.api.util.command.CommandCallable; import org.spongepowered.api.util.command.CommandException; import org.spongepowered.api.util.command.CommandResult; import org.spongepowered.api.util.command.CommandSource; @@ -76,7 +71,6 @@ import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Date; -import java.util.Iterator; import javax.annotation.Nullable; diff --git a/src/main/java/org/spongepowered/common/data/processor/SpongeDisplayNameDataProcessor.java b/src/main/java/org/spongepowered/common/data/processor/SpongeDisplayNameDataProcessor.java index 2773efee7ae..c8b0a6a2441 100644 --- a/src/main/java/org/spongepowered/common/data/processor/SpongeDisplayNameDataProcessor.java +++ b/src/main/java/org/spongepowered/common/data/processor/SpongeDisplayNameDataProcessor.java @@ -42,7 +42,6 @@ import org.spongepowered.api.data.manipulator.DisplayNameData; import org.spongepowered.api.service.persistence.InvalidDataException; import org.spongepowered.api.text.Texts; -import org.spongepowered.api.util.TextMessageException; import org.spongepowered.common.data.SpongeDataProcessor; import org.spongepowered.common.data.manipulator.SpongeDisplayNameData; import org.spongepowered.common.text.SpongeTexts; @@ -84,7 +83,6 @@ public Optional createFrom(DataHolder dataHolder) { if (mainCompound != null && mainCompound.hasKey("Name", 8)) { final String displayString = mainCompound.getString("Name"); final DisplayNameData data = new SpongeDisplayNameData(); - System.err.println("The retrieved displayname from an item stack was: " + displayString); data.setDisplayName(Texts.legacy().fromUnchecked(displayString)); data.setCustomNameVisible(true); return Optional.of(data); diff --git a/src/main/java/org/spongepowered/common/data/util/DataUtil.java b/src/main/java/org/spongepowered/common/data/util/DataUtil.java index e3e724856df..b41e95905eb 100644 --- a/src/main/java/org/spongepowered/common/data/util/DataUtil.java +++ b/src/main/java/org/spongepowered/common/data/util/DataUtil.java @@ -26,7 +26,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import org.omg.CORBA.DynAnyPackage.Invalid; import org.spongepowered.api.data.DataQuery; import org.spongepowered.api.data.DataView; import org.spongepowered.api.service.persistence.InvalidDataException; diff --git a/src/main/java/org/spongepowered/common/entity/projectile/ProjectileSourceSerializer.java b/src/main/java/org/spongepowered/common/entity/projectile/ProjectileSourceSerializer.java index 42e630782af..5bd15a6e64f 100644 --- a/src/main/java/org/spongepowered/common/entity/projectile/ProjectileSourceSerializer.java +++ b/src/main/java/org/spongepowered/common/entity/projectile/ProjectileSourceSerializer.java @@ -35,7 +35,6 @@ import org.spongepowered.api.entity.projectile.Projectile; import org.spongepowered.api.entity.projectile.source.BlockProjectileSource; import org.spongepowered.api.entity.projectile.source.ProjectileSource; -import org.spongepowered.api.entity.projectile.source.UnknownProjectileSource; import org.spongepowered.common.util.VecHelper; import java.util.UUID; @@ -69,7 +68,7 @@ public static ProjectileSource fromNbt(World worldObj, NBTBase tag) { return (ProjectileSource) tileEntity; } } - return new UnknownProjectileSource(); + return ProjectileSource.UNKNOWN; } public static void writeSourceToNbt(NBTTagCompound compound, ProjectileSource projectileSource, net.minecraft.entity.Entity potentialEntity) { diff --git a/src/main/java/org/spongepowered/common/event/SpongeEventManager.java b/src/main/java/org/spongepowered/common/event/SpongeEventManager.java index 94ef6b59450..61203a32469 100644 --- a/src/main/java/org/spongepowered/common/event/SpongeEventManager.java +++ b/src/main/java/org/spongepowered/common/event/SpongeEventManager.java @@ -119,7 +119,7 @@ private void register(List> handlers) { synchronized (this.lock) { boolean changed = false; - for (RegisteredHandler handler : handlers) { + for (RegisteredHandler handler : handlers) { if (this.handlersByEvent.put(handler.getEventClass(), handler)) { changed = true; } @@ -243,7 +243,7 @@ protected RegisteredHandler.Cache getHandlerCache(Event event) { @SuppressWarnings("unchecked") protected static boolean post(Event event, List> handlers) { - for (RegisteredHandler handler : handlers) { + for (@SuppressWarnings("rawtypes") RegisteredHandler handler : handlers) { try { handler.handle(event); } catch (Throwable e) { diff --git a/src/main/java/org/spongepowered/common/item/SpongeItemStackBuilder.java b/src/main/java/org/spongepowered/common/item/SpongeItemStackBuilder.java index 21640025ece..0bea4a4b92b 100644 --- a/src/main/java/org/spongepowered/common/item/SpongeItemStackBuilder.java +++ b/src/main/java/org/spongepowered/common/item/SpongeItemStackBuilder.java @@ -68,7 +68,6 @@ public ItemStackBuilder quantity(int quantity) throws IllegalArgumentException { } @Override - @SuppressWarnings("unchecked") public ItemStackBuilder itemData(final DataManipulator itemData) throws IllegalArgumentException { checkNotNull(itemData, "Must have a non-null item data!"); checkNotNull(this.type, "Cannot set item data without having set a type first!"); @@ -92,6 +91,7 @@ public ItemStackBuilder fromItemStack(ItemStack itemStack) { this.type = itemStack.getItem(); this.quantity = itemStack.getQuantity(); this.maxQuantity = itemStack.getMaxStackQuantity(); + this.itemDataSet.addAll(itemStack.getManipulators()); return this; } @@ -104,6 +104,7 @@ public ItemStackBuilder reset() { return this; } + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public ItemStack build() throws IllegalStateException { checkState(this.type != null, "Item type has not been set"); diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/ai/MixinEntityAIMate.java b/src/main/java/org/spongepowered/common/mixin/core/entity/ai/MixinEntityAIMate.java index f536abea6d7..6a568d6bfe1 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/ai/MixinEntityAIMate.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/ai/MixinEntityAIMate.java @@ -48,7 +48,7 @@ public abstract class MixinEntityAIMate { @Inject(method = "spawnBaby()V", at = @At(value = "INVOKE_ASSIGN", target = "net/minecraft/entity/passive/EntityAnimal.createChild(Lnet/minecraft/entity/EntityAgeable;)Lnet/minecraft/entity/EntityAgeable;", shift = At.Shift.AFTER), locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true) public void callBreedEvent(CallbackInfo ci, EntityAgeable entityageable) { - final EntityBreedEvent event = SpongeEventFactory.createEntityBreed(Sponge.getGame(), (Ageable)entityageable, (Ageable)theAnimal, (Ageable)targetMate); + final EntityBreedEvent event = SpongeEventFactory.createEntityBreed(Sponge.getGame(), (Ageable)entityageable, (Ageable)this.theAnimal, (Ageable)this.targetMate); Sponge.getGame().getEventManager().post(event); if(event.isCancelled()) { ci.cancel(); diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/explosive/MixinEntityTNTPrimed.java b/src/main/java/org/spongepowered/common/mixin/core/entity/explosive/MixinEntityTNTPrimed.java index b48ec905e33..166d8ee3e37 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/explosive/MixinEntityTNTPrimed.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/explosive/MixinEntityTNTPrimed.java @@ -30,9 +30,6 @@ import com.google.common.base.Optional; import net.minecraft.entity.EntityLivingBase; import org.spongepowered.api.data.DataContainer; -import org.spongepowered.api.data.DataQuery; -import org.spongepowered.api.data.manipulator.entity.ExplosiveRadiusData; -import org.spongepowered.api.data.manipulator.entity.FuseData; import org.spongepowered.api.entity.explosive.PrimedTNT; import org.spongepowered.api.entity.living.Living; import org.spongepowered.api.service.persistence.InvalidDataException; diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/player/MixinEntityPlayerMP.java b/src/main/java/org/spongepowered/common/mixin/core/entity/player/MixinEntityPlayerMP.java index 868eab5dc5a..6cdb591a65d 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/player/MixinEntityPlayerMP.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/player/MixinEntityPlayerMP.java @@ -31,7 +31,6 @@ import com.flowpowered.math.vector.Vector3d; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetHandlerPlayServer; @@ -203,7 +202,7 @@ public void sendMessage(ChatType type, Iterable messages) { @Override public void setMessageSink(MessageSink sink) { - Preconditions.checkNotNull(sink, "sink"); + checkNotNull(sink, "sink"); this.sink = sink; } diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityArrow.java b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityArrow.java index bd46d70a52b..0e3e7fb2c47 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityArrow.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityArrow.java @@ -29,7 +29,6 @@ import net.minecraft.nbt.NBTTagCompound; import org.spongepowered.api.entity.projectile.Arrow; import org.spongepowered.api.entity.projectile.source.ProjectileSource; -import org.spongepowered.api.entity.projectile.source.UnknownProjectileSource; import org.spongepowered.api.util.annotation.NonnullByDefault; import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Interface; @@ -63,7 +62,7 @@ public ProjectileSource getShooter() { } else if (this.shootingEntity instanceof ProjectileSource) { return (ProjectileSource) this.shootingEntity; } - return new UnknownProjectileSource(); + return ProjectileSource.UNKNOWN; } @Override diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityEnderEye.java b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityEnderEye.java index 6de4f90e63d..6fafea34836 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityEnderEye.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityEnderEye.java @@ -28,7 +28,6 @@ import net.minecraft.nbt.NBTTagCompound; import org.spongepowered.api.entity.projectile.EyeOfEnder; import org.spongepowered.api.entity.projectile.source.ProjectileSource; -import org.spongepowered.api.entity.projectile.source.UnknownProjectileSource; import org.spongepowered.api.util.annotation.NonnullByDefault; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -44,7 +43,7 @@ public abstract class MixinEntityEnderEye extends MixinEntity implements EyeOfEn @Shadow private double targetZ; @Shadow private boolean shatterOrDrop; - private ProjectileSource projectileSource = new UnknownProjectileSource(); + private ProjectileSource projectileSource = ProjectileSource.UNKNOWN; public Vector3d getTargetedLocation() { return new Vector3d(this.targetX, this.targetY, this.targetZ); diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityFireworkRocket.java b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityFireworkRocket.java index 2a37aa265ee..e7c83021b95 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityFireworkRocket.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityFireworkRocket.java @@ -27,7 +27,6 @@ import net.minecraft.nbt.NBTTagCompound; import org.spongepowered.api.entity.projectile.Firework; import org.spongepowered.api.entity.projectile.source.ProjectileSource; -import org.spongepowered.api.entity.projectile.source.UnknownProjectileSource; import org.spongepowered.api.util.annotation.NonnullByDefault; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -41,7 +40,7 @@ public abstract class MixinEntityFireworkRocket extends MixinEntity implements F @Shadow private int lifetime; @Shadow private int fireworkAge; - private ProjectileSource projectileSource = new UnknownProjectileSource(); + private ProjectileSource projectileSource = ProjectileSource.UNKNOWN; public int getFuseDuration() { return this.lifetime - this.fireworkAge; diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityFishHook.java b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityFishHook.java index 9da3c8f3d12..8f4b1fd426b 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityFishHook.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityFishHook.java @@ -37,7 +37,6 @@ import org.spongepowered.api.entity.player.Player; import org.spongepowered.api.entity.projectile.FishHook; import org.spongepowered.api.entity.projectile.source.ProjectileSource; -import org.spongepowered.api.entity.projectile.source.UnknownProjectileSource; import org.spongepowered.api.event.SpongeEventFactory; import org.spongepowered.api.event.entity.player.fishing.PlayerHookedEntityEvent; import org.spongepowered.api.event.entity.player.fishing.PlayerRetractFishingLineEvent; @@ -77,7 +76,7 @@ public ProjectileSource getShooter() { } else if (this.angler != null && this.angler instanceof ProjectileSource) { return (ProjectileSource) this.angler; } - return new UnknownProjectileSource(); + return ProjectileSource.UNKNOWN; } @Override diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityThrowable.java b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityThrowable.java index 2b9c8863da3..b74660d1ca4 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityThrowable.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/MixinEntityThrowable.java @@ -29,7 +29,6 @@ import net.minecraft.nbt.NBTTagCompound; import org.spongepowered.api.entity.projectile.Projectile; import org.spongepowered.api.entity.projectile.source.ProjectileSource; -import org.spongepowered.api.entity.projectile.source.UnknownProjectileSource; import org.spongepowered.api.util.annotation.NonnullByDefault; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -58,7 +57,7 @@ public ProjectileSource getShooter() { return (ProjectileSource) this.getThrower(); } - return new UnknownProjectileSource(); + return ProjectileSource.UNKNOWN; } @Override diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/fireball/MixinEntityFireball.java b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/fireball/MixinEntityFireball.java index f852575f0fe..0c2f01b1cde 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/fireball/MixinEntityFireball.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/projectile/fireball/MixinEntityFireball.java @@ -30,7 +30,6 @@ import org.spongepowered.api.data.manipulator.entity.DamagingData; import org.spongepowered.api.entity.projectile.explosive.fireball.Fireball; import org.spongepowered.api.entity.projectile.source.ProjectileSource; -import org.spongepowered.api.entity.projectile.source.UnknownProjectileSource; import org.spongepowered.api.util.annotation.NonnullByDefault; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -52,7 +51,7 @@ public ProjectileSource getShooter() { if (this.shootingEntity != null) { this.projectileSource = (ProjectileSource) this.shootingEntity; } else { - this.projectileSource = new UnknownProjectileSource(); + this.projectileSource = ProjectileSource.UNKNOWN; } } return this.projectileSource; diff --git a/src/main/java/org/spongepowered/common/mixin/core/item/inventory/MixinItemStack.java b/src/main/java/org/spongepowered/common/mixin/core/item/inventory/MixinItemStack.java index 8c38316282e..dce2ba51731 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/item/inventory/MixinItemStack.java +++ b/src/main/java/org/spongepowered/common/mixin/core/item/inventory/MixinItemStack.java @@ -26,12 +26,10 @@ import static org.spongepowered.api.data.DataQuery.of; -import com.google.common.collect.Lists; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import org.spongepowered.api.data.DataContainer; import org.spongepowered.api.data.DataManipulator; -import org.spongepowered.api.data.DataQuery; import org.spongepowered.api.data.MemoryDataContainer; import org.spongepowered.api.item.ItemType; import org.spongepowered.api.item.inventory.ItemStack; @@ -42,7 +40,6 @@ import org.spongepowered.common.interfaces.item.IMixinItem; import java.util.Collection; -import java.util.List; @SuppressWarnings("serial") @NonnullByDefault diff --git a/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScore.java b/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScore.java index da25599482e..7d02719f2f7 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScore.java +++ b/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScore.java @@ -26,12 +26,7 @@ import net.minecraft.scoreboard.Score; import net.minecraft.scoreboard.Scoreboard; -import org.spongepowered.api.scoreboard.objective.Objective; -import org.spongepowered.api.text.Text; -import org.spongepowered.api.text.Texts; import org.spongepowered.api.util.annotation.NonnullByDefault; -import org.spongepowered.asm.mixin.Implements; -import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -41,11 +36,6 @@ import org.spongepowered.common.interfaces.IMixinScoreboard; import org.spongepowered.common.scoreboard.SpongeScore; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - @NonnullByDefault @Mixin(Score.class) public abstract class MixinScore implements IMixinScore { diff --git a/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScoreObjective.java b/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScoreObjective.java index 1db0d96c144..cf911085f70 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScoreObjective.java +++ b/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScoreObjective.java @@ -24,41 +24,21 @@ */ package org.spongepowered.common.mixin.core.scoreboard; -import com.google.common.collect.Maps; import net.minecraft.scoreboard.IScoreObjectiveCriteria; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; -import org.spongepowered.api.scoreboard.Score; -import org.spongepowered.api.scoreboard.critieria.Criterion; -import org.spongepowered.api.scoreboard.objective.Objective; import org.spongepowered.api.scoreboard.objective.displaymode.ObjectiveDisplayMode; -import org.spongepowered.api.text.Text; import org.spongepowered.api.text.Texts; import org.spongepowered.api.util.annotation.NonnullByDefault; -import org.spongepowered.api.world.ChunkManager; -import org.spongepowered.asm.mixin.Implements; -import org.spongepowered.asm.mixin.Interface; -import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.common.Sponge; -import org.spongepowered.common.interfaces.IMixinScore; import org.spongepowered.common.interfaces.IMixinScoreObjective; import org.spongepowered.common.interfaces.IMixinScoreboard; -import org.spongepowered.common.registry.SpongeGameRegistry; import org.spongepowered.common.scoreboard.SpongeObjective; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - @NonnullByDefault @Mixin(ScoreObjective.class) public abstract class MixinScoreObjective implements IMixinScoreObjective { diff --git a/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScorePlayerTeam.java b/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScorePlayerTeam.java index 2ed42e7e9e4..1c277932b72 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScorePlayerTeam.java +++ b/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScorePlayerTeam.java @@ -24,38 +24,21 @@ */ package org.spongepowered.common.mixin.core.scoreboard; -import com.google.common.base.Optional; import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.util.EnumChatFormatting; -import org.spongepowered.api.entity.player.Player; -import org.spongepowered.api.entity.player.User; -import org.spongepowered.api.scoreboard.Team; -import org.spongepowered.api.scoreboard.Visibility; -import org.spongepowered.api.text.Text; import org.spongepowered.api.text.Texts; -import org.spongepowered.api.text.format.TextColor; -import org.spongepowered.api.text.format.TextColors; import org.spongepowered.api.util.annotation.NonnullByDefault; -import org.spongepowered.api.world.ChunkManager; -import org.spongepowered.asm.mixin.Implements; -import org.spongepowered.asm.mixin.Interface; -import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.common.Sponge; import org.spongepowered.common.interfaces.IMixinScoreboard; import org.spongepowered.common.interfaces.IMixinTeam; import org.spongepowered.common.registry.SpongeGameRegistry; import org.spongepowered.common.scoreboard.SpongeTeam; -import org.spongepowered.common.scoreboard.SpongeVisibility; -import org.spongepowered.common.text.format.SpongeTextColor; -import java.util.HashSet; import java.util.Set; @NonnullByDefault diff --git a/src/main/java/org/spongepowered/common/mixin/core/world/MixinWorld.java b/src/main/java/org/spongepowered/common/mixin/core/world/MixinWorld.java index c408c5be9ca..516e1e2ac82 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/world/MixinWorld.java +++ b/src/main/java/org/spongepowered/common/mixin/core/world/MixinWorld.java @@ -87,7 +87,7 @@ import org.spongepowered.api.entity.EntityType; import org.spongepowered.api.entity.player.Player; import org.spongepowered.api.entity.projectile.EnderPearl; -import org.spongepowered.api.entity.projectile.source.UnknownProjectileSource; +import org.spongepowered.api.entity.projectile.source.ProjectileSource; import org.spongepowered.api.service.permission.context.Context; import org.spongepowered.api.text.Text; import org.spongepowered.api.text.chat.ChatType; @@ -358,7 +358,7 @@ public Optional createEntity(EntityType type, Vector3d position) { } else if (entityClass.isAssignableFrom(EntityEnderPearl.class)) { EntityArmorStand tempEntity = new EntityArmorStand(world, x, y, z); entity = (Entity) new EntityEnderPearl(world, tempEntity); - ((EnderPearl) entity).setShooter(new UnknownProjectileSource()); + ((EnderPearl) entity).setShooter(ProjectileSource.UNKNOWN); } // Some entities need to have non-null fields (and the easiest way to diff --git a/src/main/java/org/spongepowered/common/mixin/core/world/extent/MixinExtent.java b/src/main/java/org/spongepowered/common/mixin/core/world/extent/MixinExtent.java index 6e382fb12fc..0c26a5ee793 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/world/extent/MixinExtent.java +++ b/src/main/java/org/spongepowered/common/mixin/core/world/extent/MixinExtent.java @@ -222,13 +222,13 @@ public boolean containsBlock(Vector3i position) { } @Override - public void interactBlock(Vector3i position) { - interactBlock(position.getX(), position.getY(), position.getZ()); + public void interactBlock(Vector3i position, Direction side) { + interactBlock(position.getX(), position.getY(), position.getZ(), side); } @Override - public void interactBlockWith(Vector3i position, ItemStack itemStack) { - interactBlockWith(position.getX(), position.getY(), position.getZ(), itemStack); + public void interactBlockWith(Vector3i position, ItemStack itemStack, Direction side) { + interactBlockWith(position.getX(), position.getY(), position.getZ(), itemStack, side); } @Override diff --git a/src/main/java/org/spongepowered/common/mixin/core/world/storage/MixinWorldInfo.java b/src/main/java/org/spongepowered/common/mixin/core/world/storage/MixinWorldInfo.java index 610b6f14f7c..a2c5c40d826 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/world/storage/MixinWorldInfo.java +++ b/src/main/java/org/spongepowered/common/mixin/core/world/storage/MixinWorldInfo.java @@ -29,7 +29,6 @@ import com.flowpowered.math.vector.Vector3i; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -405,7 +404,7 @@ public Collection getGeneratorModifiers() { @Override public void setGeneratorModifiers(Collection modifiers) { - Preconditions.checkNotNull(modifiers, "modifiers"); + checkNotNull(modifiers, "modifiers"); this.generatorModifiers = WorldGeneratorRegistry.getInstance().toIds(modifiers); } diff --git a/src/main/java/org/spongepowered/common/mixin/plugin/CorePlugin.java b/src/main/java/org/spongepowered/common/mixin/plugin/CorePlugin.java index 3debf9d5b31..280ec9d5bbb 100644 --- a/src/main/java/org/spongepowered/common/mixin/plugin/CorePlugin.java +++ b/src/main/java/org/spongepowered/common/mixin/plugin/CorePlugin.java @@ -25,16 +25,14 @@ package org.spongepowered.common.mixin.plugin; import org.spongepowered.asm.lib.tree.ClassNode; -import org.spongepowered.asm.mixin.MixinEnvironment.Side; - import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.Side; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; import java.util.List; import java.util.Set; -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; - public class CorePlugin implements IMixinConfigPlugin { diff --git a/src/main/java/org/spongepowered/common/registry/SpongeGameRegistry.java b/src/main/java/org/spongepowered/common/registry/SpongeGameRegistry.java index 57de1304861..e694a95bd34 100644 --- a/src/main/java/org/spongepowered/common/registry/SpongeGameRegistry.java +++ b/src/main/java/org/spongepowered/common/registry/SpongeGameRegistry.java @@ -304,16 +304,6 @@ import org.spongepowered.common.data.manipulator.tileentity.SpongeBannerData; import org.spongepowered.common.data.manipulator.tileentity.SpongeBeaconData; import org.spongepowered.common.data.manipulator.tileentity.SpongeSignData; -import org.spongepowered.common.data.processor.block.SpongeDoublePlantProcessor; -import org.spongepowered.common.data.processor.block.SpongeLayeredDataProcessor; -import org.spongepowered.common.data.processor.block.SpongePlantProcessor; -import org.spongepowered.common.data.processor.block.SpongeShrubProcessor; -import org.spongepowered.common.data.processor.block.SpongeTreeDataProcessor; -import org.spongepowered.common.data.processor.entity.SpongeGameModeDataProcessor; -import org.spongepowered.common.data.processor.item.SpongeAuthorProcessor; -import org.spongepowered.common.data.type.SpongeCookedFish; -import org.spongepowered.common.data.type.SpongeNotePitch; -import org.spongepowered.common.data.type.SpongeSkullType; import org.spongepowered.common.data.processor.SpongeBannerDataProcessor; import org.spongepowered.common.data.processor.SpongeBeaconDataProcessor; import org.spongepowered.common.data.processor.SpongeDisplayNameDataProcessor; @@ -330,6 +320,7 @@ import org.spongepowered.common.data.processor.entity.SpongeAgentDataProcessor; import org.spongepowered.common.data.processor.entity.SpongeCareerDataProcessor; import org.spongepowered.common.data.processor.entity.SpongeFoodDataProcessor; +import org.spongepowered.common.data.processor.entity.SpongeGameModeDataProcessor; import org.spongepowered.common.data.processor.entity.SpongeHealthProcessor; import org.spongepowered.common.data.processor.entity.SpongeInvulnerabilityProcessor; import org.spongepowered.common.data.processor.entity.SpongeSkinDataProcessor; @@ -1555,15 +1546,15 @@ private void setDisplaySlots() { RegistryHelper.mapFields(DisplaySlots.class, this.displaySlotMappings); - for (Map.Entry entry: this.enumChatColor.entrySet()) { + for (Map.Entry entry: SpongeGameRegistry.enumChatColor.entrySet()) { this.displaySlotMappings.put(entry.getValue().getId(), new SpongeDisplaySlot(entry.getValue().getId(), entry.getValue(), entry.getKey().getColorIndex() + 3)); } } private void addVisibility(String name, Team.EnumVisible handle) { SpongeVisibility visibility = new SpongeVisibility(handle); - this.visibilityMappings.put(name, visibility); - this.enumVisible.put(handle, visibility); + SpongeGameRegistry.visibilityMappings.put(name, visibility); + SpongeGameRegistry.enumVisible.put(handle, visibility); } private void setCriteria() { @@ -1583,7 +1574,7 @@ private void setVisibilities() { this.addVisibility("OTHER_TEAMS", Team.EnumVisible.HIDE_FOR_OWN_TEAM); this.addVisibility("NONE", Team.EnumVisible.NEVER); - RegistryHelper.mapFields(Visibilities.class, this.visibilityMappings); + RegistryHelper.mapFields(Visibilities.class, SpongeGameRegistry.visibilityMappings); } private void setupSerialization() { @@ -1866,7 +1857,7 @@ public Art apply(String fieldName) { } private void setObjectiveDisplayModes() { - RegistryHelper.mapFields(ObjectiveDisplayModes.class, this.objectiveDisplayModeMappings); + RegistryHelper.mapFields(ObjectiveDisplayModes.class, SpongeGameRegistry.objectiveDisplayModeMappings); } private void setEntityTypes() { diff --git a/src/main/java/org/spongepowered/common/scoreboard/SpongeObjective.java b/src/main/java/org/spongepowered/common/scoreboard/SpongeObjective.java index 77e48077960..68d97d3f9ef 100644 --- a/src/main/java/org/spongepowered/common/scoreboard/SpongeObjective.java +++ b/src/main/java/org/spongepowered/common/scoreboard/SpongeObjective.java @@ -34,8 +34,8 @@ import org.spongepowered.api.scoreboard.objective.displaymode.ObjectiveDisplayModes; import org.spongepowered.api.text.Text; import org.spongepowered.api.text.Texts; -import org.spongepowered.common.interfaces.IMixinScoreboard; import org.spongepowered.common.interfaces.IMixinScoreObjective; +import org.spongepowered.common.interfaces.IMixinScoreboard; import java.util.Collection; import java.util.HashMap; @@ -121,6 +121,7 @@ private void updateDisplayMode() { this.allowRecursion = true; } + @Override @SuppressWarnings({"unchecked", "rawtypes"}) public Map getScores() { return new HashMap(this.scores); diff --git a/src/main/java/org/spongepowered/common/scoreboard/SpongeScoreboard.java b/src/main/java/org/spongepowered/common/scoreboard/SpongeScoreboard.java index b9f72558919..69b7cbc23b1 100644 --- a/src/main/java/org/spongepowered/common/scoreboard/SpongeScoreboard.java +++ b/src/main/java/org/spongepowered/common/scoreboard/SpongeScoreboard.java @@ -29,13 +29,11 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.scoreboard.IScoreObjectiveCriteria; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.scoreboard.ServerScoreboard; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; import org.spongepowered.api.entity.player.User; import org.spongepowered.api.scoreboard.Score; import org.spongepowered.api.scoreboard.Scoreboard; @@ -49,8 +47,6 @@ import org.spongepowered.common.interfaces.IMixinScoreboard; import org.spongepowered.common.text.format.SpongeTextColor; -import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeObjectiveBuilder.java b/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeObjectiveBuilder.java index ac0eb44162c..ac9a271c95e 100644 --- a/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeObjectiveBuilder.java +++ b/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeObjectiveBuilder.java @@ -24,8 +24,9 @@ */ package org.spongepowered.common.scoreboard.builder; -import net.minecraft.scoreboard.IScoreObjectiveCriteria; -import net.minecraft.scoreboard.ScoreObjective; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import org.spongepowered.api.scoreboard.Score; import org.spongepowered.api.scoreboard.critieria.Criterion; import org.spongepowered.api.scoreboard.objective.Objective; @@ -33,13 +34,8 @@ import org.spongepowered.api.scoreboard.objective.displaymode.ObjectiveDisplayMode; import org.spongepowered.api.scoreboard.objective.displaymode.ObjectiveDisplayModes; import org.spongepowered.api.text.Text; -import org.spongepowered.api.text.Texts; import org.spongepowered.common.scoreboard.SpongeObjective; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; - import java.util.HashMap; import java.util.Map; @@ -92,8 +88,8 @@ public ObjectiveBuilder reset() { @Override public Objective build() throws IllegalStateException { checkState(this.name != null, "Name cannot be null"); - checkState(displayName != null, "DisplayName cannot be null"); - checkState(criterion != null, "Criterion cannot be null"); + checkState(this.displayName != null, "DisplayName cannot be null"); + checkState(this.criterion != null, "Criterion cannot be null"); SpongeObjective objective = new SpongeObjective(this.name, this.criterion); objective.setDisplayName(this.displayName); diff --git a/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeScoreboardBuilder.java b/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeScoreboardBuilder.java index 3e105b75f7b..f4fb4f0d713 100644 --- a/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeScoreboardBuilder.java +++ b/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeScoreboardBuilder.java @@ -24,7 +24,8 @@ */ package org.spongepowered.common.scoreboard.builder; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkNotNull; + import org.spongepowered.api.scoreboard.Scoreboard; import org.spongepowered.api.scoreboard.ScoreboardBuilder; import org.spongepowered.api.scoreboard.Team; diff --git a/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeTeamBuilder.java b/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeTeamBuilder.java index e3709b25bf2..130191efbfb 100644 --- a/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeTeamBuilder.java +++ b/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeTeamBuilder.java @@ -24,6 +24,9 @@ */ package org.spongepowered.common.scoreboard.builder; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import org.spongepowered.api.entity.player.User; import org.spongepowered.api.scoreboard.Team; import org.spongepowered.api.scoreboard.TeamBuilder; @@ -38,9 +41,6 @@ import java.util.HashSet; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; - public class SpongeTeamBuilder implements TeamBuilder { private String name; diff --git a/src/main/java/org/spongepowered/common/service/pagination/SpongePaginationBuilder.java b/src/main/java/org/spongepowered/common/service/pagination/SpongePaginationBuilder.java index 92a980ca70f..03849acd894 100644 --- a/src/main/java/org/spongepowered/common/service/pagination/SpongePaginationBuilder.java +++ b/src/main/java/org/spongepowered/common/service/pagination/SpongePaginationBuilder.java @@ -23,18 +23,16 @@ * THE SOFTWARE. */ package org.spongepowered.common.service.pagination; - +import static com.google.common.base.Preconditions.checkNotNull; import static org.spongepowered.api.util.command.CommandMessageFormatting.error; import com.google.common.base.Function; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import org.spongepowered.api.service.pagination.PaginationBuilder; import org.spongepowered.api.service.pagination.PaginationCalculator; import org.spongepowered.api.text.Text; -import org.spongepowered.api.text.Texts; import org.spongepowered.api.util.command.CommandException; import org.spongepowered.api.util.command.CommandSource; @@ -93,8 +91,8 @@ public PaginationBuilder paddingString(String padding) { @Override public void sendTo(final CommandSource source) { - Preconditions.checkNotNull(this.contents, "contents"); - Preconditions.checkNotNull(source, "source"); + checkNotNull(this.contents, "contents"); + checkNotNull(source, "source"); this.service.registerCommandOnce(); @SuppressWarnings("unchecked") diff --git a/src/main/java/org/spongepowered/common/service/permission/DataFactoryCollection.java b/src/main/java/org/spongepowered/common/service/permission/DataFactoryCollection.java index bd0f75b56f1..80e08097e18 100644 --- a/src/main/java/org/spongepowered/common/service/permission/DataFactoryCollection.java +++ b/src/main/java/org/spongepowered/common/service/permission/DataFactoryCollection.java @@ -24,9 +24,10 @@ */ package org.spongepowered.common.service.permission; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.base.Function; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import org.spongepowered.api.service.permission.MemorySubjectData; import org.spongepowered.api.service.permission.Subject; import org.spongepowered.api.service.permission.SubjectCollection; @@ -56,7 +57,7 @@ protected DataFactoryCollection(String identifier, SpongePermissionService servi @Override public Subject get(String identifier) { - Preconditions.checkNotNull(identifier, "identifier"); + checkNotNull(identifier, "identifier"); SpongeSubject ret = this.subjects.get(identifier); if (ret == null) { SpongeSubject newRet = this.subjects.putIfAbsent(identifier, new DataFactorySubject(identifier, this.dataFactory.apply(identifier))); diff --git a/src/main/java/org/spongepowered/common/text/selector/SelectorResolver.java b/src/main/java/org/spongepowered/common/text/selector/SelectorResolver.java index 0b7808baa73..72f3f4c638f 100644 --- a/src/main/java/org/spongepowered/common/text/selector/SelectorResolver.java +++ b/src/main/java/org/spongepowered/common/text/selector/SelectorResolver.java @@ -77,6 +77,7 @@ public class SelectorResolver { private static final Function GET_NAME = new Function() { + @Override public String apply(CommandSource input) { return input.getName(); } diff --git a/src/main/java/org/spongepowered/common/text/sink/SpongeMessageSinkFactory.java b/src/main/java/org/spongepowered/common/text/sink/SpongeMessageSinkFactory.java index 89430711157..6d75e265211 100644 --- a/src/main/java/org/spongepowered/common/text/sink/SpongeMessageSinkFactory.java +++ b/src/main/java/org/spongepowered/common/text/sink/SpongeMessageSinkFactory.java @@ -23,9 +23,9 @@ * THE SOFTWARE. */ package org.spongepowered.common.text.sink; +import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Function; -import com.google.common.base.Preconditions; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -41,8 +41,6 @@ import org.spongepowered.api.util.command.CommandSource; import org.spongepowered.common.Sponge; -import java.lang.SuppressWarnings; -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -89,7 +87,7 @@ public CommandSource apply(@Nullable Subject input) { @Override public MessageSink toPermission(String permission) { - Preconditions.checkNotNull(permission, "permission"); + checkNotNull(permission, "permission"); return new PermissionSink(permission); } diff --git a/src/main/java/org/spongepowered/common/text/xml/WhitespaceAwareUnmarshallerHandler.java b/src/main/java/org/spongepowered/common/text/xml/WhitespaceAwareUnmarshallerHandler.java index 1aee6ac468c..ed98eb691ef 100644 --- a/src/main/java/org/spongepowered/common/text/xml/WhitespaceAwareUnmarshallerHandler.java +++ b/src/main/java/org/spongepowered/common/text/xml/WhitespaceAwareUnmarshallerHandler.java @@ -53,6 +53,7 @@ public WhitespaceAwareUnmarshallerHandler(UnmarshallerHandler uh) { *
  • when parsing XmlMixed content, JAXB does not suppress the whitespace
    • * **/ + @Override public void characters( char[] ch, int start, int length ) throws SAXException { @@ -67,42 +68,52 @@ public void characters( } /* what follows is just blind delegation monkey code */ + @Override public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { this.uh.characters(ch, start, length); } + @Override public void endDocument() throws SAXException { this.uh.endDocument(); } + @Override public void endElement(String uri, String localName, String name) throws SAXException { this.uh.endElement(uri, localName, name); } + @Override public void endPrefixMapping(String prefix) throws SAXException { this.uh.endPrefixMapping(prefix); } + @Override public void processingInstruction(String target, String data) throws SAXException { this.uh.processingInstruction(target, data); } + @Override public void setDocumentLocator(Locator locator) { this.uh.setDocumentLocator(locator); } + @Override public void skippedEntity(String name) throws SAXException { this.uh.skippedEntity(name); } + @Override public void startDocument() throws SAXException { this.uh.startDocument(); } + @Override public void startElement(String uri, String localName, String name, Attributes atts) throws SAXException { this.uh.startElement(uri, localName, name, atts); } + @Override public void startPrefixMapping(String prefix, String uri) throws SAXException { this.uh.startPrefixMapping(prefix, uri); } diff --git a/src/main/java/org/spongepowered/common/util/gen/AbstractBiomeBuffer.java b/src/main/java/org/spongepowered/common/util/gen/AbstractBiomeBuffer.java index 6b96cd1b157..aef05e45cfb 100644 --- a/src/main/java/org/spongepowered/common/util/gen/AbstractBiomeBuffer.java +++ b/src/main/java/org/spongepowered/common/util/gen/AbstractBiomeBuffer.java @@ -24,9 +24,11 @@ */ package org.spongepowered.common.util.gen; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + import com.flowpowered.math.vector.Vector2i; import com.google.common.base.Objects; -import com.google.common.base.Preconditions; import org.spongepowered.api.world.extent.BiomeArea; import org.spongepowered.common.util.VecHelper; @@ -41,11 +43,11 @@ public abstract class AbstractBiomeBuffer implements BiomeArea { protected Vector2i end; protected AbstractBiomeBuffer(Vector2i start, Vector2i size) { - this.start = Preconditions.checkNotNull(start, "start"); - this.size = Preconditions.checkNotNull(size, "size"); + this.start = checkNotNull(start, "start"); + this.size = checkNotNull(size, "size"); - Preconditions.checkArgument(size.getX() > 0); - Preconditions.checkArgument(size.getY() > 0); + checkArgument(size.getX() > 0); + checkArgument(size.getY() > 0); this.end = this.start.add(this.size).sub(Vector2i.ONE); } diff --git a/src/main/java/org/spongepowered/common/util/gen/AbstractChunkBuffer.java b/src/main/java/org/spongepowered/common/util/gen/AbstractChunkBuffer.java index ba15ae986f1..ae7f07e3109 100644 --- a/src/main/java/org/spongepowered/common/util/gen/AbstractChunkBuffer.java +++ b/src/main/java/org/spongepowered/common/util/gen/AbstractChunkBuffer.java @@ -23,11 +23,11 @@ * THE SOFTWARE. */ package org.spongepowered.common.util.gen; +import static com.google.common.base.Preconditions.checkArgument; import com.flowpowered.math.vector.Vector3i; import com.google.common.base.Objects; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import org.spongepowered.api.block.BlockState; import org.spongepowered.api.block.BlockType; import org.spongepowered.api.world.extent.MutableBlockVolume; @@ -51,7 +51,7 @@ protected AbstractChunkBuffer(int chunkX, int chunkZ) { this.chunkZ = chunkZ; final Optional worldCoords = SpongeChunkLayout.instance.toWorld(chunkX, 0, chunkZ); - Preconditions.checkArgument(worldCoords.isPresent(), "Chunk coordinates are not valid" + chunkX + ", " + chunkZ); + checkArgument(worldCoords.isPresent(), "Chunk coordinates are not valid" + chunkX + ", " + chunkZ); this.minBlock = worldCoords.get(); this.maxBlock = this.minBlock.add(SpongeChunkLayout.CHUNK_SIZE).sub(Vector3i.ONE); } diff --git a/src/main/java/org/spongepowered/common/util/gen/ByteArrayImmutableBiomeBuffer.java b/src/main/java/org/spongepowered/common/util/gen/ByteArrayImmutableBiomeBuffer.java index 02280e2afab..ecb38103b1c 100644 --- a/src/main/java/org/spongepowered/common/util/gen/ByteArrayImmutableBiomeBuffer.java +++ b/src/main/java/org/spongepowered/common/util/gen/ByteArrayImmutableBiomeBuffer.java @@ -24,8 +24,9 @@ */ package org.spongepowered.common.util.gen; +import static com.google.common.base.Preconditions.checkArgument; + import com.flowpowered.math.vector.Vector2i; -import com.google.common.base.Preconditions; import net.minecraft.world.biome.BiomeGenBase; import org.spongepowered.api.world.biome.BiomeType; import org.spongepowered.api.world.biome.BiomeTypes; @@ -46,7 +47,7 @@ public ByteArrayImmutableBiomeBuffer(byte[] biomes, Vector2i start, Vector2i siz super(start, size); int minLength = size.getX() * size.getY(); - Preconditions.checkArgument(biomes.length >= minLength, "biome array to small"); + checkArgument(biomes.length >= minLength, "biome array to small"); this.biomes = Arrays.copyOf(biomes, minLength); } @@ -54,7 +55,7 @@ public ByteArrayImmutableBiomeBuffer(BiomeGenBase[] biomeGenBases, Vector2i star super(start, size); int minLength = size.getX() * size.getY(); - Preconditions.checkArgument(biomeGenBases.length >= minLength, "biome array to small"); + checkArgument(biomeGenBases.length >= minLength, "biome array to small"); this.biomes = new byte[minLength]; for (int i = 0; i > this.biomes.length; i++) { BiomeGenBase biome = biomeGenBases[i]; diff --git a/src/main/java/org/spongepowered/common/util/gen/ByteArrayMutableBiomeBuffer.java b/src/main/java/org/spongepowered/common/util/gen/ByteArrayMutableBiomeBuffer.java index 6915e163308..2c648358a21 100644 --- a/src/main/java/org/spongepowered/common/util/gen/ByteArrayMutableBiomeBuffer.java +++ b/src/main/java/org/spongepowered/common/util/gen/ByteArrayMutableBiomeBuffer.java @@ -24,8 +24,10 @@ */ package org.spongepowered.common.util.gen; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import com.flowpowered.math.vector.Vector2i; -import com.google.common.base.Preconditions; import net.minecraft.world.biome.BiomeGenBase; import org.spongepowered.api.world.biome.BiomeType; import org.spongepowered.api.world.biome.BiomeTypes; @@ -47,7 +49,7 @@ public final class ByteArrayMutableBiomeBuffer extends AbstractBiomeBuffer imple private final BiomeGenBase[] biomeById = BiomeGenBase.getBiomeGenArray(); private void checkOpen() { - Preconditions.checkState(!this.detached, "trying to use buffer after it's closed"); + checkState(!this.detached, "trying to use buffer after it's closed"); } public ByteArrayMutableBiomeBuffer(Vector2i start, Vector2i size) { @@ -103,9 +105,9 @@ public boolean isDetached() { * @param start New start position. */ public void reuse(Vector2i start) { - Preconditions.checkState(this.detached, "Cannot reuse while still in use"); + checkState(this.detached, "Cannot reuse while still in use"); - this.start = Preconditions.checkNotNull(start, "start"); + this.start = checkNotNull(start, "start"); this.end = this.start.add(this.size).sub(Vector2i.ONE); Arrays.fill(this.biomes, (byte) 0); diff --git a/src/main/java/org/spongepowered/common/util/gen/ObjectArrayImmutableBiomeBuffer.java b/src/main/java/org/spongepowered/common/util/gen/ObjectArrayImmutableBiomeBuffer.java index 89547366305..f20dea2b5bb 100644 --- a/src/main/java/org/spongepowered/common/util/gen/ObjectArrayImmutableBiomeBuffer.java +++ b/src/main/java/org/spongepowered/common/util/gen/ObjectArrayImmutableBiomeBuffer.java @@ -23,9 +23,10 @@ * THE SOFTWARE. */ package org.spongepowered.common.util.gen; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; import com.flowpowered.math.vector.Vector2i; -import com.google.common.base.Preconditions; import net.minecraft.world.biome.BiomeGenBase; import org.spongepowered.api.world.biome.BiomeType; import org.spongepowered.api.world.extent.ImmutableBiomeArea; @@ -53,8 +54,8 @@ public final class ObjectArrayImmutableBiomeBuffer extends AbstractBiomeBuffer i public ObjectArrayImmutableBiomeBuffer(BiomeGenBase[] biomes, Vector2i start, Vector2i size) { super(start, size); - Preconditions.checkNotNull(biomes); - Preconditions.checkArgument(biomes.length >= size.getX() * size.getY()); + checkNotNull(biomes); + checkArgument(biomes.length >= size.getX() * size.getY()); this.biomes = biomes; } diff --git a/src/main/java/org/spongepowered/common/util/gen/ObjectArrayMutableBiomeBuffer.java b/src/main/java/org/spongepowered/common/util/gen/ObjectArrayMutableBiomeBuffer.java index d7c68a1f78d..a39ed2d22bd 100644 --- a/src/main/java/org/spongepowered/common/util/gen/ObjectArrayMutableBiomeBuffer.java +++ b/src/main/java/org/spongepowered/common/util/gen/ObjectArrayMutableBiomeBuffer.java @@ -24,8 +24,10 @@ */ package org.spongepowered.common.util.gen; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + import com.flowpowered.math.vector.Vector2i; -import com.google.common.base.Preconditions; import net.minecraft.world.biome.BiomeGenBase; import org.spongepowered.api.world.biome.BiomeType; import org.spongepowered.api.world.extent.MutableBiomeArea; @@ -53,8 +55,8 @@ public final class ObjectArrayMutableBiomeBuffer extends AbstractBiomeBuffer imp public ObjectArrayMutableBiomeBuffer(BiomeGenBase[] biomes, Vector2i start, Vector2i size) { super(start, size); - Preconditions.checkNotNull(biomes); - Preconditions.checkArgument(biomes.length >= size.getX() * size.getY()); + checkNotNull(biomes); + checkArgument(biomes.length >= size.getX() * size.getY()); this.biomes = biomes; } @@ -76,7 +78,7 @@ public void setBiome(Vector2i position, BiomeType biome) { @Override public void setBiome(int x, int z, BiomeType biome) { - Preconditions.checkNotNull(biome, "biome"); + checkNotNull(biome, "biome"); checkRange(x, z); this.biomes[(x - this.start.getX()) | (z - this.start.getY()) << 4] = (BiomeGenBase) biome; } diff --git a/src/main/java/org/spongepowered/common/world/gen/CustomChunkProviderGenerate.java b/src/main/java/org/spongepowered/common/world/gen/CustomChunkProviderGenerate.java index 3a30885c5e5..af4d9a737eb 100644 --- a/src/main/java/org/spongepowered/common/world/gen/CustomChunkProviderGenerate.java +++ b/src/main/java/org/spongepowered/common/world/gen/CustomChunkProviderGenerate.java @@ -24,8 +24,9 @@ */ package org.spongepowered.common.world.gen; +import static com.google.common.base.Preconditions.checkNotNull; + import com.flowpowered.math.vector.Vector2i; -import com.google.common.base.Preconditions; import net.minecraft.block.BlockFalling; import net.minecraft.entity.EnumCreatureType; import net.minecraft.util.BlockPos; @@ -85,10 +86,10 @@ public static IChunkProvider of(World world, BiomeGenerator biomeGenerator, Gene private CustomChunkProviderGenerate(World world, BiomeGenerator biomeGenerator, GeneratorPopulator baseGenerator, List generatorPopulators) { - this.world = Preconditions.checkNotNull(world); - this.baseGenerator = Preconditions.checkNotNull(baseGenerator); - this.biomeGenerator = Preconditions.checkNotNull(biomeGenerator); - this.generatorPopulators = Preconditions.checkNotNull(generatorPopulators); + this.world = checkNotNull(world, "world"); + this.baseGenerator = checkNotNull(baseGenerator, "baseGenerator"); + this.biomeGenerator = checkNotNull(biomeGenerator, "biomeGenerator"); + this.generatorPopulators = checkNotNull(generatorPopulators, "generatorPopulators"); // Make initially empty biome cache this.cachedBiomes = new ByteArrayMutableBiomeBuffer(Vector2i.ZERO, CHUNK_AREA); @@ -96,7 +97,7 @@ private CustomChunkProviderGenerate(World world, BiomeGenerator biomeGenerator, } public GeneratorPopulator getBaseGenerator() { - return baseGenerator; + return this.baseGenerator; } @Override @@ -149,7 +150,7 @@ public Chunk provideChunk(int chunkX, int chunkZ) { this.baseGenerator.populate((org.spongepowered.api.world.World) this.world, blockBuffer, biomeBuffer); // Apply the generator populators to complete the blockBuffer - for (GeneratorPopulator populator : generatorPopulators) { + for (GeneratorPopulator populator : this.generatorPopulators) { populator.populate((org.spongepowered.api.world.World) this.world, blockBuffer, biomeBuffer); } diff --git a/src/main/java/org/spongepowered/common/world/gen/CustomWorldChunkManager.java b/src/main/java/org/spongepowered/common/world/gen/CustomWorldChunkManager.java index e8c184e46cc..331792dec98 100644 --- a/src/main/java/org/spongepowered/common/world/gen/CustomWorldChunkManager.java +++ b/src/main/java/org/spongepowered/common/world/gen/CustomWorldChunkManager.java @@ -24,8 +24,9 @@ */ package org.spongepowered.common.world.gen; +import static com.google.common.base.Preconditions.checkNotNull; + import com.flowpowered.math.vector.Vector2i; -import com.google.common.base.Preconditions; import net.minecraft.util.BlockPos; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; @@ -70,7 +71,7 @@ public static WorldChunkManager of(BiomeGenerator biomeGenerator) { } private CustomWorldChunkManager(BiomeGenerator biomeGenerator) { - this.biomeGenerator = Preconditions.checkNotNull(biomeGenerator); + this.biomeGenerator = checkNotNull(biomeGenerator, "biomeGenerator"); if (this.biomeGenerator instanceof SpongeBiomeGenerator) { throw new AssertionError(getClass() + " can only wrap custom biome generators, " @@ -79,7 +80,7 @@ private CustomWorldChunkManager(BiomeGenerator biomeGenerator) { } public BiomeGenerator getBiomeGenerator() { - return biomeGenerator; + return this.biomeGenerator; } /** diff --git a/src/main/java/org/spongepowered/common/world/gen/SpongeBiomeGenerator.java b/src/main/java/org/spongepowered/common/world/gen/SpongeBiomeGenerator.java index 429a979b330..1b2992d59a9 100644 --- a/src/main/java/org/spongepowered/common/world/gen/SpongeBiomeGenerator.java +++ b/src/main/java/org/spongepowered/common/world/gen/SpongeBiomeGenerator.java @@ -24,8 +24,9 @@ */ package org.spongepowered.common.world.gen; +import static com.google.common.base.Preconditions.checkNotNull; + import com.flowpowered.math.vector.Vector2i; -import com.google.common.base.Preconditions; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; import org.spongepowered.api.world.biome.BiomeType; @@ -51,7 +52,7 @@ public static BiomeGenerator of(WorldChunkManager worldChunkManager) { } private SpongeBiomeGenerator(WorldChunkManager worldChunkManager) { - this.worldChunkManager = Preconditions.checkNotNull(worldChunkManager); + this.worldChunkManager = checkNotNull(worldChunkManager, "worldChunkManager"); } @Override diff --git a/src/main/java/org/spongepowered/common/world/gen/SpongeGeneratorPopulator.java b/src/main/java/org/spongepowered/common/world/gen/SpongeGeneratorPopulator.java index e4989bb8359..2dd8d082b2a 100644 --- a/src/main/java/org/spongepowered/common/world/gen/SpongeGeneratorPopulator.java +++ b/src/main/java/org/spongepowered/common/world/gen/SpongeGeneratorPopulator.java @@ -24,8 +24,9 @@ */ package org.spongepowered.common.world.gen; +import static com.google.common.base.Preconditions.checkNotNull; + import com.flowpowered.math.vector.Vector3i; -import com.google.common.base.Preconditions; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; @@ -60,8 +61,8 @@ public static GeneratorPopulator of(World world, IChunkProvider chunkGenerator) } private SpongeGeneratorPopulator(World world, IChunkProvider chunkGenerator) { - this.world = Preconditions.checkNotNull(world); - this.chunkGenerator = Preconditions.checkNotNull(chunkGenerator); + this.world = checkNotNull(world, "world"); + this.chunkGenerator = checkNotNull(chunkGenerator); } @Override diff --git a/src/main/java/org/spongepowered/common/world/gen/SpongeWorldGenerator.java b/src/main/java/org/spongepowered/common/world/gen/SpongeWorldGenerator.java index e520e9c79fe..ad97bb7c1bf 100644 --- a/src/main/java/org/spongepowered/common/world/gen/SpongeWorldGenerator.java +++ b/src/main/java/org/spongepowered/common/world/gen/SpongeWorldGenerator.java @@ -24,7 +24,9 @@ */ package org.spongepowered.common.world.gen; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import com.google.common.collect.ImmutableList; import org.spongepowered.api.world.gen.BiomeGenerator; import org.spongepowered.api.world.gen.GeneratorPopulator; @@ -58,8 +60,8 @@ public final class SpongeWorldGenerator implements WorldGenerator { public SpongeWorldGenerator(BiomeGenerator biomeGenerator, GeneratorPopulator baseGenerator, List generatorPopulators, List populators) { - this.biomeGenerator = Preconditions.checkNotNull(biomeGenerator, "biomeGenerator"); - this.baseGenerator = Preconditions.checkNotNull(baseGenerator, "baseGenerator"); + this.biomeGenerator = checkNotNull(biomeGenerator, "biomeGenerator"); + this.baseGenerator = checkNotNull(baseGenerator, "baseGenerator"); // Note that ImmutableList.copyOf returns actually the list itself if it // is already immutable @@ -92,10 +94,10 @@ public BiomeGenerator getBiomeGenerator() { @Override public void setBiomeGenerator(BiomeGenerator biomeGenerator) { - Preconditions.checkState(!this.biomeGeneratorChanged, + checkState(!this.biomeGeneratorChanged, "Another plugin already set the biome generator to " + this.biomeGenerator.getClass().getName()); - this.biomeGenerator = Preconditions.checkNotNull(biomeGenerator); + this.biomeGenerator = checkNotNull(biomeGenerator, "biomeGenerator"); this.biomeGeneratorChanged = true; } @@ -106,10 +108,10 @@ public GeneratorPopulator getBaseGeneratorPopulator() { @Override public void setBaseGeneratorPopulator(GeneratorPopulator generator) { - Preconditions.checkState(!this.baseGeneratorChanged, + checkState(!this.baseGeneratorChanged, "Another plugin already set the base generator to " + this.biomeGenerator.getClass().getName()); - this.baseGenerator = Preconditions.checkNotNull(generator); + this.baseGenerator = checkNotNull(generator, "generator"); this.baseGeneratorChanged = true; } diff --git a/src/main/java/org/spongepowered/common/world/gen/WorldGeneratorRegistry.java b/src/main/java/org/spongepowered/common/world/gen/WorldGeneratorRegistry.java index 84952274ce1..a2d749323b2 100644 --- a/src/main/java/org/spongepowered/common/world/gen/WorldGeneratorRegistry.java +++ b/src/main/java/org/spongepowered/common/world/gen/WorldGeneratorRegistry.java @@ -24,7 +24,9 @@ */ package org.spongepowered.common.world.gen; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -64,15 +66,15 @@ public Map viewModifiersMap() { } public void registerModifier(WorldGeneratorModifier modifier) { + checkNotNull(modifier, "modifier"); String id = modifier.getId(); checkId(id, "World generator ID"); - Preconditions.checkNotNull(modifier, "modifier"); this.modifiers.put(id, modifier); } private void checkId(String id, String subject) { - Preconditions.checkArgument(id.indexOf(' ') == -1, subject + " " + id + " may not contain a space"); + checkArgument(id.indexOf(' ') == -1, subject + " " + id + " may not contain a space"); } /** @@ -87,9 +89,9 @@ private void checkId(String id, String subject) { public ImmutableCollection toIds(Collection modifiers) { ImmutableList.Builder ids = ImmutableList.builder(); for (WorldGeneratorModifier modifier : modifiers) { - Preconditions.checkNotNull(modifier, "modifier (in collection)"); + checkNotNull(modifier, "modifier (in collection)"); String id = modifier.getId(); - Preconditions.checkArgument(this.modifiers.containsKey(id), + checkArgument(this.modifiers.containsKey(id), "unregistered modifier in collection"); ids.add(id); } diff --git a/src/main/java/org/spongepowered/common/world/storage/SpongeChunkLayout.java b/src/main/java/org/spongepowered/common/world/storage/SpongeChunkLayout.java index 459647aaf27..cdbc9bb4199 100644 --- a/src/main/java/org/spongepowered/common/world/storage/SpongeChunkLayout.java +++ b/src/main/java/org/spongepowered/common/world/storage/SpongeChunkLayout.java @@ -24,9 +24,11 @@ */ package org.spongepowered.common.world.storage; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + import com.flowpowered.math.vector.Vector3i; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import org.spongepowered.api.util.Direction; import org.spongepowered.api.world.storage.ChunkLayout; @@ -69,7 +71,7 @@ public Vector3i getSpaceOrigin() { @Override public boolean isValidChunk(Vector3i coords) { - Preconditions.checkNotNull(coords); + checkNotNull(coords, "coords"); return isValidChunk(coords.getX(), coords.getY(), coords.getZ()); } @@ -103,7 +105,7 @@ public boolean isInChunk(int wx, int wy, int wz, int cx, int cy, int cz) { @Override public Optional toChunk(Vector3i worldCoords) { - Preconditions.checkNotNull(worldCoords); + checkNotNull(worldCoords, "worldCoords"); return toChunk(worldCoords.getX(), worldCoords.getY(), worldCoords.getZ()); } @@ -115,7 +117,7 @@ public Optional toChunk(int x, int y, int z) { @Override public Optional toWorld(Vector3i chunkCoords) { - Preconditions.checkNotNull(chunkCoords); + checkNotNull(chunkCoords, "chunkCoords"); return toWorld(chunkCoords.getX(), chunkCoords.getY(), chunkCoords.getZ()); } @@ -126,8 +128,8 @@ public Optional toWorld(int x, int y, int z) { @Override public Optional addToChunk(Vector3i chunkCoords, Vector3i chunkOffset) { - Preconditions.checkNotNull(chunkCoords); - Preconditions.checkNotNull(chunkOffset); + checkNotNull(chunkCoords, "chunkCoords"); + checkNotNull(chunkOffset, "chunkOffset"); return addToChunk(chunkCoords.getX(), chunkCoords.getY(), chunkCoords.getZ(), chunkOffset.getX(), chunkOffset.getY(), chunkOffset.getZ()); } @@ -154,7 +156,7 @@ public Optional moveToChunk(int x, int y, int z, Direction direction, @Override public Optional moveToChunk(Vector3i chunkCoords, Direction direction, int steps) { - Preconditions.checkArgument(!direction.isSecondaryOrdinal(), "Secondary cardinal directions can't be used here"); + checkArgument(!direction.isSecondaryOrdinal(), "Secondary cardinal directions can't be used here"); return addToChunk(chunkCoords, direction.toVector3d().ceil().toInt().mul(steps)); }