mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-27 05:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Perform some restructuring

Browse Source
This commit is contained in:
Wyatt Childers 2016-05-18 18:30:22 -04:00
parent 785a827f01
commit da33245842
14 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java
View File

@ -21,6 +21,7 @@
import com.flowpowered.math.vector.Vector3d;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.sponge.nms.SpongeNMSWorld;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.World;

1
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBiomeRegistry.java
View File

@ -19,6 +19,7 @@
package com.sk89q.worldedit.sponge;
import com.sk89q.worldedit.sponge.nms.IDHelper;
import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.biome.BiomeData;
import com.sk89q.worldedit.world.registry.BiomeRegistry;

1
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java
View File

@ -24,6 +24,7 @@
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.entity.metadata.EntityType;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.sponge.nms.NMSHelper;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.NullWorld;
import org.spongepowered.api.world.World;

3
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlatform.java
View File

@ -24,6 +24,9 @@
import com.sk89q.worldedit.event.platform.CommandEvent;
import com.sk89q.worldedit.event.platform.CommandSuggestionEvent;
import com.sk89q.worldedit.extension.platform.*;
import com.sk89q.worldedit.sponge.config.SpongeConfiguration;
import com.sk89q.worldedit.sponge.nms.IDHelper;
import com.sk89q.worldedit.sponge.nms.SpongeNMSWorld;
import com.sk89q.worldedit.util.command.CommandMapping;
import com.sk89q.worldedit.util.command.Dispatcher;
import com.sk89q.worldedit.world.World;

1
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java
View File

@ -29,6 +29,7 @@
import com.sk89q.worldedit.internal.LocalWorldAdapter;
import com.sk89q.worldedit.internal.cui.CUIEvent;
import com.sk89q.worldedit.session.SessionKey;
import com.sk89q.worldedit.sponge.nms.IDHelper;
import com.sk89q.worldedit.util.Location;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.item.inventory.ItemStack;

8
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
View File

@ -30,6 +30,7 @@
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.sponge.nms.IDHelper;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.AbstractWorld;
import com.sk89q.worldedit.world.biome.BaseBiome;
@ -54,7 +55,6 @@
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.logging.Logger;
import static com.google.common.base.Preconditions.checkNotNull;
@ -64,8 +64,6 @@
public abstract class SpongeWorld extends AbstractWorld {
protected static final Random random = new Random();
protected static final int UPDATE = 1, NOTIFY = 2, NOTIFY_CLIENT = 4;
protected static final Logger logger = Logger.getLogger(SpongeWorld.class.getCanonicalName());
private final WeakReference<World> worldRef;
@ -74,9 +72,9 @@ public abstract class SpongeWorld extends AbstractWorld {
*
* @param world the world
*/
SpongeWorld(World world) {
protected SpongeWorld(World world) {
checkNotNull(world);
this.worldRef = new WeakReference<World>(world);
this.worldRef = new WeakReference<>(world);
}
/**

3
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java
View File

@ -28,6 +28,9 @@
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.internal.LocalWorldAdapter;
import com.sk89q.worldedit.sponge.config.SpongeConfiguration;
import com.sk89q.worldedit.sponge.nms.NMSHelper;
import com.sk89q.worldedit.sponge.nms.SpongeNMSWorld;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.block.BlockSnapshot;
import org.spongepowered.api.block.BlockType;

3
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeConfiguration.java → worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/SpongeConfiguration.java
View File

@ -17,8 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.sponge;
package com.sk89q.worldedit.sponge.config;
import com.sk89q.worldedit.sponge.SpongeWorldEdit;
import com.sk89q.worldedit.util.PropertiesConfiguration;
import java.io.File;

5
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/IDHelper.java → worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/nms/IDHelper.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.sponge;
package com.sk89q.worldedit.sponge.nms;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
@ -26,7 +26,8 @@
import org.spongepowered.api.item.ItemType;
import org.spongepowered.api.world.biome.BiomeType;
final class IDHelper {
@Deprecated
public final class IDHelper {
private IDHelper() { }

3
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/NBTConverter.java → worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/nms/NBTConverter.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.sponge;
package com.sk89q.worldedit.sponge.nms;
import com.sk89q.jnbt.*;
import net.minecraft.nbt.*;
@ -28,6 +28,7 @@
/**
* Converts between JNBT and Minecraft NBT classes.
*/
@Deprecated
final class NBTConverter {
private NBTConverter() {

5
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/NMSHelper.java → worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/nms/NMSHelper.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.sponge;
package com.sk89q.worldedit.sponge.nms;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.entity.BaseEntity;
@ -28,7 +28,8 @@
import java.util.Map;
final class NMSHelper {
@Deprecated
public final class NMSHelper {
private NMSHelper() { }

15
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeNMSWorld.java → worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/nms/SpongeNMSWorld.java
View File

@ -17,17 +17,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.sponge;
package com.sk89q.worldedit.sponge.nms;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.LazyBlock;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.internal.Constants;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.sponge.SpongeWorld;
import com.sk89q.worldedit.util.TreeGenerator;
import net.minecraft.block.*;
import net.minecraft.block.state.IBlockState;
@ -37,11 +36,6 @@
import net.minecraft.nbt.NBTTagInt;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.LongHashMap;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.ChunkProviderServer;
import net.minecraft.world.gen.feature.*;
import org.spongepowered.api.block.BlockState;
import org.spongepowered.api.entity.Entity;
@ -49,13 +43,10 @@
import org.spongepowered.api.world.World;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import static com.google.common.base.Preconditions.checkNotNull;
@Deprecated
public class SpongeNMSWorld extends SpongeWorld {
private static final IBlockState JUNGLE_LOG = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.JUNGLE);

3
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/TileEntityBaseBlock.java → worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/nms/TileEntityBaseBlock.java
View File

@ -17,13 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.sponge;
package com.sk89q.worldedit.sponge.nms;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@Deprecated
public class TileEntityBaseBlock extends BaseBlock implements TileEntityBlock {
public TileEntityBaseBlock(int type, int data, TileEntity tile) {

3
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/TileEntityUtils.java → worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/nms/TileEntityUtils.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.sponge;
package com.sk89q.worldedit.sponge.nms;
import com.sk89q.worldedit.Vector;
import net.minecraft.nbt.NBTTagCompound;
@ -34,6 +34,7 @@
/**
* Utility methods for setting tile entities in the world.
*/
@Deprecated
final class TileEntityUtils {
private TileEntityUtils() {