From e6a57227eaa72b0fdc64cc0589d3c52f7529436f Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 19:23:22 -0600 Subject: [PATCH 1/9] Mapped a bunch of misc stuff --- .../entity/player/PlayerModelParts.mapping | 16 +++++ mappings/net/minecraft/item/Item.mapping | 1 + mappings/net/minecraft/item/ItemArmor.mapping | 18 ++++- .../item/impl/ItemChorusFruit.mapping} | 2 +- .../net/minecraft/item/impl/ItemMap.mapping | 6 ++ .../minecraft/item/impl/ItemMapFilled.mapping | 4 ++ .../minecraft/particle/ParticleType.mapping | 70 +++++++++++++++++++ .../recipe/impl/RecipeCopyMap.mapping} | 2 +- .../recipe/impl/RecipeRepair.mapping} | 2 +- .../recipe/impl/RecipeScaleMap.mapping} | 2 +- .../recipe/impl/ShieldRecipes.mapping} | 6 +- 11 files changed, 121 insertions(+), 8 deletions(-) create mode 100644 mappings/net/minecraft/entity/player/PlayerModelParts.mapping rename mappings/{none/adl.mapping => net/minecraft/item/impl/ItemChorusFruit.mapping} (63%) create mode 100644 mappings/net/minecraft/item/impl/ItemMap.mapping create mode 100644 mappings/net/minecraft/particle/ParticleType.mapping rename mappings/{none/agw.mapping => net/minecraft/recipe/impl/RecipeCopyMap.mapping} (77%) rename mappings/{none/agr.mapping => net/minecraft/recipe/impl/RecipeRepair.mapping} (77%) rename mappings/{none/ags.mapping => net/minecraft/recipe/impl/RecipeScaleMap.mapping} (59%) rename mappings/{none/agz.mapping => net/minecraft/recipe/impl/ShieldRecipes.mapping} (58%) diff --git a/mappings/net/minecraft/entity/player/PlayerModelParts.mapping b/mappings/net/minecraft/entity/player/PlayerModelParts.mapping new file mode 100644 index 0000000000..11fc7b6700 --- /dev/null +++ b/mappings/net/minecraft/entity/player/PlayerModelParts.mapping @@ -0,0 +1,16 @@ +CLASS none/aal net/minecraft/entity/player/PlayerModelParts + FIELD a CAPE Lnone/aal; + FIELD b JACKET Lnone/aal; + FIELD c LEFT_SLEEVE Lnone/aal; + FIELD d RIGHT_SLEEVE Lnone/aal; + FIELD e LEFT_LEG Lnone/aal; + FIELD f RIGHT_LEG Lnone/aal; + FIELD g HEAD Lnone/aal; + FIELD h id I + FIELD j name Ljava/lang/String; + FIELD k localizedName Lnone/fa; + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + METHOD b getId ()I + METHOD c getName ()Ljava/lang/String; + METHOD d getLocalizedName ()Lnone/fa; diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 28b44158ec..59b92fcda9 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -123,6 +123,7 @@ CLASS none/aeo net/minecraft/item/Item ARG 0 durability METHOD e (Lnone/aeq;)I ARG 0 stack + METHOD f isMap ()Z METHOD f (Lnone/aeq;)Lnone/aga; ARG 0 stack METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/ItemArmor.mapping b/mappings/net/minecraft/item/ItemArmor.mapping index 07ecc6f554..a114986c03 100644 --- a/mappings/net/minecraft/item/ItemArmor.mapping +++ b/mappings/net/minecraft/item/ItemArmor.mapping @@ -6,13 +6,29 @@ CLASS none/acw net/minecraft/item/ItemArmor FIELD d GOLD Lnone/acw$a; FIELD e DIAMOND Lnone/acw$a; FIELD f name Ljava/lang/String; - METHOD c getResourceItem ()Lnone/aeo; + FIELD h protectionAmounts [I + FIELD i enchantability I + FIELD j equipSound Lnone/nk; + FIELD k toughness F + METHOD (Ljava/lang/String;ILjava/lang/String;I[IILnone/nk;F)V + ARG 3 name + METHOD a getEnchantability ()I + METHOD b getEquipSound ()Lnone/nk; + METHOD b getProtection (Lnone/sj;)I + ARG 0 slotType + METHOD c getRepairItem ()Lnone/aeo; METHOD d getName ()Ljava/lang/String; + METHOD e getToughness ()F FIELD a SLOT_TEXTURE_LOCATIONS [Ljava/lang/String; FIELD b DISPENSER_BEHAVIOR Lnone/cv; + FIELD c slotType Lnone/sj; + FIELD d protection I + FIELD e toughness F + FIELD o MODIFIERS [Ljava/util/UUID; FIELD p material Lnone/acw$a; METHOD (Lnone/acw$a;ILnone/sj;)V ARG 0 material + METHOD A_ getSlotType ()Lnone/sj; METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z ARG 0 tool ARG 1 repairItem diff --git a/mappings/none/adl.mapping b/mappings/net/minecraft/item/impl/ItemChorusFruit.mapping similarity index 63% rename from mappings/none/adl.mapping rename to mappings/net/minecraft/item/impl/ItemChorusFruit.mapping index 86643d13b3..f563d46e29 100644 --- a/mappings/none/adl.mapping +++ b/mappings/net/minecraft/item/impl/ItemChorusFruit.mapping @@ -1,4 +1,4 @@ -CLASS none/adl +CLASS none/adl net/minecraft/item/impl/ItemChorusFruit METHOD a (Lnone/aeq;Lnone/aiu;Lnone/sn;)Lnone/aeq; ARG 0 stack ARG 1 world diff --git a/mappings/net/minecraft/item/impl/ItemMap.mapping b/mappings/net/minecraft/item/impl/ItemMap.mapping new file mode 100644 index 0000000000..fa0836e824 --- /dev/null +++ b/mappings/net/minecraft/item/impl/ItemMap.mapping @@ -0,0 +1,6 @@ +CLASS none/adp net/minecraft/item/impl/ItemMap + METHOD a createMapPacket (Lnone/aeq;Lnone/aiu;Lnone/aak;)Lnone/fl; + ARG 0 stack + ARG 1 world + ARG 2 player + METHOD f isMap ()Z diff --git a/mappings/net/minecraft/item/impl/ItemMapFilled.mapping b/mappings/net/minecraft/item/impl/ItemMapFilled.mapping index 49b23bc279..71934ff42e 100644 --- a/mappings/net/minecraft/item/impl/ItemMapFilled.mapping +++ b/mappings/net/minecraft/item/impl/ItemMapFilled.mapping @@ -1,2 +1,6 @@ CLASS none/aew net/minecraft/item/impl/ItemMapFilled METHOD a addInformation (Lnone/aeq;Lnone/aak;Ljava/util/List;Z)V + METHOD a createMapPacket (Lnone/aeq;Lnone/aiu;Lnone/aak;)Lnone/fl; + ARG 0 stack + ARG 1 world + ARG 2 player diff --git a/mappings/net/minecraft/particle/ParticleType.mapping b/mappings/net/minecraft/particle/ParticleType.mapping new file mode 100644 index 0000000000..c05751c5ca --- /dev/null +++ b/mappings/net/minecraft/particle/ParticleType.mapping @@ -0,0 +1,70 @@ +CLASS none/dd net/minecraft/particle/ParticleType + FIELD A FLAME Lnone/dd; + FIELD B LAVA Lnone/dd; + FIELD C FOOTSTEP Lnone/dd; + FIELD D CLOUD Lnone/dd; + FIELD E REDDUST Lnone/dd; + FIELD F SNOWBALL_POOF Lnone/dd; + FIELD G SNOW_SHOVEL Lnone/dd; + FIELD H SLIME Lnone/dd; + FIELD I HEART Lnone/dd; + FIELD J BARRIER Lnone/dd; + FIELD K ICON_CRACK Lnone/dd; + FIELD L BLOCK_CRACK Lnone/dd; + FIELD M BLOCK_DUST Lnone/dd; + FIELD N DROPLET Lnone/dd; + FIELD O TAKE Lnone/dd; + FIELD P MOB_APPEARANCE Lnone/dd; + FIELD Q DRAGON_BREATH Lnone/dd; + FIELD R END_ROD Lnone/dd; + FIELD S DAMAGE_INDICATOR Lnone/dd; + FIELD T SWEEP_ATTACK Lnone/dd; + FIELD U FALLING_DUST Lnone/dd; + FIELD V name Ljava/lang/String; + FIELD W id I + FIELD X ignoreRange Z + FIELD Y argCount I + FIELD Z ID_MAP Ljava/util/Map; + FIELD a EXPLODE Lnone/dd; + FIELD aa NAME_MAP Ljava/util/Map; + FIELD b LARGE_EXPLODE Lnone/dd; + FIELD c HUGE_EXPLOSION Lnone/dd; + FIELD d FIREWORKS_SPARK Lnone/dd; + FIELD e BUBBLE Lnone/dd; + FIELD f SPLASH Lnone/dd; + FIELD g WAKE Lnone/dd; + FIELD h SUSPEND Lnone/dd; + FIELD i DEPTH_SUSPEND Lnone/dd; + FIELD j CRIT Lnone/dd; + FIELD k MAGIC_CRIT Lnone/dd; + FIELD l SMOKE Lnone/dd; + FIELD m LARGE_SMOKE Lnone/dd; + FIELD n SPELL Lnone/dd; + FIELD o INSTANT_SPELL Lnone/dd; + FIELD p MOB_SPELL Lnone/dd; + FIELD q MOB_SPELL_AMBIENT Lnone/dd; + FIELD r WITCH_MAGIC Lnone/dd; + FIELD s DRIP_WATER Lnone/dd; + FIELD t DRIP_LAVA Lnone/dd; + FIELD u ANGRY_VILLAGER Lnone/dd; + FIELD v HAPPY_VILLAGER Lnone/dd; + FIELD w TOWN_AURA Lnone/dd; + FIELD x NOTE Lnone/dd; + FIELD y PORTAL Lnone/dd; + FIELD z ENCHANTMENT_TABLE Lnone/dd; + METHOD (Ljava/lang/String;ILjava/lang/String;IZ)V + ARG 3 name + ARG 4 id + METHOD (Ljava/lang/String;ILjava/lang/String;IZI)V + ARG 3 name + ARG 4 id + ARG 5 ignoreRange + METHOD a getNames ()Ljava/util/Set; + METHOD a getParticleById (I)Lnone/dd; + ARG 0 id + METHOD a getParticleByName (Ljava/lang/String;)Lnone/dd; + ARG 0 name + METHOD b getName ()Ljava/lang/String; + METHOD c getId ()I + METHOD d getArgumentCount ()I + METHOD e ignoreRange ()Z diff --git a/mappings/none/agw.mapping b/mappings/net/minecraft/recipe/impl/RecipeCopyMap.mapping similarity index 77% rename from mappings/none/agw.mapping rename to mappings/net/minecraft/recipe/impl/RecipeCopyMap.mapping index 99eee4fc0c..376574dd15 100644 --- a/mappings/none/agw.mapping +++ b/mappings/net/minecraft/recipe/impl/RecipeCopyMap.mapping @@ -1,4 +1,4 @@ -CLASS none/agw +CLASS none/agr net/minecraft/recipe/impl/RecipeCopyMap METHOD a getSize ()I METHOD a craft (Lnone/acc;)Lnone/aeq; METHOD a matches (Lnone/acc;Lnone/aiu;)Z diff --git a/mappings/none/agr.mapping b/mappings/net/minecraft/recipe/impl/RecipeRepair.mapping similarity index 77% rename from mappings/none/agr.mapping rename to mappings/net/minecraft/recipe/impl/RecipeRepair.mapping index f501b141e8..b3e0e20655 100644 --- a/mappings/none/agr.mapping +++ b/mappings/net/minecraft/recipe/impl/RecipeRepair.mapping @@ -1,4 +1,4 @@ -CLASS none/agr +CLASS none/agw net/minecraft/recipe/impl/RecipeRepair METHOD a getSize ()I METHOD a craft (Lnone/acc;)Lnone/aeq; METHOD a matches (Lnone/acc;Lnone/aiu;)Z diff --git a/mappings/none/ags.mapping b/mappings/net/minecraft/recipe/impl/RecipeScaleMap.mapping similarity index 59% rename from mappings/none/ags.mapping rename to mappings/net/minecraft/recipe/impl/RecipeScaleMap.mapping index 8759fc39a5..8b9caff171 100644 --- a/mappings/none/ags.mapping +++ b/mappings/net/minecraft/recipe/impl/RecipeScaleMap.mapping @@ -1,3 +1,3 @@ -CLASS none/ags +CLASS none/ags net/minecraft/recipe/impl/RecipeScaleMap METHOD a craft (Lnone/acc;)Lnone/aeq; METHOD a matches (Lnone/acc;Lnone/aiu;)Z diff --git a/mappings/none/agz.mapping b/mappings/net/minecraft/recipe/impl/ShieldRecipes.mapping similarity index 58% rename from mappings/none/agz.mapping rename to mappings/net/minecraft/recipe/impl/ShieldRecipes.mapping index 2ab63515d4..37fd387e9d 100644 --- a/mappings/none/agz.mapping +++ b/mappings/net/minecraft/recipe/impl/ShieldRecipes.mapping @@ -1,8 +1,8 @@ -CLASS none/agz - CLASS none/agz$a +CLASS none/agz net/minecraft/recipe/impl/ShieldRecipes + CLASS none/agz$a RecipeShieldDesign METHOD a getSize ()I METHOD a craft (Lnone/acc;)Lnone/aeq; METHOD a matches (Lnone/acc;Lnone/aiu;)Z METHOD b getOutput ()Lnone/aeq; METHOD b getRemainingStacks (Lnone/acc;)Lnone/dc; - METHOD a register (Lnone/agv;)V + METHOD a addCraftingRecipes (Lnone/agv;)V From 403c5a575e49fb11ce1439dbd37cb2de9dc43456 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 19:50:06 -0600 Subject: [PATCH 2/9] Mapped out some position related stuff. --- .../net/minecraft/util/math/BlockPosition.mapping | 7 +++++++ .../minecraft/util/math/BlockPositionImpl.mapping | 13 +++++++++++++ mappings/net/minecraft/util/math/Position.mapping | 4 ++++ .../net/minecraft/util/math/WorldPosition.mapping | 2 ++ mappings/none/df.mapping | 4 ++++ 5 files changed, 30 insertions(+) create mode 100644 mappings/net/minecraft/util/math/BlockPosition.mapping create mode 100644 mappings/net/minecraft/util/math/BlockPositionImpl.mapping create mode 100644 mappings/net/minecraft/util/math/Position.mapping create mode 100644 mappings/net/minecraft/util/math/WorldPosition.mapping create mode 100644 mappings/none/df.mapping diff --git a/mappings/net/minecraft/util/math/BlockPosition.mapping b/mappings/net/minecraft/util/math/BlockPosition.mapping new file mode 100644 index 0000000000..3a9a97944e --- /dev/null +++ b/mappings/net/minecraft/util/math/BlockPosition.mapping @@ -0,0 +1,7 @@ +CLASS none/co net/minecraft/util/math/BlockPosition + METHOD a getX ()D + METHOD b getY ()D + METHOD c getZ ()D + METHOD d getBlockPos ()Lnone/cn; + METHOD e getBlockState ()Lnone/asj; + METHOD g getTileEntity ()Lnone/arb; diff --git a/mappings/net/minecraft/util/math/BlockPositionImpl.mapping b/mappings/net/minecraft/util/math/BlockPositionImpl.mapping new file mode 100644 index 0000000000..cd1b6fff0d --- /dev/null +++ b/mappings/net/minecraft/util/math/BlockPositionImpl.mapping @@ -0,0 +1,13 @@ +CLASS none/cp net/minecraft/util/math/BlockPositionImpl + FIELD a world Lnone/aiu; + FIELD b pos Lnone/cn; + METHOD (Lnone/aiu;Lnone/cn;)V + ARG 0 world + ARG 1 pos + METHOD a getX ()D + METHOD b getY ()D + METHOD c getZ ()D + METHOD d getBlockPos ()Lnone/cn; + METHOD e getBlockState ()Lnone/asj; + METHOD g getTileEntity ()Lnone/arb; + METHOD h getWorld ()Lnone/aiu; diff --git a/mappings/net/minecraft/util/math/Position.mapping b/mappings/net/minecraft/util/math/Position.mapping new file mode 100644 index 0000000000..1996d8fea8 --- /dev/null +++ b/mappings/net/minecraft/util/math/Position.mapping @@ -0,0 +1,4 @@ +CLASS none/de net/minecraft/util/math/Position + METHOD a getX ()D + METHOD b getY ()D + METHOD c getZ ()D diff --git a/mappings/net/minecraft/util/math/WorldPosition.mapping b/mappings/net/minecraft/util/math/WorldPosition.mapping new file mode 100644 index 0000000000..9703abd6a7 --- /dev/null +++ b/mappings/net/minecraft/util/math/WorldPosition.mapping @@ -0,0 +1,2 @@ +CLASS none/cz net/minecraft/util/math/WorldPosition + METHOD h getWorld ()Lnone/aiu; diff --git a/mappings/none/df.mapping b/mappings/none/df.mapping new file mode 100644 index 0000000000..da49172da2 --- /dev/null +++ b/mappings/none/df.mapping @@ -0,0 +1,4 @@ +CLASS none/df + METHOD a getX ()D + METHOD b getY ()D + METHOD c getZ ()D From 15512f34109fd8bf9f0726245c1c4f4ea0b78e0d Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 19:50:24 -0600 Subject: [PATCH 3/9] Mapped out some dispenser logic stuff. --- mappings/net/minecraft/dispenser/DispenserBehavior.mapping | 5 +++++ .../minecraft/dispenser/impl/BehaviorDispenseItem.mapping | 3 +++ .../dispenser/impl/BehaviorDispenseProjectile.mapping | 1 + mappings/net/minecraft/reference/Bootstrap.mapping | 6 ++++++ 4 files changed, 15 insertions(+) create mode 100644 mappings/net/minecraft/dispenser/impl/BehaviorDispenseItem.mapping create mode 100644 mappings/net/minecraft/dispenser/impl/BehaviorDispenseProjectile.mapping diff --git a/mappings/net/minecraft/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/dispenser/DispenserBehavior.mapping index 9381cf8e19..4afbb31f64 100644 --- a/mappings/net/minecraft/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/dispenser/DispenserBehavior.mapping @@ -1,2 +1,7 @@ CLASS none/cv net/minecraft/dispenser/DispenserBehavior + CLASS none/cv$1 + METHOD a dispense (Lnone/co;Lnone/aeq;)Lnone/aeq; + ARG 1 stack FIELD a DEFAULT Lnone/cv; + METHOD a dispense (Lnone/co;Lnone/aeq;)Lnone/aeq; + ARG 1 stack diff --git a/mappings/net/minecraft/dispenser/impl/BehaviorDispenseItem.mapping b/mappings/net/minecraft/dispenser/impl/BehaviorDispenseItem.mapping new file mode 100644 index 0000000000..e1a16b67df --- /dev/null +++ b/mappings/net/minecraft/dispenser/impl/BehaviorDispenseItem.mapping @@ -0,0 +1,3 @@ +CLASS none/cr net/minecraft/dispenser/impl/BehaviorDispenseItem + METHOD a dispense (Lnone/co;Lnone/aeq;)Lnone/aeq; + ARG 1 stack diff --git a/mappings/net/minecraft/dispenser/impl/BehaviorDispenseProjectile.mapping b/mappings/net/minecraft/dispenser/impl/BehaviorDispenseProjectile.mapping new file mode 100644 index 0000000000..c79dd2a9df --- /dev/null +++ b/mappings/net/minecraft/dispenser/impl/BehaviorDispenseProjectile.mapping @@ -0,0 +1 @@ +CLASS none/kr net/minecraft/dispenser/impl/BehaviorDispenseProjectile diff --git a/mappings/net/minecraft/reference/Bootstrap.mapping b/mappings/net/minecraft/reference/Bootstrap.mapping index c021dba2a9..189c5b2999 100644 --- a/mappings/net/minecraft/reference/Bootstrap.mapping +++ b/mappings/net/minecraft/reference/Bootstrap.mapping @@ -1,4 +1,10 @@ CLASS none/ks net/minecraft/reference/Bootstrap + CLASS none/ks$16 + METHOD a dispense (Lnone/co;Lnone/aeq;)Lnone/aeq; + ARG 1 stack + CLASS none/ks$17 + METHOD a dispense (Lnone/co;Lnone/aeq;)Lnone/aeq; + ARG 1 stack FIELD a OUTPUT Ljava/io/PrintStream; FIELD b initialized Z FIELD c LOGGER Lorg/apache/logging/log4j/Logger; From 57143673c62b42fb237034af09855a4737a826c8 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 20:30:11 -0600 Subject: [PATCH 4/9] Mapped some misc stuff --- mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping | 1 + mappings/net/minecraft/util/DyeColor.mapping | 2 ++ mappings/net/minecraft/world/GameMode.mapping | 2 ++ mappings/net/minecraft/world/World.mapping | 1 + 4 files changed, 6 insertions(+) diff --git a/mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping b/mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping index 16af3fa592..23aac6a6a0 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping @@ -1,3 +1,4 @@ CLASS none/wu net/minecraft/entity/passive/impl/EntitySheep METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD b setWoolColor (Lnone/adt;)V METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index cba0a663b1..2b0a6de4c0 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -21,6 +21,8 @@ CLASS none/adt net/minecraft/util/DyeColor FIELD t dyeId I FIELD w mapColor Lnone/ayp; FIELD x chatFormat Lnone/a; + METHOD (Ljava/lang/String;IIILjava/lang/String;Ljava/lang/String;Lnone/ayp;Lnone/a;)V + ARG 3 meta METHOD a getWoolId ()I METHOD a getWoolColor (I)Lnone/adt; ARG 0 id diff --git a/mappings/net/minecraft/world/GameMode.mapping b/mappings/net/minecraft/world/GameMode.mapping index 94a08a4a72..dd32408371 100644 --- a/mappings/net/minecraft/world/GameMode.mapping +++ b/mappings/net/minecraft/world/GameMode.mapping @@ -18,5 +18,7 @@ CLASS none/ais net/minecraft/world/GameMode METHOD a byName (Ljava/lang/String;Lnone/ais;)Lnone/ais; ARG 0 name ARG 1 defaultMode + METHOD a setAbilitites (Lnone/aai;)V + ARG 0 abilities METHOD b getName ()Ljava/lang/String; METHOD d isCreative ()Z diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 0de9465522..1a68a42de2 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -36,6 +36,7 @@ CLASS none/aiu net/minecraft/world/World ARG 0 pos ARG 1 state ARG 2 flags + METHOD a spawnParticle (Lnone/dd;DDDDDD[I)V METHOD a createEntity (Lnone/se;)Z METHOD ae getDifficulty ()Lnone/qx; METHOD aj getWorldBorder ()Lnone/atd; From 9ed7b8ed52c2a08abbb5c4e4271f2975542579df Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 20:30:26 -0600 Subject: [PATCH 5/9] Mapped stats a bit --- .../minecraft/reference/Achievements.mapping | 4 +++ mappings/net/minecraft/stat/Stat.mapping | 1 + .../stat/achievement/Achievement.mapping | 31 +++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/mappings/net/minecraft/reference/Achievements.mapping b/mappings/net/minecraft/reference/Achievements.mapping index 1a8fddbe63..cc5a81fc10 100644 --- a/mappings/net/minecraft/reference/Achievements.mapping +++ b/mappings/net/minecraft/reference/Achievements.mapping @@ -12,6 +12,10 @@ CLASS none/np net/minecraft/reference/Achievements FIELD K FULL_BEACON Lnone/no; FIELD L EXPLORE_ALL_BIOMES Lnone/no; FIELD M OVERPOWERED Lnone/no; + FIELD a lowestY I + FIELD b lowestX I + FIELD c highestY I + FIELD d highestX I FIELD e ACHIEVEMENTS Ljava/util/List; FIELD f OPEN_INVENTORY Lnone/no; FIELD g MINE_WOOD Lnone/no; diff --git a/mappings/net/minecraft/stat/Stat.mapping b/mappings/net/minecraft/stat/Stat.mapping index 9922e50911..3be90602ad 100644 --- a/mappings/net/minecraft/stat/Stat.mapping +++ b/mappings/net/minecraft/stat/Stat.mapping @@ -10,6 +10,7 @@ CLASS none/nu net/minecraft/stat/Stat METHOD (Ljava/lang/String;Lnone/fa;Lnone/nv;)V ARG 0 id ARG 1 name + METHOD d isAchievement ()Z METHOD e getName ()Lnone/fa; METHOD equals (Ljava/lang/Object;)Z ARG 0 other diff --git a/mappings/net/minecraft/stat/achievement/Achievement.mapping b/mappings/net/minecraft/stat/achievement/Achievement.mapping index a0fc7e8d3b..dfbc1df6ba 100644 --- a/mappings/net/minecraft/stat/achievement/Achievement.mapping +++ b/mappings/net/minecraft/stat/achievement/Achievement.mapping @@ -1,4 +1,35 @@ CLASS none/no net/minecraft/stat/achievement/Achievement + FIELD a displayY I + FIELD b displayX I + FIELD c parent Lnone/no; + FIELD d displayStack Lnone/aeq; + FIELD k description Ljava/lang/String; + FIELD m isSpecial Z + METHOD (Ljava/lang/String;Ljava/lang/String;IILnone/aeo;Lnone/no;)V + ARG 0 id + ARG 1 name + ARG 2 displayY + ARG 3 displayX + ARG 4 displayItem + ARG 5 parent + METHOD (Ljava/lang/String;Ljava/lang/String;IILnone/aeq;Lnone/no;)V + ARG 0 id + ARG 1 name + ARG 2 displayY + ARG 3 displayX + ARG 4 displayStack + ARG 5 parent + METHOD (Ljava/lang/String;Ljava/lang/String;IILnone/akw;Lnone/no;)V + ARG 0 id + ARG 1 name + ARG 2 displayY + ARG 3 displayX + ARG 4 displayBlock + ARG 5 parent + METHOD a setSeperate ()Lnone/no; + METHOD b setSpecial ()Lnone/no; METHOD c register ()Lnone/no; + METHOD d isAchievement ()Z METHOD e getName ()Lnone/fa; + METHOD g isSpecial ()Z METHOD h register ()Lnone/nu; From 440212098a99306b5842b236c1a9a6bef153188f Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 20:30:37 -0600 Subject: [PATCH 6/9] Mapped items a bit --- mappings/net/minecraft/item/Item.mapping | 11 +++++++++++ mappings/net/minecraft/item/impl/ItemDye.mapping | 8 ++++++++ mappings/net/minecraft/item/impl/ItemNameTag.mapping | 5 +++++ mappings/net/minecraft/item/impl/ItemSaddle.mapping | 5 +++++ 4 files changed, 29 insertions(+) diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 59b92fcda9..97ec74fc88 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -7,6 +7,9 @@ CLASS none/aeo net/minecraft/item/Item FIELD e GOLD Lnone/aeo$a; FIELD f miningLevel I FIELD g durability I + FIELD h efficiency F + FIELD i damage F + FIELD j enchantability I METHOD a getDurability ()I METHOD b getEfficiency ()F METHOD c getWeaponDamage ()F @@ -56,6 +59,11 @@ CLASS none/aeo net/minecraft/item/Item ARG 1 player ARG 2 list ARG 3 advancedTooltips + METHOD a interactWithEntity (Lnone/aeq;Lnone/aak;Lnone/sn;Lnone/qz;)Z + ARG 0 stack + ARG 1 user + ARG 2 entity + ARG 3 hand METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z ARG 0 tool ARG 1 repairItem @@ -101,6 +109,7 @@ CLASS none/aeo net/minecraft/item/Item METHOD a (Lnone/dt;)Z METHOD a getAttributeModifiers (Lnone/sj;)Lcom/google/common/collect/Multimap; ARG 0 slotType + METHOD a useVariants (Z)Lnone/aeo; METHOD b getCreativeTab ()Lnone/adq; METHOD b setContainerItem (Lnone/aeo;)Lnone/aeo; ARG 0 containerItem @@ -138,6 +147,8 @@ CLASS none/aeo net/minecraft/item/Item METHOD j getTranslatedName (Lnone/aeq;)Ljava/lang/String; ARG 0 stack METHOD l getDurability ()I + METHOD m canDamage ()Z + METHOD p requireClientSyncing ()Z METHOD q getContainerItem ()Lnone/aeo; METHOD r hasContainerItem ()Z METHOD t init ()V diff --git a/mappings/net/minecraft/item/impl/ItemDye.mapping b/mappings/net/minecraft/item/impl/ItemDye.mapping index 085332dae8..e2289bbae7 100644 --- a/mappings/net/minecraft/item/impl/ItemDye.mapping +++ b/mappings/net/minecraft/item/impl/ItemDye.mapping @@ -2,4 +2,12 @@ CLASS none/adu net/minecraft/item/impl/ItemDye FIELD a COLOR [I METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V + METHOD a interactWithEntity (Lnone/aeq;Lnone/aak;Lnone/sn;Lnone/qz;)Z + ARG 0 stack + ARG 1 user + ARG 2 entity + ARG 3 hand + METHOD a (Lnone/aiu;Lnone/cn;I)V + ARG 0 world + ARG 1 pos METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/impl/ItemNameTag.mapping b/mappings/net/minecraft/item/impl/ItemNameTag.mapping index b99958a9a7..960eb8336a 100644 --- a/mappings/net/minecraft/item/impl/ItemNameTag.mapping +++ b/mappings/net/minecraft/item/impl/ItemNameTag.mapping @@ -1 +1,6 @@ CLASS none/afa net/minecraft/item/impl/ItemNameTag + METHOD a interactWithEntity (Lnone/aeq;Lnone/aak;Lnone/sn;Lnone/qz;)Z + ARG 0 stack + ARG 1 user + ARG 2 entity + ARG 3 hand diff --git a/mappings/net/minecraft/item/impl/ItemSaddle.mapping b/mappings/net/minecraft/item/impl/ItemSaddle.mapping index d6baab2494..e7a57ed2a6 100644 --- a/mappings/net/minecraft/item/impl/ItemSaddle.mapping +++ b/mappings/net/minecraft/item/impl/ItemSaddle.mapping @@ -1,4 +1,9 @@ CLASS none/afh net/minecraft/item/impl/ItemSaddle + METHOD a interactWithEntity (Lnone/aeq;Lnone/aak;Lnone/sn;Lnone/qz;)Z + ARG 0 stack + ARG 1 user + ARG 2 entity + ARG 3 hand METHOD a onEntityDamaged (Lnone/aeq;Lnone/sn;Lnone/sn;)Z ARG 0 stack ARG 1 target From bfee108e0e3020c8c7691e1a00166633e0230e28 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 20:45:54 -0600 Subject: [PATCH 7/9] Mapped a decent bit of biomes. --- mappings/net/minecraft/world/biome/Biome.mapping | 16 ++++++++++++++++ .../world/biome/impl/BiomeBeach.mapping | 1 + .../world/biome/impl/BiomeDesert.mapping | 1 + .../minecraft/world/biome/impl/BiomeEnd.mapping | 3 +++ .../world/biome/impl/BiomeExtremeHills.mapping | 2 ++ .../world/biome/impl/BiomeForest.mapping} | 3 ++- .../world/biome/impl/BiomeFrozen.mapping} | 2 +- .../world/biome/impl/BiomeJungle.mapping} | 2 +- .../world/biome/impl/BiomeMesa.mapping} | 2 +- .../world/biome/impl/BiomeMushroomIsland.mapping | 1 + .../world/biome/impl/BiomeMutatedForest.mapping | 2 ++ .../world/biome/impl/BiomeMutatedSavanna.mapping | 1 + .../world/biome/impl/BiomeNether.mapping | 1 + .../world/biome/impl/BiomeOcean.mapping} | 3 ++- .../world/biome/impl/BiomePlains.mapping} | 2 +- .../world/biome/impl/BiomeRiver.mapping | 1 + .../world/biome/impl/BiomeSavanna.mapping | 3 +++ .../world/biome/impl/BiomeStoneBeach.mapping | 1 + .../world/biome/impl/BiomeSwamp.mapping} | 2 +- .../world/biome/impl/BiomeTaiga.mapping} | 2 +- .../world/biome/impl/BiomeVoide.mapping | 1 + mappings/none/aju.mapping | 2 -- mappings/none/ajy.mapping | 2 -- mappings/none/akd.mapping | 2 -- 24 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeBeach.mapping create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeDesert.mapping create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeEnd.mapping create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeExtremeHills.mapping rename mappings/{none/akb.mapping => net/minecraft/world/biome/impl/BiomeForest.mapping} (55%) rename mappings/{none/ajp.mapping => net/minecraft/world/biome/impl/BiomeFrozen.mapping} (51%) rename mappings/{none/ajv.mapping => net/minecraft/world/biome/impl/BiomeJungle.mapping} (68%) rename mappings/{none/ajw.mapping => net/minecraft/world/biome/impl/BiomeMesa.mapping} (64%) create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeMushroomIsland.mapping create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeMutatedForest.mapping create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeMutatedSavanna.mapping create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeNether.mapping rename mappings/{none/aka.mapping => net/minecraft/world/biome/impl/BiomeOcean.mapping} (56%) rename mappings/{none/ajr.mapping => net/minecraft/world/biome/impl/BiomePlains.mapping} (68%) create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeRiver.mapping create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeSavanna.mapping create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeStoneBeach.mapping rename mappings/{none/akf.mapping => net/minecraft/world/biome/impl/BiomeSwamp.mapping} (69%) rename mappings/{none/akg.mapping => net/minecraft/world/biome/impl/BiomeTaiga.mapping} (69%) create mode 100644 mappings/net/minecraft/world/biome/impl/BiomeVoide.mapping delete mode 100644 mappings/none/aju.mapping delete mode 100644 mappings/none/ajy.mapping delete mode 100644 mappings/none/akd.mapping diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 7ad7f7dfc9..b00f364cca 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -8,6 +8,12 @@ CLASS none/ajh net/minecraft/world/biome/Biome ARG 0 temperature METHOD a getName (Lnone/ajh$a;)Ljava/lang/String; METHOD d getTemperature (Lnone/ajh$a;)F + CLASS none/ajh$b TemperatureGroup + FIELD a OCEAN Lnone/ajh$b; + FIELD b COLD Lnone/ajh$b; + FIELD c MILD Lnone/ajh$b; + FIELD d HOT Lnone/ajh$b; + CLASS none/ajh$c SpawnListEntry FIELD C temperature F FIELD H name Ljava/lang/String; FIELD a STONE Lnone/asj; @@ -24,11 +30,17 @@ CLASS none/ajh net/minecraft/world/biome/Biome FIELD r surfaceBlock Lnone/asj; FIELD s dirtBlock Lnone/asj; FIELD t generator Lnone/ajk; + FIELD u spawnListMonsters Ljava/util/List; + FIELD v spawnListAnimals Ljava/util/List; + FIELD w spawnListAquatic Ljava/util/List; + FIELD x spawnListCave Ljava/util/List; FIELD y LOGGER Lorg/apache/logging/log4j/Logger; FIELD z id Ljava/lang/String; METHOD (Lnone/ajh$a;)V ARG 0 config METHOD a createGenerator ()Lnone/ajk; + METHOD a getSkyColor (F)I + ARG 0 temperature METHOD a getBiome (I)Lnone/ajh; ARG 0 id METHOD a register (ILjava/lang/String;Lnone/ajh;)V @@ -50,4 +62,8 @@ CLASS none/ajh net/minecraft/world/biome/Biome ARG 0 id METHOD b createTallGrassDecorator (Ljava/util/Random;)Lnone/avl; ARG 0 random + METHOD g getBiomeClass ()Ljava/lang/Class; + METHOD h getTemperatureGroup ()Lnone/ajh$b; + METHOD l getId ()Ljava/lang/String; + METHOD n getTemperature ()F METHOD q init ()V diff --git a/mappings/net/minecraft/world/biome/impl/BiomeBeach.mapping b/mappings/net/minecraft/world/biome/impl/BiomeBeach.mapping new file mode 100644 index 0000000000..a1ade44dac --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeBeach.mapping @@ -0,0 +1 @@ +CLASS none/ajg net/minecraft/world/biome/impl/BiomeBeach diff --git a/mappings/net/minecraft/world/biome/impl/BiomeDesert.mapping b/mappings/net/minecraft/world/biome/impl/BiomeDesert.mapping new file mode 100644 index 0000000000..03c7027521 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeDesert.mapping @@ -0,0 +1 @@ +CLASS none/ajo net/minecraft/world/biome/impl/BiomeDesert diff --git a/mappings/net/minecraft/world/biome/impl/BiomeEnd.mapping b/mappings/net/minecraft/world/biome/impl/BiomeEnd.mapping new file mode 100644 index 0000000000..6f5c52acb9 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeEnd.mapping @@ -0,0 +1,3 @@ +CLASS none/akh net/minecraft/world/biome/impl/BiomeEnd + METHOD a getSkyColor (F)I + ARG 0 temperature diff --git a/mappings/net/minecraft/world/biome/impl/BiomeExtremeHills.mapping b/mappings/net/minecraft/world/biome/impl/BiomeExtremeHills.mapping new file mode 100644 index 0000000000..097c0f96c0 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeExtremeHills.mapping @@ -0,0 +1,2 @@ +CLASS none/ajp net/minecraft/world/biome/impl/BiomeExtremeHills + METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; diff --git a/mappings/none/akb.mapping b/mappings/net/minecraft/world/biome/impl/BiomeForest.mapping similarity index 55% rename from mappings/none/akb.mapping rename to mappings/net/minecraft/world/biome/impl/BiomeForest.mapping index 0ab61ab9f4..a3c7540002 100644 --- a/mappings/none/akb.mapping +++ b/mappings/net/minecraft/world/biome/impl/BiomeForest.mapping @@ -1,3 +1,4 @@ -CLASS none/akb +CLASS none/ajr net/minecraft/world/biome/impl/BiomeForest METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; METHOD a getFlowerType (Ljava/util/Random;Lnone/cn;)Lnone/amq$a; + METHOD g getBiomeClass ()Ljava/lang/Class; diff --git a/mappings/none/ajp.mapping b/mappings/net/minecraft/world/biome/impl/BiomeFrozen.mapping similarity index 51% rename from mappings/none/ajp.mapping rename to mappings/net/minecraft/world/biome/impl/BiomeFrozen.mapping index 018f84d974..5b40cd2434 100644 --- a/mappings/none/ajp.mapping +++ b/mappings/net/minecraft/world/biome/impl/BiomeFrozen.mapping @@ -1,2 +1,2 @@ -CLASS none/ajp +CLASS none/aju net/minecraft/world/biome/impl/BiomeFrozen METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; diff --git a/mappings/none/ajv.mapping b/mappings/net/minecraft/world/biome/impl/BiomeJungle.mapping similarity index 68% rename from mappings/none/ajv.mapping rename to mappings/net/minecraft/world/biome/impl/BiomeJungle.mapping index 3a9fa91141..362fcbf245 100644 --- a/mappings/none/ajv.mapping +++ b/mappings/net/minecraft/world/biome/impl/BiomeJungle.mapping @@ -1,3 +1,3 @@ -CLASS none/ajv +CLASS none/ajv net/minecraft/world/biome/impl/BiomeJungle METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; METHOD b createTallGrassDecorator (Ljava/util/Random;)Lnone/avl; diff --git a/mappings/none/ajw.mapping b/mappings/net/minecraft/world/biome/impl/BiomeMesa.mapping similarity index 64% rename from mappings/none/ajw.mapping rename to mappings/net/minecraft/world/biome/impl/BiomeMesa.mapping index 2f87fe829b..ab786d527f 100644 --- a/mappings/none/ajw.mapping +++ b/mappings/net/minecraft/world/biome/impl/BiomeMesa.mapping @@ -1,3 +1,3 @@ -CLASS none/ajw +CLASS none/ajw net/minecraft/world/biome/impl/BiomeMesa METHOD a createGenerator ()Lnone/ajk; METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; diff --git a/mappings/net/minecraft/world/biome/impl/BiomeMushroomIsland.mapping b/mappings/net/minecraft/world/biome/impl/BiomeMushroomIsland.mapping new file mode 100644 index 0000000000..4f1af3c7ba --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeMushroomIsland.mapping @@ -0,0 +1 @@ +CLASS none/ajx net/minecraft/world/biome/impl/BiomeMushroomIsland diff --git a/mappings/net/minecraft/world/biome/impl/BiomeMutatedForest.mapping b/mappings/net/minecraft/world/biome/impl/BiomeMutatedForest.mapping new file mode 100644 index 0000000000..2f203768a9 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeMutatedForest.mapping @@ -0,0 +1,2 @@ +CLASS none/ajy net/minecraft/world/biome/impl/BiomeMutatedForest + METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; diff --git a/mappings/net/minecraft/world/biome/impl/BiomeMutatedSavanna.mapping b/mappings/net/minecraft/world/biome/impl/BiomeMutatedSavanna.mapping new file mode 100644 index 0000000000..c3c70faa52 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeMutatedSavanna.mapping @@ -0,0 +1 @@ +CLASS none/ajz net/minecraft/world/biome/impl/BiomeMutatedSavanna diff --git a/mappings/net/minecraft/world/biome/impl/BiomeNether.mapping b/mappings/net/minecraft/world/biome/impl/BiomeNether.mapping new file mode 100644 index 0000000000..7a2b62df05 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeNether.mapping @@ -0,0 +1 @@ +CLASS none/ajs net/minecraft/world/biome/impl/BiomeNether diff --git a/mappings/none/aka.mapping b/mappings/net/minecraft/world/biome/impl/BiomeOcean.mapping similarity index 56% rename from mappings/none/aka.mapping rename to mappings/net/minecraft/world/biome/impl/BiomeOcean.mapping index 37a93d1be0..b2d5161a8c 100644 --- a/mappings/none/aka.mapping +++ b/mappings/net/minecraft/world/biome/impl/BiomeOcean.mapping @@ -1,6 +1,7 @@ -CLASS none/aka +CLASS none/aka net/minecraft/world/biome/impl/BiomeOcean METHOD (Lnone/ajh$a;)V ARG 0 config METHOD a (Lnone/aiu;Ljava/util/Random;Lnone/aum;IID)V ARG 0 world ARG 1 random + METHOD h getTemperatureGroup ()Lnone/ajh$b; diff --git a/mappings/none/ajr.mapping b/mappings/net/minecraft/world/biome/impl/BiomePlains.mapping similarity index 68% rename from mappings/none/ajr.mapping rename to mappings/net/minecraft/world/biome/impl/BiomePlains.mapping index 9353ec8f65..a22ae76407 100644 --- a/mappings/none/ajr.mapping +++ b/mappings/net/minecraft/world/biome/impl/BiomePlains.mapping @@ -1,3 +1,3 @@ -CLASS none/ajr +CLASS none/akb net/minecraft/world/biome/impl/BiomePlains METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; METHOD a getFlowerType (Ljava/util/Random;Lnone/cn;)Lnone/amq$a; diff --git a/mappings/net/minecraft/world/biome/impl/BiomeRiver.mapping b/mappings/net/minecraft/world/biome/impl/BiomeRiver.mapping new file mode 100644 index 0000000000..ff3ef8cf2d --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeRiver.mapping @@ -0,0 +1 @@ +CLASS none/akc net/minecraft/world/biome/impl/BiomeRiver diff --git a/mappings/net/minecraft/world/biome/impl/BiomeSavanna.mapping b/mappings/net/minecraft/world/biome/impl/BiomeSavanna.mapping new file mode 100644 index 0000000000..6ecd72f794 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeSavanna.mapping @@ -0,0 +1,3 @@ +CLASS none/akd net/minecraft/world/biome/impl/BiomeSavanna + METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; + METHOD g getBiomeClass ()Ljava/lang/Class; diff --git a/mappings/net/minecraft/world/biome/impl/BiomeStoneBeach.mapping b/mappings/net/minecraft/world/biome/impl/BiomeStoneBeach.mapping new file mode 100644 index 0000000000..8fd2458215 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeStoneBeach.mapping @@ -0,0 +1 @@ +CLASS none/ake net/minecraft/world/biome/impl/BiomeStoneBeach diff --git a/mappings/none/akf.mapping b/mappings/net/minecraft/world/biome/impl/BiomeSwamp.mapping similarity index 69% rename from mappings/none/akf.mapping rename to mappings/net/minecraft/world/biome/impl/BiomeSwamp.mapping index 68b6cd740b..8c3a71a10a 100644 --- a/mappings/none/akf.mapping +++ b/mappings/net/minecraft/world/biome/impl/BiomeSwamp.mapping @@ -1,3 +1,3 @@ -CLASS none/akf +CLASS none/akf net/minecraft/world/biome/impl/BiomeSwamp METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; METHOD a getFlowerType (Ljava/util/Random;Lnone/cn;)Lnone/amq$a; diff --git a/mappings/none/akg.mapping b/mappings/net/minecraft/world/biome/impl/BiomeTaiga.mapping similarity index 69% rename from mappings/none/akg.mapping rename to mappings/net/minecraft/world/biome/impl/BiomeTaiga.mapping index 13b916c95c..beb286267e 100644 --- a/mappings/none/akg.mapping +++ b/mappings/net/minecraft/world/biome/impl/BiomeTaiga.mapping @@ -1,3 +1,3 @@ -CLASS none/akg +CLASS none/akg net/minecraft/world/biome/impl/BiomeTaiga METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; METHOD b createTallGrassDecorator (Ljava/util/Random;)Lnone/avl; diff --git a/mappings/net/minecraft/world/biome/impl/BiomeVoide.mapping b/mappings/net/minecraft/world/biome/impl/BiomeVoide.mapping new file mode 100644 index 0000000000..b7c3c4bca9 --- /dev/null +++ b/mappings/net/minecraft/world/biome/impl/BiomeVoide.mapping @@ -0,0 +1 @@ +CLASS none/akj net/minecraft/world/biome/impl/BiomeVoide diff --git a/mappings/none/aju.mapping b/mappings/none/aju.mapping deleted file mode 100644 index 6fd5c63a95..0000000000 --- a/mappings/none/aju.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/aju - METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; diff --git a/mappings/none/ajy.mapping b/mappings/none/ajy.mapping deleted file mode 100644 index 0b3656e9ab..0000000000 --- a/mappings/none/ajy.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/ajy - METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; diff --git a/mappings/none/akd.mapping b/mappings/none/akd.mapping deleted file mode 100644 index a40ed6af08..0000000000 --- a/mappings/none/akd.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/akd - METHOD a getSurfaceDecorator (Ljava/util/Random;)Lnone/auw; From 2f958976a4ef77316736931523855c906706163b Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 21:00:51 -0600 Subject: [PATCH 8/9] Mapped out some of the main entity types. Not sure where to but the big types like Mob and EntityAnimal --- ...{EntityType.mapping => EntityAttribute.mapping} | 2 +- mappings/net/minecraft/entity/Living.mapping | 1 + .../entity/unsorted/EntityAnimal.mapping} | 2 +- .../entity/unsorted/EntityAquatic.mapping | 1 + .../minecraft/entity/unsorted/EntityCave.mapping | 1 + .../minecraft/entity/unsorted/EntityType.mapping | 14 ++++++++++++++ mappings/net/minecraft/entity/unsorted/Mob.mapping | 1 + mappings/net/minecraft/world/biome/Biome.mapping | 2 ++ 8 files changed, 22 insertions(+), 2 deletions(-) rename mappings/net/minecraft/entity/{EntityType.mapping => EntityAttribute.mapping} (61%) create mode 100644 mappings/net/minecraft/entity/Living.mapping rename mappings/{none/wl.mapping => net/minecraft/entity/unsorted/EntityAnimal.mapping} (60%) create mode 100644 mappings/net/minecraft/entity/unsorted/EntityAquatic.mapping create mode 100644 mappings/net/minecraft/entity/unsorted/EntityCave.mapping create mode 100644 mappings/net/minecraft/entity/unsorted/EntityType.mapping create mode 100644 mappings/net/minecraft/entity/unsorted/Mob.mapping diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityAttribute.mapping similarity index 61% rename from mappings/net/minecraft/entity/EntityType.mapping rename to mappings/net/minecraft/entity/EntityAttribute.mapping index d98039e11f..055488c7cb 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityAttribute.mapping @@ -1,4 +1,4 @@ -CLASS none/ss net/minecraft/entity/EntityType +CLASS none/ss net/minecraft/entity/EntityAttribute FIELD a UNKNOWN Lnone/ss; FIELD b UNDEAD Lnone/ss; FIELD c ARTHROPOD Lnone/ss; diff --git a/mappings/net/minecraft/entity/Living.mapping b/mappings/net/minecraft/entity/Living.mapping new file mode 100644 index 0000000000..0198e634f6 --- /dev/null +++ b/mappings/net/minecraft/entity/Living.mapping @@ -0,0 +1 @@ +CLASS none/sd net/minecraft/entity/Living diff --git a/mappings/none/wl.mapping b/mappings/net/minecraft/entity/unsorted/EntityAnimal.mapping similarity index 60% rename from mappings/none/wl.mapping rename to mappings/net/minecraft/entity/unsorted/EntityAnimal.mapping index ee34fcbdd9..082a8e0868 100644 --- a/mappings/none/wl.mapping +++ b/mappings/net/minecraft/entity/unsorted/EntityAnimal.mapping @@ -1,3 +1,3 @@ -CLASS none/wl +CLASS none/wl net/minecraft/entity/unsorted/EntityAnimal METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/unsorted/EntityAquatic.mapping b/mappings/net/minecraft/entity/unsorted/EntityAquatic.mapping new file mode 100644 index 0000000000..f6c1c77628 --- /dev/null +++ b/mappings/net/minecraft/entity/unsorted/EntityAquatic.mapping @@ -0,0 +1 @@ +CLASS none/wy net/minecraft/entity/unsorted/EntityAquatic diff --git a/mappings/net/minecraft/entity/unsorted/EntityCave.mapping b/mappings/net/minecraft/entity/unsorted/EntityCave.mapping new file mode 100644 index 0000000000..5cbca5a91f --- /dev/null +++ b/mappings/net/minecraft/entity/unsorted/EntityCave.mapping @@ -0,0 +1 @@ +CLASS none/wi net/minecraft/entity/unsorted/EntityCave diff --git a/mappings/net/minecraft/entity/unsorted/EntityType.mapping b/mappings/net/minecraft/entity/unsorted/EntityType.mapping new file mode 100644 index 0000000000..ecfc2383c3 --- /dev/null +++ b/mappings/net/minecraft/entity/unsorted/EntityType.mapping @@ -0,0 +1,14 @@ +CLASS none/sp net/minecraft/entity/unsorted/EntityType + FIELD a MONSTER Lnone/sp; + FIELD b ANIMAL Lnone/sp; + FIELD c CAVE Lnone/sp; + FIELD d AQUATIC Lnone/sp; + FIELD e entityClass Ljava/lang/Class; + FIELD f spawnCap I + FIELD g preferedMaterial Lnone/ayo; + FIELD h isPeaceful Z + FIELD i isAnimal Z + METHOD a getEntityClass ()Ljava/lang/Class; + METHOD b getSpawnCap ()I + METHOD d isPeaceful ()Z + METHOD e isAnimal ()Z diff --git a/mappings/net/minecraft/entity/unsorted/Mob.mapping b/mappings/net/minecraft/entity/unsorted/Mob.mapping new file mode 100644 index 0000000000..708de1e2e7 --- /dev/null +++ b/mappings/net/minecraft/entity/unsorted/Mob.mapping @@ -0,0 +1 @@ +CLASS none/zi net/minecraft/entity/unsorted/Mob diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index b00f364cca..d2a645a0b4 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -57,6 +57,8 @@ CLASS none/ajh net/minecraft/world/biome/Biome ARG 1 pos METHOD a getId (Lnone/ajh;)I ARG 0 biome + METHOD a getSpawnList (Lnone/sp;)Ljava/util/List; + ARG 0 listType METHOD b hasName ()Z METHOD b get (I)Lnone/ajh; ARG 0 id From 4f10b69f8c214d9beb8ea97b6ae91c680df67f9d Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sun, 21 Aug 2016 12:11:11 -0600 Subject: [PATCH 9/9] Implemented feedbac --- .../dispenser/impl/BehaviorDispenseItem.mapping | 3 --- .../impl/BehaviorDispenseProjectile.mapping | 1 - mappings/net/minecraft/entity/Living.mapping | 1 - .../entity/player/PlayerModelParts.mapping | 16 ---------------- .../net/minecraft/entity/unsorted/Mob.mapping | 1 - .../net/minecraft/particle/ParticleType.mapping | 2 +- .../world/biome/impl/BiomeVoide.mapping | 1 - 7 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 mappings/net/minecraft/dispenser/impl/BehaviorDispenseItem.mapping delete mode 100644 mappings/net/minecraft/dispenser/impl/BehaviorDispenseProjectile.mapping delete mode 100644 mappings/net/minecraft/entity/Living.mapping delete mode 100644 mappings/net/minecraft/entity/player/PlayerModelParts.mapping delete mode 100644 mappings/net/minecraft/entity/unsorted/Mob.mapping delete mode 100644 mappings/net/minecraft/world/biome/impl/BiomeVoide.mapping diff --git a/mappings/net/minecraft/dispenser/impl/BehaviorDispenseItem.mapping b/mappings/net/minecraft/dispenser/impl/BehaviorDispenseItem.mapping deleted file mode 100644 index e1a16b67df..0000000000 --- a/mappings/net/minecraft/dispenser/impl/BehaviorDispenseItem.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/cr net/minecraft/dispenser/impl/BehaviorDispenseItem - METHOD a dispense (Lnone/co;Lnone/aeq;)Lnone/aeq; - ARG 1 stack diff --git a/mappings/net/minecraft/dispenser/impl/BehaviorDispenseProjectile.mapping b/mappings/net/minecraft/dispenser/impl/BehaviorDispenseProjectile.mapping deleted file mode 100644 index c79dd2a9df..0000000000 --- a/mappings/net/minecraft/dispenser/impl/BehaviorDispenseProjectile.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/kr net/minecraft/dispenser/impl/BehaviorDispenseProjectile diff --git a/mappings/net/minecraft/entity/Living.mapping b/mappings/net/minecraft/entity/Living.mapping deleted file mode 100644 index 0198e634f6..0000000000 --- a/mappings/net/minecraft/entity/Living.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/sd net/minecraft/entity/Living diff --git a/mappings/net/minecraft/entity/player/PlayerModelParts.mapping b/mappings/net/minecraft/entity/player/PlayerModelParts.mapping deleted file mode 100644 index 11fc7b6700..0000000000 --- a/mappings/net/minecraft/entity/player/PlayerModelParts.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS none/aal net/minecraft/entity/player/PlayerModelParts - FIELD a CAPE Lnone/aal; - FIELD b JACKET Lnone/aal; - FIELD c LEFT_SLEEVE Lnone/aal; - FIELD d RIGHT_SLEEVE Lnone/aal; - FIELD e LEFT_LEG Lnone/aal; - FIELD f RIGHT_LEG Lnone/aal; - FIELD g HEAD Lnone/aal; - FIELD h id I - FIELD j name Ljava/lang/String; - FIELD k localizedName Lnone/fa; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - METHOD b getId ()I - METHOD c getName ()Ljava/lang/String; - METHOD d getLocalizedName ()Lnone/fa; diff --git a/mappings/net/minecraft/entity/unsorted/Mob.mapping b/mappings/net/minecraft/entity/unsorted/Mob.mapping deleted file mode 100644 index 708de1e2e7..0000000000 --- a/mappings/net/minecraft/entity/unsorted/Mob.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/zi net/minecraft/entity/unsorted/Mob diff --git a/mappings/net/minecraft/particle/ParticleType.mapping b/mappings/net/minecraft/particle/ParticleType.mapping index c05751c5ca..31fe175a38 100644 --- a/mappings/net/minecraft/particle/ParticleType.mapping +++ b/mappings/net/minecraft/particle/ParticleType.mapping @@ -67,4 +67,4 @@ CLASS none/dd net/minecraft/particle/ParticleType METHOD b getName ()Ljava/lang/String; METHOD c getId ()I METHOD d getArgumentCount ()I - METHOD e ignoreRange ()Z + METHOD e shouldIgnoreRange ()Z diff --git a/mappings/net/minecraft/world/biome/impl/BiomeVoide.mapping b/mappings/net/minecraft/world/biome/impl/BiomeVoide.mapping deleted file mode 100644 index b7c3c4bca9..0000000000 --- a/mappings/net/minecraft/world/biome/impl/BiomeVoide.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/akj net/minecraft/world/biome/impl/BiomeVoide