From c64fe5080c996e8ea29b3e113043dd0aa962aaee Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 13 Dec 2018 11:00:00 +1100 Subject: Mappings Update --- .../org/bukkit/craftbukkit/CraftLootTable.java | 4 ++-- .../java/org/bukkit/craftbukkit/CraftServer.java | 4 ++-- .../java/org/bukkit/craftbukkit/CraftWorld.java | 26 +++++++++++----------- .../bukkit/craftbukkit/entity/CraftEndermite.java | 4 ++-- .../generator/CustomChunkGenerator.java | 2 +- .../generator/NormalChunkGenerator.java | 4 ++-- .../craftbukkit/inventory/CraftMetaItem.java | 2 +- .../craftbukkit/util/DummyGeneratorAccess.java | 6 ++--- 8 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/main/java/org/bukkit') diff --git a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java index 8822e6b9..d76fe60f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java @@ -39,7 +39,7 @@ public class CraftLootTable implements org.bukkit.loot.LootTable { @Override public Collection populateLoot(Random random, LootContext context) { LootTableInfo nmsContext = convertContext(context); - List nmsItems = handle.a(random, nmsContext); // PAIL rename populateLoot + List nmsItems = handle.populateLoot(random, nmsContext); Collection bukkit = new ArrayList<>(nmsItems.size()); for (net.minecraft.server.ItemStack item : nmsItems) { @@ -59,7 +59,7 @@ public class CraftLootTable implements org.bukkit.loot.LootTable { IInventory handle = craftInventory.getInventory(); // TODO: When events are added, call event here w/ custom reason? - getHandle().a(handle, random, nmsContext); // PAIL rename fillInventory + getHandle().fillInventory(handle, random, nmsContext); } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index f97be218..f86cc694 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -962,7 +962,7 @@ public final class CraftServer implements Server { } BlockPosition chunkcoordinates = internal.getSpawn(); - internal.getChunkProviderServer().getChunkAt(chunkcoordinates.getX() + j >> 4, chunkcoordinates.getZ() + k >> 4, true, true); + internal.getChunkProvider().getChunkAt(chunkcoordinates.getX() + j >> 4, chunkcoordinates.getZ() + k >> 4, true, true); } } } @@ -978,7 +978,7 @@ public final class CraftServer implements Server { long k = longiterator.nextLong(); ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(k); - internal.getChunkProviderServer().getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, true, true); + internal.getChunkProvider().getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, true, true); } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 944595a1..27ebfb30 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -140,7 +140,7 @@ public class CraftWorld implements World { } public Chunk getChunkAt(int x, int z) { - return this.world.getChunkProviderServer().getChunkAt(x, z, true, true).bukkitChunk; + return this.world.getChunkProvider().getChunkAt(x, z, true, true).bukkitChunk; } public Chunk getChunkAt(Block block) { @@ -148,16 +148,16 @@ public class CraftWorld implements World { } public boolean isChunkLoaded(int x, int z) { - return world.getChunkProviderServer().isLoaded(x, z); + return world.getChunkProvider().isLoaded(x, z); } @Override public boolean isChunkGenerated(int x, int z) { - return isChunkLoaded(x, z) || ((ChunkRegionLoader) world.getChunkProviderServer().chunkLoader).chunkExists(x, z); + return isChunkLoaded(x, z) || ((ChunkRegionLoader) world.getChunkProvider().chunkLoader).chunkExists(x, z); } public Chunk[] getLoadedChunks() { - Object[] chunks = world.getChunkProviderServer().chunks.values().toArray(); + Object[] chunks = world.getChunkProvider().chunks.values().toArray(); org.bukkit.Chunk[] craftChunks = new CraftChunk[chunks.length]; for (int i = 0; i < chunks.length; i++) { @@ -193,9 +193,9 @@ public class CraftWorld implements World { return false; } - net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z, false, false); + net.minecraft.server.Chunk chunk = world.getChunkProvider().getChunkAt(x, z, false, false); if (chunk != null) { - world.getChunkProviderServer().unload(chunk); + world.getChunkProvider().unload(chunk); } return true; @@ -210,13 +210,13 @@ public class CraftWorld implements World { } private boolean unloadChunk0(int x, int z, boolean save) { - net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z, false, false); + net.minecraft.server.Chunk chunk = world.getChunkProvider().getChunkAt(x, z, false, false); if (chunk == null) { return true; } // If chunk had previously been queued to save, must do save to avoid loss of that data - return world.getChunkProviderServer().unloadChunk(chunk, chunk.mustSave || save); + return world.getChunkProvider().unloadChunk(chunk, chunk.mustSave || save); } public boolean regenerateChunk(int x, int z) { @@ -225,9 +225,9 @@ public class CraftWorld implements World { } final long chunkKey = ChunkCoordIntPair.a(x, z); - world.getChunkProviderServer().unloadQueue.remove(chunkKey); + world.getChunkProvider().unloadQueue.remove(chunkKey); - net.minecraft.server.Chunk chunk = world.getChunkProviderServer().generateChunk(x, z); + net.minecraft.server.Chunk chunk = world.getChunkProvider().generateChunk(x, z); PlayerChunk playerChunk = world.getPlayerChunkMap().getChunk(x, z); if (playerChunk != null) { playerChunk.chunk = chunk; @@ -266,7 +266,7 @@ public class CraftWorld implements World { public boolean loadChunk(int x, int z, boolean generate) { chunkLoadCount++; - return world.getChunkProviderServer().getChunkAt(x, z, true, generate) != null; + return world.getChunkProvider().getChunkAt(x, z, true, generate) != null; } public boolean isChunkLoaded(Chunk chunk) { @@ -1723,7 +1723,7 @@ public class CraftWorld implements World { @Override public Location locateNearestStructure(Location origin, StructureType structureType, int radius, boolean findUnexplored) { BlockPosition originPos = new BlockPosition(origin.getX(), origin.getY(), origin.getZ()); - BlockPosition nearest = getHandle().getChunkProviderServer().getChunkGenerator().findNearestMapFeature(getHandle(), structureType.getName(), originPos, radius, findUnexplored); + BlockPosition nearest = getHandle().getChunkProvider().getChunkGenerator().findNearestMapFeature(getHandle(), structureType.getName(), originPos, radius, findUnexplored); return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ()); } @@ -1738,7 +1738,7 @@ public class CraftWorld implements World { return; } - ChunkProviderServer cps = world.getChunkProviderServer(); + ChunkProviderServer cps = world.getChunkProvider(); for (net.minecraft.server.Chunk chunk : cps.chunks.values()) { // If in use, skip it if (isChunkInUse(chunk.locX, chunk.locZ)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java index 771eea2d..31c5d97e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java @@ -28,11 +28,11 @@ public class CraftEndermite extends CraftMonster implements Endermite { @Override public boolean isPlayerSpawned() { - return getHandle().l(); // PAIL + return getHandle().isPlayerSpawned(); } @Override public void setPlayerSpawned(boolean playerSpawned) { - getHandle().a(playerSpawned); // PAIL + getHandle().setPlayerSpawned(playerSpawned); } } diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java index 8c8fa453..3f2948a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java @@ -174,7 +174,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator extends InternalC } @Override - public int e() { - return generator.e(); // PAIL: Gen depth + public int getGenerationDepth() { + return generator.getGenerationDepth(); } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index 19e52317..dc344be4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -421,7 +421,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable { continue; } - EquipmentSlot slot = CraftEquipmentSlot.getSlot(EnumItemSlot.a(slotName.toLowerCase(Locale.ROOT))); // PAIL rename fromName + EquipmentSlot slot = CraftEquipmentSlot.getSlot(EnumItemSlot.fromName(slotName.toLowerCase(Locale.ROOT))); if (slot == null) { modifiers.put(attribute, attribMod); continue; diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java index 3cf5deac..b1ecf5a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java @@ -44,17 +44,17 @@ public class DummyGeneratorAccess implements GeneratorAccess { } @Override - public TickList J() { + public TickList getBlockTickList() { throw new UnsupportedOperationException("Not supported yet."); } @Override - public TickList I() { + public TickList getFluidTickList() { throw new UnsupportedOperationException("Not supported yet."); } @Override - public IChunkAccess b(int i, int i1) { + public IChunkAccess getChunkAt(int i, int i1) { throw new UnsupportedOperationException("Not supported yet."); } -- cgit v1.2.3