From 3df026c2fd06aa703e52bd37dba73ca7b7280039 Mon Sep 17 00:00:00 2001 From: Me4502 Date: Thu, 17 Nov 2016 20:20:06 +1000 Subject: [PATCH] Removed forgegradle - it's not needed. --- worldedit-sponge/build.gradle | 22 ------- .../sk89q/worldedit/sponge/SpongeAdapter.java | 41 ------------- .../sk89q/worldedit/sponge/SpongeEntity.java | 4 +- .../sk89q/worldedit/sponge/SpongePlayer.java | 6 +- .../sk89q/worldedit/sponge/SpongeWorld.java | 3 - .../sponge/adapter/SpongeImplAdapter.java | 61 +++---------------- 6 files changed, 14 insertions(+), 123 deletions(-) delete mode 100644 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java diff --git a/worldedit-sponge/build.gradle b/worldedit-sponge/build.gradle index 04c3fc1b6..b67036054 100644 --- a/worldedit-sponge/build.gradle +++ b/worldedit-sponge/build.gradle @@ -2,23 +2,15 @@ buildscript { repositories { mavenCentral() maven { url = "http://files.minecraftforge.net/maven" } - maven { url = "http://repo.minecrell.net/releases" } maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } jcenter() } - - dependencies { - classpath 'net.minecrell:VanillaGradle:2.0.3_1' - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' - } } plugins { id 'org.spongepowered.plugin' version '0.6' } -apply plugin: 'net.minecrell.vanilla.server.library' - dependencies { compile project(':worldedit-core') compile 'org.spongepowered:spongeapi:6.0.0-SNAPSHOT' @@ -34,14 +26,6 @@ sponge { } } -minecraft { - version = "1.11" - mappings = "snapshot_20161116" - runDir = 'run' -} - -project.archivesBaseName = "${project.archivesBaseName}-mc${minecraft.version}" - jar { manifest { attributes("Class-Path": "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar", @@ -55,12 +39,6 @@ shadowJar { } } -reobf { - shadowJar { - mappingType = 'SEARGE' - } -} - task deobfJar(type: Jar) { from sourceSets.main.output classifier = 'dev' diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java deleted file mode 100644 index e54f66a84..000000000 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * WorldEdit, a Minecraft world manipulation toolkit - * Copyright (C) sk89q - * Copyright (C) WorldEdit team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldedit.sponge; - -import com.flowpowered.math.vector.Vector3d; -import com.sk89q.worldedit.Vector; -import com.sk89q.worldedit.util.Location; -import com.sk89q.worldedit.world.World; - -final class SpongeAdapter { - - private SpongeAdapter() { - } - - public static World adapt(org.spongepowered.api.world.World world) { - return SpongeWorldEdit.inst().getAdapter().getWorld(world); - } - - public static Location adapt(org.spongepowered.api.world.Location loc, Vector3d rot) { - Vector position = new Vector(loc.getX(), loc.getY(), loc.getZ()); - - return new Location(SpongeAdapter.adapt(loc.getExtent()), position, (float) rot.getY(), (float) rot.getX()); - } -} diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java index 3f3d8bb79..160c51c71 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java @@ -59,7 +59,7 @@ class SpongeEntity implements Entity { org.spongepowered.api.world.Location entityLoc = entity.getLocation(); Vector3d entityRot = entity.getRotation(); - return SpongeAdapter.adapt(entityLoc, entityRot); + return SpongeWorldEdit.inst().getAdapter().adapt(entityLoc, entityRot); } else { return new Location(NullWorld.getInstance()); } @@ -69,7 +69,7 @@ class SpongeEntity implements Entity { public Extent getExtent() { org.spongepowered.api.entity.Entity entity = entityRef.get(); if (entity != null) { - return SpongeAdapter.adapt(entity.getWorld()); + return SpongeWorldEdit.inst().getAdapter().getWorld(entity.getWorld()); } else { return NullWorld.getInstance(); } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java index 76c06a3f4..0ef45cf47 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java @@ -79,18 +79,18 @@ public class SpongePlayer extends AbstractPlayerActor { org.spongepowered.api.world.Location entityLoc = this.player.getLocation(); Vector3d entityRot = this.player.getRotation(); - return SpongeAdapter.adapt(entityLoc, entityRot); + return SpongeWorldEdit.inst().getAdapter().adapt(entityLoc, entityRot); } @Override public WorldVector getPosition() { Vector3d pos = this.player.getLocation().getPosition(); - return new WorldVector(LocalWorldAdapter.adapt(SpongeAdapter.adapt(this.player.getWorld())), pos.getX(), pos.getY(), pos.getZ()); + return new WorldVector(LocalWorldAdapter.adapt(SpongeWorldEdit.inst().getAdapter().getWorld(this.player.getWorld())), pos.getX(), pos.getY(), pos.getZ()); } @Override public com.sk89q.worldedit.world.World getWorld() { - return SpongeAdapter.adapt(player.getWorld()); + return SpongeWorldEdit.inst().getAdapter().getWorld(player.getWorld()); } @Override diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java index 3da03bffd..116920a36 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java @@ -55,7 +55,6 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.Random; import static com.google.common.base.Preconditions.checkNotNull; @@ -64,8 +63,6 @@ import static com.google.common.base.Preconditions.checkNotNull; */ public abstract class SpongeWorld extends AbstractWorld { - protected static final Random random = new Random(); - private final WeakReference worldRef; /** diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/adapter/SpongeImplAdapter.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/adapter/SpongeImplAdapter.java index 50c309fb8..a626e76c9 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/adapter/SpongeImplAdapter.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/adapter/SpongeImplAdapter.java @@ -19,11 +19,12 @@ package com.sk89q.worldedit.sponge.adapter; -import com.sk89q.jnbt.*; +import com.flowpowered.math.vector.Vector3d; +import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.sponge.SpongeWorld; -import net.minecraft.nbt.*; +import com.sk89q.worldedit.util.Location; import org.spongepowered.api.block.BlockType; import org.spongepowered.api.entity.Entity; import org.spongepowered.api.item.ItemType; @@ -66,59 +67,15 @@ public interface SpongeImplAdapter { BiomeType resolveBiome(int intID); - NBTBase toNative(Tag tag); - - NBTTagIntArray toNative(IntArrayTag tag); - - NBTTagList toNative(ListTag tag); - - NBTTagLong toNative(LongTag tag); - - NBTTagString toNative(StringTag tag); - - NBTTagInt toNative(IntTag tag); - - NBTTagByte toNative(ByteTag tag); - - NBTTagByteArray toNative(ByteArrayTag tag); - - NBTTagCompound toNative(CompoundTag tag); - - NBTTagFloat toNative(FloatTag tag); - - NBTTagShort toNative(ShortTag tag); - - NBTTagDouble toNative(DoubleTag tag); - - Tag fromNative(NBTBase other); - - IntArrayTag fromNative(NBTTagIntArray other); - - ListTag fromNative(NBTTagList other); - - EndTag fromNative(NBTTagEnd other); - - LongTag fromNative(NBTTagLong other); - - StringTag fromNative(NBTTagString other); - - IntTag fromNative(NBTTagInt other); - - ByteTag fromNative(NBTTagByte other); - - ByteArrayTag fromNative(NBTTagByteArray other); - - CompoundTag fromNative(NBTTagCompound other); - - FloatTag fromNative(NBTTagFloat other); - - ShortTag fromNative(NBTTagShort other); - - DoubleTag fromNative(NBTTagDouble other); - BaseEntity createBaseEntity(Entity entity); ItemStack makeSpongeStack(BaseItemStack itemStack); SpongeWorld getWorld(World world); + + default Location adapt(org.spongepowered.api.world.Location loc, Vector3d rot) { + Vector position = new Vector(loc.getX(), loc.getY(), loc.getZ()); + + return new Location(getWorld(loc.getExtent()), position, (float) rot.getY(), (float) rot.getX()); + } }