diff --git a/info.json b/info.json index 64b1c1e..c2a4463 100644 --- a/info.json +++ b/info.json @@ -1,12 +1,12 @@ { - "minecraftVersion": "1.16.4", - "serverUrl": "https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar", - "minecraftHash": "c43dc4c1bda4f485428fc60d5b998270", - "accessTransforms": "bukkit-1.16.4.at", - "classMappings": "bukkit-1.16.4-cl.csrg", - "memberMappings": "bukkit-1.16.4-members.csrg", + "minecraftVersion": "1.16.5", + "serverUrl": "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar", + "minecraftHash": "c10b74188efc4ed6960db49c9ade50ce", + "accessTransforms": "bukkit-1.16.5.at", + "classMappings": "bukkit-1.16.5-cl.csrg", + "memberMappings": "bukkit-1.16.5-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.16.4.exclude -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.16.5.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}", diff --git a/mappings/bukkit-1.16.4-cl.csrg b/mappings/bukkit-1.16.5-cl.csrg similarity index 100% rename from mappings/bukkit-1.16.4-cl.csrg rename to mappings/bukkit-1.16.5-cl.csrg diff --git a/mappings/bukkit-1.16.4-members.csrg b/mappings/bukkit-1.16.5-members.csrg similarity index 99% rename from mappings/bukkit-1.16.4-members.csrg rename to mappings/bukkit-1.16.5-members.csrg index 7c937ca..e2c24f0 100644 --- a/mappings/bukkit-1.16.4-members.csrg +++ b/mappings/bukkit-1.16.5-members.csrg @@ -328,6 +328,7 @@ BiomeFog$GrassColor a NONE BiomeFog$GrassColor b DARK_FOREST BiomeFog$GrassColor c SWAMP BiomeManager$Provider b (III)LBiomeBase; getBiome +BiomeStorage g registry Biomes A SNOWY_BEACH Biomes B BIRCH_FOREST Biomes C BIRCH_FOREST_HILLS @@ -493,6 +494,7 @@ BlockBrewingStand a HAS_BOTTLE BlockButtonAbstract a POWERED BlockCactus a AGE BlockCake a BITES +BlockCampfire b LIT BlockCarpet b color BlockCauldron a LEVEL BlockChest a (LBlockChest;LIBlockData;LWorld;LBlockPosition;Z)LIInventory; getInventory @@ -2225,6 +2227,7 @@ Entity a (LEnumMoveType;LVec3D;)V move Entity a (LIChatBaseComponent;)V setCustomName Entity a (LNBTTagCompound;)V loadData Entity a (LSoundEffect;FF)V playSound +Entity a (LWorldServer;LBlockPosition;Z)Ljava/util/Optional; findOrCreatePortal Entity a (LWorldServer;LEntityLightning;)V onLightningStrike Entity a (Ljava/lang/String;)Z addScoreboardTag Entity aA ()Z isSilent @@ -2324,6 +2327,7 @@ Entity ch ()Lnet/minecraft/server/MinecraftServer; getMinecraftServer Entity cm ()LEntity; getRidingPassenger Entity cn ()Ljava/util/List; getPassengers Entity co ()Ljava/util/Collection; getAllPassengers +Entity cp ()Ljava/util/stream/Stream; recursiveStream Entity cq ()Z hasSinglePlayerPassenger Entity cr ()LEntity; getRootVehicle Entity ct ()LEntity; getVehicle @@ -2582,9 +2586,17 @@ EntityFish b FROM_BUCKET EntityFish eM ()LSoundEffect; getSoundFlop EntityFish eN ()Z isFromBucket EntityFish t (Z)V setFromBucket +EntityFishingHook ah waitTime +EntityFishingHook ak inOpenWater EntityFishingHook al hooked +EntityFishingHook am hookState +EntityFishingHook ao lureLevel +EntityFishingHook e HOOKED_ENTITY +EntityFishingHook g ()Z isInOpenWater EntityFishingHook h ()V reel EntityFishingHook i ()LEntityHuman; getOwner +EntityFishingHook k ()LEntity; getHooked +EntityFishingHook n ()V updateHookedEntity EntityFishingHook$HookState a FLYING EntityFishingHook$HookState b HOOKED_IN_ENTITY EntityFishingHook$HookState c BOBBING @@ -2787,6 +2799,7 @@ EntityItem x ()V mergeNearby EntityItemFrame a (I)V setRotation EntityItemFrame a (IZ)V setRotation EntityItemFrame a (LItemStack;Z)V setItem +EntityItemFrame ag itemDropChance EntityItemFrame ah fixed EntityItemFrame b (LItemStack;)V setItem EntityItemFrame f ITEM @@ -2822,6 +2835,7 @@ EntityLiving b (F)V heal EntityLiving b (LBlockPosition;)V entitySleep EntityLiving b (LDamageSource;F)V damageArmor EntityLiving b (LEnumItemSlot;)LItemStack; getEquipment +EntityLiving b (LItemStack;)V playEquipSound EntityLiving b (LMobEffectList;)LMobEffect; getEffect EntityLiving bc activeItem EntityLiving bh ARROWS_IN_BODY @@ -3937,6 +3951,7 @@ ITagRegistry e ()V bind ITickable aj_ ()V tick ITileEntity a (LIBlockAccess;)LTileEntity; createTile ITileInventory d ()LIChatBaseComponent; getScoreboardDisplayName +IWorldDataServer a (I)V setClearWeatherTime IWorldDataServer a (J)V setTime IWorldDataServer a (LEnumGamemode;)V setGameType IWorldDataServer a (Z)V setThundering @@ -3944,6 +3959,7 @@ IWorldDataServer b (J)V setDayTime IWorldDataServer e (I)V setThunderDuration IWorldDataServer f (I)V setWeatherDuration IWorldDataServer g ()Ljava/lang/String; getName +IWorldDataServer h ()I getClearWeatherTime IWorldDataServer j ()I getThunderDuration IWorldDataServer l ()I getWeatherDuration IWorldDataServer m ()LEnumGamemode; getGameType @@ -4532,6 +4548,7 @@ LootTableInfo$EntityTarget b KILLER LootTableInfo$EntityTarget c DIRECT_KILLER LootTableInfo$EntityTarget d KILLER_PLAYER LootTableRegistry a (LMinecraftKey;)LLootTable; getLootTable +LootTableRegistry c keyToLootTable MapIcon a ()B getType MapIcon a type MapIcon b ()LMapIcon$Type; getType @@ -5674,6 +5691,18 @@ SoundCategory g NEUTRAL SoundCategory h PLAYERS SoundCategory i AMBIENT SoundCategory j VOICE +SoundEffectType V volume +SoundEffectType W pitch +SoundEffectType X breakSound +SoundEffectType Y stepSound +SoundEffectType Z placeSound +SoundEffectType a ()F getVolume +SoundEffectType aa hitSound +SoundEffectType ab fallSound +SoundEffectType b ()F getPitch +SoundEffectType d ()LSoundEffect; getStepSound +SoundEffectType e ()LSoundEffect; getPlaceSound +SoundEffectType g ()LSoundEffect; getFallSound SoundEffects A BLOCK_ANCIENT_DEBRIS_FALL SoundEffects B BLOCK_ANVIL_BREAK SoundEffects C BLOCK_ANVIL_DESTROY @@ -7541,6 +7570,7 @@ net/minecraft/server/MinecraftServer at ()V invalidatePingSample net/minecraft/server/MinecraftServer az ()Lcom/mojang/datafixers/DataFixer; getDataFixer net/minecraft/server/MinecraftServer b (LWorldLoadListener;)V loadSpawn net/minecraft/server/MinecraftServer ba ()Z canSleepForTick +net/minecraft/server/MinecraftServer bc ()V updateSpawnFlags net/minecraft/server/MinecraftServer d ()Z init net/minecraft/server/MinecraftServer d (I)V setIdleTimeout net/minecraft/server/MinecraftServer d (LTickTask;)Z canExecute diff --git a/mappings/bukkit-1.16.4.at b/mappings/bukkit-1.16.5.at similarity index 97% rename from mappings/bukkit-1.16.4.at rename to mappings/bukkit-1.16.5.at index d149f86..083683f 100644 --- a/mappings/bukkit-1.16.4.at +++ b/mappings/bukkit-1.16.5.at @@ -1,5 +1,6 @@ # (c) 2020 SpigotMC Pty. Ltd. +public net/minecraft/server/EntityFishingHook$HookState public net/minecraft/server/PlayerChunkMap$EntityTracker public net/minecraft/server/RecipeItemStack$Provider public net/minecraft/server/RecipeItemStack$StackProvider @@ -19,6 +20,7 @@ public net/minecraft/server/AdvancementDataWorld/DESERIALIZER public net/minecraft/server/AdvancementDataWorld/REGISTRY public net/minecraft/server/Advancements/advancements public net/minecraft/server/AttributeRanged/maximum +public net/minecraft/server/BiomeStorage/registry public net/minecraft/server/BlockBase$BlockData/strength public net/minecraft/server/BlockDispenser/REGISTRY public net/minecraft/server/BlockJukeBox/dropRecord(Lnet/minecraft/server/World;Lnet/minecraft/server/BlockPosition;)V @@ -109,6 +111,11 @@ public net/minecraft/server/EntityFireworks/FIREWORK_ITEM public net/minecraft/server/EntityFireworks/SHOT_AT_ANGLE public net/minecraft/server/EntityFireworks/expectedLifespan public net/minecraft/server/EntityFish/isFromBucket()Z +public net/minecraft/server/EntityFishingHook/HOOKED_ENTITY +public net/minecraft/server/EntityFishingHook/hookState +public net/minecraft/server/EntityFishingHook/hooked +public net/minecraft/server/EntityFishingHook/reel()V +public net/minecraft/server/EntityFishingHook/updateHookedEntity()V public net/minecraft/server/EntityFox/FIRST_TRUSTED_PLAYER public net/minecraft/server/EntityFox/SECOND_TRUSTED_PLAYER public net/minecraft/server/EntityFox/setFoxType(Lnet/minecraft/server/EntityFox$Type;)V @@ -135,6 +142,7 @@ public net/minecraft/server/EntityInsentient/persistent public net/minecraft/server/EntityItem/age public net/minecraft/server/EntityItem/pickupDelay public net/minecraft/server/EntityItemFrame/fixed +public net/minecraft/server/EntityItemFrame/itemDropChance public net/minecraft/server/EntityLightning/isEffect public net/minecraft/server/EntityLiving/ARROWS_IN_BODY public net/minecraft/server/EntityLiving/HEALTH @@ -273,6 +281,8 @@ public net/minecraft/server/RecipeItemStack/choices public net/minecraft/server/RegionFileCache/cache public net/minecraft/server/ScoreboardObjective/displayName public net/minecraft/server/Slot/index +public net/minecraft/server/SoundEffectType/breakSound +public net/minecraft/server/SoundEffectType/hitSound public net/minecraft/server/Ticket/identifier public net/minecraft/server/TileEntityBanner/color public net/minecraft/server/TileEntityBanner/patterns diff --git a/mappings/bukkit-1.16.4.exclude b/mappings/bukkit-1.16.5.exclude similarity index 100% rename from mappings/bukkit-1.16.4.exclude rename to mappings/bukkit-1.16.5.exclude