From 785ba10ca11da0e912c00b87223ed8c2800f81c6 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 25 Jan 2018 14:51:39 +1100 Subject: [PATCH] Update to latest sponge --- Sponge/build.gradle | 10 +++++----- .../plotsquared/sponge/util/SpongeUtil.java | 20 ++++--------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/Sponge/build.gradle b/Sponge/build.gradle index 41046ee30..fce7906ba 100644 --- a/Sponge/build.gradle +++ b/Sponge/build.gradle @@ -12,8 +12,8 @@ buildscript { } } dependencies { - classpath 'gradle.plugin.net.minecrell:vanillagradle:2.2-3' - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'gradle.plugin.net.minecrell:vanillagradle:2.2-6' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } @@ -21,7 +21,7 @@ apply plugin: 'net.minecrell.vanillagradle.server' dependencies { compile project(':Core') - compile 'org.spongepowered:spongeapi:6.0.0-SNAPSHOT' + compile 'org.spongepowered:spongeapi:7.1.0-SNAPSHOT' compile 'net.minecrell.mcstats:statslite-sponge:0.2.2' } @@ -44,8 +44,8 @@ repositories { } } minecraft { - version = "1.11" - mappings = "snapshot_20161126" + version = "1.12.2" + mappings = "snapshot_20171022" runDir = 'run' } diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java index a96647a1d..a0e464adf 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java +++ b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java @@ -9,22 +9,11 @@ import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.object.schematic.PlotItem; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.ReflectionUtils; -import com.intellectualcrafters.plot.util.StringComparison; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.sponge.SpongeMain; +import com.intellectualcrafters.plot.util.*; import com.plotsquared.sponge.object.SpongePlayer; import java.io.IOException; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Optional; +import java.util.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.world.biome.Biome; @@ -41,7 +30,6 @@ import org.spongepowered.api.data.value.mutable.ListValue; import org.spongepowered.api.entity.Entity; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.cause.Cause; -import org.spongepowered.api.event.cause.NamedCause; import org.spongepowered.api.text.Text; import org.spongepowered.api.text.serializer.TextSerializers; import org.spongepowered.api.text.translation.Translation; @@ -52,7 +40,7 @@ import org.spongepowered.api.world.extent.Extent; public class SpongeUtil extends WorldUtil { - public static Cause CAUSE = Cause.of(NamedCause.source(Sponge.getPluginManager().fromInstance(SpongeMain.THIS).get())); +// public static Cause CAUSE = Cause.of(NamedCause.source(Sponge.getPluginManager().fromInstance(SpongeMain.THIS).get())); private static BiomeType[] biomes; private static HashMap biomeMap; private static Player lastPlayer = null; @@ -406,7 +394,7 @@ public class SpongeUtil extends WorldUtil { @Override public void setSign(String worldName, int x, int y, int z, String[] lines) { World world = SpongeUtil.getWorld(worldName); - world.setBlock(x, y, z, BlockTypes.WALL_SIGN.getDefaultState(), CAUSE); + world.setBlock(x, y, z, BlockTypes.WALL_SIGN.getDefaultState()); Optional block = world.getTileEntity(x, y, z); if (!block.isPresent()) { return;