From 630f0a2573395306964395fdcc428490f461c330 Mon Sep 17 00:00:00 2001 From: asie Date: Thu, 25 Oct 2018 18:58:04 +0200 Subject: [PATCH] map state-related stuff --- mappings/ayn.mapping | 10 ------- mappings/blx.mapping | 3 -- mappings/boc.mapping | 9 ++++++ mappings/bog.mapping | 4 ++- mappings/boh.mapping | 7 ++++- mappings/bop.mapping | 7 ++++- mappings/dag.mapping | 6 +++- .../minecraft/block/state/BlockState.mapping | 29 ++++++++++++++++++- .../scoreboard/IScoreboardCriterion.mapping | 10 +++++++ .../scoreboard/ScoreboardObjective.mapping | 1 + .../state/AbstractPropertyContainer.mapping | 16 ++++++++++ .../state/IPropertyContainer.mapping | 5 ++++ .../net/minecraft/world/IBlockView.mapping | 21 ++++++++++++++ mappings/net/minecraft/world/World.mapping | 6 +++- .../minecraft/world/chunk/ChunkCache.mapping | 6 +++- mappings/uh.mapping | 6 +++- 16 files changed, 125 insertions(+), 21 deletions(-) delete mode 100644 mappings/ayn.mapping delete mode 100644 mappings/blx.mapping create mode 100644 mappings/net/minecraft/state/AbstractPropertyContainer.mapping create mode 100644 mappings/net/minecraft/state/IPropertyContainer.mapping create mode 100644 mappings/net/minecraft/world/IBlockView.mapping diff --git a/mappings/ayn.mapping b/mappings/ayn.mapping deleted file mode 100644 index ee6487c2a0..0000000000 --- a/mappings/ayn.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS ayn - METHOD H getMaxLightLevel ()I - METHOD I getHeight ()I - METHOD a getBlockState (Leq;)Lcac; - ARG 0 pos - METHOD c (III)I - ARG 0 x - ARG 2 z - METHOD d getBlockEntity (Leq;)Lbkf; - ARG 0 pos diff --git a/mappings/blx.mapping b/mappings/blx.mapping deleted file mode 100644 index 41d38c721a..0000000000 --- a/mappings/blx.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS blx - METHOD equals (Ljava/lang/Object;)Z - ARG 0 object diff --git a/mappings/boc.mapping b/mappings/boc.mapping index aa3407209e..6aaf77cf89 100644 --- a/mappings/boc.mapping +++ b/mappings/boc.mapping @@ -1,4 +1,13 @@ CLASS boc + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD b (III)I + ARG 0 x + ARG 1 y + ARG 2 z METHOD c (III)I ARG 0 x + ARG 1 y ARG 2 z diff --git a/mappings/bog.mapping b/mappings/bog.mapping index 6685fc48cc..d0ce7e093e 100644 --- a/mappings/bog.mapping +++ b/mappings/bog.mapping @@ -1,6 +1,8 @@ CLASS bog METHOD H getMaxLightLevel ()I - METHOD a getBlockState (Leq;)Lcac; + METHOD a (Leq;)Lcac; ARG 0 pos METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos + METHOD h getBlockState (Leq;)Lblz; + ARG 0 pos diff --git a/mappings/boh.mapping b/mappings/boh.mapping index ca5dc51f8d..455706fee6 100644 --- a/mappings/boh.mapping +++ b/mappings/boh.mapping @@ -1,8 +1,13 @@ CLASS boh - METHOD a getBlockState (Leq;)Lcac; + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a (Leq;)Lcac; ARG 0 pos METHOD c (III)I ARG 0 x + ARG 1 y ARG 2 z METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos diff --git a/mappings/bop.mapping b/mappings/bop.mapping index 0586013cf7..69404caec9 100644 --- a/mappings/bop.mapping +++ b/mappings/bop.mapping @@ -1,8 +1,13 @@ CLASS bop - METHOD a getBlockState (Leq;)Lcac; + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a (Leq;)Lcac; ARG 0 pos METHOD c (III)I ARG 0 x + ARG 1 y ARG 2 z METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos diff --git a/mappings/dag.mapping b/mappings/dag.mapping index e43b5c9a8a..3ac377ca7f 100644 --- a/mappings/dag.mapping +++ b/mappings/dag.mapping @@ -1,8 +1,12 @@ CLASS dag + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z METHOD a getLightLevel (Lazj;Leq;)I ARG 0 type ARG 1 pos - METHOD a getBlockState (Leq;)Lcac; + METHOD a (Leq;)Lcac; ARG 0 pos METHOD c getBiome (Leq;)Lazx; ARG 0 pos diff --git a/mappings/net/minecraft/block/state/BlockState.mapping b/mappings/net/minecraft/block/state/BlockState.mapping index 92768705bb..4b4a6dc90f 100644 --- a/mappings/net/minecraft/block/state/BlockState.mapping +++ b/mappings/net/minecraft/block/state/BlockState.mapping @@ -8,4 +8,31 @@ CLASS blz net/minecraft/block/state/BlockState ARG 0 pos METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos - METHOD d ()Lbdx; + METHOD a allowsSpawning (Lafh;)Z + METHOD a calcBlockBreakingDelta (Lapb;Layn;Leq;)F + METHOD a canPlaceAtSide (Layn;Leq;Lccm;)Z + METHOD a getWeakRedstonePower (Layn;Leq;Lev;)I + METHOD a getComparatorOutput (Laza;Leq;)I + METHOD a onBlockAction (Laza;Leq;II)Z + METHOD a onEntityCollision (Laza;Leq;Lafh;)V + METHOD a onBlockBreakStart (Laza;Leq;Lapb;)V + METHOD a activate (Laza;Leq;Lapb;Laea;Lev;FFF)Z + METHOD a update (Laza;Leq;Lbdx;Leq;)V + METHOD a onBlockAdded (Laza;Leq;Lblz;)V + METHOD a onBlockRemoved (Laza;Leq;Lblz;Z)V + METHOD a randomTick (Laza;Leq;Ljava/util/Random;)V + METHOD a applyMirror (Lbha;)Lblz; + METHOD a applyRotation (Lbia;)Lblz; + METHOD a getRenderingState (Lev;Lblz;Lazb;Leq;Leq;)Lblz; + METHOD b getStrongRedstonePower (Layn;Leq;Lev;)I + METHOD d getBlock ()Lbdx; + METHOD d getMapColor (Layn;Leq;)Lcah; + METHOD e getMaterial ()Lcag; + METHOD e getHardness (Layn;Leq;)F + METHOD j getRenderType ()Lbhx; + METHOD k getOffsetPos (Layn;Leq;)Lchc; + METHOD m isSimpleFullBlock ()Z + METHOD n emitsRedstonePower ()Z + METHOD o hasComparatorOutput ()Z + METHOD p getPistonBehavior ()Lcai; + METHOD v getSoundGroup ()Lbio; diff --git a/mappings/net/minecraft/scoreboard/IScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/IScoreboardCriterion.mapping index bc452aaf40..d07c2de782 100644 --- a/mappings/net/minecraft/scoreboard/IScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/IScoreboardCriterion.mapping @@ -10,3 +10,13 @@ CLASS cid net/minecraft/scoreboard/IScoreboardCriterion FIELD d DEATH_COUNT Lcid; FIELD e PLAYER_KILL_COUNT Lcid; FIELD f TOTAL_KILL_COUNT Lcid; + FIELD g HEALTH Lcid; + FIELD h FOOD Lcid; + FIELD i AIR Lcid; + FIELD j ARMOR Lcid; + FIELD k XP Lcid; + FIELD l LEVEL Lcid; + FIELD m TEAM_KILLS [Lcid; + FIELD n KILLED_BY_TEAMS [Lcid; + FIELD q type Lcid$a; + METHOD e getType ()Lcid$a; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping index 27cfeaab44..6314789cdc 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping @@ -13,4 +13,5 @@ CLASS chx net/minecraft/scoreboard/ScoreboardObjective METHOD b getName ()Ljava/lang/String; METHOD c getCriterion ()Lcid; METHOD d getDisplayName ()Liw; + METHOD e getTextComponent ()Liw; METHOD f getCriterionType ()Lcid$a; diff --git a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping b/mappings/net/minecraft/state/AbstractPropertyContainer.mapping new file mode 100644 index 0000000000..30367b0fc0 --- /dev/null +++ b/mappings/net/minecraft/state/AbstractPropertyContainer.mapping @@ -0,0 +1,16 @@ +CLASS blx net/minecraft/state/AbstractPropertyContainer + FIELD a baseObject Ljava/lang/Object; + FIELD d entries Lcom/google/common/collect/ImmutableMap; + FIELD e computedHashCode I + FIELD f entryWithTable Lcom/google/common/collect/Table; + METHOD (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)V + ARG 0 baseObject + ARG 1 entries + METHOD a getProperties ()Ljava/util/Collection; + METHOD b getEntries ()Lcom/google/common/collect/ImmutableMap; + METHOD b contains (Lbnj;)Z + ARG 0 property + METHOD c get (Lbnj;)Ljava/lang/Comparable; + ARG 0 property + METHOD equals (Ljava/lang/Object;)Z + ARG 0 object diff --git a/mappings/net/minecraft/state/IPropertyContainer.mapping b/mappings/net/minecraft/state/IPropertyContainer.mapping new file mode 100644 index 0000000000..cf37939b5c --- /dev/null +++ b/mappings/net/minecraft/state/IPropertyContainer.mapping @@ -0,0 +1,5 @@ +CLASS bmb net/minecraft/state/IPropertyContainer + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + METHOD b getEntries ()Lcom/google/common/collect/ImmutableMap; + METHOD c get (Lbnj;)Ljava/lang/Comparable; + ARG 0 property diff --git a/mappings/net/minecraft/world/IBlockView.mapping b/mappings/net/minecraft/world/IBlockView.mapping new file mode 100644 index 0000000000..fb156c7197 --- /dev/null +++ b/mappings/net/minecraft/world/IBlockView.mapping @@ -0,0 +1,21 @@ +CLASS ayn net/minecraft/world/IBlockView + METHOD H getMaxLightLevel ()I + METHOD I getHeight ()I + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a (Leq;)Lcac; + ARG 0 pos + METHOD b (III)I + ARG 0 x + ARG 1 y + ARG 2 z + METHOD c (III)I + ARG 0 x + ARG 1 y + ARG 2 z + METHOD d getBlockEntity (Leq;)Lbkf; + ARG 0 pos + METHOD h getBlockState (Leq;)Lblz; + ARG 0 pos diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index a6b2f36fd0..1ca6a790e7 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -53,6 +53,10 @@ CLASS aza net/minecraft/world/World ARG 5 volume ARG 6 pitch METHOD a calculateAmbientDarkness (F)I + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z METHOD a markRegionForRenderUpdate (IIIIII)V METHOD a fireGlobalWorldEvent (ILeq;I)V ARG 0 eventId @@ -111,7 +115,7 @@ CLASS aza net/minecraft/world/World METHOD a rayTrace (Lchc;Lchc;Lcha;ZZ)Lcgz; ARG 0 begin ARG 1 end - METHOD a getBlockState (Leq;)Lcac; + METHOD a (Leq;)Lcac; ARG 0 pos METHOD a addBlockAction (Leq;Lbdx;II)V ARG 0 pos diff --git a/mappings/net/minecraft/world/chunk/ChunkCache.mapping b/mappings/net/minecraft/world/chunk/ChunkCache.mapping index e8be451a2c..318c4c3118 100644 --- a/mappings/net/minecraft/world/chunk/ChunkCache.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkCache.mapping @@ -8,10 +8,14 @@ CLASS azm net/minecraft/world/chunk/ChunkCache ARG 1 minPos ARG 2 maxPos ARG 3 offset + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z METHOD a getLightLevel (Lazj;Leq;)I ARG 0 type ARG 1 pos - METHOD a getBlockState (Leq;)Lcac; + METHOD a (Leq;)Lcac; ARG 0 pos METHOD c getBiome (Leq;)Lazx; ARG 0 pos diff --git a/mappings/uh.mapping b/mappings/uh.mapping index 768c0d6eda..66016892e2 100644 --- a/mappings/uh.mapping +++ b/mappings/uh.mapping @@ -1,11 +1,15 @@ CLASS uh METHOD E getChunkProvider ()Lbnz; + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z METHOD a spawnEntity (Lafh;)Z ARG 0 entity METHOD a getLightLevel (Lazj;Leq;)I ARG 0 type ARG 1 pos - METHOD a getBlockState (Leq;)Lcac; + METHOD a (Leq;)Lcac; ARG 0 pos METHOD a getEmittedStrongRedstonePower (Leq;Lev;)I ARG 0 pos