From b418a046f0bb031f5fb3c07543c972a4d9e43aca Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Fri, 29 Mar 2019 08:37:29 +0800 Subject: [PATCH] Some stuff about trading and villages (#563) * Some stuff about trading and villages Signed-off-by: liach * A few more random mappings Signed-off-by: liach --- .../net/minecraft/block/ChestBlock.mapping | 8 +++ .../minecraft/block/enums/Attachment.mapping | 1 + .../minecraft/block/enums/ChestType.mapping | 3 + .../packet/ChunkLoadDistanceS2CPacket.mapping | 3 + .../client/world/ClientChunkManager.mapping | 1 + .../container/MerchantContainer.mapping | 1 + .../minecraft/enchantment/Enchantment.mapping | 2 +- .../minecraft/entity/mob/ZombieEntity.mapping | 13 +++-- .../entity/mob/ZombieVillagerEntity.mapping | 1 + .../entity/passive/VillagerEntity.mapping | 2 + .../net/minecraft/inventory/Inventory.mapping | 1 + .../net/minecraft/item/DyeableItem.mapping | 1 + .../minecraft/item/EnchantedBookItem.mapping | 1 + .../net/minecraft/item/FilledMapItem.mapping | 13 +++++ .../net/minecraft/item/map/MapState.mapping | 7 +++ .../listener/ClientPlayPacketListener.mapping | 2 + .../server/world/ServerWorld.mapping | 6 +- mappings/net/minecraft/village/Trader.mapping | 5 +- mappings/net/minecraft/village/Trades.mapping | 58 +++++++++++++++++++ .../minecraft/village/VillageManager.mapping | 2 - .../minecraft/village/VillagerData.mapping | 2 +- .../village/ZombieSiegeManager.mapping | 14 +++++ 22 files changed, 134 insertions(+), 13 deletions(-) create mode 100644 mappings/net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket.mapping delete mode 100644 mappings/net/minecraft/village/VillageManager.mapping create mode 100644 mappings/net/minecraft/village/ZombieSiegeManager.mapping diff --git a/mappings/net/minecraft/block/ChestBlock.mapping b/mappings/net/minecraft/block/ChestBlock.mapping index 3752fcfec8..5b363b29ea 100644 --- a/mappings/net/minecraft/block/ChestBlock.mapping +++ b/mappings/net/minecraft/block/ChestBlock.mapping @@ -3,6 +3,9 @@ CLASS bmn net/minecraft/block/ChestBlock CLASS bmn$2$1 METHOD createMenu (ILavl;Lavm;)Laxq; ARG 1 syncId + CLASS bmn$a PropertyRetriever + METHOD b getFromSingleChest (Lbtd;)Ljava/lang/Object; + METHOD b getFromDoubleChest (Lbtd;Lbtd;)Ljava/lang/Object; FIELD a FACING Lbvr; FIELD b CHEST_TYPE Lbvu; FIELD c WATERLOGGED Lbvo; @@ -11,10 +14,15 @@ CLASS bmn net/minecraft/block/ChestBlock FIELD f DOUBLE_WEST_SHAPE Lcsa; FIELD g DOUBLE_EAST_SHAPE Lcsa; FIELD h SINGLE_SHAPE Lcsa; + FIELD i INVENTORY_RETRIEVER Lbmn$a; + FIELD j NAME_RETRIEVER Lbmn$a; METHOD (Lbly$c;)V ARG 1 settings + METHOD a getNeighborChestDirection (Lazt;Lfa;)Lfa; METHOD a hasBlockOnTop (Lbgg;Lev;)Z METHOD a isChestBlocked (Lbgw;Lev;)Z + METHOD a getInventory (Lbuw;Lbgv;Lev;Z)Lagn; + METHOD a retrieve (Lbuw;Lbgw;Lev;ZLbmn$a;)Ljava/lang/Object; METHOD b hasOcelotOnTop (Lbgw;Lev;)Z METHOD d getOpenStat ()Lyo; METHOD j getFacing (Lbuw;)Lfa; diff --git a/mappings/net/minecraft/block/enums/Attachment.mapping b/mappings/net/minecraft/block/enums/Attachment.mapping index ca5b8007f0..443dfaa030 100644 --- a/mappings/net/minecraft/block/enums/Attachment.mapping +++ b/mappings/net/minecraft/block/enums/Attachment.mapping @@ -1 +1,2 @@ CLASS bvm net/minecraft/block/enums/Attachment + FIELD e name Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enums/ChestType.mapping b/mappings/net/minecraft/block/enums/ChestType.mapping index 64945ac662..96230e89e0 100644 --- a/mappings/net/minecraft/block/enums/ChestType.mapping +++ b/mappings/net/minecraft/block/enums/ChestType.mapping @@ -1,2 +1,5 @@ CLASS bvp net/minecraft/block/enums/ChestType + FIELD d VALUES [Lbvp; FIELD e name Ljava/lang/String; + FIELD f opposite I + METHOD a getOpposite ()Lbvp; diff --git a/mappings/net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket.mapping new file mode 100644 index 0000000000..93975697f8 --- /dev/null +++ b/mappings/net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS mn net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket + FIELD a distance I + METHOD b getDistance ()I diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 341eceb30b..1ea1998115 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -24,6 +24,7 @@ CLASS dgo net/minecraft/client/world/ClientChunkManager FIELD g playerChunkZ I FIELD h world Ldgt; METHOD a updateChunkList ()V + METHOD a updateLoadDistance (I)V METHOD a loadChunkFromPacket (Lbgv;IILjc;Lib;IZ)Lbww; ARG 1 world ARG 2 chunkX diff --git a/mappings/net/minecraft/container/MerchantContainer.mapping b/mappings/net/minecraft/container/MerchantContainer.mapping index 58fe9db994..8396744302 100644 --- a/mappings/net/minecraft/container/MerchantContainer.mapping +++ b/mappings/net/minecraft/container/MerchantContainer.mapping @@ -11,5 +11,6 @@ CLASS ayt net/minecraft/container/MerchantContainer ARG 1 canLevel METHOD d setRecipeIndex (I)V METHOD e getExperience ()I + METHOD e setExperienceFromServer (I)V METHOD h getRecipes ()Lbga; METHOD i canLevel ()Z diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 16e231fac9..e982fa06da 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -34,7 +34,7 @@ CLASS bex net/minecraft/enchantment/Enchantment ARG 1 stack METHOD a differs (Lbex;)Z ARG 1 other - METHOD b isLootOnly ()Z + METHOD b isTreasure ()Z METHOD b onUserDamaged (Laii;Lahz;I)V ARG 1 user ARG 2 attacker diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 9dd3962f88..b2e02e4dd5 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -1,9 +1,10 @@ CLASS aus net/minecraft/entity/mob/ZombieEntity CLASS aus$a DestroyEggGoal - FIELD bB TICKS_UNTIL_DROWNED Lqg; + FIELD bB CONVERTING_IN_WATER Lqg; FIELD bD breakDoorsGoal Lalw; FIELD bE canBreakDoors Z - FIELD bG ticksUntilDrowned I + FIELD bF inWaterTime I + FIELD bG ticksUntilWaterConversion I FIELD b BABY_SPEED_ID Ljava/util/UUID; FIELD bz BABY Lqg; FIELD c BABY_SPEED_BONUS Laja; @@ -11,15 +12,15 @@ CLASS aus net/minecraft/entity/mob/ZombieEntity METHOD (Laid;Lbgv;)V ARG 1 type METHOD J_ burnsInDaylight ()Z - METHOD a setTicksUntilDrowned (I)V - ARG 1 ticksUntilDrowned + METHOD a setTicksUntilWaterConversion (I)V METHOD b convertTo (Laid;)V ARG 1 entityType METHOD dQ shouldBreakDoors ()Z METHOD dR getStepSound ()Lyh; METHOD dS getSkull ()Lbbp; - METHOD dV drown ()V - METHOD dY isDrowning ()Z + METHOD dT canConvertInWater ()Z + METHOD dV convertInWater ()V + METHOD dY isConvertingInWater ()Z METHOD dZ canBreakDoors ()Z METHOD l initCustomGoals ()V METHOD s setCanBreakDoors (Z)V diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index 2893e3e4d5..c49fc3d535 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -11,4 +11,5 @@ CLASS aut net/minecraft/entity/mob/ZombieVillagerEntity METHOD a setConverting (Ljava/util/UUID;I)V METHOD a finishConversion (Lve;)V METHOD dX isConverting ()Z + METHOD ea getConversionRate ()I METHOD g setOfferData (Lib;)V diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 245c9f9304..921ebff815 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -39,6 +39,7 @@ CLASS auz net/minecraft/entity/passive/VillagerEntity METHOD eg consumeAvailableFood ()V METHOD eh wantsToStartBreeding ()Z METHOD ei canBreed ()Z + METHOD ej hasSeedToPlant ()Z METHOD ek getLastRestock ()J METHOD el clearCurrentBonus ()V METHOD em canLevelUp ()Z @@ -51,3 +52,4 @@ CLASS auz net/minecraft/entity/passive/VillagerEntity METHOD g prepareRecipesFor (Lavm;)V METHOD r depleteFood (I)V ARG 1 amount + METHOD s setExperience (I)V diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 33306b8028..5339b8aa6a 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -11,6 +11,7 @@ CLASS agn net/minecraft/inventory/Inventory METHOD a canPlayerUseInv (Lavm;)Z ARG 1 playerEntity METHOD a getInvAmountOf (Lbbk;)I + METHOD a containsAnyInInv (Ljava/util/Set;)Z METHOD a_ onInvOpen (Lavm;)V METHOD b removeInvStack (I)Lbbp; ARG 1 slot diff --git a/mappings/net/minecraft/item/DyeableItem.mapping b/mappings/net/minecraft/item/DyeableItem.mapping index fb17a8fdf9..cfd297c15a 100644 --- a/mappings/net/minecraft/item/DyeableItem.mapping +++ b/mappings/net/minecraft/item/DyeableItem.mapping @@ -1,5 +1,6 @@ CLASS baq net/minecraft/item/DyeableItem METHOD a hasColor (Lbbp;)Z METHOD a setColor (Lbbp;I)V + METHOD a applyDyes (Lbbp;Ljava/util/List;)Lbbp; METHOD b getColor (Lbbp;)I METHOD c removeColor (Lbbp;)V diff --git a/mappings/net/minecraft/item/EnchantedBookItem.mapping b/mappings/net/minecraft/item/EnchantedBookItem.mapping index 0f549e3e9c..d50390bc60 100644 --- a/mappings/net/minecraft/item/EnchantedBookItem.mapping +++ b/mappings/net/minecraft/item/EnchantedBookItem.mapping @@ -2,5 +2,6 @@ CLASS bau net/minecraft/item/EnchantedBookItem METHOD a addEnchantment (Lbbp;Lbfa;)V ARG 0 stack ARG 1 enchantmentInfo + METHOD a makeStack (Lbfa;)Lbbp; METHOD e getEnchantmentTag (Lbbp;)Lii; ARG 0 stack diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index a0f95a3651..59d5d243dd 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -1 +1,14 @@ CLASS bbu net/minecraft/item/FilledMapItem + METHOD a getMapStorageName (I)Ljava/lang/String; + ARG 0 mapId + METHOD a getMapState (Lbbp;Lbgv;)Lcng; + METHOD a createMapState (Lbbp;Lbgv;IIIZZLbxq;)Lcng; + ARG 4 scale + ARG 5 showIcons + ARG 6 unlimitedTracking + METHOD a createMap (Lbgv;IIBZZ)Lbbp; + ARG 3 scale + ARG 4 showIcons + ARG 5 unlimitedTracking + METHOD b getOrCreateMapState (Lbbp;Lbgv;)Lcng; + METHOD e getMapId (Lbbp;)I diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 38c702cea4..fdc4a94f23 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -10,3 +10,10 @@ CLASS cng net/minecraft/item/map/MapState FIELD j icons Ljava/util/Map; METHOD (Ljava/lang/String;)V ARG 1 key + METHOD a calculateCenter (DDI)V + METHOD a init (IIIZZLbxq;)V + ARG 3 scale + ARG 4 showIcons + ARG 5 unlimitedTracking + METHOD a addDecorationsTag (Lbbp;Lev;Ljava/lang/String;Lcnd$a;)V + ARG 2 id diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 4f62b365d1..b5e089496d 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -121,6 +121,8 @@ CLASS kd net/minecraft/network/listener/ClientPlayPacketListener ARG 1 packet METHOD a onHeldItemChange (Lmm;)V ARG 1 packet + METHOD a handleChunkLoadDistance (Lmn;)V + ARG 1 packet METHOD a onScoreboardDisplay (Lmo;)V ARG 1 packet METHOD a onEntityTrackerUpdate (Lmp;)V diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index cf7936f2ab..9a6a055cb7 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -14,7 +14,7 @@ CLASS ve net/minecraft/server/world/ServerWorld FIELD a ticking Z FIELD b savingDisabled Z FIELD c raidManager Laws; - FIELD d villageManager Lapu; + FIELD d siegeManager Lapu; FIELD v LOGGER Lorg/apache/logging/log4j/Logger; FIELD w globalEntities Ljava/util/List; FIELD x entitiesById Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; @@ -45,6 +45,9 @@ CLASS ve net/minecraft/server/world/ServerWorld METHOD a tickChunk (Lbww;I)V ARG 1 chunk ARG 2 randomTickSpeed + METHOD a isInterestingPointAt (Lev;I)Z + ARG 2 interest + METHOD a getPointOfInterestLevel (Lfo;)I METHOD a getEntity (Ljava/util/UUID;)Lahz; METHOD a save (Lzr;ZZ)V ARG 1 progressListener @@ -55,6 +58,7 @@ CLASS ve net/minecraft/server/world/ServerWorld ARG 1 x ARG 2 z ARG 3 forced + METHOD b_ isVillageCenterAt (Lev;)Z METHOD c_ getRaidAt (Lev;)Lawq; METHOD d_ hasRaidAt (Lev;)Z METHOD e removePlayer (Lvf;)V diff --git a/mappings/net/minecraft/village/Trader.mapping b/mappings/net/minecraft/village/Trader.mapping index 79d7a9703b..8f92b1d40b 100644 --- a/mappings/net/minecraft/village/Trader.mapping +++ b/mappings/net/minecraft/village/Trader.mapping @@ -1,13 +1,14 @@ CLASS bfy net/minecraft/village/Trader METHOD a sendRecipes (Lavm;Ljm;I)V METHOD a useRecipe (Lbfz;)V - METHOD a setServerRecipes (Lbga;)V + METHOD a setRecipesFromServer (Lbga;)V METHOD dP getExperience ()I METHOD dQ getCurrentCustomer ()Lavm; METHOD dS getRecipes ()Lbga; + METHOD dT isLevelledTrader ()Z METHOD dX getTraderWorld ()Lbgv; METHOD e setCurrentCustomer (Lavm;)V ARG 1 customer METHOD j onSellingItem (Lbbp;)V - METHOD q setExperience (I)V + METHOD q setExperienceFromServer (I)V ARG 1 experience diff --git a/mappings/net/minecraft/village/Trades.mapping b/mappings/net/minecraft/village/Trades.mapping index 66364f723a..a9b2b6ae6e 100644 --- a/mappings/net/minecraft/village/Trades.mapping +++ b/mappings/net/minecraft/village/Trades.mapping @@ -1,9 +1,67 @@ CLASS avd net/minecraft/village/Trades + CLASS avd$a SellDyedArmorFactory + FIELD a sell Lbbk; + FIELD b price I + FIELD c maxUses I + FIELD d experience I + METHOD a getDye (Ljava/util/Random;)Lban; + CLASS avd$b BuyForOneEmeraldFactory + FIELD a buy Lbbk; + FIELD b price I + FIELD c maxUses I + FIELD d experience I + FIELD e multiplier F + CLASS avd$c TypeAwareBuyForOneEmeraldFactory + FIELD a map Ljava/util/Map; + FIELD b count I + FIELD c maxUses I + FIELD d experience I CLASS avd$d EnchantBookFactory + FIELD a experience I + CLASS avd$e SellEnchantedToolFactory + FIELD a tool Lbbp; + FIELD b basePrice I + FIELD c maxUses I + FIELD d experience I + FIELD e multiplier F CLASS avd$f Factory METHOD a create (Lahz;Ljava/util/Random;)Lbfz; + CLASS avd$g ProcessItemFactory + FIELD a secondBuy Lbbp; + FIELD b secondCount I + FIELD c price I + FIELD d sell Lbbp; + FIELD e sellCount I + FIELD f maxUses I + FIELD g experience I + FIELD h multiplier F + CLASS avd$h SellItemFactory + FIELD a sell Lbbp; + FIELD b price I + FIELD c count I + FIELD d maxUses I + FIELD e experience I + FIELD f multiplier F + CLASS avd$i SellSuspiciousStewFactory + FIELD a effect Lahr; + FIELD b duration I + FIELD c experience I + FIELD d multiplier F + CLASS avd$j SellPotionHoldingItemFactory + FIELD a sell Lbbp; + FIELD b sellCount I + FIELD c price I + FIELD d maxUses I + FIELD e experience I + FIELD f secondBuy Lbbk; + FIELD g secondCount I + FIELD h priceMultiplier F CLASS avd$k SellMapFactory + FIELD a price I FIELD b structure Ljava/lang/String; + FIELD c iconType Lcnd$a; + FIELD d maxUses I + FIELD e experience I FIELD a PROFESSION_TO_LEVELED_TRADE Ljava/util/Map; FIELD b WANDERING_TRADER_TRADES Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD a copyToFastUtilMap (Lcom/google/common/collect/ImmutableMap;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; diff --git a/mappings/net/minecraft/village/VillageManager.mapping b/mappings/net/minecraft/village/VillageManager.mapping deleted file mode 100644 index 1f9122d615..0000000000 --- a/mappings/net/minecraft/village/VillageManager.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS apu net/minecraft/village/VillageManager - METHOD a tick ()V diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping index e6195dbe9f..d242f41741 100644 --- a/mappings/net/minecraft/village/VillagerData.mapping +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -18,5 +18,5 @@ CLASS ava net/minecraft/village/VillagerData METHOD c getLevel ()I METHOD c getUpperLevelExperience (I)I ARG 0 level - METHOD d isLevelValid (I)Z + METHOD d canLevelUp (I)Z ARG 0 level diff --git a/mappings/net/minecraft/village/ZombieSiegeManager.mapping b/mappings/net/minecraft/village/ZombieSiegeManager.mapping new file mode 100644 index 0000000000..ca87e6bef1 --- /dev/null +++ b/mappings/net/minecraft/village/ZombieSiegeManager.mapping @@ -0,0 +1,14 @@ +CLASS apu net/minecraft/village/ZombieSiegeManager + CLASS apu$a State + FIELD a world Lve; + FIELD b spawned Z + FIELD c state Lapu$a; + FIELD d remaining I + FIELD e countdown I + FIELD f startX I + FIELD g startY I + FIELD h startZ I + METHOD a tick ()V + METHOD a getSpawnVector (Lev;)Lcrg; + METHOD b spawn ()Z + METHOD c trySpawnZombie ()V