From ca9f6fc8f61a869de9b631d6e534174e939147d9 Mon Sep 17 00:00:00 2001 From: matrix89 Date: Wed, 7 Nov 2018 22:18:42 +0100 Subject: [PATCH] some structure gen mappings --- mappings/byy.mapping | 7 +++++ mappings/byz.mapping | 2 ++ mappings/bza.mapping | 4 --- mappings/bzd.mapping | 4 --- mappings/bzf.mapping | 17 ---------- mappings/bzh.mapping | 6 ++++ mappings/bzj.mapping | 5 --- mappings/bzk.mapping | 2 ++ mappings/bzl.mapping | 5 --- mappings/bzn.mapping | 6 ++++ mappings/bzq.mapping | 6 ++++ mappings/bzs.mapping | 4 --- mappings/bzt.mapping | 2 ++ mappings/bzv.mapping | 5 --- .../sortme/structures/DesertTemple.mapping | 6 ++++ .../sortme/structures/EndCity.mapping} | 4 ++- .../sortme/structures/Igloo.mapping} | 4 ++- .../sortme/structures/JungleTemple.mapping | 6 ++++ .../sortme/structures/Mansion.mapping | 8 +++++ .../sortme/structures/Mineshaft.mapping | 31 +++++++++++++++++++ .../sortme/structures/NetherFortress.mapping} | 17 +++++++++- .../sortme/structures/OceanTemple.mapping | 7 +++++ .../sortme/structures/Shipwreck.mapping | 7 +++++ .../sortme/structures/Stronghold.mapping} | 22 ++++++++++++- .../sortme/structures/SwampHut.mapping | 6 ++++ .../sortme/structures/Village.mapping} | 17 +++++++++- 26 files changed, 161 insertions(+), 49 deletions(-) create mode 100644 mappings/byy.mapping delete mode 100644 mappings/bza.mapping delete mode 100644 mappings/bzd.mapping delete mode 100644 mappings/bzf.mapping delete mode 100644 mappings/bzj.mapping delete mode 100644 mappings/bzl.mapping create mode 100644 mappings/bzn.mapping delete mode 100644 mappings/bzs.mapping delete mode 100644 mappings/bzv.mapping create mode 100644 mappings/net/minecraft/sortme/structures/DesertTemple.mapping rename mappings/{bzb.mapping => net/minecraft/sortme/structures/EndCity.mapping} (50%) rename mappings/{bzc.mapping => net/minecraft/sortme/structures/Igloo.mapping} (50%) create mode 100644 mappings/net/minecraft/sortme/structures/JungleTemple.mapping create mode 100644 mappings/net/minecraft/sortme/structures/Mansion.mapping create mode 100644 mappings/net/minecraft/sortme/structures/Mineshaft.mapping rename mappings/{bzg.mapping => net/minecraft/sortme/structures/NetherFortress.mapping} (59%) create mode 100644 mappings/net/minecraft/sortme/structures/OceanTemple.mapping create mode 100644 mappings/net/minecraft/sortme/structures/Shipwreck.mapping rename mappings/{bzm.mapping => net/minecraft/sortme/structures/Stronghold.mapping} (67%) create mode 100644 mappings/net/minecraft/sortme/structures/SwampHut.mapping rename mappings/{bzu.mapping => net/minecraft/sortme/structures/Village.mapping} (66%) diff --git a/mappings/byy.mapping b/mappings/byy.mapping new file mode 100644 index 0000000000..a25f76e0ea --- /dev/null +++ b/mappings/byy.mapping @@ -0,0 +1,7 @@ +CLASS byy + FIELD a x0 I + FIELD b y0 I + FIELD c z0 I + FIELD d x1 I + FIELD e y1 I + FIELD f z1 I diff --git a/mappings/byz.mapping b/mappings/byz.mapping index 843a22d8e2..76d0a8c705 100644 --- a/mappings/byz.mapping +++ b/mappings/byz.mapping @@ -1,5 +1,7 @@ CLASS byz CLASS byz$a METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances diff --git a/mappings/bza.mapping b/mappings/bza.mapping deleted file mode 100644 index 345e18f64c..0000000000 --- a/mappings/bza.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS bza - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag diff --git a/mappings/bzd.mapping b/mappings/bzd.mapping deleted file mode 100644 index 2e5274b7bf..0000000000 --- a/mappings/bzd.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS bzd - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag diff --git a/mappings/bzf.mapping b/mappings/bzf.mapping deleted file mode 100644 index c9539375dd..0000000000 --- a/mappings/bzf.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS bzf - CLASS bzf$a - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag - CLASS bzf$b - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag - CLASS bzf$c - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag - CLASS bzf$d - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag diff --git a/mappings/bzh.mapping b/mappings/bzh.mapping index 95c2d5677c..6c0dae7ea5 100644 --- a/mappings/bzh.mapping +++ b/mappings/bzh.mapping @@ -1,5 +1,11 @@ CLASS bzh + CLASS bzh$h + CLASS bzh$j + CLASS bzh$p + CLASS bzh$q CLASS bzh$r METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances diff --git a/mappings/bzj.mapping b/mappings/bzj.mapping deleted file mode 100644 index 86ca11bdfe..0000000000 --- a/mappings/bzj.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS bzj - CLASS bzj$a - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag diff --git a/mappings/bzk.mapping b/mappings/bzk.mapping index d17494fb8f..3aed7ddba1 100644 --- a/mappings/bzk.mapping +++ b/mappings/bzk.mapping @@ -4,5 +4,7 @@ CLASS bzk FIELD c depth I FIELD d hpos I METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances diff --git a/mappings/bzl.mapping b/mappings/bzl.mapping deleted file mode 100644 index e05ea0aa92..0000000000 --- a/mappings/bzl.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS bzl - CLASS bzl$a - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag diff --git a/mappings/bzn.mapping b/mappings/bzn.mapping new file mode 100644 index 0000000000..8c0e1ccd24 --- /dev/null +++ b/mappings/bzn.mapping @@ -0,0 +1,6 @@ +CLASS bzn + FIELD a logger Lorg/apache/logging/log4j/Logger; + FIELD d structurePart Ljava/util/Map; + FIELD e partStructure Ljava/util/Map; + METHOD a addPart (Ljava/lang/Class;Ljava/lang/String;)V + METHOD b registerStructure (Ljava/lang/Class;Ljava/lang/String;)V diff --git a/mappings/bzq.mapping b/mappings/bzq.mapping index 61fc98a9f7..76dc54126e 100644 --- a/mappings/bzq.mapping +++ b/mappings/bzq.mapping @@ -1,4 +1,10 @@ CLASS bzq + FIELD a facing Lex; + FIELD b mirror Lbif; + FIELD c rotation Lbjf; METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances + METHOD f getFacing ()Lex; diff --git a/mappings/bzs.mapping b/mappings/bzs.mapping deleted file mode 100644 index 0d85a2e54c..0000000000 --- a/mappings/bzs.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS bzs - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag diff --git a/mappings/bzt.mapping b/mappings/bzt.mapping index 6b51843078..998c0f5b28 100644 --- a/mappings/bzt.mapping +++ b/mappings/bzt.mapping @@ -1,4 +1,6 @@ CLASS bzt METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances diff --git a/mappings/bzv.mapping b/mappings/bzv.mapping deleted file mode 100644 index 710638a9a0..0000000000 --- a/mappings/bzv.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS bzv - CLASS bzv$i - METHOD a toNbt (Lho;)V - METHOD a fromNbt (Lho;Lbzy;)V - ARG 1 tag diff --git a/mappings/net/minecraft/sortme/structures/DesertTemple.mapping b/mappings/net/minecraft/sortme/structures/DesertTemple.mapping new file mode 100644 index 0000000000..e7bf83b030 --- /dev/null +++ b/mappings/net/minecraft/sortme/structures/DesertTemple.mapping @@ -0,0 +1,6 @@ +CLASS bza net/minecraft/sortme/structures/DesertTemple + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances diff --git a/mappings/bzb.mapping b/mappings/net/minecraft/sortme/structures/EndCity.mapping similarity index 50% rename from mappings/bzb.mapping rename to mappings/net/minecraft/sortme/structures/EndCity.mapping index 30efd936a6..a32408a0d6 100644 --- a/mappings/bzb.mapping +++ b/mappings/net/minecraft/sortme/structures/EndCity.mapping @@ -1,5 +1,7 @@ -CLASS bzb +CLASS bzb net/minecraft/sortme/structures/EndCity CLASS bzb$a METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances diff --git a/mappings/bzc.mapping b/mappings/net/minecraft/sortme/structures/Igloo.mapping similarity index 50% rename from mappings/bzc.mapping rename to mappings/net/minecraft/sortme/structures/Igloo.mapping index ecbffd6a78..4cfc27f067 100644 --- a/mappings/bzc.mapping +++ b/mappings/net/minecraft/sortme/structures/Igloo.mapping @@ -1,5 +1,7 @@ -CLASS bzc +CLASS bzc net/minecraft/sortme/structures/Igloo CLASS bzc$a METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances diff --git a/mappings/net/minecraft/sortme/structures/JungleTemple.mapping b/mappings/net/minecraft/sortme/structures/JungleTemple.mapping new file mode 100644 index 0000000000..a821713358 --- /dev/null +++ b/mappings/net/minecraft/sortme/structures/JungleTemple.mapping @@ -0,0 +1,6 @@ +CLASS bzd net/minecraft/sortme/structures/JungleTemple + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances diff --git a/mappings/net/minecraft/sortme/structures/Mansion.mapping b/mappings/net/minecraft/sortme/structures/Mansion.mapping new file mode 100644 index 0000000000..77ebdd8652 --- /dev/null +++ b/mappings/net/minecraft/sortme/structures/Mansion.mapping @@ -0,0 +1,8 @@ +CLASS bzv net/minecraft/sortme/structures/Mansion + CLASS bzv$d + CLASS bzv$i + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances diff --git a/mappings/net/minecraft/sortme/structures/Mineshaft.mapping b/mappings/net/minecraft/sortme/structures/Mineshaft.mapping new file mode 100644 index 0000000000..74f9fb997a --- /dev/null +++ b/mappings/net/minecraft/sortme/structures/Mineshaft.mapping @@ -0,0 +1,31 @@ +CLASS bzf net/minecraft/sortme/structures/Mineshaft + CLASS bzf$a MineshaftCorridor + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances + CLASS bzf$b MineshaftCrossing + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances + METHOD a (Ljava/util/List;Ljava/util/Random;IIILex;)Lbyy; + ARG 5 facing + CLASS bzf$c MineshaftPart + FIELD a mineshaftType Lbuq$b; + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances + CLASS bzf$d MineshaftRoom + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances + CLASS bzf$e MineshaftStairs + METHOD a (Ljava/util/List;Ljava/util/Random;IIILex;ILbuq$b;)Lbzf$c; + ARG 1 rand diff --git a/mappings/bzg.mapping b/mappings/net/minecraft/sortme/structures/NetherFortress.mapping similarity index 59% rename from mappings/bzg.mapping rename to mappings/net/minecraft/sortme/structures/NetherFortress.mapping index e869737c3b..593c8b2103 100644 --- a/mappings/bzg.mapping +++ b/mappings/net/minecraft/sortme/structures/NetherFortress.mapping @@ -1,21 +1,36 @@ -CLASS bzg +CLASS bzg net/minecraft/sortme/structures/NetherFortress + CLASS bzg$a CLASS bzg$b METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances + CLASS bzg$g CLASS bzg$h METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzg$j METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzg$l METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzg$m METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances + CLASS bzg$o + CLASS bzg$p + CLASS bzg$q diff --git a/mappings/net/minecraft/sortme/structures/OceanTemple.mapping b/mappings/net/minecraft/sortme/structures/OceanTemple.mapping new file mode 100644 index 0000000000..50655b0de8 --- /dev/null +++ b/mappings/net/minecraft/sortme/structures/OceanTemple.mapping @@ -0,0 +1,7 @@ +CLASS bzj net/minecraft/sortme/structures/OceanTemple + CLASS bzj$a + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances diff --git a/mappings/net/minecraft/sortme/structures/Shipwreck.mapping b/mappings/net/minecraft/sortme/structures/Shipwreck.mapping new file mode 100644 index 0000000000..5c75222cb8 --- /dev/null +++ b/mappings/net/minecraft/sortme/structures/Shipwreck.mapping @@ -0,0 +1,7 @@ +CLASS bzl net/minecraft/sortme/structures/Shipwreck + CLASS bzl$a + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances diff --git a/mappings/bzm.mapping b/mappings/net/minecraft/sortme/structures/Stronghold.mapping similarity index 67% rename from mappings/bzm.mapping rename to mappings/net/minecraft/sortme/structures/Stronghold.mapping index bc103cf3f4..1b211add4d 100644 --- a/mappings/bzm.mapping +++ b/mappings/net/minecraft/sortme/structures/Stronghold.mapping @@ -1,37 +1,57 @@ -CLASS bzm +CLASS bzm net/minecraft/sortme/structures/Stronghold CLASS bzm$a METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzm$b METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzm$c METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances + CLASS bzm$d CLASS bzm$e METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzm$g METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzm$j METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzm$l METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzm$n METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances + CLASS bzm$o CLASS bzm$p METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances diff --git a/mappings/net/minecraft/sortme/structures/SwampHut.mapping b/mappings/net/minecraft/sortme/structures/SwampHut.mapping new file mode 100644 index 0000000000..18202f973c --- /dev/null +++ b/mappings/net/minecraft/sortme/structures/SwampHut.mapping @@ -0,0 +1,6 @@ +CLASS bzs net/minecraft/sortme/structures/SwampHut + METHOD a toNbt (Lho;)V + ARG 1 tag + METHOD a fromNbt (Lho;Lbzy;)V + ARG 1 tag + ARG 3 entrances diff --git a/mappings/bzu.mapping b/mappings/net/minecraft/sortme/structures/Village.mapping similarity index 66% rename from mappings/bzu.mapping rename to mappings/net/minecraft/sortme/structures/Village.mapping index c0bbb05629..42cee01261 100644 --- a/mappings/bzu.mapping +++ b/mappings/net/minecraft/sortme/structures/Village.mapping @@ -1,29 +1,44 @@ -CLASS bzu +CLASS bzu net/minecraft/sortme/structures/Village CLASS bzu$b METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzu$c METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances + CLASS bzu$f CLASS bzu$g METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzu$h METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzu$j METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzu$l METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances CLASS bzu$o METHOD a toNbt (Lho;)V + ARG 1 tag METHOD a fromNbt (Lho;Lbzy;)V ARG 1 tag + ARG 3 entrances