Merge branch 'version/7.2.x'

PiTheGuy · Jun 12, 2022 · bc9a6dd · bc9a6dd
2 parents f667474 + 3433e40
commit bc9a6dd
Show file tree

Hide file tree

Showing 42 changed files with 430 additions and 222 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -6,6 +6,20 @@ plugins {
 }
 
 repositories {
+    maven {
+        name = "PaperMC"
+        url = uri("https://papermc.io/repo/repository/maven-public/")
+        content {
+            includeGroupByRegex("io\\.papermc\\..*")
+        }
+    }
+    maven {
+        name = "Forge Maven"
+        url = uri("https://maven.minecraftforge.net/")
+        content {
+            includeGroupByRegex("net\\.minecraftforge(|\\..*)$")
+        }
+    }
     mavenCentral()
     gradlePluginPortal()
     maven {
@@ -20,20 +34,6 @@ repositories {
         name = "EngineHub Repository"
         url = uri("https://maven.enginehub.org/repo/")
     }
-    maven {
-        name = "PaperMC"
-        url = uri("https://papermc.io/repo/repository/maven-public/")
-        content {
-            includeGroupByRegex("io\\.papermc\\..*")
-        }
-    }
-    maven {
-        name = "Forge Maven"
-        url = uri("https://maven.minecraftforge.net/")
-        content {
-            includeGroupByRegex("net\\.minecraftforge\\..*")
-        }
-    }
 }
 
 val properties = Properties().also { props ->
@@ -53,7 +53,7 @@ dependencies {
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.27.1")
     implementation("org.spongepowered:spongegradle-plugin-development:2.0.1")
     implementation("org.spongepowered:vanillagradle:0.2")
-    implementation("net.minecraftforge.gradle:ForgeGradle:5.1.31")
+    implementation("net.minecraftforge.gradle:ForgeGradle:5.1.41")
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
     implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0")

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 group=com.sk89q.worldedit
 version=7.3.0-SNAPSHOT
 
-org.gradle.jvmargs=-Xmx1512M
+org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-loom.version=0.11.32
-mixin.version=0.11.2+mixin.0.8.5
+loom.version=0.12.47
+mixin.version=0.11.4+mixin.0.8.5
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,9 +2,9 @@ rootProject.name = "worldedit"
 
 include("worldedit-libs")
 
-include("worldedit-bukkit:adapters:adapter-1.17.1")
-include("worldedit-bukkit:adapters:adapter-1.18")
-include("worldedit-bukkit:adapters:adapter-1.18.2")
+listOf("1.17.1", "1.18.2", "1.19").forEach {
+    include("worldedit-bukkit:adapters:adapter-$it")
+}
 
 listOf("bukkit", "core", "sponge", "fabric", "forge", "cli").forEach {
     include("worldedit-libs:$it")

diff --git a/...n/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R2/PaperweightWorldNativeAccess.java b/...n/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R2/PaperweightWorldNativeAccess.java
@@ -154,6 +154,12 @@ public void notifyNeighbors(BlockPos pos, net.minecraft.world.level.block.state.
         }
     }
 
+    @Override
+    public void updateBlock(BlockPos pos, net.minecraft.world.level.block.state.BlockState oldState, net.minecraft.world.level.block.state.BlockState newState) {
+        ServerLevel world = getWorld();
+        newState.onPlace(world, pos, oldState, false);
+    }
+
     private void fireNeighborChanged(BlockPos pos, ServerLevel world, Block block, BlockPos neighborPos) {
         world.getBlockState(neighborPos).neighborChanged(world, neighborPos, block, pos, false);
     }

diff --git a/...it/adapters/adapter-1.18/build.gradle.kts → ...it/adapters/adapter-1.19/build.gradle.kts b/...it/adapters/adapter-1.18/build.gradle.kts → ...it/adapters/adapter-1.19/build.gradle.kts
@@ -1,6 +1,6 @@
-applyPaperweightAdapterConfiguration(javaRelease = 17)
+applyPaperweightAdapterConfiguration()
 
 dependencies {
     // https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    paperDevBundle("1.18.1-R0.1-20211221.093324-19")
+    paperDevBundle("1.19-R0.1-20220609.175204-1")
 }
diff --git a/...ter/impl/v1_18_R1/PaperweightAdapter.java → ...ter/impl/v1_19_R1/PaperweightAdapter.java b/...ter/impl/v1_18_R1/PaperweightAdapter.java → ...ter/impl/v1_19_R1/PaperweightAdapter.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.bukkit.adapter.impl.v1_18_R1;
+package com.sk89q.worldedit.bukkit.adapter.impl.v1_19_R1;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -124,13 +124,13 @@
 import org.bukkit.Location;
 import org.bukkit.World.Environment;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_18_R1.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_19_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R1.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_19_R1.util.CraftMagicNumbers;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.generator.ChunkGenerator;
@@ -155,7 +155,6 @@
 import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ForkJoinPool;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -182,8 +181,8 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
         CraftServer.class.cast(Bukkit.getServer());
 
         int dataVersion = CraftMagicNumbers.INSTANCE.getDataVersion();
-        if (dataVersion != 2860 && dataVersion != 2865) {
-            throw new UnsupportedClassVersionError("Not 1.18(.1)!");
+        if (dataVersion != 3105) {
+            throw new UnsupportedClassVersionError("Not 1.19!");
         }
 
         serverWorldsField = CraftServer.class.getDeclaredField("worlds");
@@ -196,11 +195,11 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
         getChunkFutureMethod.setAccessible(true);
 
         chunkProviderExecutorField = ServerChunkCache.class.getDeclaredField(
-            Refraction.pickName("mainThreadProcessor", "h")
+            Refraction.pickName("mainThreadProcessor", "g")
         );
         chunkProviderExecutorField.setAccessible(true);
 
-        new PaperweightDataConverters(CraftMagicNumbers.INSTANCE.getDataVersion(), this).build(ForkJoinPool.commonPool());
+        new PaperweightDataConverters(CraftMagicNumbers.INSTANCE.getDataVersion(), this).buildUnoptimized();
 
         Watchdog watchdog;
         try {
@@ -649,14 +648,17 @@ private void doRegen(org.bukkit.World bukkitWorld, Region region, Extent extent,
                 originalWorld.getServer().executor,
                 session, newWorldData,
                 originalWorld.dimension(),
-                originalWorld.dimensionType(),
+                new LevelStem(
+                    originalWorld.dimensionTypeRegistration(),
+                    newOpts.dimensions().get(worldDimKey).generator()
+                ),
                 new NoOpWorldLoadListener(),
-                newOpts.dimensions().get(worldDimKey).generator(),
                 originalWorld.isDebug(),
                 seed,
                 ImmutableList.of(),
                 false,
-                env, gen,
+                env,
+                gen,
                 bukkitWorld.getBiomeProvider()
             );
             try {
@@ -723,7 +725,7 @@ private void regenForWorld(Region region, Extent extent, ServerLevel serverWorld
             }
             extent.setBlock(vec, state.toBaseBlock());
             if (options.shouldRegenBiomes()) {
-                Biome origBiome = chunk.getNoiseBiome(vec.getX(), vec.getY(), vec.getZ());
+                Biome origBiome = chunk.getNoiseBiome(vec.getX(), vec.getY(), vec.getZ()).value();
                 BiomeType adaptedBiome = adapt(serverWorld, origBiome);
                 if (adaptedBiome != null) {
                     extent.setBiome(vec, adaptedBiome);
@@ -963,8 +965,11 @@ private static class MojangWatchdog implements Watchdog {
         MojangWatchdog(DedicatedServer server) throws NoSuchFieldException {
             this.server = server;
             Field tickField = MinecraftServer.class.getDeclaredField(
-                Refraction.pickName("nextTickTime", "ao")
+                Refraction.pickName("nextTickTime", "ag")
             );
+            if (tickField.getType() != long.class) {
+                throw new IllegalStateException("nextTickTime is not a long field, mapping is likely incorrect");
+            }
             tickField.setAccessible(true);
             this.tickField = tickField;
         }

diff --git a/...l/v1_18_R1/PaperweightDataConverters.java → ...l/v1_19_R1/PaperweightDataConverters.java b/...l/v1_18_R1/PaperweightDataConverters.java → ...l/v1_19_R1/PaperweightDataConverters.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.bukkit.adapter.impl.v1_18_R1;
+package com.sk89q.worldedit.bukkit.adapter.impl.v1_19_R1;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -39,7 +39,6 @@
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.util.StringUtil;
@@ -214,10 +213,15 @@ public TypeReference getDFUType() {
 
     // Called after fixers are built and ready for FIXING
     @Override
-    public DataFixer build(final Executor executor) {
+    public DataFixer buildUnoptimized() {
         return this.fixer = new WrappedDataFixer(DataFixers.getDataFixer());
     }
 
+    @Override
+    public DataFixer buildOptimized(Executor executor) {
+        return buildUnoptimized();
+    }
+
     @SuppressWarnings("unchecked")
     private class WrappedDataFixer implements DataFixer {
         private final DataFixer realFixer;
@@ -804,8 +808,6 @@ public net.minecraft.nbt.CompoundTag inspect(net.minecraft.nbt.CompoundTag cmp,
 
     private static class DataInspectorEntity implements DataInspector {
 
-        private static final Logger a = LogManager.getLogger(PaperweightDataConverters.class);
-
         DataInspectorEntity() {
         }
 
@@ -1889,12 +1891,12 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp)
 
                         if (!"null".equals(s) && !StringUtil.isNullOrEmpty(s)) {
                             if ((s.charAt(0) != 34 || s.charAt(s.length() - 1) != 34) && (s.charAt(0) != 123 || s.charAt(s.length() - 1) != 125)) {
-                                object = new TextComponent(s);
+                                object = Component.literal(s);
                             } else {
                                 try {
                                     object = GsonHelper.fromJson(DataConverterSignText.a, s, Component.class, true);
                                     if (object == null) {
-                                        object = new TextComponent("");
+                                        object = Component.literal("");
                                     }
                                 } catch (JsonParseException jsonparseexception) {
                                     ;
@@ -1917,11 +1919,11 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp)
                                 }
 
                                 if (object == null) {
-                                    object = new TextComponent(s);
+                                    object = Component.literal(s);
                                 }
                             }
                         } else {
-                            object = new TextComponent("");
+                            object = Component.literal("");
                         }
 
                         nbttaglist.set(i, net.minecraft.nbt.StringTag.valueOf(Component.Serializer.toJson(object)));
@@ -2501,7 +2503,7 @@ private static class DataConverterSignText implements DataConverter {
         public static final Gson a = new GsonBuilder().registerTypeAdapter(Component.class, new JsonDeserializer() {
             MutableComponent a(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
                 if (jsonelement.isJsonPrimitive()) {
-                    return new TextComponent(jsonelement.getAsString());
+                    return Component.literal(jsonelement.getAsString());
                 } else if (jsonelement.isJsonArray()) {
                     JsonArray jsonarray = jsonelement.getAsJsonArray();
                     MutableComponent ichatbasecomponent = null;
@@ -2553,12 +2555,12 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) {
 
             if (!"null".equals(s1) && !StringUtil.isNullOrEmpty(s1)) {
                 if ((s1.charAt(0) != 34 || s1.charAt(s1.length() - 1) != 34) && (s1.charAt(0) != 123 || s1.charAt(s1.length() - 1) != 125)) {
-                    object = new TextComponent(s1);
+                    object = Component.literal(s1);
                 } else {
                     try {
                         object = GsonHelper.fromJson(DataConverterSignText.a, s1, Component.class, true);
                         if (object == null) {
-                            object = new TextComponent("");
+                            object = Component.literal("");
                         }
                     } catch (JsonParseException jsonparseexception) {
                         ;
@@ -2581,11 +2583,11 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) {
                     }
 
                     if (object == null) {
-                        object = new TextComponent(s1);
+                        object = Component.literal(s1);
                     }
                 }
             } else {
-                object = new TextComponent("");
+                object = Component.literal("");
             }
 
             nbttagcompound.putString(s, Component.Serializer.toJson(object));

diff --git a/.../impl/v1_18_R1/PaperweightFakePlayer.java → .../impl/v1_19_R1/PaperweightFakePlayer.java b/.../impl/v1_18_R1/PaperweightFakePlayer.java → .../impl/v1_19_R1/PaperweightFakePlayer.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.bukkit.adapter.impl.v1_18_R1;
+package com.sk89q.worldedit.bukkit.adapter.impl.v1_19_R1;
 
 import com.mojang.authlib.GameProfile;
 import net.minecraft.network.chat.ChatType;
@@ -41,7 +41,7 @@ class PaperweightFakePlayer extends ServerPlayer {
     private static final Vec3 ORIGIN = new Vec3(0.0D, 0.0D, 0.0D);
 
     PaperweightFakePlayer(ServerLevel world) {
-        super(world.getServer(), world, FAKE_WORLDEDIT_PROFILE);
+        super(world.getServer(), world, FAKE_WORLDEDIT_PROFILE, null);
     }
 
     @Override
@@ -75,10 +75,6 @@ public void updateOptions(ServerboundClientInformationPacket packet) {
     public void displayClientMessage(Component message, boolean actionBar) {
     }
 
-    @Override
-    public void sendMessage(Component message, ChatType type, UUID sender) {
-    }
-
     @Override
     public void awardStat(Stat<?> stat, int amount) {
     }

diff --git a/...1_18_R1/PaperweightWorldNativeAccess.java → ...1_19_R1/PaperweightWorldNativeAccess.java b/...1_18_R1/PaperweightWorldNativeAccess.java → ...1_19_R1/PaperweightWorldNativeAccess.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.bukkit.adapter.impl.v1_18_R1;
+package com.sk89q.worldedit.bukkit.adapter.impl.v1_19_R1;
 
 import com.sk89q.jnbt.AdventureNBTConverter;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -34,8 +34,8 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.chunk.LevelChunk;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R1.block.data.CraftBlockData;
 import org.bukkit.event.block.BlockPhysicsEvent;
 
 import java.lang.ref.WeakReference;
@@ -160,6 +160,8 @@ public void updateBlock(BlockPos pos, net.minecraft.world.level.block.state.Bloc
         newState.onPlace(world, pos, oldState, false);
     }
 
+    // Not sure why neighborChanged is deprecated
+    @SuppressWarnings("deprecation")
     private void fireNeighborChanged(BlockPos pos, ServerLevel world, Block block, BlockPos neighborPos) {
         world.getBlockState(neighborPos).neighborChanged(world, neighborPos, block, pos, false);
     }

diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts
@@ -47,7 +47,8 @@ dependencies {
 
     "compileOnly"("org.jetbrains:annotations:20.1.0")
     "compileOnly"("io.papermc.paper:paper-api:1.17-R0.1-SNAPSHOT") {
-        exclude(group = "org.slf4j", module = "slf4j-api")
+        exclude("org.slf4j", "slf4j-api")
+        exclude("junit", "junit")
     }
     "implementation"("io.papermc:paperlib:1.0.7")
     "compileOnly"("com.sk89q:dummypermscompat:1.10")