From 00d6c31b6a4d71c7cd7abb7b80ed61649344ba68 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mnmiller1@me.com>
Date: Fri, 24 Jan 2020 20:58:14 +1000
Subject: [PATCH] Bump Fabric to 1.15.2. It already worked on 1.15.2 before
 this, just bumping mappings.

---
 worldedit-fabric/build.gradle.kts                         | 6 +++---
 .../java/com/sk89q/worldedit/fabric/FabricDataFixer.java  | 6 +++---
 .../main/java/com/sk89q/worldedit/fabric/FabricWorld.java | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts
index 2f66cebc34..0c28841a1a 100644
--- a/worldedit-fabric/build.gradle.kts
+++ b/worldedit-fabric/build.gradle.kts
@@ -6,9 +6,9 @@ applyShadowConfiguration()
 
 apply(plugin = "fabric-loom")
 
-val minecraftVersion = "1.15.1"
-val yarnMappings = "1.15.1+build.6"
-val loaderVersion = "0.7.2+build.175"
+val minecraftVersion = "1.15.2"
+val yarnMappings = "1.15.2+build.7"
+val loaderVersion = "0.7.6+build.179"
 
 configurations.all {
     resolutionStrategy {
diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricDataFixer.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricDataFixer.java
index 15d5f30955..0392bbc2e4 100644
--- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricDataFixer.java
+++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricDataFixer.java
@@ -36,9 +36,9 @@
 import com.mojang.datafixers.Dynamic;
 import com.mojang.datafixers.schemas.Schema;
 import com.sk89q.jnbt.CompoundTag;
-import net.minecraft.datafixers.NbtOps;
-import net.minecraft.datafixers.Schemas;
-import net.minecraft.datafixers.TypeReferences;
+import net.minecraft.datafixer.NbtOps;
+import net.minecraft.datafixer.Schemas;
+import net.minecraft.datafixer.TypeReferences;
 import net.minecraft.nbt.FloatTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.StringTag;
diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java
index b24e8b4a2b..c1b599d302 100644
--- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java
+++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java
@@ -194,7 +194,7 @@ public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B
                     BlockEntity tileEntity = getWorld().getWorldChunk(pos).getBlockEntity(pos);
                     if (tileEntity != null) {
                         tileEntity.fromTag(nativeTag);
-                        tileEntity.setWorld(world, pos);
+                        tileEntity.setLocation(world, pos);
                         successful = true; // update if TE changed as well
                     }
                 }
@@ -278,7 +278,7 @@ public boolean useItem(BlockVector3 position, BaseItem item, Direction face) {
             return false;
         }
         fakePlayer.setStackInHand(Hand.MAIN_HAND, stack);
-        fakePlayer.setPositionAndAngles(position.getBlockX(), position.getBlockY(), position.getBlockZ(),
+        fakePlayer.updatePositionAndAngles(position.getBlockX(), position.getBlockY(), position.getBlockZ(),
                 (float) face.toVector().toYaw(), (float) face.toVector().toPitch());
         final BlockPos blockPos = FabricAdapter.toBlockPos(position);
         final BlockHitResult rayTraceResult = new BlockHitResult(FabricAdapter.toVec3(position),
@@ -367,7 +367,7 @@ public boolean regenerate(Region region, EditSession editSession) {
             case BIRCH: return Feature.NORMAL_TREE.configure(DefaultBiomeFeatures.BIRCH_TREE_CONFIG);
             case JUNGLE: return Feature.MEGA_JUNGLE_TREE.configure(DefaultBiomeFeatures.MEGA_JUNGLE_TREE_CONFIG);
             case SMALL_JUNGLE: return Feature.NORMAL_TREE.configure(DefaultBiomeFeatures.JUNGLE_TREE_CONFIG);
-            case SHORT_JUNGLE: return new OakTreeFeature(BranchedTreeFeatureConfig::deserialize2)
+            case SHORT_JUNGLE: return new OakTreeFeature(BranchedTreeFeatureConfig::deserialize)
                 .configure(DefaultBiomeFeatures.JUNGLE_SAPLING_TREE_CONFIG);
             case JUNGLE_BUSH: return Feature.JUNGLE_GROUND_BUSH.configure(DefaultBiomeFeatures.JUNGLE_GROUND_BUSH_CONFIG);
             case SWAMP: return Feature.NORMAL_TREE.configure(DefaultBiomeFeatures.SWAMP_TREE_CONFIG);
@@ -564,7 +564,7 @@ public Entity createEntity(Location location, BaseEntity entity) {
                 createdEntity.fromTag(tag);
             }
 
-            createdEntity.setPositionAndAngles(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
+            createdEntity.updatePositionAndAngles(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
 
             world.spawnEntity(createdEntity);
             return new FabricEntity(createdEntity);