From 20f2a30a5dc4f37cde24b120a74deec53ebdd95d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 1 Apr 2022 16:32:04 +0100 Subject: [PATCH] 22w13oneblockatatime --- build.gradle | 2 +- .../block/AbstractLichenBlock.mapping | 49 ------ .../minecraft/block/DispenserBlock.mapping | 4 +- .../net/minecraft/block/DropperBlock.mapping | 1 - .../block/EndPortalFrameBlock.mapping | 8 - mappings/net/minecraft/block/OreBlock.mapping | 5 - .../client/gui/hud/InGameHud.mapping | 1 - .../gui/screen/ingame/MerchantScreen.mapping | 62 ------- .../minecraft/client/model/ModelPart.mapping | 1 - .../client/particle/ParticleManager.mapping | 9 - .../client/render/GameRenderer.mapping | 2 - .../entity/PlayerEntityRenderer.mapping | 3 - .../feature/HeadFeatureRenderer.mapping | 2 +- .../entity/model/CowEntityModel.mapping | 1 - .../render/entity/model/ModelWithHead.mapping | 2 +- .../client/util/ParticleUtil.mapping | 9 +- mappings/net/minecraft/entity/Entity.mapping | 1 - .../net/minecraft/entity/LivingEntity.mapping | 4 +- .../ai/brain/task/HoldTradeOffersTask.mapping | 12 +- .../entity/ai/goal/IronGolemLookGoal.mapping | 1 - .../ai/goal/TrackIronGolemTargetGoal.mapping | 6 - .../entity/mob/EndermanEntity.mapping | 4 - .../entity/passive/VillagerEntity.mapping | 21 --- .../entity/player/PlayerEntity.mapping | 4 +- mappings/net/minecraft/item/BlockItem.mapping | 2 +- mappings/net/minecraft/item/ItemStack.mapping | 1 - .../minecraft/particle/ParticleTypes.mapping | 2 +- .../screen/MerchantScreenHandler.mapping | 37 ----- .../screen/slot/TradeOutputSlot.mapping | 12 -- .../server/command/PublishCommand.mapping | 2 +- .../server/network/DebugInfoSender.mapping | 6 - .../packageinfo/PackageInfo7349.mapping | 1 + .../packageinfo/PackageInfo7350.mapping | 1 + .../net/minecraft/village/Merchant.mapping | 8 - .../village/MerchantInventory.mapping | 15 -- .../net/minecraft/village/TradeOffer.mapping | 73 +-------- .../minecraft/village/TradeOfferList.mapping | 4 - .../net/minecraft/village/TradeOffers.mapping | 154 +----------------- .../SimpleGameEventDispatcher.mapping | 2 - .../world/explosion/Explosion.mapping | 6 - 40 files changed, 19 insertions(+), 521 deletions(-) delete mode 100644 mappings/net/minecraft/block/EndPortalFrameBlock.mapping delete mode 100644 mappings/net/minecraft/block/OreBlock.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping delete mode 100644 mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping delete mode 100644 mappings/net/minecraft/screen/MerchantScreenHandler.mapping delete mode 100644 mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7349.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7350.mapping delete mode 100644 mappings/net/minecraft/village/MerchantInventory.mapping diff --git a/build.gradle b/build.gradle index c46a3c0a62..8e8742df50 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.18.2" +def minecraft_version = "22w13oneblockatatime" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/AbstractLichenBlock.mapping b/mappings/net/minecraft/block/AbstractLichenBlock.mapping index ca3349e81e..04b41636d0 100644 --- a/mappings/net/minecraft/block/AbstractLichenBlock.mapping +++ b/mappings/net/minecraft/block/AbstractLichenBlock.mapping @@ -17,13 +17,6 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock ARG 1 direction ARG 2 pos ARG 3 state - METHOD method_33359 addDirection (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)Z - ARG 1 world - ARG 2 pos - ARG 3 direction - ARG 4 postProcess - METHOD method_33360 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_2350;)Z - ARG 5 to METHOD method_33361 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680; ARG 4 direction METHOD method_33362 withDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680; @@ -31,20 +24,6 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock ARG 2 world ARG 3 pos ARG 4 direction - METHOD method_33363 trySpreadTo (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;Z)Z - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 from - ARG 5 to - ARG 6 postProcess - METHOD method_33364 trySpreadRandomly (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Ljava/util/Random;Z)Z - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 from - ARG 5 random - ARG 6 postProcess METHOD method_33365 disableDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2746;)Lnet/minecraft/class_2680; ARG 0 state ARG 1 direction @@ -60,44 +39,16 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock ARG 1 direction METHOD method_33370 (Ljava/util/EnumMap;)V ARG 0 shapes - METHOD method_33371 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;ZLnet/minecraft/class_2350;)Z - ARG 6 to METHOD method_33372 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z ARG 1 direction METHOD method_33374 getProperty (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2746; ARG 0 direction - METHOD method_33375 trySpreadRandomly (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)Z - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 random METHOD method_33376 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z ARG 1 direction - METHOD method_33377 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z - ARG 1 from METHOD method_33378 isWaterlogged ()Z - METHOD method_33379 canGrowIn (Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_33380 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; ARG 0 state METHOD method_33381 hasAnyDirection (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_33382 isNotFullBlock (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_34728 canSpreadTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 1 world - ARG 2 pos - ARG 3 direction - METHOD method_34729 getSpreadLocation (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Ljava/util/Optional; - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 from - ARG 5 to - METHOD method_34730 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z - ARG 5 to - METHOD method_34731 canSpread (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 from diff --git a/mappings/net/minecraft/block/DispenserBlock.mapping b/mappings/net/minecraft/block/DispenserBlock.mapping index 5575410f3c..b90ccd008a 100644 --- a/mappings/net/minecraft/block/DispenserBlock.mapping +++ b/mappings/net/minecraft/block/DispenserBlock.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock ARG 1 behavior METHOD method_10010 getOutputLocation (Lnet/minecraft/class_2342;)Lnet/minecraft/class_2374; ARG 0 pointer - METHOD method_10011 getBehaviorForItem (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2357; - ARG 1 stack - METHOD method_10012 dispense (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + METHOD method_10012 dispense (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/DropperBlock.mapping b/mappings/net/minecraft/block/DropperBlock.mapping index 730a3ce05e..16c1f0f505 100644 --- a/mappings/net/minecraft/block/DropperBlock.mapping +++ b/mappings/net/minecraft/block/DropperBlock.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_2325 net/minecraft/block/DropperBlock - FIELD field_10949 BEHAVIOR Lnet/minecraft/class_2357; diff --git a/mappings/net/minecraft/block/EndPortalFrameBlock.mapping b/mappings/net/minecraft/block/EndPortalFrameBlock.mapping deleted file mode 100644 index 478218e456..0000000000 --- a/mappings/net/minecraft/block/EndPortalFrameBlock.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2333 net/minecraft/block/EndPortalFrameBlock - FIELD field_10953 EYE_SHAPE Lnet/minecraft/class_265; - FIELD field_10954 FACING Lnet/minecraft/class_2753; - FIELD field_10955 FRAME_WITH_EYE_SHAPE Lnet/minecraft/class_265; - FIELD field_10956 FRAME_SHAPE Lnet/minecraft/class_265; - FIELD field_10957 COMPLETED_FRAME Lnet/minecraft/class_2700; - FIELD field_10958 EYE Lnet/minecraft/class_2746; - METHOD method_10054 getCompletedFramePattern ()Lnet/minecraft/class_2700; diff --git a/mappings/net/minecraft/block/OreBlock.mapping b/mappings/net/minecraft/block/OreBlock.mapping deleted file mode 100644 index 14fa151652..0000000000 --- a/mappings/net/minecraft/block/OreBlock.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2431 net/minecraft/block/OreBlock - FIELD field_27195 experienceDropped Lnet/minecraft/class_6019; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_6019;)V - ARG 1 settings - ARG 2 experienceDropped diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 25a852fb0b..dc67bfd039 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -103,7 +103,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 2 matrices METHOD method_1760 renderStatusBars (Lnet/minecraft/class_4587;)V COMMENT Renders the armor, health, air, and hunger bars. - ARG 1 matrices METHOD method_1762 renderHotbarItem (IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping deleted file mode 100644 index a454225eeb..0000000000 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ /dev/null @@ -1,62 +0,0 @@ -CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScreen - FIELD field_19161 selectedIndex I - FIELD field_19162 offers [Lnet/minecraft/class_492$class_493; - FIELD field_19163 indexStartOffset I - FIELD field_19164 scrolling Z - FIELD field_26569 TRADES_TEXT Lnet/minecraft/class_2561; - FIELD field_26570 SEPARATOR_TEXT Lnet/minecraft/class_2561; - FIELD field_26571 DEPRECATED_TEXT Lnet/minecraft/class_2561; - FIELD field_2950 TEXTURE Lnet/minecraft/class_2960; - FIELD field_32354 TEXTURE_WIDTH I - FIELD field_32355 TEXTURE_HEIGHT I - FIELD field_32357 XP_BAR_X_OFFSET I - FIELD field_32358 TRADE_LIST_AREA_Y_OFFSET I - FIELD field_32359 FIRST_BUY_ITEM_X_OFFSET I - FIELD field_32360 SECOND_BUY_ITEM_X_OFFSET I - FIELD field_32361 SOLD_ITEM_X_OFFSET I - FIELD field_32363 MAX_TRADE_OFFERS I - FIELD field_32365 TRADE_OFFER_BUTTON_HEIGHT I - FIELD field_32366 TRADE_OFFER_BUTTON_WIDTH I - FIELD field_32367 SCROLLBAR_HEIGHT I - FIELD field_32368 SCROLLBAR_WIDTH I - FIELD field_32369 SCROLLBAR_AREA_HEIGHT I - FIELD field_32370 SCROLLBAR_OFFSET_Y I - FIELD field_32371 SCROLLBAR_OFFSET_X I - METHOD (Lnet/minecraft/class_1728;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler - ARG 2 inventory - ARG 3 title - METHOD method_19413 drawLevelInfo (Lnet/minecraft/class_4587;IILnet/minecraft/class_1914;)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 tradeOffer - METHOD method_19896 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_20220 canScroll (I)Z - ARG 1 listSize - METHOD method_20221 renderScrollbar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1916;)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 tradeOffers - METHOD method_20222 renderFirstBuyItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;II)V - ARG 1 matrices - ARG 2 adjustedFirstBuyItem - ARG 3 originalFirstBuyItem - ARG 4 x - ARG 5 y - METHOD method_20223 renderArrow (Lnet/minecraft/class_4587;Lnet/minecraft/class_1914;II)V - ARG 1 matrices - ARG 2 tradeOffer - ARG 3 x - ARG 4 y - METHOD method_2496 syncRecipeIndex ()V - CLASS class_493 WidgetButtonPage - FIELD field_19165 index I - METHOD (Lnet/minecraft/class_492;IIILnet/minecraft/class_4185$class_4241;)V - ARG 2 x - ARG 3 y - ARG 4 index - ARG 5 onPress - METHOD method_20228 getIndex ()I diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index ebdd3d439a..d8b089d73e 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart FIELD field_3674 roll F FIELD field_3675 yaw F METHOD (Ljava/util/List;Ljava/util/Map;)V - ARG 1 cuboids ARG 2 children METHOD method_17138 copyTransform (Lnet/minecraft/class_630;)V ARG 1 part diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 6e20bd2dfe..67d022a179 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -37,8 +37,6 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager METHOD method_3045 setWorld (Lnet/minecraft/class_638;)V ARG 1 world METHOD method_3046 addBlockBreakParticles (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 1 pos - ARG 2 state METHOD method_3048 tickParticles (Ljava/util/Collection;)V COMMENT Ticks all particles belonging to the same texture sheet. ARG 1 particles @@ -82,13 +80,6 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 1 entity ARG 2 parameters METHOD method_3062 registerDefaultFactories ()V - METHOD method_34020 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;DDDDDD)V - ARG 3 minX - ARG 5 minY - ARG 7 minZ - ARG 9 maxX - ARG 11 maxY - ARG 13 maxZ METHOD method_34021 canAdd (Lnet/minecraft/class_5878;)Z COMMENT {@return whether another particle from {@code group} can be rendered by this COMMENT manager} diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 6baaf19d88..47e3b0ce07 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -100,8 +100,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 client ARG 2 resourceManager ARG 3 buffers - METHOD method_18144 (Lnet/minecraft/class_1297;)Z - ARG 0 entity METHOD method_19418 getCamera ()Lnet/minecraft/class_4184; METHOD method_22709 loadProjectionMatrix (Lnet/minecraft/class_1159;)V ARG 1 projectionMatrix diff --git a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping index f5cd616638..b66e519dc8 100644 --- a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping @@ -3,12 +3,9 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe ARG 1 ctx ARG 2 slim METHOD method_23205 renderArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_742;Lnet/minecraft/class_630;Lnet/minecraft/class_630;)V - ARG 1 matrices ARG 2 vertexConsumers ARG 3 light ARG 4 player - ARG 5 arm - ARG 6 sleeve METHOD method_4210 getArmPose (Lnet/minecraft/class_742;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573; ARG 0 player ARG 1 hand diff --git a/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping index d00f7433fa..57a3cda009 100644 --- a/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_976 net/minecraft/client/render/entity/feature/HeadFea METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V ARG 1 context ARG 2 loader - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;FFF)V + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;FFFZ)V ARG 1 context ARG 2 loader ARG 3 scaleX diff --git a/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping index 65d45b7903..c1439537b1 100644 --- a/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping @@ -36,5 +36,4 @@ CLASS net/minecraft/class_560 net/minecraft/client/render/entity/model/CowEntity COMMENT METHOD (Lnet/minecraft/class_630;)V ARG 1 root - METHOD method_2800 getHead ()Lnet/minecraft/class_630; METHOD method_31990 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/ModelWithHead.mapping b/mappings/net/minecraft/client/render/entity/model/ModelWithHead.mapping index 4e59da99c5..5d17fdbba8 100644 --- a/mappings/net/minecraft/client/render/entity/model/ModelWithHead.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ModelWithHead.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3882 net/minecraft/client/render/entity/model/ModelWithHead COMMENT Represents a model with a head. - METHOD method_2838 getHead ()Lnet/minecraft/class_630; + METHOD method_2800 getHead ()Lnet/minecraft/class_630; COMMENT Gets the head model part. COMMENT COMMENT @return the head diff --git a/mappings/net/minecraft/client/util/ParticleUtil.mapping b/mappings/net/minecraft/client/util/ParticleUtil.mapping index 6f13263aa3..e7bf7e0498 100644 --- a/mappings/net/minecraft/client/util/ParticleUtil.mapping +++ b/mappings/net/minecraft/client/util/ParticleUtil.mapping @@ -1,14 +1,9 @@ CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil - METHOD method_34681 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2394;)V - ARG 0 world + METHOD method_34681 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2394;Lnet/minecraft/class_243;D)V ARG 1 pos ARG 2 direction ARG 3 effect - METHOD method_34682 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2394;Lnet/minecraft/class_6019;)V - ARG 0 world - ARG 1 pos - ARG 2 effect - ARG 3 range + METHOD method_34682 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2394;Lnet/minecraft/class_6017;)V METHOD method_34683 spawnParticle (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;DLnet/minecraft/class_2394;Lnet/minecraft/class_6019;)V ARG 0 axis ARG 1 world diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 64e84880ed..ef37036425 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -460,7 +460,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5623 fall (DZLnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V ARG 1 heightDifference ARG 3 onGround - ARG 4 landedState ARG 5 landedPosition METHOD method_5624 isSprinting ()Z METHOD method_5625 getSplashSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index e60e66341d..fa63fea3ca 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -545,7 +545,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6107 getSoundVolume ()F METHOD method_6108 updatePostDeath ()V METHOD method_6109 isBaby ()Z - METHOD method_6110 getXpToDrop (Lnet/minecraft/class_1657;)I + METHOD method_6110 getXpToDrop ()I COMMENT Called when this entity is killed and returns the amount of experience COMMENT to drop. COMMENT @@ -555,8 +555,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT @see #dropXp() COMMENT @see #shouldAlwaysDropXp() COMMENT @see #shouldDropXp() - ARG 1 player - COMMENT the attacking player METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; COMMENT Removes a status effect from this entity without calling any listener. COMMENT diff --git a/mappings/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.mapping index 8e21ed4958..b62df09068 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_4130 net/minecraft/entity/ai/brain/task/HoldTradeOffersTask - FIELD field_18392 customerHeldStack Lnet/minecraft/class_1799; - FIELD field_18393 offers Ljava/util/List; FIELD field_18394 offerShownTicks I FIELD field_18395 offerIndex I FIELD field_18396 ticksLeft I @@ -14,16 +12,8 @@ CLASS net/minecraft/class_4130 net/minecraft/entity/ai/brain/task/HoldTradeOffer METHOD method_19027 setupOffers (Lnet/minecraft/class_1309;Lnet/minecraft/class_1646;)V ARG 1 customer ARG 2 villager - METHOD method_19028 isPossible (Lnet/minecraft/class_1914;)Z - ARG 1 offer METHOD method_19598 holdOffer (Lnet/minecraft/class_1646;)V - ARG 1 villager - METHOD method_19601 loadPossibleOffers (Lnet/minecraft/class_1646;)V + METHOD method_19601 loadPossibleOffers (Lnet/minecraft/class_1646;Lnet/minecraft/class_7317;)V ARG 1 villager METHOD method_19603 findPotentialCustomer (Lnet/minecraft/class_1646;)Lnet/minecraft/class_1309; ARG 1 villager - METHOD method_37447 holdOffer (Lnet/minecraft/class_1646;Lnet/minecraft/class_1799;)V - ARG 0 villager - ARG 1 stack - METHOD method_37448 holdNothing (Lnet/minecraft/class_1646;)V - ARG 0 villager diff --git a/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping b/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping index e0b4e3732d..f5af522a00 100644 --- a/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping @@ -3,6 +3,5 @@ CLASS net/minecraft/class_1372 net/minecraft/entity/ai/goal/IronGolemLookGoal FIELD field_30224 MAX_LOOK_COOLDOWN I FIELD field_6542 golem Lnet/minecraft/class_1439; FIELD field_6543 lookCountdown I - FIELD field_6544 targetVillager Lnet/minecraft/class_1646; METHOD (Lnet/minecraft/class_1439;)V ARG 1 golem diff --git a/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping deleted file mode 100644 index 2721e1d4d6..0000000000 --- a/mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1397 net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal - FIELD field_19340 targetPredicate Lnet/minecraft/class_4051; - FIELD field_6629 golem Lnet/minecraft/class_1439; - FIELD field_6630 target Lnet/minecraft/class_1309; - METHOD (Lnet/minecraft/class_1439;)V - ARG 1 golem diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index 8776e88006..9039f05f9b 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity FIELD field_7254 ageWhenTargetSet I FIELD field_7255 ANGRY Lnet/minecraft/class_2940; FIELD field_7256 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; - FIELD field_7257 CARRIED_BLOCK Lnet/minecraft/class_2940; METHOD method_22330 isProvoked ()Z METHOD method_22331 setProvoked ()V METHOD method_26910 createEndermanAttributes ()Lnet/minecraft/class_5132$class_5133; @@ -24,12 +23,9 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity ARG 1 entity METHOD method_7026 isPlayerStaring (Lnet/minecraft/class_1657;)Z ARG 1 player - METHOD method_7027 getCarriedBlock ()Lnet/minecraft/class_2680; METHOD method_7028 isAngry ()Z METHOD method_7029 teleportRandomly ()Z METHOD method_7030 playAngrySound ()V - METHOD method_7032 setCarriedBlock (Lnet/minecraft/class_2680;)V - ARG 1 state CLASS class_1561 PlaceBlockGoal FIELD field_7258 enderman Lnet/minecraft/class_1560; METHOD (Lnet/minecraft/class_1560;)V diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 5e17df9dbe..5f43cf4f93 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -5,14 +5,11 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity FIELD field_18529 levelingUp Z FIELD field_18530 lastCustomer Lnet/minecraft/class_1657; FIELD field_18533 foodLevel I - FIELD field_18534 gossip Lnet/minecraft/class_4136; - FIELD field_18535 gossipStartTime J FIELD field_18536 experience I FIELD field_18537 lastRestockTime J FIELD field_18538 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_18539 SENSORS Lcom/google/common/collect/ImmutableList; FIELD field_18851 POINTS_OF_INTEREST Ljava/util/Map; - FIELD field_19357 lastGossipDecayTime J FIELD field_19427 restocksToday I FIELD field_20332 lastRestockCheckTime J FIELD field_25167 natural Z @@ -27,10 +24,6 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_19174 initBrain (Lnet/minecraft/class_4095;)V ARG 1 brain METHOD method_19176 releaseTicketFor (Lnet/minecraft/class_4140;)V - METHOD method_19177 talkWithVillager (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)V - ARG 1 world - ARG 2 villager - ARG 3 time METHOD method_19178 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_4140;Lnet/minecraft/class_4208;)V ARG 3 pos METHOD method_19179 reinitializeBrain (Lnet/minecraft/class_3218;)V @@ -38,16 +31,10 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_19182 restock ()V METHOD method_19183 playWorkSound ()V METHOD method_19185 consumeAvailableFood ()V - METHOD method_19187 clearSpecialPrices ()V - COMMENT Resets the special price of all the trade offers of this villager. METHOD method_19188 canLevelUp ()Z METHOD method_19189 getAvailableFood ()I METHOD method_19190 spawnIronGolem (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1439; ARG 1 world - METHOD method_19191 beginTradeWith (Lnet/minecraft/class_1657;)V - ARG 1 customer - METHOD method_19192 prepareOffersFor (Lnet/minecraft/class_1657;)V - ARG 1 player METHOD method_19193 depleteFood (I)V ARG 1 amount METHOD method_19520 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z @@ -63,10 +50,6 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_19625 setExperience (I)V ARG 1 experience METHOD method_20264 sayNo ()V - METHOD method_20593 (Lnet/minecraft/class_4139;)Z - ARG 0 gossipType - METHOD method_20594 getReputation (Lnet/minecraft/class_1657;)I - ARG 1 player METHOD method_20687 canSummonGolem (J)Z ARG 1 time METHOD method_20688 summonGolem (Lnet/minecraft/class_3218;JI)V @@ -77,7 +60,6 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity ARG 1 killer METHOD method_20693 (JLnet/minecraft/class_1646;)Z ARG 2 villager - METHOD method_20696 decayGossip ()V METHOD method_20697 eatForBreeding ()V METHOD method_20698 lacksFood ()Z METHOD method_20741 hasRecentlySlept (J)Z @@ -89,9 +71,6 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity COMMENT COMMENT

Checks if at least one of its trade offers has been used. METHOD method_20824 canRestock ()Z - METHOD method_21650 readGossipDataNbt (Lnet/minecraft/class_2520;)V - ARG 1 nbt - METHOD method_21651 getGossip ()Lnet/minecraft/class_4136; METHOD method_21723 restockAndUpdateDemandBonus ()V METHOD method_21724 updateDemandBonus ()V COMMENT Updates the demand bonus of all the trade offers of this villager. diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 9972728529..d9d04b3975 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -244,10 +244,10 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7326 doesNotSuffocate (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_7327 getScoreboard ()Lnet/minecraft/class_269; - METHOD method_7328 dropItem (Lnet/minecraft/class_1799;Z)Lnet/minecraft/class_1542; + METHOD method_7328 dropItem (Lnet/minecraft/class_1799;Z)Ljava/util/List; ARG 1 stack ARG 2 retainOwnership - METHOD method_7329 dropItem (Lnet/minecraft/class_1799;ZZ)Lnet/minecraft/class_1542; + METHOD method_7329 dropItem (Lnet/minecraft/class_1799;ZZ)Ljava/util/List; ARG 1 stack ARG 2 throwRandomly COMMENT if true, the item will be thrown in a random direction from the entity regardless of which direction the entity is facing diff --git a/mappings/net/minecraft/item/BlockItem.mapping b/mappings/net/minecraft/item/BlockItem.mapping index 5089c904b4..a5300dce3a 100644 --- a/mappings/net/minecraft/item/BlockItem.mapping +++ b/mappings/net/minecraft/item/BlockItem.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem ARG 0 state ARG 1 property ARG 2 name - METHOD method_18084 placeFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + METHOD method_18084 placeFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_1750;)Lnet/minecraft/class_2680; ARG 1 pos ARG 2 world ARG 3 stack diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index bbaaaf2919..2677871e90 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -106,7 +106,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD (Lnet/minecraft/class_1935;)V ARG 1 item METHOD (Lnet/minecraft/class_1935;I)V - ARG 1 item ARG 2 count METHOD (Lnet/minecraft/class_1935;ILjava/util/Optional;)V ARG 1 item diff --git a/mappings/net/minecraft/particle/ParticleTypes.mapping b/mappings/net/minecraft/particle/ParticleTypes.mapping index 533681f55c..cfa3d6d20e 100644 --- a/mappings/net/minecraft/particle/ParticleTypes.mapping +++ b/mappings/net/minecraft/particle/ParticleTypes.mapping @@ -3,6 +3,6 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400; ARG 0 name ARG 1 alwaysShow - METHOD method_10304 register (Ljava/lang/String;Lnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;)Lnet/minecraft/class_2396; + METHOD method_10304 register (Ljava/lang/String;Lnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;Z)Lnet/minecraft/class_2396; ARG 0 name ARG 1 factory diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping deleted file mode 100644 index ca3c9fce52..0000000000 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ /dev/null @@ -1,37 +0,0 @@ -CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler - FIELD field_18669 levelProgress I - FIELD field_18670 leveled Z - FIELD field_19358 canRefreshTrades Z - FIELD field_7861 merchantInventory Lnet/minecraft/class_1725; - FIELD field_7863 merchant Lnet/minecraft/class_1915; - METHOD (ILnet/minecraft/class_1661;)V - ARG 1 syncId - ARG 2 playerInventory - METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1915;)V - ARG 1 syncId - ARG 2 playerInventory - ARG 3 merchant - METHOD method_17437 setOffers (Lnet/minecraft/class_1916;)V - ARG 1 offers - METHOD method_17438 getRecipes ()Lnet/minecraft/class_1916; - METHOD method_19253 setLeveled (Z)V - ARG 1 leveled - METHOD method_19254 getExperience ()I - METHOD method_19255 setExperienceFromServer (I)V - ARG 1 experience - METHOD method_19256 getMerchantRewardedExperience ()I - METHOD method_19257 setLevelProgress (I)V - ARG 1 levelProgress - METHOD method_19258 getLevelProgress ()I - METHOD method_19259 isLeveled ()Z - METHOD method_20214 autofill (ILnet/minecraft/class_1799;)V - ARG 1 slot - ARG 2 stack - METHOD method_20215 switchTo (I)V - ARG 1 recipeIndex - METHOD method_20595 playYesSound ()V - METHOD method_20700 setCanRefreshTrades (Z)V - ARG 1 canRefreshTrades - METHOD method_20701 canRefreshTrades ()Z - METHOD method_7650 setRecipeIndex (I)V - ARG 1 index diff --git a/mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping b/mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping deleted file mode 100644 index 5437ddce41..0000000000 --- a/mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_1727 net/minecraft/screen/slot/TradeOutputSlot - FIELD field_7857 player Lnet/minecraft/class_1657; - FIELD field_7858 merchant Lnet/minecraft/class_1915; - FIELD field_7859 amount I - FIELD field_7860 merchantInventory Lnet/minecraft/class_1725; - METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1915;Lnet/minecraft/class_1725;III)V - ARG 1 player - ARG 2 merchant - ARG 3 merchantInventory - ARG 4 index - ARG 5 x - ARG 6 y diff --git a/mappings/net/minecraft/server/command/PublishCommand.mapping b/mappings/net/minecraft/server/command/PublishCommand.mapping index 7850345d58..347a2257ec 100644 --- a/mappings/net/minecraft/server/command/PublishCommand.mapping +++ b/mappings/net/minecraft/server/command/PublishCommand.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_3093 net/minecraft/server/command/PublishCommand FIELD field_13680 FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_13508 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13509 execute (Lnet/minecraft/class_2168;I)I + METHOD method_13509 execute (Lnet/minecraft/class_2168;IZLnet/minecraft/class_1934;)I ARG 0 source ARG 1 port METHOD method_13510 register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/network/DebugInfoSender.mapping b/mappings/net/minecraft/server/network/DebugInfoSender.mapping index 6ceea64604..38d8f8311d 100644 --- a/mappings/net/minecraft/server/network/DebugInfoSender.mapping +++ b/mappings/net/minecraft/server/network/DebugInfoSender.mapping @@ -75,12 +75,6 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender ARG 1 buf METHOD method_36159 (Lnet/minecraft/class_4158;)Z ARG 0 poiType - METHOD method_36160 (Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_4139;Ljava/lang/Integer;)V - ARG 2 type - ARG 3 value - METHOD method_36161 (Ljava/util/List;Ljava/util/UUID;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)V - ARG 1 uuid - ARG 2 gossips METHOD method_36162 (Lnet/minecraft/class_2540;Lnet/minecraft/class_4135;)V ARG 0 buf ARG 1 goal diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7349.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7349.mapping new file mode 100644 index 0000000000..59d2c19bd7 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7349.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7349 net/minecraft/unused/packageinfo/PackageInfo7349 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7350.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7350.mapping new file mode 100644 index 0000000000..2ed8171b9c --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7350.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7350 net/minecraft/unused/packageinfo/PackageInfo7350 diff --git a/mappings/net/minecraft/village/Merchant.mapping b/mappings/net/minecraft/village/Merchant.mapping index 850a2ee188..5954432ab5 100644 --- a/mappings/net/minecraft/village/Merchant.mapping +++ b/mappings/net/minecraft/village/Merchant.mapping @@ -1,12 +1,4 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Merchant - METHOD method_17448 (ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; - ARG 1 syncId - ARG 2 playerInventory - ARG 3 player - METHOD method_17449 sendOffers (Lnet/minecraft/class_1657;Lnet/minecraft/class_2561;I)V - ARG 1 player - ARG 2 test - ARG 3 levelProgress METHOD method_18010 getYesSound ()Lnet/minecraft/class_3414; METHOD method_19269 getExperience ()I METHOD method_19270 isLeveledMerchant ()Z diff --git a/mappings/net/minecraft/village/MerchantInventory.mapping b/mappings/net/minecraft/village/MerchantInventory.mapping deleted file mode 100644 index 95cac2e784..0000000000 --- a/mappings/net/minecraft/village/MerchantInventory.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_1725 net/minecraft/village/MerchantInventory - FIELD field_18668 merchantRewardedExperience I - FIELD field_7842 offerIndex I - FIELD field_7843 tradeOffer Lnet/minecraft/class_1914; - FIELD field_7844 merchant Lnet/minecraft/class_1915; - FIELD field_7845 inventory Lnet/minecraft/class_2371; - METHOD (Lnet/minecraft/class_1915;)V - ARG 1 merchant - METHOD method_19252 getMerchantRewardedExperience ()I - METHOD method_7642 getTradeOffer ()Lnet/minecraft/class_1914; - METHOD method_7643 setOfferIndex (I)V - ARG 1 index - METHOD method_7644 needsOfferUpdate (I)Z - ARG 1 slot - METHOD method_7645 updateOffers ()V diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 9accfd74f5..40b6c32ddf 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -1,77 +1,18 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer - FIELD field_18676 specialPrice I FIELD field_18677 demandBonus I FIELD field_18678 priceMultiplier F FIELD field_18679 merchantExperience I - FIELD field_9143 secondBuyItem Lnet/minecraft/class_1799; FIELD field_9144 maxUses I FIELD field_9145 rewardingPlayerExperience Z - FIELD field_9146 firstBuyItem Lnet/minecraft/class_1799; FIELD field_9147 uses I - FIELD field_9148 sellItem Lnet/minecraft/class_1799; - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIF)V - ARG 1 buyItem - ARG 2 sellItem - ARG 3 maxUses - ARG 4 merchantExperience - ARG 5 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIF)V - ARG 1 firstBuyItem - ARG 2 secondBuyItem - ARG 3 sellItem - ARG 4 maxUses - ARG 5 merchantExperience - ARG 6 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIF)V - ARG 1 firstBuyItem - ARG 2 secondBuyItem - ARG 3 sellItem - ARG 4 uses - ARG 5 maxUses - ARG 6 merchantExperience - ARG 7 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFI)V - ARG 1 firstBuyItem - ARG 2 secondBuyItem - ARG 3 sellItem - ARG 4 uses - ARG 5 maxUses - ARG 6 merchantExperience - ARG 7 priceMultiplier - ARG 8 demandBonus METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt - METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 1 first - ARG 2 second - METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 1 firstBuyStack - ARG 2 secondBuyStack - METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 1 given - ARG 2 sample - METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; - COMMENT Returns a copy of the sell item of this trade offer. - METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; - COMMENT Returns a copy of the first buy item of this trade offer, - COMMENT with its price adjusted depending on the demand bonus, the - COMMENT special price and the price multiplier. - METHOD method_19273 setSpecialPrice (I)V - COMMENT Sets the special price of this trade offer to {@code specialPrice}. - ARG 1 specialPrice METHOD method_19274 updateDemandBonus ()V COMMENT Updates the demand bonus of this trade offer depending on its COMMENT previous demand bonus, the number of times it has been used and COMMENT its remaining uses. METHOD method_19275 resetUses ()V COMMENT Resets the number of times this trade offer has been used. - METHOD method_19276 clearSpecialPrice ()V - COMMENT Resets the special price of this trade offer. - METHOD method_19277 getSpecialPrice ()I - COMMENT Returns the special price of this trade offer. It is used to - COMMENT adjust the price of its first buy item. - COMMENT - COMMENT

The less the special price is, the more the price will be low. METHOD method_19278 getPriceMultiplier ()F COMMENT Returns the price multiplier of this trade offer. It is used to COMMENT adjust the price of its first buy item. @@ -94,23 +35,11 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer COMMENT is greater than 0. METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. - METHOD method_8245 increaseSpecialPrice (I)V - COMMENT Increases the special price of this trade offer by {@code increment}. - COMMENT - COMMENT

A negative {@code increment} value will decrease the special price. - ARG 1 increment - METHOD method_8246 getOriginalFirstBuyItem ()Lnet/minecraft/class_1799; - COMMENT Returns the first buy item of this trade offer. - METHOD method_8247 getSecondBuyItem ()Lnet/minecraft/class_1799; - COMMENT Returns the second buy item of this trade offer. - COMMENT - COMMENT

If there is no second buy item, this returns the {@linkplain ItemStack#EMPTY empty - COMMENT item stack}. METHOD method_8248 getMaxUses ()I COMMENT Returns the maximum number of times this trade offer can be used. METHOD method_8249 getUses ()I COMMENT Returns the number of times this trade offer has been used. - METHOD method_8250 getSellItem ()Lnet/minecraft/class_1799; + METHOD method_8250 getSellItem ()Lnet/minecraft/class_7317; COMMENT Returns the sell item of this trade offer. METHOD method_8251 toNbt ()Lnet/minecraft/class_2487; METHOD method_8254 disable ()V diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index 82bb4b1446..1d50df1755 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList ARG 1 nbt METHOD method_8265 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1916; ARG 0 buf - METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914; - ARG 1 firstBuyItem - ARG 2 secondBuyItem - ARG 3 index METHOD method_8268 toNbt ()Lnet/minecraft/class_2487; METHOD method_8270 toPacket (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 29a060a02d..db8fc8d031 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_17724 WANDERING_TRADER_TRADES Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_30615 DEFAULT_MAX_USES I FIELD field_30616 COMMON_MAX_USES I - FIELD field_30617 RARE_MAX_USES I FIELD field_30618 NOVICE_SELL_XP I FIELD field_30619 NOVICE_BUY_XP I FIELD field_30620 APPRENTICE_SELL_XP I @@ -19,10 +18,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 0 map METHOD method_16929 (Ljava/util/HashMap;)V ARG 0 map - CLASS class_1648 EnchantBookFactory - FIELD field_18557 experience I - METHOD (I)V - ARG 1 experience CLASS class_1652 Factory COMMENT A factory to create trade offers. METHOD method_7246 create (Lnet/minecraft/class_1297;Ljava/util/Random;)Lnet/minecraft/class_1914; @@ -31,163 +26,20 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers COMMENT @return a new trade offer, or {@code null} if none should be created ARG 1 entity ARG 2 random - CLASS class_1654 SellMapFactory - FIELD field_18589 price I - FIELD field_18590 maxUses I - FIELD field_18591 experience I - FIELD field_37051 nameKey Ljava/lang/String; - FIELD field_7473 iconType Lnet/minecraft/class_20$class_21; - FIELD field_7474 structure Lnet/minecraft/class_6862; - METHOD (ILnet/minecraft/class_6862;Ljava/lang/String;Lnet/minecraft/class_20$class_21;II)V - ARG 1 price - ARG 2 structure - ARG 3 nameKey - ARG 4 iconType - ARG 5 maxUses - ARG 6 experience - CLASS class_4160 SellDyedArmorFactory - FIELD field_18544 sell Lnet/minecraft/class_1792; - FIELD field_18545 price I - FIELD field_18546 maxUses I - FIELD field_18547 experience I - METHOD (Lnet/minecraft/class_1792;I)V - ARG 1 item - ARG 2 price - METHOD (Lnet/minecraft/class_1792;III)V - ARG 1 item - ARG 2 price - ARG 3 maxUses - ARG 4 experience - METHOD method_19200 getDye (Ljava/util/Random;)Lnet/minecraft/class_1769; - ARG 0 random CLASS class_4161 BuyForOneEmeraldFactory - FIELD field_18548 buy Lnet/minecraft/class_1792; - FIELD field_18549 price I FIELD field_18550 maxUses I FIELD field_18551 experience I FIELD field_18552 multiplier F - METHOD (Lnet/minecraft/class_1935;III)V - ARG 1 item + METHOD (Lnet/minecraft/class_7317;II)V ARG 2 price ARG 3 maxUses - ARG 4 experience - CLASS class_4162 TypeAwareBuyForOneEmeraldFactory - FIELD field_18553 map Ljava/util/Map; - FIELD field_18554 count I - FIELD field_18555 maxUses I - FIELD field_18556 experience I - METHOD (IIILjava/util/Map;)V - ARG 1 count - ARG 2 maxUses - ARG 3 experience - ARG 4 map - METHOD method_19201 (Lnet/minecraft/class_3854;)V - ARG 0 villagerType - METHOD method_19202 (Ljava/util/Map;Lnet/minecraft/class_3854;)Z - ARG 1 villagerType - CLASS class_4163 SellEnchantedToolFactory - FIELD field_18558 tool Lnet/minecraft/class_1799; - FIELD field_18559 basePrice I - FIELD field_18560 maxUses I - FIELD field_18561 experience I - FIELD field_18562 multiplier F - METHOD (Lnet/minecraft/class_1792;III)V - ARG 1 item - ARG 2 basePrice - ARG 3 maxUses - ARG 4 experience - METHOD (Lnet/minecraft/class_1792;IIIF)V - ARG 1 item - ARG 2 basePrice - ARG 3 maxUses - ARG 4 experience - ARG 5 multiplier - CLASS class_4164 ProcessItemFactory - FIELD field_18563 secondBuy Lnet/minecraft/class_1799; - FIELD field_18564 secondCount I - FIELD field_18565 price I - FIELD field_18566 sell Lnet/minecraft/class_1799; - FIELD field_18567 sellCount I - FIELD field_18568 maxUses I - FIELD field_18569 experience I - FIELD field_18570 multiplier F - METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;III)V - ARG 1 item - ARG 2 secondCount - ARG 3 price - ARG 4 sellItem - ARG 5 sellCount - ARG 6 maxUses - ARG 7 experience - METHOD (Lnet/minecraft/class_1935;ILnet/minecraft/class_1792;III)V - ARG 1 item - ARG 2 secondCount - ARG 3 sellItem - ARG 4 sellCount - ARG 5 maxUses - ARG 6 experience CLASS class_4165 SellItemFactory - FIELD field_18571 sell Lnet/minecraft/class_1799; - FIELD field_18572 price I - FIELD field_18573 count I FIELD field_18574 maxUses I FIELD field_18575 experience I FIELD field_18576 multiplier F - METHOD (Lnet/minecraft/class_1792;III)V - ARG 1 item + METHOD (Lnet/minecraft/class_7317;II)V ARG 2 price ARG 3 count - ARG 4 experience - METHOD (Lnet/minecraft/class_1792;IIII)V - ARG 1 item + METHOD (Lnet/minecraft/class_7317;IIF)V ARG 2 price ARG 3 count - ARG 4 maxUses - ARG 5 experience - METHOD (Lnet/minecraft/class_1799;IIII)V - ARG 1 stack - ARG 2 price - ARG 3 count - ARG 4 maxUses - ARG 5 experience - METHOD (Lnet/minecraft/class_1799;IIIIF)V - ARG 1 stack - ARG 2 price - ARG 3 count - ARG 4 maxUses - ARG 5 experience - ARG 6 multiplier - METHOD (Lnet/minecraft/class_2248;IIII)V - ARG 1 block - ARG 2 price - ARG 3 count - ARG 4 maxUses - ARG 5 experience - CLASS class_4166 SellSuspiciousStewFactory - FIELD field_18577 effect Lnet/minecraft/class_1291; - FIELD field_18578 duration I - FIELD field_18579 experience I - FIELD field_18580 multiplier F - METHOD (Lnet/minecraft/class_1291;II)V - ARG 1 effect - ARG 2 duration - ARG 3 experience - CLASS class_4167 SellPotionHoldingItemFactory - FIELD field_18581 sell Lnet/minecraft/class_1799; - FIELD field_18582 sellCount I - FIELD field_18583 price I - FIELD field_18584 maxUses I - FIELD field_18585 experience I - FIELD field_18586 secondBuy Lnet/minecraft/class_1792; - FIELD field_18587 secondCount I - FIELD field_18588 priceMultiplier F - METHOD (Lnet/minecraft/class_1792;ILnet/minecraft/class_1792;IIII)V - ARG 1 arrow - ARG 2 secondCount - ARG 3 tippedArrow - ARG 4 sellCount - ARG 5 price - ARG 6 maxUses - ARG 7 experience - METHOD method_19203 (Lnet/minecraft/class_1842;)Z - ARG 0 potion diff --git a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping index 62d194de75..4ceb794220 100644 --- a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven COMMENT @apiNote Vanilla Minecraft creates it on a per-chunk-section basis. FIELD field_28142 listeners Ljava/util/List; FIELD field_28143 world Lnet/minecraft/class_1937; - METHOD (Lnet/minecraft/class_1937;)V - ARG 1 world METHOD method_32936 dispatchTo (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;Lnet/minecraft/class_5714;)Z ARG 1 world ARG 2 event diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 86bebea04e..9231ee9a8f 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -61,12 +61,6 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD method_17752 getExposure (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)F ARG 0 source ARG 1 entity - METHOD method_24023 tryMergeStack (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V - ARG 0 stacks - ARG 1 stack - ARG 2 pos - METHOD method_24024 (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V - ARG 2 stack METHOD method_29553 chooseBehavior (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5362; ARG 1 entity METHOD method_8346 getAffectedBlocks ()Ljava/util/List;