From 29274e2a510222598f731b2b30a54b1ae5cccfa0 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 18 Aug 2016 02:35:58 +0200 Subject: [PATCH] chunk, potion work --- .../minecraft/block/impl/BlockPiston.mapping | 10 +++++ .../block/impl/BlockPistonHead.mapping | 7 ++- .../net/minecraft/block/piston/ase.mapping | 2 + .../world/WorldClient.mapping} | 2 +- mappings/net/minecraft/potion/Potion.mapping | 13 ++++++ .../net/minecraft/potion/PotionEffect.mapping | 43 +++++++++++++------ .../minecraft/potion/PotionEffectType.mapping | 12 ++++++ ...ects.mapping => PotionEffectTypes.mapping} | 2 +- .../minecraft/world/WorldServer.mapping} | 4 +- .../net/minecraft/world/biome/Biome.mapping | 3 ++ .../world/chunk/ChunkBlockInfo.mapping | 9 ++++ .../world/chunk/ChunkNibbleArray.mapping | 2 +- .../minecraft/world/chunk/ChunkPos.mapping | 17 ++++++++ .../world/chunk/ChunkProviderClient.mapping | 17 ++++++++ .../world/chunk/ChunkProviderServer.mapping | 26 +++++++++++ .../world/chunk/IChunkProvider.mapping | 5 ++- mappings/none/lt.mapping | 2 - 17 files changed, 155 insertions(+), 21 deletions(-) create mode 100644 mappings/net/minecraft/block/piston/ase.mapping rename mappings/net/minecraft/{world/World.mapping => client/world/WorldClient.mapping} (93%) create mode 100644 mappings/net/minecraft/potion/PotionEffectType.mapping rename mappings/net/minecraft/reference/{PotionEffects.mapping => PotionEffectTypes.mapping} (93%) rename mappings/{none/lu.mapping => net/minecraft/world/WorldServer.mapping} (56%) create mode 100644 mappings/net/minecraft/world/chunk/ChunkPos.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping delete mode 100644 mappings/none/lt.mapping diff --git a/mappings/net/minecraft/block/impl/BlockPiston.mapping b/mappings/net/minecraft/block/impl/BlockPiston.mapping index 09b6e9f796..d5426d624e 100644 --- a/mappings/net/minecraft/block/impl/BlockPiston.mapping +++ b/mappings/net/minecraft/block/impl/BlockPiston.mapping @@ -1,4 +1,14 @@ CLASS none/asa net/minecraft/block/impl/BlockPiston + FIELD B isSticky Z + FIELD a EXTENDED Lnone/asv; + FIELD b BOX_WEST Lnone/bcp; + FIELD c BOX_EAST Lnone/bcp; + FIELD d BOX_NORTH Lnone/bcp; + FIELD e BOX_SOUTH Lnone/bcp; + FIELD f BOX_BOTTOM Lnone/bcp; + FIELD g BOX_TOP Lnone/bcp; + METHOD (Z)V + ARG 0 sticky METHOD a deserializeState (I)Lnone/asj; METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; METHOD a addBoundingBoxes (Lnone/asj;Lnone/aiu;Lnone/cn;Lnone/bcp;Ljava/util/List;Lnone/se;)V diff --git a/mappings/net/minecraft/block/impl/BlockPistonHead.mapping b/mappings/net/minecraft/block/impl/BlockPistonHead.mapping index bfbf5ff421..9b52c0680f 100644 --- a/mappings/net/minecraft/block/impl/BlockPistonHead.mapping +++ b/mappings/net/minecraft/block/impl/BlockPistonHead.mapping @@ -1,6 +1,11 @@ CLASS none/asb net/minecraft/block/impl/BlockPistonHead - CLASS none/asb$a + CLASS none/asb$a Type + FIELD a NORMAL Lnone/asb$a; + FIELD b STICKY Lnone/asb$a; + FIELD c name Ljava/lang/String; METHOD m asString ()Ljava/lang/String; + FIELD a TYPE Lnone/asx; + FIELD b SHORT Lnone/asv; METHOD a deserializeState (I)Lnone/asj; METHOD a getDropAmount (Ljava/util/Random;)I METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq; diff --git a/mappings/net/minecraft/block/piston/ase.mapping b/mappings/net/minecraft/block/piston/ase.mapping new file mode 100644 index 0000000000..c714e1f9fd --- /dev/null +++ b/mappings/net/minecraft/block/piston/ase.mapping @@ -0,0 +1,2 @@ +CLASS none/ase net/minecraft/block/piston/ase + FIELD a world Lnone/aiu; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping similarity index 93% rename from mappings/net/minecraft/world/World.mapping rename to mappings/net/minecraft/client/world/WorldClient.mapping index de7c25af1e..7eecc7fbef 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -1,4 +1,4 @@ -CLASS none/aiu net/minecraft/world/World +CLASS none/aiu net/minecraft/client/world/WorldClient FIELD C profiler Lnone/os; FIELD E isRemote Z FIELD r rand Ljava/util/Random; diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index ed335f4158..f42d8a7060 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -3,9 +3,22 @@ CLASS none/age net/minecraft/potion/Potion FIELD b id Lnone/kp; FIELD c maxRawId I FIELD d name Ljava/lang/String; + FIELD e effectList Lcom/google/common/collect/ImmutableList; + METHOD (Ljava/lang/String;[Lnone/ry;)V + ARG 0 id + ARG 1 effects + METHOD ([Lnone/ry;)V + ARG 0 effects + METHOD a getEffects ()Ljava/util/List; METHOD a getPotionByRawId (I)Lnone/age; + ARG 0 rawId METHOD a getPotionById (Ljava/lang/String;)Lnone/age; + ARG 0 id METHOD a register (Ljava/lang/String;Lnone/age;)V + ARG 0 id + ARG 1 potion METHOD a getRawIdFromPotion (Lnone/age;)I + ARG 0 potion METHOD b init ()V METHOD b getName (Ljava/lang/String;)Ljava/lang/String; + ARG 0 prefix diff --git a/mappings/net/minecraft/potion/PotionEffect.mapping b/mappings/net/minecraft/potion/PotionEffect.mapping index 016e53c730..9d6a2a4627 100644 --- a/mappings/net/minecraft/potion/PotionEffect.mapping +++ b/mappings/net/minecraft/potion/PotionEffect.mapping @@ -1,12 +1,31 @@ -CLASS none/rx net/minecraft/potion/PotionEffect - FIELD b REGISTRY Lnone/db; - FIELD e translationKey Ljava/lang/String; - METHOD a getTranslationKey ()Ljava/lang/String; - METHOD a getEffectByRawId (I)Lnone/rx; - ARG 0 id - METHOD a getRawIdFromEffect (Lnone/rx;)I - ARG 0 effect - METHOD b getEffectById (Ljava/lang/String;)Lnone/rx; - ARG 0 id - METHOD c setTranslationKey (Ljava/lang/String;)Lnone/rx; - METHOD k init ()V +CLASS none/ry net/minecraft/potion/PotionEffect + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b type Lnone/rx; + FIELD c duration I + FIELD d amplifier I + FIELD e splash Z + FIELD f ambient Z + FIELD h showParticles Z + METHOD (Lnone/rx;)V + ARG 0 type + METHOD (Lnone/rx;I)V + ARG 0 type + ARG 1 duration + METHOD (Lnone/rx;II)V + ARG 0 type + ARG 1 duration + ARG 2 amplifier + METHOD (Lnone/rx;IIZZ)V + ARG 0 type + ARG 1 duration + ARG 2 amplifier + ARG 3 ambient + ARG 4 showParticles + METHOD (Lnone/ry;)V + ARG 0 other + METHOD a getEffectType ()Lnone/rx; + METHOD b getDuration ()I + METHOD c getAmplifier ()I + METHOD d isAmbient ()Z + METHOD e shouldShowParticles ()Z + METHOD f getTranslationKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/potion/PotionEffectType.mapping b/mappings/net/minecraft/potion/PotionEffectType.mapping new file mode 100644 index 0000000000..7490b12aac --- /dev/null +++ b/mappings/net/minecraft/potion/PotionEffectType.mapping @@ -0,0 +1,12 @@ +CLASS none/rx net/minecraft/potion/PotionEffectType + FIELD b REGISTRY Lnone/db; + FIELD e translationKey Ljava/lang/String; + METHOD a getTranslationKey ()Ljava/lang/String; + METHOD a getEffectByRawId (I)Lnone/rx; + ARG 0 id + METHOD a getRawIdFromEffect (Lnone/rx;)I + ARG 0 effect + METHOD b getEffectById (Ljava/lang/String;)Lnone/rx; + ARG 0 id + METHOD c setTranslationKey (Ljava/lang/String;)Lnone/rx; + METHOD k init ()V diff --git a/mappings/net/minecraft/reference/PotionEffects.mapping b/mappings/net/minecraft/reference/PotionEffectTypes.mapping similarity index 93% rename from mappings/net/minecraft/reference/PotionEffects.mapping rename to mappings/net/minecraft/reference/PotionEffectTypes.mapping index 39ff209146..2c0930cc5d 100644 --- a/mappings/net/minecraft/reference/PotionEffects.mapping +++ b/mappings/net/minecraft/reference/PotionEffectTypes.mapping @@ -1,4 +1,4 @@ -CLASS none/rz net/minecraft/reference/PotionEffects +CLASS none/rz net/minecraft/reference/PotionEffectTypes FIELD A UNLUCK Lnone/rx; FIELD a SPEED Lnone/rx; FIELD b SLOWNESS Lnone/rx; diff --git a/mappings/none/lu.mapping b/mappings/net/minecraft/world/WorldServer.mapping similarity index 56% rename from mappings/none/lu.mapping rename to mappings/net/minecraft/world/WorldServer.mapping index 7bbe800bb3..5cc73924fb 100644 --- a/mappings/none/lu.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -1,4 +1,6 @@ -CLASS none/lu +CLASS none/lu net/minecraft/world/WorldServer + FIELD I server Lnet/minecraft/server/MinecraftServer; + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; METHOD a createEntity (Lnone/se;)Z METHOD aE isMainThread ()Z diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index c9d6bf1d5d..260578e6dd 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -1,11 +1,14 @@ CLASS none/ajh net/minecraft/world/biome/Biome CLASS none/ajh$a BiomeConfiguration + FIELD a name Ljava/lang/String; FIELD d temperature F FIELD i name Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 0 name METHOD a setTemperature (F)Lnone/ajh$a; ARG 0 temperature + METHOD a getName (Lnone/ajh$a;)Ljava/lang/String; + METHOD d getTemperature (Lnone/ajh$a;)F FIELD C temperature F FIELD H name Ljava/lang/String; FIELD a STONE Lnone/asj; diff --git a/mappings/net/minecraft/world/chunk/ChunkBlockInfo.mapping b/mappings/net/minecraft/world/chunk/ChunkBlockInfo.mapping index 887f7588a7..0735fa4b95 100644 --- a/mappings/net/minecraft/world/chunk/ChunkBlockInfo.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkBlockInfo.mapping @@ -1 +1,10 @@ CLASS none/atn net/minecraft/world/chunk/ChunkBlockInfo + METHOD a getBlockState (III)Lnone/asj; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a setBlockState (IIILnone/asj;)V + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 state diff --git a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping index c951b6741b..9dea4a7f26 100644 --- a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping @@ -23,5 +23,5 @@ CLASS none/ati net/minecraft/world/chunk/ChunkNibbleArray ARG 0 x ARG 1 y ARG 2 z - METHOD c stripOneBit (I)I + METHOD c toArrayPos (I)I ARG 0 nibblePos diff --git a/mappings/net/minecraft/world/chunk/ChunkPos.mapping b/mappings/net/minecraft/world/chunk/ChunkPos.mapping new file mode 100644 index 0000000000..72baf8c877 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkPos.mapping @@ -0,0 +1,17 @@ +CLASS none/ain net/minecraft/world/chunk/ChunkPos + FIELD a x I + FIELD b z I + METHOD (II)V + ARG 0 x + ARG 1 z + METHOD (Lnone/cn;)V + ARG 0 pos + METHOD a toLong (II)J + ARG 0 chunkX + ARG 1 chunkZ + METHOD a toBlockPos (III)Lnone/cn; + ARG 0 xOffset + ARG 1 y + ARG 2 zOffset + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other diff --git a/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping b/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping new file mode 100644 index 0000000000..fb7977bd8a --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping @@ -0,0 +1,17 @@ +CLASS none/bma net/minecraft/world/chunk/ChunkProviderClient + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b emptyChunk Lnone/atm; + FIELD c chunkByIdMap Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD d world Lnone/aiu; + METHOD (Lnone/aiu;)V + ARG 0 world + METHOD a getChunk (II)Lnone/atm; + ARG 0 x + ARG 1 z + METHOD c provideChunk (II)Lnone/atm; + ARG 0 x + ARG 1 z + METHOD d (II)Lnone/atm; + ARG 0 x + ARG 1 z + METHOD f getStatus ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping b/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping new file mode 100644 index 0000000000..ad78c6ae15 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping @@ -0,0 +1,26 @@ +CLASS none/lt net/minecraft/world/chunk/ChunkProviderServer + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b loadedChunkIds Ljava/util/Set; + FIELD e chunkByIdMap Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + METHOD a getChunks ()Ljava/util/Collection; + METHOD a getChunk (II)Lnone/atm; + ARG 0 x + ARG 1 z + METHOD b getOrLoadChunk (II)Lnone/atm; + ARG 0 x + ARG 1 z + METHOD b saveEntities (Lnone/atm;)V + ARG 0 chunk + METHOD c provideChunk (II)Lnone/atm; + ARG 0 x + ARG 1 z + METHOD c saveChunk (Lnone/atm;)V + ARG 0 chunk + METHOD d hasChunk (II)Z + ARG 0 x + ARG 1 z + METHOD e loadChunk (II)Lnone/atm; + ARG 0 x + ARG 1 z + METHOD f getStatus ()Ljava/lang/String; + METHOD g getChunkCount ()I diff --git a/mappings/net/minecraft/world/chunk/IChunkProvider.mapping b/mappings/net/minecraft/world/chunk/IChunkProvider.mapping index f2ba56b537..ccb0ae7307 100644 --- a/mappings/net/minecraft/world/chunk/IChunkProvider.mapping +++ b/mappings/net/minecraft/world/chunk/IChunkProvider.mapping @@ -1,7 +1,8 @@ CLASS none/ath net/minecraft/world/chunk/IChunkProvider - METHOD a (II)Lnone/atm; + METHOD a getChunk (II)Lnone/atm; ARG 0 x ARG 1 z - METHOD c (II)Lnone/atm; + METHOD c provideChunk (II)Lnone/atm; ARG 0 x ARG 1 z + METHOD f getStatus ()Ljava/lang/String; diff --git a/mappings/none/lt.mapping b/mappings/none/lt.mapping deleted file mode 100644 index bdd3c2e603..0000000000 --- a/mappings/none/lt.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/lt - FIELD a LOGGER Lorg/apache/logging/log4j/Logger;