From 05dc08bffb1a8ae3e25fb1f26e984c7b0504f9b5 Mon Sep 17 00:00:00 2001 From: asie Date: Mon, 26 Nov 2018 14:33:11 +0100 Subject: [PATCH] close #199, close #201, close #202 --- mappings/net/minecraft/entity/Entity.mapping | 4 +++- .../entity/passive/EntityCat.mapping} | 21 +++++++++++++++---- .../entity/passive/EntityOcelot.mapping | 21 ++++--------------- .../entity/passive/EntityVillager.mapping | 4 ++-- .../vehicle/EntityHopperMinecart.mapping | 2 +- .../entity/vehicle/EntityMinecartBase.mapping | 6 ++++++ .../minecraft/sortme/Hopper.mapping} | 4 ++-- .../minecraft/village/SimpleVillager.mapping | 4 ++-- .../net/minecraft/village/Villager.mapping | 4 ++-- 9 files changed, 39 insertions(+), 31 deletions(-) rename mappings/{als.mapping => net/minecraft/entity/passive/EntityCat.mapping} (55%) rename mappings/{bmx.mapping => net/minecraft/sortme/Hopper.mapping} (51%) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 33c6638e48..bfe01f9e9f 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -197,7 +197,9 @@ CLASS age net/minecraft/entity/Entity METHOD bE getComponentHoverEvent ()Ljc; METHOD bF getBoundingBox ()Lckc; METHOD bH getEyeHeight ()F - METHOD bL getCommandStats ()Lbam; + METHOD bJ getPos ()Les; + METHOD bK getPosVector ()Lckg; + METHOD bL getWorld ()Lbam; METHOD bM getServer ()Lnet/minecraft/server/MinecraftServer; METHOD bN isImmuneToExplosion ()Z METHOD bR getPassengerList ()Ljava/util/List; diff --git a/mappings/als.mapping b/mappings/net/minecraft/entity/passive/EntityCat.mapping similarity index 55% rename from mappings/als.mapping rename to mappings/net/minecraft/entity/passive/EntityCat.mapping index 5b03605eca..80dce8c494 100644 --- a/mappings/als.mapping +++ b/mappings/net/minecraft/entity/passive/EntityCat.mapping @@ -1,22 +1,35 @@ -CLASS als - CLASS als$a +CLASS alk net/minecraft/entity/passive/EntityCat + CLASS alk$a METHOD a canStart ()Z METHOD b shouldContinue ()Z + CLASS alk$b + METHOD a canStart ()Z + METHOD b shouldContinue ()Z + METHOD c start ()V + METHOD d onRemove ()V + METHOD e tick ()V + CLASS alk$c + METHOD e tick ()V + FIELD bI OCELOT_TYPE Lpm; METHOD D getSoundAmbient ()Lxc; METHOD H mobTick ()V - METHOD a damage (Lafn;F)Z - ARG 1 source + METHOD V_ update ()V METHOD a createChild (Lagb;)Lagb; METHOD a interactMob (Laqf;Laex;)Z ARG 1 player METHOD a (Lban;Laew;Lagq;Lagy;Lho;)Lagy; ARG 3 difficulty METHOD a deserializeCustomData (Lho;)V + METHOD b createChild (Lagb;)Lalk; METHOD b serializeCustomData (Lho;)V + METHOD bH getEyeHeight ()F METHOD c handleFallDamage (FF)V ARG 1 fallDistance METHOD cb initAttributes ()V METHOD cw getSoundDeath ()Lxc; + METHOD dA onTamedChanged ()V + METHOD dJ getOcelotType ()I METHOD e getSoundHurt (Lafn;)Lxc; METHOD n initAi ()V + METHOD p getOcelotType (I)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/EntityOcelot.mapping b/mappings/net/minecraft/entity/passive/EntityOcelot.mapping index e305044d22..c2a64224ac 100644 --- a/mappings/net/minecraft/entity/passive/EntityOcelot.mapping +++ b/mappings/net/minecraft/entity/passive/EntityOcelot.mapping @@ -1,35 +1,22 @@ -CLASS alk net/minecraft/entity/passive/EntityOcelot - CLASS alk$a +CLASS als net/minecraft/entity/passive/EntityOcelot + CLASS als$a METHOD a canStart ()Z METHOD b shouldContinue ()Z - CLASS alk$b - METHOD a canStart ()Z - METHOD b shouldContinue ()Z - METHOD c start ()V - METHOD d onRemove ()V - METHOD e tick ()V - CLASS alk$c - METHOD e tick ()V - FIELD bI OCELOT_TYPE Lpm; METHOD D getSoundAmbient ()Lxc; METHOD H mobTick ()V - METHOD V_ update ()V + METHOD a damage (Lafn;F)Z + ARG 1 source METHOD a createChild (Lagb;)Lagb; METHOD a interactMob (Laqf;Laex;)Z ARG 1 player METHOD a (Lban;Laew;Lagq;Lagy;Lho;)Lagy; ARG 3 difficulty METHOD a deserializeCustomData (Lho;)V - METHOD b createChild (Lagb;)Lalk; METHOD b serializeCustomData (Lho;)V - METHOD bH getEyeHeight ()F METHOD c handleFallDamage (FF)V ARG 1 fallDistance METHOD cb initAttributes ()V METHOD cw getSoundDeath ()Lxc; - METHOD dA onTamedChanged ()V - METHOD dJ getOcelotType ()I METHOD e getSoundHurt (Lafn;)Lxc; METHOD n initAi ()V - METHOD p getOcelotType (I)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/EntityVillager.mapping index 3d6afb3806..a12a342617 100644 --- a/mappings/net/minecraft/entity/passive/EntityVillager.mapping +++ b/mappings/net/minecraft/entity/passive/EntityVillager.mapping @@ -28,10 +28,10 @@ CLASS aqa net/minecraft/entity/passive/EntityVillager METHOD b serializeCustomData (Lho;)V METHOD bH getEyeHeight ()F METHOD b_ getRecipes (Laqf;)Lazs; - METHOD c getWorld ()Lbam; + METHOD c getVillagerWorld ()Lbam; METHOD cb initAttributes ()V METHOD cw getSoundDeath ()Lxc; - METHOD d getPos ()Les; + METHOD d getVillagerPos ()Les; METHOD d setVillagerType (I)V METHOD dE getInventory ()Lafg; METHOD dz getVillagerType ()I diff --git a/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping index 675e812baa..f1b27f38a6 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping @@ -4,7 +4,7 @@ CLASS arq net/minecraft/entity/vehicle/EntityHopperMinecart FIELD f currentBlockPos Les; METHOD B getDefaultBlockOffset ()I METHOD D isEnabled ()Z - METHOD F getWorld ()Lbam; + METHOD F getHopperWorld ()Lbam; METHOD G getHopperX ()D METHOD H getHopperY ()D METHOD I getHopperZ ()D diff --git a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping index 505861277c..6724997fb7 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping @@ -1,4 +1,10 @@ CLASS arj net/minecraft/entity/vehicle/EntityMinecartBase + CLASS arj$a Type + FIELD h VALUES [Larj$a; + FIELD i id I + METHOD a getId ()I + METHOD a byId (I)Larj$a; + ARG 0 id FIELD d CUSTOM_BLOCK_ID Lpm; FIELD e CUSTOM_BLOCK_OFFSET Lpm; FIELD f CUSTOM_BLOCK_PRESENT Lpm; diff --git a/mappings/bmx.mapping b/mappings/net/minecraft/sortme/Hopper.mapping similarity index 51% rename from mappings/bmx.mapping rename to mappings/net/minecraft/sortme/Hopper.mapping index 98e126f836..f90c124a98 100644 --- a/mappings/bmx.mapping +++ b/mappings/net/minecraft/sortme/Hopper.mapping @@ -1,5 +1,5 @@ -CLASS bmx - METHOD F getWorld ()Lbam; +CLASS bmx net/minecraft/sortme/Hopper + METHOD F getHopperWorld ()Lbam; METHOD G getHopperX ()D METHOD H getHopperY ()D METHOD I getHopperZ ()D diff --git a/mappings/net/minecraft/village/SimpleVillager.mapping b/mappings/net/minecraft/village/SimpleVillager.mapping index c57357633d..04256ec66e 100644 --- a/mappings/net/minecraft/village/SimpleVillager.mapping +++ b/mappings/net/minecraft/village/SimpleVillager.mapping @@ -12,5 +12,5 @@ CLASS apy net/minecraft/village/SimpleVillager METHOD a setRecipeList (Lazs;)V METHOD a_ setCurrentCustomer (Laqf;)V METHOD b_ getRecipes (Laqf;)Lazs; - METHOD c getWorld ()Lbam; - METHOD d getPos ()Les; + METHOD c getVillagerWorld ()Lbam; + METHOD d getVillagerPos ()Les; diff --git a/mappings/net/minecraft/village/Villager.mapping b/mappings/net/minecraft/village/Villager.mapping index 70f75b8140..f4ba26e505 100644 --- a/mappings/net/minecraft/village/Villager.mapping +++ b/mappings/net/minecraft/village/Villager.mapping @@ -6,5 +6,5 @@ CLASS azq net/minecraft/village/Villager METHOD a setRecipeList (Lazs;)V METHOD a_ setCurrentCustomer (Laqf;)V METHOD b_ getRecipes (Laqf;)Lazs; - METHOD c getWorld ()Lbam; - METHOD d getPos ()Les; + METHOD c getVillagerWorld ()Lbam; + METHOD d getVillagerPos ()Les;