diff --git a/bin/SpecialSource-2.jar b/bin/SpecialSource-2.jar index f5baedb..28f591e 100644 Binary files a/bin/SpecialSource-2.jar and b/bin/SpecialSource-2.jar differ diff --git a/info.json b/info.json index 61a5d8a..d3640f0 100644 --- a/info.json +++ b/info.json @@ -1,14 +1,14 @@ { - "minecraftVersion": "1.14-pre5", - "serverUrl": "https://launcher.mojang.com/v1/objects/5d550762b9c82ab4fe9f259c14fcf7bf7ed8017a/server.jar", - "minecraftHash": "e9db16cfce7d60135d412811ea80c8b8", - "accessTransforms": "bukkit-1.14-pre5.at", - "classMappings": "bukkit-1.14-pre5-cl.csrg", - "memberMappings": "bukkit-1.14-pre5-members.csrg", + "minecraftVersion": "1.14", + "serverUrl": "https://launcher.mojang.com/v1/objects/f1a0073671057f01aa843443fef34330281333ce/server.jar", + "minecraftHash": "177e83e7563b08509c70b1296583f29f", + "accessTransforms": "bukkit-1.14.at", + "classMappings": "bukkit-1.14-cl.csrg", + "memberMappings": "bukkit-1.14-members.csrg", "packageMappings": "package.srg", - "classMapCommand": "java -jar BuildData/bin/SpecialSource-2.jar map --only . --only net/minecraft --auto-lvt BASIC --auto-member SYNTHETIC -e BuildData/mappings/bukkit-1.14-pre5.exclude -i {0} -m {1} -o {2}", - "memberMapCommand": "java -jar BuildData/bin/SpecialSource-2.jar map --only . --only net/minecraft --auto-member TOKENS -i {0} -m {1} -o {2}", + "classMapCommand": "java -jar BuildData/bin/SpecialSource-2.jar map --only . --only net/minecraft --auto-lvt BASIC --auto-member SYNTHETIC -e BuildData/mappings/bukkit-1.14.exclude -i {0} -m {1} -o {2}", + "memberMapCommand": "java -jar BuildData/bin/SpecialSource-2.jar map --only . --only net/minecraft --auto-member LOGGER --auto-member TOKENS -i {0} -m {1} -o {2}", "finalMapCommand": "java -jar BuildData/bin/SpecialSource.jar --only . --only net/minecraft -i {0} --access-transformer {1} -m {2} -o {3}", "decompileCommand": "java -jar BuildData/bin/fernflower.jar -dgs=1 -hdc=0 -asc=1 -udv=0 -rsy=1 -aoa=1 {0} {1}", - "toolsVersion": 93 + "toolsVersion": 101 } diff --git a/mappings/bukkit-1.14-pre5-cl.csrg b/mappings/bukkit-1.14-cl.csrg similarity index 99% rename from mappings/bukkit-1.14-pre5-cl.csrg rename to mappings/bukkit-1.14-cl.csrg index a94989a..d337689 100644 --- a/mappings/bukkit-1.14-pre5-cl.csrg +++ b/mappings/bukkit-1.14-cl.csrg @@ -1776,6 +1776,7 @@ cki LightEngineBlock ckj LightEngineStorageBlock ckk LightEngineStorageArray ckl LightEngineGraph +ckm NibbleArrayFlat ckn LightEngineLayer cko LightEngineLayerEventListener cko$a LightEngineLayerEventListener$Void diff --git a/mappings/bukkit-1.14-pre5-members.csrg b/mappings/bukkit-1.14-members.csrg similarity index 99% rename from mappings/bukkit-1.14-pre5-members.csrg rename to mappings/bukkit-1.14-members.csrg index 8f0ea22..7556c6d 100644 --- a/mappings/bukkit-1.14-pre5-members.csrg +++ b/mappings/bukkit-1.14-members.csrg @@ -1252,7 +1252,6 @@ ChunkGenerator e ()I getGenerationDepth ChunkGenerator f ()I getSeaLevel ChunkMapDistance a ()V purgeTickets ChunkMapDistance a (I)V setEntityDistance -ChunkMapDistance a LOGGER ChunkMapDistance c (LTicketType;LChunkCoordIntPair;ILjava/lang/Object;)V addTicket ChunkMapDistance d (LTicketType;LChunkCoordIntPair;ILjava/lang/Object;)V removeTicket ChunkMapDistance e tickets @@ -1452,6 +1451,7 @@ Counter d DISTANCE Counter e TIME CraftingManager a (LIRecipe;)V addRecipe CraftingManager a (LRecipes;LIInventory;LWorld;)Ljava/util/Optional; craft +CraftingManager a (Ljava/util/Map;)V initializeRecipeMap CraftingManager d recipes CriterionProgress d ()Ljava/util/Date; getDate CustomFunctionData e ()V tick @@ -1522,7 +1522,6 @@ DedicatedServer a (Ljava/lang/String;LCommandListenerWrapper;)V issueCommand DedicatedServer aW ()V handleCommandQueue DedicatedServer aZ ()Z convertNames DedicatedServer ba ()J getMaxTickTime -DedicatedServer i LOGGER DedicatedServer k serverCommandQueue DedicatedServer m remoteControlCommandListener DedicatedServer n remoteControlListener @@ -1808,7 +1807,6 @@ Entity g (Z)V setSwimming Entity g id Entity h ()V tick Entity h (I)Z getFlag -Entity h LOGGER Entity i (I)V setAirTicks Entity i (LEntity;)V collide Entity i (Z)V setInvisible @@ -2044,8 +2042,8 @@ EntityHorseChestedAbstract r (Z)V setCarryingChest EntityHuman a (ILMerchantRecipeList;IIZ)V openTrade EntityHuman a (LBlockPosition;)Lcom/mojang/datafixers/util/Either; sleep EntityHuman a (LEntityHorseAbstract;LIInventory;)V openHorseInventory -EntityHuman a (LIBlockAccess;LBlockPosition;Z)LBlockPosition; getBed EntityHuman a (LITileInventory;)Ljava/util/OptionalInt; openContainer +EntityHuman a (LIWorldReader;LBlockPosition;Z)Ljava/util/Optional; getBed EntityHuman a (LItemStack;I)V enchantDone EntityHuman a (LItemStack;Z)LEntityItem; drop EntityHuman a (LTileEntitySign;)V openSign @@ -2340,7 +2338,6 @@ EntityPlayer a (LContainer;)V updateInventory EntityPlayer a (LEntityPlayer;Z)V copyFrom EntityPlayer a (Ljava/lang/String;Ljava/lang/String;)V setResourcePack EntityPlayer b playerConnection -EntityPlayer bU LOGGER EntityPlayer bV locale EntityPlayer bW removeQueue EntityPlayer bX advancementDataPlayer @@ -2956,9 +2953,19 @@ HeightMap$Type f MOTION_BLOCKING_NO_LEAVES HeightMap$Use a WORLDGEN HeightMap$Use b LIVE_WORLD HeightMap$Use c CLIENT +IAsyncTaskHandler a (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; executeFuture IAsyncTaskHandler aw ()Z isNotMainThread +IAsyncTaskHandler ax ()Ljava/lang/Thread; getThread IAsyncTaskHandler bc ()Z isMainThread +IAsyncTaskHandler bf ()V executeAll +IAsyncTaskHandler c (Ljava/lang/Runnable;)Z canExecute +IAsyncTaskHandler c (Ljava/util/function/BooleanSupplier;)V awaitTasks IAsyncTaskHandler d (Ljava/lang/Runnable;)Ljava/lang/Runnable; postToMainThread +IAsyncTaskHandler f (Ljava/lang/Runnable;)V executeSync +IAsyncTaskHandler h (Ljava/lang/Runnable;)V executeTask +IAsyncTaskHandler p ()Z executeNext +IAsyncTaskHandlerReentrant b depth +IAsyncTaskHandlerReentrant bg ()Z isEntered IAttribute a ()Ljava/lang/String; getName IAttribute b ()D getDefault IBlockAccess I ()I getHeight @@ -4222,7 +4229,6 @@ PlayerChunkMap a GOLDEN_TICKET PlayerChunkMap b (J)LPlayerChunk; getVisibleChunk PlayerChunkMap b (LEntity;)V removeEntity PlayerChunkMap b (LEntity;LPacket;)V broadcastIncludingSelf -PlayerChunkMap d LOGGER PlayerChunkMap e updatingChunks PlayerChunkMap f visibleChunks PlayerChunkMap i world @@ -4254,7 +4260,6 @@ PlayerConnection b (LIChatBaseComponent;)V disconnect PlayerConnection b player PlayerConnection c ()V syncPosition PlayerConnection c (Ljava/lang/String;)V handleCommand -PlayerConnection c LOGGER PlayerConnection d ()Z isExemptPlayer PlayerConnection d minecraftServer PlayerConnection f lastKeepAlive @@ -6107,6 +6112,7 @@ net/minecraft/server/MinecraftServer au ()V invalidatePingSample net/minecraft/server/MinecraftServer au executorService net/minecraft/server/MinecraftServer b (Z)V setForceUpgrade net/minecraft/server/MinecraftServer c (I)V setIdleTimeout +net/minecraft/server/MinecraftServer c (LTickTask;)Z canExecute net/minecraft/server/MinecraftServer d ()Z init net/minecraft/server/MinecraftServer d worldLoadListenerFactory net/minecraft/server/MinecraftServer e (Ljava/lang/String;)V info @@ -6120,7 +6126,6 @@ net/minecraft/server/MinecraftServer h serverThread net/minecraft/server/MinecraftServer h_ ()Z isRunning net/minecraft/server/MinecraftServer i ()Z isHardcore net/minecraft/server/MinecraftServer i (Z)V setSpawnAnimals -net/minecraft/server/MinecraftServer i LOGGER net/minecraft/server/MinecraftServer j (Z)V setSpawnNPCs net/minecraft/server/MinecraftServer j convertable net/minecraft/server/MinecraftServer k (Ljava/lang/String;)V setMotd diff --git a/mappings/bukkit-1.14-pre5.at b/mappings/bukkit-1.14.at similarity index 99% rename from mappings/bukkit-1.14-pre5.at rename to mappings/bukkit-1.14.at index ef258cf..4d31d6e 100644 --- a/mappings/bukkit-1.14-pre5.at +++ b/mappings/bukkit-1.14.at @@ -47,6 +47,7 @@ public net/minecraft/server/CommandListenerWrapper/base public net/minecraft/server/ContainerAnvil/levelCost public net/minecraft/server/ContainerAnvil/renameText public net/minecraft/server/ContainerDispenser/items +public net/minecraft/server/CraftingManager/initializeRecipeMap(Ljava/util/Map;)V public net/minecraft/server/DataConverterMaterialId/ID_MAPPING public net/minecraft/server/DataConverterSpawnEgg/ID_MAPPING public net/minecraft/server/DedicatedServer/remoteControlCommandListener diff --git a/mappings/bukkit-1.14-pre5.exclude b/mappings/bukkit-1.14.exclude similarity index 100% rename from mappings/bukkit-1.14-pre5.exclude rename to mappings/bukkit-1.14.exclude