update to forge 31.2.21

build.gradle

@@ -16,7 +16,7 @@ group = 'me.hammerle.km'
 archivesBaseName = 'km'
 
 minecraft {
-    mappings channel: 'snapshot', version: '20200214-1.15.1'
+    mappings channel: 'snapshot', version: '20200514-1.15.1'
 
     runs {
         client {
@@ -35,7 +35,7 @@ minecraft {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.15.2-31.1.0'
+    minecraft 'net.minecraftforge:forge:1.15.2-31.2.21'
     
     compile 'mysql:mysql-connector-java:5.1.42'
     

src/main/java/me/km/overrides/ModPlayerList.java

@@ -225,7 +225,7 @@ public final class ModPlayerList extends DedicatedPlayerList {
         ServerWorld sw = this.server.getWorld(pIn.dimension);
         setPlayerGameTypeBasedOnOther(p, pIn, sw);
         if(blockpos != null) {
-            Optional<Vec3d> optional = PlayerEntity.func_213822_a(server.getWorld(pIn.dimension), blockpos, flag);
+            Optional<Vec3d> optional = PlayerEntity.checkBedValidRespawnPosition(server.getWorld(pIn.dimension), blockpos, flag);
             if(optional.isPresent()) {
                 Vec3d vec3d = optional.get();
                 p.setLocationAndAngles(vec3d.x, vec3d.y, vec3d.z, 0.0f, 0.0f);
@@ -235,7 +235,7 @@ public final class ModPlayerList extends DedicatedPlayerList {
             }
         }
 
-        while(!sw.func_226669_j_(p) && p.getPosY() < 256.0D) {
+        while(!sw.hasNoCollisions(p) && p.getPosY() < 256.0D) {
             p.setPosition(p.getPosX(), p.getPosY() + 1.0, p.getPosZ());
         }
 

src/main/java/me/km/snuviscript/commands/EntityCommands.java

@@ -19,7 +19,6 @@ import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.JsonToNBT;
-import net.minecraft.network.play.server.SEntityPacket;
 import net.minecraft.potion.Effect;
 import net.minecraft.potion.EffectInstance;
 import net.minecraft.potion.PotionUtils;
@@ -28,7 +27,6 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.World;
@@ -135,7 +133,7 @@ public class EntityCommands {
 
                 p.stopRiding();
                 if(p.isSleeping()) {
-                    p.func_225652_a_(true, true);
+                    p.stopSleepInBed(true, true);
                 }
 
                 float yaw = l.getYaw() != 0.0f ? l.getYaw() : ent.rotationYaw;

src/main/java/me/km/world/ModBiomeProvider.java

@@ -15,7 +15,7 @@ public class ModBiomeProvider extends BiomeProvider {
     public ModBiomeProvider(Set<Biome> biomes, OverworldBiomeProviderSettings settingsProvider) {
         super(biomes);
         biomeArray = biomes.toArray(new Biome[biomes.size()]);
-        this.genBiomes = LayerUtil.func_227474_a_(settingsProvider.func_226850_a_(), settingsProvider.func_226851_b_(), settingsProvider.getGeneratorSettings());
+        this.genBiomes = LayerUtil.func_227474_a_(settingsProvider.getSeed(), settingsProvider.getWorldType(), settingsProvider.getGeneratorSettings());
     }
 
     @Override

src/main/java/me/km/world/ModOverworldDimension.java

@@ -34,7 +34,7 @@ public class ModOverworldDimension extends OverworldDimension {
             ChunkGeneratorType<OverworldGenSettings, OverworldChunkGenerator> chunkGenType = ChunkGeneratorType.SURFACE;
             BiomeProviderType<OverworldBiomeProviderSettings, ModBiomeProvider> provider = info.getType().getProvider();
             OverworldGenSettings genSettings = chunkGenType.createSettings();
-            OverworldBiomeProviderSettings providerSettings = provider.func_226840_a_(this.world.getWorldInfo()).setGeneratorSettings(genSettings);
+            OverworldBiomeProviderSettings providerSettings = provider.createSettings(this.world.getWorldInfo()).setGeneratorSettings(genSettings);
             return chunkGenType.create(this.world, provider.create(providerSettings), genSettings);
         }