From 2f958976a4ef77316736931523855c906706163b Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 21:00:51 -0600 Subject: [PATCH] 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