From c8cf0d8ba64ced99dbe18063caa7ba80b6cbbd03 Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Thu, 25 Jul 2019 19:19:03 -0700 Subject: [PATCH] [Forge] Update to 1.14.4, pending Forge bugfixes --- worldedit-forge/build.gradle.kts | 9 ++++----- .../java/com/sk89q/worldedit/forge/ForgePlatform.java | 2 +- .../java/com/sk89q/worldedit/forge/ForgeWorld.java | 10 +++++----- .../com/sk89q/worldedit/forge/WorldEditFakePlayer.java | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/worldedit-forge/build.gradle.kts b/worldedit-forge/build.gradle.kts index 235900181..89ae7fc27 100644 --- a/worldedit-forge/build.gradle.kts +++ b/worldedit-forge/build.gradle.kts @@ -11,8 +11,9 @@ plugins { applyPlatformAndCoreConfiguration() applyShadowConfiguration() -val minecraftVersion = "1.14.3" -val forgeVersion = "27.0.13" +val minecraftVersion = "1.14.4" +val mappingsMinecraftVersion = "1.14.3" +val forgeVersion = "28.0.16" configurations.all { resolutionStrategy { @@ -25,14 +26,12 @@ dependencies { "compile"("org.apache.logging.log4j:log4j-slf4j-impl:2.11.2") "minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion") - - "testCompile"("org.mockito:mockito-core:1.9.0-rc1") } configure { mappings(mapOf( "channel" to "snapshot", - "version" to "20190626-$minecraftVersion" + "version" to "20190724-$mappingsMinecraftVersion" )) runs { diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java index 99ef0103e..93fea255f 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java @@ -35,7 +35,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.management.PlayerList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SharedConstants; -import net.minecraft.world.ServerWorld; +import net.minecraft.world.server.ServerWorld; import net.minecraftforge.fml.server.ServerLifecycleHooks; import org.enginehub.piston.Command; import org.enginehub.piston.CommandManager; diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java index dca8f1c1f..542cf884c 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java @@ -65,13 +65,11 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.ServerWorld; import net.minecraft.world.World; import net.minecraft.world.chunk.AbstractChunkProvider; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.IChunk; -import net.minecraft.world.chunk.ServerChunkProvider; import net.minecraft.world.chunk.listener.IChunkStatusListener; import net.minecraft.world.gen.feature.BigBrownMushroomFeature; import net.minecraft.world.gen.feature.BigMushroomFeatureConfig; @@ -91,6 +89,8 @@ import net.minecraft.world.gen.feature.ShrubFeature; import net.minecraft.world.gen.feature.SwampTreeFeature; import net.minecraft.world.gen.feature.TallTaigaTreeFeature; import net.minecraft.world.gen.feature.TreeFeature; +import net.minecraft.world.server.ServerChunkProvider; +import net.minecraft.world.server.ServerWorld; import net.minecraft.world.storage.SaveHandler; import net.minecraft.world.storage.WorldInfo; @@ -583,15 +583,15 @@ public class ForgeWorld extends AbstractWorld { private static class NoOpChunkStatusListener implements IChunkStatusListener { @Override - public void func_219509_a(ChunkPos chunkPos) { + public void start(ChunkPos chunkPos) { } @Override - public void func_219508_a(ChunkPos chunkPos, @Nullable ChunkStatus chunkStatus) { + public void statusChanged(ChunkPos chunkPos, @Nullable ChunkStatus chunkStatus) { } @Override - public void func_219510_b() { + public void stop() { } } } diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/WorldEditFakePlayer.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/WorldEditFakePlayer.java index 53897176e..971179339 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/WorldEditFakePlayer.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/WorldEditFakePlayer.java @@ -21,7 +21,7 @@ package com.sk89q.worldedit.forge; import com.mojang.authlib.GameProfile; import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.world.ServerWorld; +import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.FakePlayer; import javax.annotation.Nullable;