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

[Forge] Update to 1.14.4, pending Forge bugfixes

Browse Source
This commit is contained in:
Kenzie Togami 2019-07-25 19:19:03 -07:00
parent 415cdc0ab2
commit c8cf0d8ba6
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worldedit-forge/build.gradle.kts
View File

@ -11,8 +11,9 @@ plugins {
applyPlatformAndCoreConfiguration() applyPlatformAndCoreConfiguration()
applyShadowConfiguration() applyShadowConfiguration()
val minecraftVersion = "1.14.3" val minecraftVersion = "1.14.4"
val forgeVersion = "27.0.13" val mappingsMinecraftVersion = "1.14.3"
val forgeVersion = "28.0.16"
configurations.all { configurations.all {
resolutionStrategy { resolutionStrategy {
@ -25,14 +26,12 @@ dependencies {
"compile"("org.apache.logging.log4j:log4j-slf4j-impl:2.11.2") "compile"("org.apache.logging.log4j:log4j-slf4j-impl:2.11.2")
"minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion") "minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion")
"testCompile"("org.mockito:mockito-core:1.9.0-rc1")
} }
configure<UserDevExtension> { configure<UserDevExtension> {
mappings(mapOf( mappings(mapOf(
"channel" to "snapshot", "channel" to "snapshot",
"version" to "20190626-$minecraftVersion" "version" to "20190724-$mappingsMinecraftVersion"
)) ))
runs { runs {

2
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java
View File

@ -35,7 +35,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.server.management.PlayerList; import net.minecraft.server.management.PlayerList;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SharedConstants; import net.minecraft.util.SharedConstants;
import net.minecraft.world.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.fml.server.ServerLifecycleHooks; import net.minecraftforge.fml.server.ServerLifecycleHooks;
import org.enginehub.piston.Command; import org.enginehub.piston.Command;
import org.enginehub.piston.CommandManager; import org.enginehub.piston.CommandManager;

10
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java
View File

@ -65,13 +65,11 @@ import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.chunk.AbstractChunkProvider; import net.minecraft.world.chunk.AbstractChunkProvider;
import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.IChunk; import net.minecraft.world.chunk.IChunk;
import net.minecraft.world.chunk.ServerChunkProvider;
import net.minecraft.world.chunk.listener.IChunkStatusListener; import net.minecraft.world.chunk.listener.IChunkStatusListener;
import net.minecraft.world.gen.feature.BigBrownMushroomFeature; import net.minecraft.world.gen.feature.BigBrownMushroomFeature;
import net.minecraft.world.gen.feature.BigMushroomFeatureConfig; 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.SwampTreeFeature;
import net.minecraft.world.gen.feature.TallTaigaTreeFeature; import net.minecraft.world.gen.feature.TallTaigaTreeFeature;
import net.minecraft.world.gen.feature.TreeFeature; 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.SaveHandler;
import net.minecraft.world.storage.WorldInfo; import net.minecraft.world.storage.WorldInfo;
@ -583,15 +583,15 @@ public class ForgeWorld extends AbstractWorld {
private static class NoOpChunkStatusListener implements IChunkStatusListener { private static class NoOpChunkStatusListener implements IChunkStatusListener {
@Override @Override
public void func_219509_a(ChunkPos chunkPos) { public void start(ChunkPos chunkPos) {
} }
@Override @Override
public void func_219508_a(ChunkPos chunkPos, @Nullable ChunkStatus chunkStatus) { public void statusChanged(ChunkPos chunkPos, @Nullable ChunkStatus chunkStatus) {
} }
@Override @Override
public void func_219510_b() { public void stop() {
} }
} }
} }

2
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/WorldEditFakePlayer.java
View File

@ -21,7 +21,7 @@ package com.sk89q.worldedit.forge;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import net.minecraft.inventory.container.INamedContainerProvider; import net.minecraft.inventory.container.INamedContainerProvider;
import net.minecraft.world.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;
import javax.annotation.Nullable; import javax.annotation.Nullable;