From 730b13f42272e2c881f7b9df35f229c14387c466 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Fri, 26 Oct 2018 18:32:05 +0200 Subject: [PATCH] mostly Chunk/WorldBorder-related mappings --- mappings/ays.mapping | 5 ++ mappings/azb.mapping | 3 + mappings/aze.mapping | 3 + mappings/azp.mapping | 1 + mappings/bkl.mapping | 2 + mappings/bnu.mapping | 14 +++ mappings/boa.mapping | 14 +++ mappings/boc.mapping | 30 +++++++ mappings/bog.mapping | 14 +++ mappings/bop.mapping | 14 +++ mappings/bpc.mapping | 4 + mappings/bpp.mapping | 9 ++ mappings/bxk.mapping | 1 + mappings/net/minecraft/block/Block.mapping | 1 + .../minecraft/block/BlockDispenser.mapping | 1 + .../net/minecraft/block/BlockLeaves.mapping | 3 + .../dispenser/DispenserBehaviorItem.mapping | 3 +- .../DispenserBehaviorProjectile.mapping | 13 +++ .../block/entity/BlockEntity.mapping | 8 ++ .../block/entity/BlockEntityChest.mapping | 2 + .../block/entity/BlockEntityDispenser.mapping | 2 + .../block/entity/BlockEntityEndPortal.mapping | 2 + .../BlockEntityLockableContainer.mapping | 2 + .../entity/BlockEntityWithLootTable.mapping | 2 + .../block/pattern/BlockProxy.mapping | 2 + .../minecraft/client/render/Renderer.mapping | 4 + .../client/world/WorldClient.mapping | 3 + .../command/CommandWorldBorder.mapping | 1 + mappings/net/minecraft/item/ItemArmor.mapping | 3 +- .../net/minecraft/item/ItemMinecart.mapping | 3 +- .../reference/DispenserBehaviors.mapping | 88 ++++++++++++++++--- .../config/ServerConfigurationManager.mapping | 24 +++++ mappings/net/minecraft/world/World.mapping | 22 +++++ .../net/minecraft/world/WorldServer.mapping | 3 + .../world/border/IWorldBorderListener.mapping | 15 ++++ .../world/border/WorldBorder.mapping | 75 ++++++++++++++++ .../world/border/WorldBorderStage.mapping | 8 ++ .../net/minecraft/world/chunk/Chunk.mapping | 69 +++++++++++++++ mappings/pv.mapping | 6 -- mappings/to.mapping | 1 + mappings/tt.mapping | 25 ++++++ mappings/uh.mapping | 4 + mappings/xs.mapping | 1 + mappings/ya.mapping | 2 + 44 files changed, 489 insertions(+), 23 deletions(-) create mode 100644 mappings/ays.mapping create mode 100644 mappings/azp.mapping create mode 100644 mappings/boa.mapping create mode 100644 mappings/bpc.mapping create mode 100644 mappings/bpp.mapping create mode 100644 mappings/bxk.mapping create mode 100644 mappings/net/minecraft/block/dispenser/DispenserBehaviorProjectile.mapping create mode 100644 mappings/net/minecraft/world/border/IWorldBorderListener.mapping create mode 100644 mappings/net/minecraft/world/border/WorldBorder.mapping create mode 100644 mappings/net/minecraft/world/border/WorldBorderStage.mapping delete mode 100644 mappings/pv.mapping create mode 100644 mappings/to.mapping create mode 100644 mappings/tt.mapping create mode 100644 mappings/xs.mapping create mode 100644 mappings/ya.mapping diff --git a/mappings/ays.mapping b/mappings/ays.mapping new file mode 100644 index 0000000000..aaf05df4c9 --- /dev/null +++ b/mappings/ays.mapping @@ -0,0 +1,5 @@ +CLASS ays + METHOD a getEntities (Lafh;Lcgz;Ljava/util/function/Predicate;)Ljava/util/List; + ARG 0 entity + ARG 1 boundingBox + ARG 3 list diff --git a/mappings/azb.mapping b/mappings/azb.mapping index 88300336ec..53511ece52 100644 --- a/mappings/azb.mapping +++ b/mappings/azb.mapping @@ -1,5 +1,8 @@ CLASS azb METHOD E getChunkProvider ()Lbnz; + METHOD a getChunk (IILboa;)Lbnu; + ARG 0 chunkX + ARG 1 chunkZ METHOD ag getDifficulty ()Lady; METHOD f getLocalDifficulty (Leq;)Ladz; METHOD g getLevelProperties ()Lcdj; diff --git a/mappings/aze.mapping b/mappings/aze.mapping index bcb94c7b1f..39d4c5246f 100644 --- a/mappings/aze.mapping +++ b/mappings/aze.mapping @@ -1,4 +1,7 @@ CLASS aze + METHOD D isBlockLoaded (Leq;)Z + METHOD a isChunkLoaded (IIZ)Z METHOD a getEmittedStrongRedstonePower (Leq;Lev;)I ARG 0 pos ARG 1 facing + METHOD b isBlockLoaded (Leq;Z)Z diff --git a/mappings/azp.mapping b/mappings/azp.mapping new file mode 100644 index 0000000000..ef6fbb701b --- /dev/null +++ b/mappings/azp.mapping @@ -0,0 +1 @@ +CLASS azp diff --git a/mappings/bkl.mapping b/mappings/bkl.mapping index d7b2619e63..54ad5b6319 100644 --- a/mappings/bkl.mapping +++ b/mappings/bkl.mapping @@ -1,4 +1,6 @@ CLASS bkl + METHOD (Lbkg;)V + ARG 0 factory METHOD Z_ update ()V METHOD a serialize (Lhl;)Lhl; ARG 0 tag diff --git a/mappings/bnu.mapping b/mappings/bnu.mapping index 91be370796..2085098592 100644 --- a/mappings/bnu.mapping +++ b/mappings/bnu.mapping @@ -1,2 +1,16 @@ CLASS bnu + METHOD a addEntity (Lafh;)V + METHOD a setBlockEntity (Leq;Lbkf;)V + ARG 0 pos + ARG 1 entity + METHOD a setBlockState (Leq;Lblz;Z)Lblz; + ARG 0 pos + ARG 1 state + METHOD a addPendingBlockEntityTag (Lhl;)V + ARG 0 tag + METHOD b removeBlockEntity (Leq;)V + ARG 0 pos + ARG 1 entity + METHOD d getSectionArray ()[Lboi; METHOD g getPos ()Layp; + METHOD i getBiomeArray ()[Lazx; diff --git a/mappings/boa.mapping b/mappings/boa.mapping new file mode 100644 index 0000000000..92f8879792 --- /dev/null +++ b/mappings/boa.mapping @@ -0,0 +1,14 @@ +CLASS boa + FIELD a EMPTY Lboa; + FIELD b BIOMES Lboa; + FIELD c NOISE Lboa; + FIELD d BASE Lboa; + FIELD e CARVED Lboa; + FIELD f LIQUID_CARVED Lboa; + FIELD g DECORATED Lboa; + FIELD h LIGHTED Lboa; + FIELD i MOBS_SPAWNED Lboa; + FIELD j FINALIZED Lboa; + FIELD k FULLCHUNK Lboa; + FIELD o name Ljava/lang/String; + METHOD b getName ()Ljava/lang/String; diff --git a/mappings/boc.mapping b/mappings/boc.mapping index 6aaf77cf89..e1505edc8a 100644 --- a/mappings/boc.mapping +++ b/mappings/boc.mapping @@ -3,11 +3,41 @@ CLASS boc ARG 0 x ARG 1 y ARG 2 z + METHOD a addEntity (Lafh;)V + METHOD a remove (Lafh;I)V + ARG 0 entity + ARG 1 section + METHOD a appendEntities (Lafh;Lcgz;Ljava/util/List;Ljava/util/function/Predicate;)V + ARG 0 except + ARG 1 box + ARG 2 entityList + ARG 3 predicate + METHOD a addBlockEntity (Lbkf;)V + ARG 0 entity + METHOD a setBlockEntity (Leq;Lbkf;)V + ARG 0 pos + ARG 1 entity + METHOD a getBlockEntity (Leq;Lboh$a;)Lbkf; + ARG 0 pos + ARG 1 accessType + METHOD a appendEntities (Ljava/lang/Class;Lcgz;Ljava/util/List;Ljava/util/function/Predicate;)V + ARG 0 entityClass + ARG 1 box + ARG 2 entityList + ARG 3 predicate METHOD b (III)I ARG 0 x ARG 1 y ARG 2 z + METHOD b remove (Lafh;)V + ARG 0 entity + METHOD b removeBlockEntity (Leq;)V + ARG 0 pos + ARG 1 entity METHOD c (III)I ARG 0 x ARG 1 y ARG 2 z + METHOD v loadToWorld ()V + METHOD w unloadFromWorld ()V + METHOD x markDirty ()V diff --git a/mappings/bog.mapping b/mappings/bog.mapping index fd36cee5ff..223eba4133 100644 --- a/mappings/bog.mapping +++ b/mappings/bog.mapping @@ -1,9 +1,23 @@ CLASS bog METHOD H getMaxLightLevel ()I + METHOD a addEntity (Lafh;)V METHOD a getFluidState (Leq;)Lcad; ARG 0 pos + METHOD a setBlockEntity (Leq;Lbkf;)V + ARG 0 pos + ARG 1 entity + METHOD a setBlockState (Leq;Lblz;Z)Lblz; + ARG 0 pos + ARG 1 state + METHOD a addPendingBlockEntityTag (Lhl;)V + ARG 0 tag + METHOD b removeBlockEntity (Leq;)V + ARG 0 pos + ARG 1 entity + METHOD d getSectionArray ()[Lboi; METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos METHOD g getPos ()Layp; METHOD h getBlockState (Leq;)Lblz; ARG 0 pos + METHOD i getBiomeArray ()[Lazx; diff --git a/mappings/bop.mapping b/mappings/bop.mapping index 7a7a365ab0..29bfdec4c4 100644 --- a/mappings/bop.mapping +++ b/mappings/bop.mapping @@ -3,12 +3,26 @@ CLASS bop ARG 0 x ARG 1 y ARG 2 z + METHOD a addEntity (Lafh;)V METHOD a getFluidState (Leq;)Lcad; ARG 0 pos + METHOD a setBlockEntity (Leq;Lbkf;)V + ARG 0 pos + ARG 1 entity + METHOD a setBlockState (Leq;Lblz;Z)Lblz; + ARG 0 pos + ARG 1 state + METHOD a addPendingBlockEntityTag (Lhl;)V + ARG 0 tag + METHOD b removeBlockEntity (Leq;)V + ARG 0 pos + ARG 1 entity METHOD c (III)I ARG 0 x ARG 1 y ARG 2 z + METHOD d getSectionArray ()[Lboi; METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos METHOD g getPos ()Layp; + METHOD i getBiomeArray ()[Lazx; diff --git a/mappings/bpc.mapping b/mappings/bpc.mapping new file mode 100644 index 0000000000..4e21f8a01c --- /dev/null +++ b/mappings/bpc.mapping @@ -0,0 +1,4 @@ +CLASS bpc + CLASS bpc$1 + METHOD f getCenterX ()D + METHOD g getCenterZ ()D diff --git a/mappings/bpp.mapping b/mappings/bpp.mapping new file mode 100644 index 0000000000..9c61a4a4e9 --- /dev/null +++ b/mappings/bpp.mapping @@ -0,0 +1,9 @@ +CLASS bpp + CLASS bpp$a + FIELD a WORLD_SURFACE_WG Lbpp$a; + FIELD b OCEAN_FLOOR_WG Lbpp$a; + FIELD c LIGHT_BLOCKING Lbpp$a; + FIELD d MOTION_BLOCKING Lbpp$a; + FIELD e MOTION_BLOCKING_NO_LEAVES Lbpp$a; + FIELD f OCEAN_FLOOR Lbpp$a; + FIELD g WORLD_SURFACE Lbpp$a; diff --git a/mappings/bxk.mapping b/mappings/bxk.mapping new file mode 100644 index 0000000000..6a68873396 --- /dev/null +++ b/mappings/bxk.mapping @@ -0,0 +1 @@ +CLASS bxk diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 5c2183b030..9123455f31 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -208,6 +208,7 @@ CLASS bdx net/minecraft/block/Block ARG 2 pos METHOD f isFullBoundsCubeForCulling (Lblz;)Z ARG 0 state + METHOD g hasBlockEntity ()Z METHOD g getAmbientOcclusionLightLevel (Lblz;)F ARG 0 state METHOD h getItem ()Latx; diff --git a/mappings/net/minecraft/block/BlockDispenser.mapping b/mappings/net/minecraft/block/BlockDispenser.mapping index 0fc311d2a6..a079191426 100644 --- a/mappings/net/minecraft/block/BlockDispenser.mapping +++ b/mappings/net/minecraft/block/BlockDispenser.mapping @@ -47,6 +47,7 @@ CLASS bfe net/minecraft/block/BlockDispenser ARG 1 rotation METHOD a appendProperties (Lbma$a;)V ARG 0 builder + METHOD a getOutputLocation (Ler;)Lff; METHOD b getComparatorOutput (Lblz;Laza;Leq;)I ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/block/BlockLeaves.mapping b/mappings/net/minecraft/block/BlockLeaves.mapping index 8995f76509..11521edd5c 100644 --- a/mappings/net/minecraft/block/BlockLeaves.mapping +++ b/mappings/net/minecraft/block/BlockLeaves.mapping @@ -1,4 +1,5 @@ CLASS bgr net/minecraft/block/BlockLeaves + FIELD c translucentLeaves Z METHOD (Lbdx$c;)V ARG 0 builder METHOD a randomTick (Lblz;Laza;Leq;Ljava/util/Random;)V @@ -11,6 +12,8 @@ CLASS bgr net/minecraft/block/BlockLeaves ARG 5 pos METHOD a appendProperties (Lbma$a;)V ARG 0 builder + METHOD a setRenderingMode (Z)V + ARG 0 fancy METHOD b (Lblz;Laza;Leq;Ljava/util/Random;)V ARG 0 world ARG 1 state diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehaviorItem.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehaviorItem.mapping index f3beb7e33c..47e742b3a8 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehaviorItem.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehaviorItem.mapping @@ -8,8 +8,9 @@ CLASS et net/minecraft/block/dispenser/DispenserBehaviorItem METHOD a playSound (Ler;)V ARG 0 block METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile METHOD a spawnParticles (Ler;Lev;)V ARG 0 block ARG 1 facing diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehaviorProjectile.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehaviorProjectile.mapping new file mode 100644 index 0000000000..3eda7ef4f1 --- /dev/null +++ b/mappings/net/minecraft/block/dispenser/DispenserBehaviorProjectile.mapping @@ -0,0 +1,13 @@ +CLASS pv net/minecraft/block/dispenser/DispenserBehaviorProjectile + METHOD a getVariation ()F + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack + METHOD a playSound (Ler;)V + ARG 0 block + METHOD a doDispense (Ler;Lauc;)Lauc; + ARG 0 location + ARG 1 stack + ARG 5 projectile + METHOD b getForce ()F diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 80737b5753..c710feee43 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -3,7 +3,12 @@ CLASS bkf net/minecraft/block/entity/BlockEntity FIELD c_ world Laza; FIELD d invalid Z FIELD d_ pos Leq; + FIELD e factory Lbkg; + FIELD f cachedState Lblz; + METHOD (Lbkg;)V + ARG 0 factory METHOD A resetBlock ()V + METHOD C getFactory ()Lbkg; METHOD F getWorld ()Laza; METHOD a getRenderDistance (DDD)D ARG 0 x @@ -25,12 +30,15 @@ CLASS bkf net/minecraft/block/entity/BlockEntity METHOD ab_ serializeInitialChunkData ()Lhl; METHOD b deserialize (Lhl;)V ARG 0 tag + METHOD c createFromTag (Lhl;)Lbkf; + ARG 0 tag METHOD d serializeIdentifyingData (Lhl;)Lhl; ARG 0 tag METHOD g markDirty ()V METHOD t getSquaredRenderDistance ()D METHOD u hasWorld ()Z METHOD v getPos ()Leq; + METHOD w getCachedState ()Lblz; METHOD x isInvalid ()Z METHOD y invalidate ()V METHOD z validate ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntityChest.mapping b/mappings/net/minecraft/block/entity/BlockEntityChest.mapping index fcb1879a43..1df5c23bab 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityChest.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityChest.mapping @@ -1,5 +1,7 @@ CLASS bki net/minecraft/block/entity/BlockEntityChest FIELD j inventory Lfe; + METHOD (Lbkg;)V + ARG 0 factory METHOD O_ getNameAsComponent ()Liw; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I diff --git a/mappings/net/minecraft/block/entity/BlockEntityDispenser.mapping b/mappings/net/minecraft/block/entity/BlockEntityDispenser.mapping index bef4b1e4d5..49a639313f 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityDispenser.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityDispenser.mapping @@ -1,6 +1,8 @@ CLASS bkn net/minecraft/block/entity/BlockEntityDispenser FIELD a RANDOM Ljava/util/Random; FIELD e inventory Lfe; + METHOD (Lbkg;)V + ARG 0 factory METHOD O_ getNameAsComponent ()Liw; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I diff --git a/mappings/net/minecraft/block/entity/BlockEntityEndPortal.mapping b/mappings/net/minecraft/block/entity/BlockEntityEndPortal.mapping index 9c5e19db89..ee4ca4aaa8 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityEndPortal.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityEndPortal.mapping @@ -1 +1,3 @@ CLASS ble net/minecraft/block/entity/BlockEntityEndPortal + METHOD (Lbkg;)V + ARG 0 factory diff --git a/mappings/net/minecraft/block/entity/BlockEntityLockableContainer.mapping b/mappings/net/minecraft/block/entity/BlockEntityLockableContainer.mapping index 3c7c7d8ca1..f198df5593 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityLockableContainer.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityLockableContainer.mapping @@ -1,5 +1,7 @@ CLASS bkw net/minecraft/block/entity/BlockEntityLockableContainer FIELD a lock Laef; + METHOD (Lbkg;)V + ARG 0 factory METHOD W_ hasContainerLock ()Z METHOD a setContainerLock (Laef;)V ARG 0 lock diff --git a/mappings/net/minecraft/block/entity/BlockEntityWithLootTable.mapping b/mappings/net/minecraft/block/entity/BlockEntityWithLootTable.mapping index ba4e7a5868..cecaa2937c 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityWithLootTable.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityWithLootTable.mapping @@ -1,6 +1,8 @@ CLASS bkx net/minecraft/block/entity/BlockEntityWithLootTable FIELD g lootTableId Lpt; FIELD h lootTableSeed J + METHOD (Lbkg;)V + ARG 0 factory METHOD P_ hasCustomName ()Z METHOD R_ getLootTable ()Lpt; METHOD a getInvStack (I)Lauc; diff --git a/mappings/net/minecraft/block/pattern/BlockProxy.mapping b/mappings/net/minecraft/block/pattern/BlockProxy.mapping index 0867adc23b..2a41184ce2 100644 --- a/mappings/net/minecraft/block/pattern/BlockProxy.mapping +++ b/mappings/net/minecraft/block/pattern/BlockProxy.mapping @@ -7,4 +7,6 @@ CLASS bmd net/minecraft/block/pattern/BlockProxy METHOD (Laze;Leq;Z)V ARG 1 pos ARG 2 forceLoad + METHOD a getBlockState ()Lblz; + METHOD b getBlockEntity ()Lbkf; METHOD d getPos ()Leq; diff --git a/mappings/net/minecraft/client/render/Renderer.mapping b/mappings/net/minecraft/client/render/Renderer.mapping index fd62538a8c..aabebf13ca 100644 --- a/mappings/net/minecraft/client/render/Renderer.mapping +++ b/mappings/net/minecraft/client/render/Renderer.mapping @@ -3,10 +3,12 @@ CLASS cxu net/minecraft/client/render/Renderer FIELD B partiallyBrokenBlocks Ljava/util/Map; FIELD D destroyStages [Ldgx; FIELD E framebuffer Lcih; + FIELD W chunkBatcher Ldab; FIELD Y renderDistance I FIELD aa totalEntities I FIELD ab renderedEntities I FIELD ah vertexBufferObjectsEnabled Z + FIELD ai chunkRendererFactory Ldag; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c MOON_PHASES_TEX Lpt; FIELD d SUN_TEX Lpt; @@ -19,6 +21,8 @@ CLASS cxu net/minecraft/client/render/Renderer FIELD k world Lcva; METHOD (Lcjk;)V ARG 0 game + METHOD a ()V + ARG 0 oldVBOEnabled METHOD a markRegionForRenderUpdate (IIIIII)V METHOD a markRegionForRenderUpdate (IIIIIIZ)V METHOD a onGlobalWorldEvent (ILeq;I)V diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index 8e24e00935..20b4a320d5 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -23,8 +23,11 @@ CLASS cva net/minecraft/client/world/WorldClient ARG 4 rand ARG 5 spawnBarrierParticles ARG 6 posMutable + METHOD a isChunkLoaded (IIZ)Z METHOD a spawnEntity (Lafh;)Z ARG 0 entity + ARG 1 chunkX + ARG 2 chunkZ METHOD a playSound (Lapb;DDDLwv;Lwx;FF)V ARG 0 player ARG 1 x diff --git a/mappings/net/minecraft/command/CommandWorldBorder.mapping b/mappings/net/minecraft/command/CommandWorldBorder.mapping index 1fad85230e..017102ee71 100644 --- a/mappings/net/minecraft/command/CommandWorldBorder.mapping +++ b/mappings/net/minecraft/command/CommandWorldBorder.mapping @@ -1 +1,2 @@ CLASS sz net/minecraft/command/CommandWorldBorder + METHOD a (Lbx;DJ)I diff --git a/mappings/net/minecraft/item/ItemArmor.mapping b/mappings/net/minecraft/item/ItemArmor.mapping index 4e3b37aa5a..9b1b75dada 100644 --- a/mappings/net/minecraft/item/ItemArmor.mapping +++ b/mappings/net/minecraft/item/ItemArmor.mapping @@ -1,8 +1,9 @@ CLASS arx net/minecraft/item/ItemArmor CLASS arx$1 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile FIELD a DISPENSER_BEHAVIOR Lex; FIELD c protection I FIELD d toughness F diff --git a/mappings/net/minecraft/item/ItemMinecart.mapping b/mappings/net/minecraft/item/ItemMinecart.mapping index 2c29e8897b..65f97897e0 100644 --- a/mappings/net/minecraft/item/ItemMinecart.mapping +++ b/mappings/net/minecraft/item/ItemMinecart.mapping @@ -3,8 +3,9 @@ CLASS auj net/minecraft/item/ItemMinecart METHOD a playSound (Ler;)V ARG 0 block METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile FIELD a DISPENSER_BEHAVIOR Lex; FIELD b type Laqc$a; METHOD a activate (Lavp;)Laec; diff --git a/mappings/net/minecraft/reference/DispenserBehaviors.mapping b/mappings/net/minecraft/reference/DispenserBehaviors.mapping index 0ff2467bc0..06a0dc006b 100644 --- a/mappings/net/minecraft/reference/DispenserBehaviors.mapping +++ b/mappings/net/minecraft/reference/DispenserBehaviors.mapping @@ -1,75 +1,135 @@ CLASS pw net/minecraft/reference/DispenserBehaviors + CLASS pw$1 + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack CLASS pw$2 METHOD a playSound (Ler;)V ARG 0 block METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$3 METHOD a playSound (Ler;)V ARG 0 block METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$4 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$5 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$6 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$7 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$8 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$9 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$a METHOD a playSound (Ler;)V ARG 0 block METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$c METHOD a playSound (Ler;)V ARG 0 block CLASS pw$d METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$10 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile CLASS pw$11 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile + CLASS pw$12 + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack CLASS pw$13 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile + CLASS pw$15 + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack + CLASS pw$16 + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack + CLASS pw$17 + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack + CLASS pw$18 + METHOD a getVariation ()F + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack + METHOD b getForce ()F CLASS pw$19 + CLASS pw$19$1 + METHOD a getVariation ()F + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack + METHOD b getForce ()F METHOD dispense (Ler;Lauc;)Lauc; ARG 0 location ARG 1 stack CLASS pw$20 + CLASS pw$20$1 + METHOD a getVariation ()F + METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; + ARG 0 world + ARG 1 position + ARG 2 stack + METHOD b getForce ()F METHOD dispense (Ler;Lauc;)Lauc; ARG 0 location ARG 1 stack CLASS pw$21 METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block + ARG 0 location ARG 1 stack + ARG 5 projectile FIELD c LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping index 82db11f29c..30d65c9da4 100644 --- a/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/config/ServerConfigurationManager.mapping @@ -1,4 +1,28 @@ CLASS wc net/minecraft/server/config/ServerConfigurationManager + CLASS wc$1 + METHOD a (Lbns;D)V + ARG 0 border + ARG 1 size + METHOD a onCenterChanged (Lbns;DD)V + ARG 0 border + ARG 1 centerX + ARG 3 centerZ + METHOD a (Lbns;DDJ)V + ARG 0 border + ARG 1 oldSize + ARG 3 newSize + METHOD a (Lbns;I)V + ARG 0 border + ARG 1 warningTime + METHOD b (Lbns;D)V + ARG 0 border + ARG 1 damagePerBlock + METHOD b (Lbns;I)V + ARG 0 border + ARG 1 warningBlocks + METHOD c (Lbns;D)V + ARG 0 border + ARG 1 safeZoneRadius FIELD a BANNED_PLAYERS_FILE Ljava/io/File; FIELD b BANNED_IPS_FILE Ljava/io/File; FIELD c OPS_FILE Ljava/io/File; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index b6418b9fc0..12837c43bf 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -23,6 +23,7 @@ CLASS aza net/minecraft/world/World FIELD s rand Ljava/util/Random; FIELD u pathingCoordinator Lajo; FIELD v listeners Ljava/util/List; + FIELD w chunkProvider Lbnz; FIELD x saveHandler Lcdk; FIELD y properties Lcdj; FIELD z villageManager Lajz; @@ -34,6 +35,8 @@ CLASS aza net/minecraft/world/World METHOD M getChunkProviderStatus ()Ljava/lang/String; METHOD N updateAmbientDarkness ()V METHOD O initWeatherGradients ()V + METHOD P getEntityCount ()I + METHOD Q getGeneratorType ()Lazh; METHOD S checkSessionLock ()V METHOD T getTime ()J METHOD U getTimeOfDay ()J @@ -53,11 +56,16 @@ CLASS aza net/minecraft/world/World ARG 5 volume ARG 6 pitch METHOD a calculateAmbientDarkness (F)I + METHOD a isHeightInvalid (I)Z + ARG 0 y METHOD a getBlockState (III)Lblz; ARG 0 x ARG 1 y ARG 2 z METHOD a markRegionForRenderUpdate (IIIIII)V + METHOD a getChunk (IILboa;)Lbnu; + ARG 0 chunkX + ARG 1 chunkZ METHOD a fireGlobalWorldEvent (ILeq;I)V ARG 0 eventId ARG 1 pos @@ -66,6 +74,8 @@ CLASS aza net/minecraft/world/World ARG 0 time METHOD a spawnEntity (Lafh;)Z ARG 0 entity + ARG 1 chunkX + ARG 2 chunkZ METHOD a createExplosion (Lafh;DDDFZ)Layt; ARG 0 entity ARG 1 x @@ -81,6 +91,10 @@ CLASS aza net/minecraft/world/World ARG 5 power ARG 6 createFire ARG 7 destroyBlocks + METHOD a getEntities (Lafh;Lcgz;Ljava/util/function/Predicate;)Ljava/util/List; + ARG 0 entity + ARG 1 boundingBox + ARG 3 list METHOD a playSound (Lapb;DDDLwv;Lwx;FF)V ARG 0 player ARG 1 x @@ -191,6 +205,9 @@ CLASS aza net/minecraft/world/World ARG 0 uuid METHOD c setSeaLevel (I)V ARG 0 seaLevel + METHOD c getChunk (II)Lboh; + ARG 0 chunkX + ARG 1 chunkZ METHOD c setBlockBreakingProgress (ILeq;I)V ARG 0 entityId ARG 1 pos @@ -225,6 +242,10 @@ CLASS aza net/minecraft/world/World ARG 0 pos METHOD j setRainGradient (F)V ARG 0 value + METHOD j isValid (Leq;)Z + ARG 0 pos + METHOD k isHeightInvaid (Leq;)Z + ARG 0 pos METHOD l setDefaultSpawnClient ()V METHOD l getChunk (Leq;)Lboh; ARG 0 pos @@ -233,6 +254,7 @@ CLASS aza net/minecraft/world/World METHOD n removeBlockEntity (Leq;)V ARG 0 pos METHOD n_ updateEntities ()V + METHOD r_ getSeaLevel ()I METHOD s getReceivedStrongRedstonePower (Leq;)I ARG 0 pos METHOD t updateWeather ()V diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 66015499ba..c578ac68f1 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -2,10 +2,13 @@ CLASS tz net/minecraft/world/WorldServer FIELD C server Lnet/minecraft/server/MinecraftServer; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD E getChunkProvider ()Lbnz; + METHOD a isChunkLoaded (IIZ)Z METHOD a setTime (J)V ARG 0 time METHOD a spawnEntity (Lafh;)Z ARG 0 entity + ARG 1 chunkX + ARG 2 chunkZ METHOD a createExplosion (Lafh;Laeq;DDDFZZ)Layt; ARG 0 entity ARG 2 x diff --git a/mappings/net/minecraft/world/border/IWorldBorderListener.mapping b/mappings/net/minecraft/world/border/IWorldBorderListener.mapping new file mode 100644 index 0000000000..e63ab79db9 --- /dev/null +++ b/mappings/net/minecraft/world/border/IWorldBorderListener.mapping @@ -0,0 +1,15 @@ +CLASS bnq net/minecraft/world/border/IWorldBorderListener + METHOD a (Lbns;D)V + ARG 0 border + METHOD a onCenterChanged (Lbns;DD)V + ARG 0 border + METHOD a (Lbns;DDJ)V + ARG 0 border + METHOD a (Lbns;I)V + ARG 0 border + METHOD b (Lbns;D)V + ARG 0 border + METHOD b (Lbns;I)V + ARG 0 border + METHOD c (Lbns;D)V + ARG 0 border diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping new file mode 100644 index 0000000000..14871ce706 --- /dev/null +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -0,0 +1,75 @@ +CLASS bns net/minecraft/world/border/WorldBorder + CLASS bns$a Area + METHOD a getBoundWest ()D + METHOD b getBoundEast ()D + METHOD c getBoundNorth ()D + METHOD d getBoundSouth ()D + METHOD e getSize ()D + ARG 0 elapsedTime + METHOD g getTargetRemainingTime ()J + METHOD h getTargetSize ()D + METHOD i getStage ()Lbnr; + METHOD j onSafeZoneChanged ()V + METHOD k onCenterChanged ()V + METHOD l getAreaInstance ()Lbns$a; + CLASS bns$b AreaResizing + FIELD b oldSize D + FIELD c newSize D + FIELD d timeEnd J + FIELD e timeStart J + FIELD f timeDuration D + METHOD a getBoundWest ()D + METHOD b getBoundEast ()D + METHOD c getBoundNorth ()D + METHOD d getBoundSouth ()D + METHOD e getSize ()D + ARG 0 elapsedTime + METHOD g getTargetRemainingTime ()J + METHOD h getTargetSize ()D + METHOD i getStage ()Lbnr; + METHOD j onSafeZoneChanged ()V + METHOD k onCenterChanged ()V + METHOD l getAreaInstance ()Lbns$a; + CLASS bns$c AreaStatic + FIELD b size D + FIELD c boundWest D + FIELD d boundNorth D + FIELD e boundEast D + FIELD f boundSouth D + METHOD (Lbns;D)V + ARG 1 size + METHOD a getBoundWest ()D + METHOD b getBoundEast ()D + METHOD c getBoundNorth ()D + METHOD d getBoundSouth ()D + METHOD e getSize ()D + ARG 0 elapsedTime + METHOD g getTargetRemainingTime ()J + METHOD h getTargetSize ()D + METHOD i getStage ()Lbnr; + METHOD j onSafeZoneChanged ()V + METHOD k onCenterChanged ()V + METHOD l getAreaInstance ()Lbns$a; + METHOD m recalculateBounds ()V + FIELD a listeners Ljava/util/List; + FIELD f centerX D + FIELD g centerZ D + FIELD h safeZone I + FIELD i area Lbns$a; + METHOD a getStage ()Lbnr; + METHOD a (DDJ)V + ARG 0 oldSize + ARG 2 newSize + METHOD a setSafeZone (I)V + ARG 0 safeZone + METHOD a addListener (Lbnq;)V + ARG 0 listener + METHOD c setCenter (DD)V + ARG 0 x + ARG 2 z + METHOD f getCenterX ()D + METHOD g getCenterZ ()D + METHOD h getSize ()D + METHOD k getListenerList ()Ljava/util/List; + METHOD l getSafeZone ()I + METHOD r update ()V diff --git a/mappings/net/minecraft/world/border/WorldBorderStage.mapping b/mappings/net/minecraft/world/border/WorldBorderStage.mapping new file mode 100644 index 0000000000..dfa4cfee39 --- /dev/null +++ b/mappings/net/minecraft/world/border/WorldBorderStage.mapping @@ -0,0 +1,8 @@ +CLASS bnr net/minecraft/world/border/WorldBorderStage + FIELD a GROWING Lbnr; + FIELD b SHRINKING Lbnr; + FIELD c STATIC Lbnr; + FIELD d color I + METHOD (Ljava/lang/String;II)V + ARG 2 color + METHOD a getColor ()I diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 5f4e1d5c6a..071632ee23 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -1,21 +1,90 @@ CLASS boh net/minecraft/world/chunk/Chunk + CLASS boh$a AccessType + FIELD a CREATE Lboh$a; + FIELD c GET Lboh$a; + FIELD a EMPTY_SECTION Lboi; + FIELD b xPos I + FIELD c zPos I FIELD d LOGGER Lorg/apache/logging/log4j/Logger; FIELD e sections [Lboi; + FIELD f biomeArray [Lazx; + FIELD g pendingBlockEntityTags Ljava/util/Map; + FIELD h loadedToWorld Z FIELD i world Laza; + FIELD l blockEntityMap Ljava/util/Map; + FIELD m entitySections [Lxs; + FIELD u dirty Z FIELD y pos Layp; METHOD (Laza;II[Lazx;Lbor;Lazp;Lazp;J[Lboi;Ljava/util/function/Consumer;)V + ARG 3 biomeArray ARG 9 argSections + METHOD B isLoadedToWorld ()Z METHOD C getWorld ()Laza; + METHOD D getBlockEntityMap ()Ljava/util/Map; + METHOD E getEntitySectionArray ()[Lxs; METHOD a getBlockState (III)Lblz; ARG 0 x ARG 1 y ARG 2 z + METHOD a addEntity (Lafh;)V + METHOD a remove (Lafh;I)V + ARG 0 entity + ARG 1 section + METHOD a appendEntities (Lafh;Lcgz;Ljava/util/List;Ljava/util/function/Predicate;)V + ARG 0 except + ARG 1 box + ARG 2 entityList + ARG 3 predicate + METHOD a addBlockEntity (Lbkf;)V + ARG 0 entity METHOD a getFluidState (Leq;)Lcad; ARG 0 pos + METHOD a setBlockEntity (Leq;Lbkf;)V + ARG 0 pos + ARG 1 entity + METHOD a setBlockState (Leq;Lblz;Z)Lblz; + ARG 0 pos + ARG 1 state + METHOD a getBlockEntity (Leq;Lboh$a;)Lbkf; + ARG 0 pos + ARG 1 accessType + METHOD a loadBlockEntity (Leq;Lhl;)Lbkf; + ARG 0 pos + ARG 1 tag + ARG 2 entity + ARG 3 block + METHOD a addPendingBlockEntityTag (Lhl;)V + ARG 0 tag + METHOD a appendEntities (Ljava/lang/Class;Lcgz;Ljava/util/List;Ljava/util/function/Predicate;)V + ARG 0 entityClass + ARG 1 box + ARG 2 entityList + ARG 3 predicate + METHOD b remove (Lafh;)V + ARG 0 entity + METHOD b removeBlockEntity (Leq;)V + ARG 0 pos + ARG 1 entity METHOD c (III)I ARG 0 x ARG 1 y ARG 2 z + METHOD c setLoadedToWorld (Z)V + METHOD d getSectionArray ()[Lboi; + METHOD d getFluidState (III)Lcad; + ARG 0 x + ARG 1 y + ARG 2 z METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos + METHOD f getBiome (Leq;)Lazx; + ARG 0 pos + ARG 1 xSub + ARG 2 zSub METHOD g getPos ()Layp; + METHOD g createBlockEntity (Leq;)Lbkf; + ARG 0 pos + METHOD i getBiomeArray ()[Lazx; + METHOD v loadToWorld ()V + METHOD w unloadFromWorld ()V + METHOD x markDirty ()V diff --git a/mappings/pv.mapping b/mappings/pv.mapping deleted file mode 100644 index 291a43a77c..0000000000 --- a/mappings/pv.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS pv - METHOD a playSound (Ler;)V - ARG 0 block - METHOD a doDispense (Ler;Lauc;)Lauc; - ARG 0 block - ARG 1 stack diff --git a/mappings/to.mapping b/mappings/to.mapping new file mode 100644 index 0000000000..8388fe8c6e --- /dev/null +++ b/mappings/to.mapping @@ -0,0 +1 @@ +CLASS to diff --git a/mappings/tt.mapping b/mappings/tt.mapping new file mode 100644 index 0000000000..1e1c04453b --- /dev/null +++ b/mappings/tt.mapping @@ -0,0 +1,25 @@ +CLASS tt + CLASS tt$1 + METHOD a (Lbns;D)V + ARG 0 border + ARG 1 size + METHOD a onCenterChanged (Lbns;DD)V + ARG 0 border + ARG 1 centerX + ARG 3 centerZ + METHOD a (Lbns;DDJ)V + ARG 0 border + ARG 1 oldSize + ARG 3 newSize + METHOD a (Lbns;I)V + ARG 0 border + ARG 1 warningTime + METHOD b (Lbns;D)V + ARG 0 border + ARG 1 damagePerBlock + METHOD b (Lbns;I)V + ARG 0 border + ARG 1 warningBlocks + METHOD c (Lbns;D)V + ARG 0 border + ARG 1 safeZoneRadius diff --git a/mappings/uh.mapping b/mappings/uh.mapping index 1e69af90e3..dd6a47ff5a 100644 --- a/mappings/uh.mapping +++ b/mappings/uh.mapping @@ -4,6 +4,10 @@ CLASS uh ARG 0 x ARG 1 y ARG 2 z + METHOD a getChunk (IILboa;)Lbnu; + ARG 0 chunkX + ARG 1 chunkZ + METHOD a isChunkLoaded (IIZ)Z METHOD a spawnEntity (Lafh;)Z ARG 0 entity METHOD a getLightLevel (Lazj;Leq;)I diff --git a/mappings/xs.mapping b/mappings/xs.mapping new file mode 100644 index 0000000000..86e7b5edac --- /dev/null +++ b/mappings/xs.mapping @@ -0,0 +1 @@ +CLASS xs diff --git a/mappings/ya.mapping b/mappings/ya.mapping new file mode 100644 index 0000000000..234ca43393 --- /dev/null +++ b/mappings/ya.mapping @@ -0,0 +1,2 @@ +CLASS ya + METHOD a get (I)Ljava/lang/Object;