From 38ddeaf7775d616e3cba7b0fec177cf19e8d4c99 Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Thu, 23 Jun 2016 03:27:13 -0700 Subject: [PATCH] [Forge] Initial update for 1.10 --- worldedit-forge/build.gradle | 6 +++--- .../com/sk89q/worldedit/forge/ForgePermissionsProvider.java | 5 +++-- .../java/com/sk89q/worldedit/forge/TileEntityUtils.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle index 88ea79405..2193f4ece 100644 --- a/worldedit-forge/build.gradle +++ b/worldedit-forge/build.gradle @@ -27,12 +27,12 @@ repositories { } //version = "6.1.2" -ext.forgeVersion = "12.17.0.1965" +ext.forgeVersion = "12.18.0.1981-1.10.0" //ext.internalVersion = version + ";" + gitCommitHash minecraft { - version = "1.9.4-${project.forgeVersion}" - mappings = "snapshot_20160617" + version = "1.10-${project.forgeVersion}" + mappings = "snapshot_20160623" runDir = 'run' replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java" diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePermissionsProvider.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePermissionsProvider.java index 0c9b0542f..1b80998dd 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePermissionsProvider.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePermissionsProvider.java @@ -19,11 +19,12 @@ package com.sk89q.worldedit.forge; +import org.spongepowered.api.entity.living.player.Player; + import net.minecraft.command.ICommand; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.WorldSettings.GameType; +import net.minecraft.world.GameType; import net.minecraftforge.fml.common.FMLCommonHandler; -import org.spongepowered.api.entity.living.player.Player; public interface ForgePermissionsProvider { diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java index 074b42b96..b86dae476 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java @@ -96,7 +96,8 @@ final class TileEntityUtils { static void setTileEntity(World world, Vector position, @Nullable NBTTagCompound tag) { if (tag != null) { updateForSet(tag, position); - TileEntity tileEntity = TileEntity.create(tag); + // TileEntity.create(World, NBTTagCompound) + TileEntity tileEntity = TileEntity.func_190200_a(world, tag); if (tileEntity != null) { world.setTileEntity(new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), tileEntity); }