Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Forge] Initial update for 1.10

Browse Source
This commit is contained in:
Kenzie Togami 2016-06-23 03:27:13 -07:00 committed by wizjany
parent 2e10fe896f
commit 38ddeaf777
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-forge/build.gradle
View File

@ -27,12 +27,12 @@ repositories {
} }
//version = "6.1.2" //version = "6.1.2"
ext.forgeVersion = "12.17.0.1965" ext.forgeVersion = "12.18.0.1981-1.10.0"
//ext.internalVersion = version + ";" + gitCommitHash //ext.internalVersion = version + ";" + gitCommitHash
minecraft { minecraft {
version = "1.9.4-${project.forgeVersion}" version = "1.10-${project.forgeVersion}"
mappings = "snapshot_20160617" mappings = "snapshot_20160623"
runDir = 'run' runDir = 'run'
replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java" replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"

5
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePermissionsProvider.java
View File

@ -19,11 +19,12 @@
package com.sk89q.worldedit.forge; package com.sk89q.worldedit.forge;
import org.spongepowered.api.entity.living.player.Player;
import net.minecraft.command.ICommand; import net.minecraft.command.ICommand;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.world.WorldSettings.GameType; import net.minecraft.world.GameType;
import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLCommonHandler;
import org.spongepowered.api.entity.living.player.Player;
public interface ForgePermissionsProvider { public interface ForgePermissionsProvider {

3
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java
View File

@ -96,7 +96,8 @@ final class TileEntityUtils {
static void setTileEntity(World world, Vector position, @Nullable NBTTagCompound tag) { static void setTileEntity(World world, Vector position, @Nullable NBTTagCompound tag) {
if (tag != null) { if (tag != null) {
updateForSet(tag, position); updateForSet(tag, position);
TileEntity tileEntity = TileEntity.create(tag); // TileEntity.create(World, NBTTagCompound)
TileEntity tileEntity = TileEntity.func_190200_a(world, tag);
if (tileEntity != null) { if (tileEntity != null) {
world.setTileEntity(new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), tileEntity); world.setTileEntity(new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), tileEntity);
} }