SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.15

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
View File

@@ -33,7 +33,7 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
@Override
public Fluid getFluid(BlockPosition bp) {
CraftBlockState state = list.get(bp);
return (state != null) ? state.getHandle().p() : world.getFluid(bp);
return (state != null) ? state.getHandle().getFluid() : world.getFluid(bp);
}
@Override

6
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@@ -188,12 +188,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string
*/
public String getMappingsVersion() {
return "11ae498d9cf909730659b6357e7c2afa";
return "e50e3dd1d07234cc9c09cb516a951227";
}
@Override
public int getDataVersion() {
return SharedConstants.a().getWorldVersion();
return SharedConstants.getGameVersion().getWorldVersion();
}
@Override
@@ -247,7 +247,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
return file.delete();
}
private static final List<String> SUPPORTED_API = Arrays.asList("1.13", "1.14");
private static final List<String> SUPPORTED_API = Arrays.asList("1.13", "1.14", "1.15");
@Override
public void checkSupported(PluginDescriptionFile pdf) throws InvalidPluginException {

8
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java
View File

@@ -77,16 +77,16 @@ public class CraftNBTTagConfigSerializer {
throw new RuntimeException("Could not deserialize found list ", e);
}
} else if (INTEGER.matcher(string).matches()) { //Read integers on our own
return new NBTTagInt(Integer.parseInt(string.substring(0, string.length() - 1)));
return NBTTagInt.a(Integer.parseInt(string.substring(0, string.length() - 1)));
} else if (DOUBLE.matcher(string).matches()) {
return new NBTTagDouble(Double.parseDouble(string.substring(0, string.length() - 1)));
return NBTTagDouble.a(Double.parseDouble(string.substring(0, string.length() - 1)));
} else {
NBTBase nbtBase = MOJANGSON_PARSER.parseLiteral(string);
if (nbtBase instanceof NBTTagInt) { // If this returns an integer, it did not use our method from above
return new NBTTagString(nbtBase.asString()); // It then is a string that was falsely read as an int
return NBTTagString.a(nbtBase.asString()); // It then is a string that was falsely read as an int
} else if (nbtBase instanceof NBTTagDouble) {
return new NBTTagString(String.valueOf(((NBTTagDouble) nbtBase).asDouble())); // Doubles add "d" at the end
return NBTTagString.a(String.valueOf(((NBTTagDouble) nbtBase).asDouble())); // Doubles add "d" at the end
} else {
return nbtBase;
}

34
paper-server/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
View File

@@ -5,13 +5,13 @@ import java.util.Random;
import java.util.function.Predicate;
import net.minecraft.server.AxisAlignedBB;
import net.minecraft.server.BiomeBase;
import net.minecraft.server.BiomeManager;
import net.minecraft.server.Block;
import net.minecraft.server.BlockPosition;
import net.minecraft.server.ChunkStatus;
import net.minecraft.server.DifficultyDamageScaler;
import net.minecraft.server.Entity;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.EnumSkyBlock;
import net.minecraft.server.Fluid;
import net.minecraft.server.FluidType;
import net.minecraft.server.GeneratorAccess;
@@ -19,6 +19,7 @@ import net.minecraft.server.HeightMap;
import net.minecraft.server.IBlockData;
import net.minecraft.server.IChunkAccess;
import net.minecraft.server.IChunkProvider;
import net.minecraft.server.LightEngine;
import net.minecraft.server.ParticleParam;
import net.minecraft.server.SoundCategory;
import net.minecraft.server.SoundEffect;
@@ -111,21 +112,11 @@ public class DummyGeneratorAccess implements GeneratorAccess {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public int getLightLevel(BlockPosition bp, int i) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public IChunkAccess getChunkAt(int i, int i1, ChunkStatus cs, boolean bln) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public BlockPosition getHighestBlockYAt(HeightMap.Type type, BlockPosition bp) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public int a(HeightMap.Type type, int i, int i1) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -137,12 +128,17 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public WorldBorder getWorldBorder() {
public BiomeManager d() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean e() {
public BiomeBase a(int i, int i1, int i2) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean p_() {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -157,27 +153,27 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public BiomeBase getBiome(BlockPosition bp) {
public LightEngine e() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public int getBrightness(EnumSkyBlock esb, BlockPosition bp) {
public TileEntity getTileEntity(BlockPosition blockposition) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public TileEntity getTileEntity(BlockPosition bp) {
public IBlockData getType(BlockPosition blockposition) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public IBlockData getType(BlockPosition bp) {
public Fluid getFluid(BlockPosition blockposition) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Fluid getFluid(BlockPosition bp) {
public WorldBorder getWorldBorder() {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -197,7 +193,7 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public boolean b(BlockPosition blockposition, boolean flag) {
public boolean a(BlockPosition blockposition, boolean flag, Entity entity) {
throw new UnsupportedOperationException("Not supported yet.");
}
}