From 4bca70994b0c6edd6aa958ac13c3cbb092a2b1ff Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Mon, 3 Dec 2018 19:56:28 +0000 Subject: [PATCH] SuggestionProviders, new features, and stuffs (#236) --- mappings/bxu.mapping | 2 ++ mappings/bxv.mapping | 8 +++++++ mappings/cjh.mapping | 8 +++++++ .../client/ClientGameSession.mapping | 6 +++++ .../suggestion/SuggestionProviders.mapping | 22 +++++++++++++++++++ .../feature/NewVillageFeatureConfig.mapping | 3 +++ .../world/gen/decorator/Decorator.mapping | 1 + .../world/gen/feature/Feature.mapping | 3 +++ .../world/gen/feature/HayBaleFeature.mapping} | 2 +- .../gen/feature/NewVillageFeature.mapping | 2 ++ .../gen/surfacebuilder/SurfaceBuilder.mapping | 1 + 11 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 mappings/bxu.mapping create mode 100644 mappings/bxv.mapping create mode 100644 mappings/net/minecraft/client/ClientGameSession.mapping create mode 100644 mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping create mode 100644 mappings/net/minecraft/world/gen/config/feature/NewVillageFeatureConfig.mapping rename mappings/{buk.mapping => net/minecraft/world/gen/feature/HayBaleFeature.mapping} (53%) create mode 100644 mappings/net/minecraft/world/gen/feature/NewVillageFeature.mapping diff --git a/mappings/bxu.mapping b/mappings/bxu.mapping new file mode 100644 index 0000000000..e8113d74b6 --- /dev/null +++ b/mappings/bxu.mapping @@ -0,0 +1,2 @@ +CLASS bxu + FIELD a elements Ljava/util/List; diff --git a/mappings/bxv.mapping b/mappings/bxv.mapping new file mode 100644 index 0000000000..7435e567d4 --- /dev/null +++ b/mappings/bxv.mapping @@ -0,0 +1,8 @@ +CLASS bxv + FIELD a location Lpy; + FIELD b processors Lcom/google/common/collect/ImmutableList; + METHOD (Ljava/lang/String;)V + ARG 1 location + METHOD (Ljava/lang/String;Lcom/google/common/collect/ImmutableList;)V + ARG 1 location + ARG 2 processors diff --git a/mappings/cjh.mapping b/mappings/cjh.mapping index 9d6f859c5f..5dc790f3d2 100644 --- a/mappings/cjh.mapping +++ b/mappings/cjh.mapping @@ -1,4 +1,12 @@ CLASS cjh + FIELD a EMPTY Lcjg; + FIELD b CHEST Lcjg; + FIELD c FISHING Lcjg; + FIELD d ENTITY Lcjg; + FIELD e GIFT Lcjg; + FIELD f ADVANCEMENT_REWARD Lcjg; + FIELD g GENERIC Lcjg; + FIELD h BLOCK Lcjg; FIELD i MAP Lcom/google/common/collect/BiMap; METHOD a getId (Lcjg;)Lpy; METHOD a register (Ljava/lang/String;Ljava/util/function/Consumer;)Lcjg; diff --git a/mappings/net/minecraft/client/ClientGameSession.mapping b/mappings/net/minecraft/client/ClientGameSession.mapping new file mode 100644 index 0000000000..76dc37f17f --- /dev/null +++ b/mappings/net/minecraft/client/ClientGameSession.mapping @@ -0,0 +1,6 @@ +CLASS coa net/minecraft/client/ClientGameSession + FIELD a playerCount I + FIELD b remoteServer Z + FIELD c difficulty Ljava/lang/String; + FIELD d gameMode Ljava/lang/String; + FIELD e sessionId Ljava/util/UUID; diff --git a/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping b/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping new file mode 100644 index 0000000000..d454df5df7 --- /dev/null +++ b/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping @@ -0,0 +1,22 @@ +CLASS ej net/minecraft/command/suggestion/SuggestionProviders + CLASS ej$a LocalProvider + FIELD a provider Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD b name Lpy; + METHOD (Lpy;Lcom/mojang/brigadier/suggestion/SuggestionProvider;)V + ARG 1 name + ARG 2 provider + FIELD a ASK_SERVER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD b ALL_RECIPES Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD c AVAILABLE_SOUNDS Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD d SUMMONABLE_ENTITIES Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD e REGISTRY Ljava/util/Map; + FIELD f ASK_SERVER_NAME Lpy; + METHOD a computeName (Lcom/mojang/brigadier/suggestion/SuggestionProvider;)Lpy; + ARG 0 provider + METHOD a byId (Lpy;)Lcom/mojang/brigadier/suggestion/SuggestionProvider; + ARG 0 name + METHOD a register (Lpy;Lcom/mojang/brigadier/suggestion/SuggestionProvider;)Lcom/mojang/brigadier/suggestion/SuggestionProvider; + ARG 0 name + ARG 1 provider + METHOD b getLocalProvider (Lcom/mojang/brigadier/suggestion/SuggestionProvider;)Lcom/mojang/brigadier/suggestion/SuggestionProvider; + ARG 0 provider diff --git a/mappings/net/minecraft/world/gen/config/feature/NewVillageFeatureConfig.mapping b/mappings/net/minecraft/world/gen/config/feature/NewVillageFeatureConfig.mapping new file mode 100644 index 0000000000..60502188ae --- /dev/null +++ b/mappings/net/minecraft/world/gen/config/feature/NewVillageFeatureConfig.mapping @@ -0,0 +1,3 @@ +CLASS bvj net/minecraft/world/gen/config/feature/NewVillageFeatureConfig + FIELD a startPool Lpy; + FIELD b size I diff --git a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping index e5628ff00c..75a0f56c9d 100644 --- a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping @@ -11,6 +11,7 @@ CLASS bzj net/minecraft/world/gen/decorator/Decorator FIELD J END_ISLAND Lbzj; FIELD K CHORUS_PLANT Lbzj; FIELD L END_GATEWAY Lbzj; + FIELD M factory Ljava/util/function/Function; FIELD a COUNT_HEIGHTMAP Lbzj; FIELD b COUNT_TOP_SOLID Lbzj; FIELD c COUNT_HEIGHTMAP_32 Lbzj; diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index ed7eb913aa..ec5be9004c 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -36,6 +36,7 @@ CLASS btz net/minecraft/world/gen/feature/Feature FIELD aI DECORATED_FLOWER Lbtz; FIELD aJ BONUS_CHEST Lbsr; FIELD aK STRUCTURES Lcom/google/common/collect/BiMap; + FIELD a factory Ljava/util/function/Function; FIELD aa FREEZE_TOP_LAYER Lbtz; FIELD ab VINES Lbtz; FIELD ac WATERLILY Lbtz; @@ -43,6 +44,7 @@ CLASS btz net/minecraft/world/gen/feature/Feature FIELD ae BLUE_ICE Lbtz; FIELD af ICEBERG Lbtz; FIELD ag FOREST_ROCK Lbtz; + FIELD ah HAY_BALE Lbtz; FIELD ai BUSH Lbtz; FIELD aj DISK Lbtz; FIELD ak DOUBLE_PLANT Lbtz; @@ -76,6 +78,7 @@ CLASS btz net/minecraft/world/gen/feature/Feature FIELD n NETHER_FORTRESS Lbxb; FIELD o END_CITY Lbxb; FIELD p BURIED_TREASURE Lbxb; + FIELD q NEW_VILLAGE Lbxb; FIELD r LARGE_OAK_TREE Lbtz; FIELD s BIRCH_TREE Lbtz; FIELD t SUPER_BIRCH_TREE Lbtz; diff --git a/mappings/buk.mapping b/mappings/net/minecraft/world/gen/feature/HayBaleFeature.mapping similarity index 53% rename from mappings/buk.mapping rename to mappings/net/minecraft/world/gen/feature/HayBaleFeature.mapping index 54367f4658..cb5a94a9cc 100644 --- a/mappings/buk.mapping +++ b/mappings/net/minecraft/world/gen/feature/HayBaleFeature.mapping @@ -1,3 +1,3 @@ -CLASS buk +CLASS buk net/minecraft/world/gen/feature/HayBaleFeature METHOD a (Lbar;Lbpx;Ljava/util/Random;Let;Lbua;)Z ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/NewVillageFeature.mapping b/mappings/net/minecraft/world/gen/feature/NewVillageFeature.mapping new file mode 100644 index 0000000000..5323b56091 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/NewVillageFeature.mapping @@ -0,0 +1,2 @@ +CLASS bvk net/minecraft/world/gen/feature/NewVillageFeature + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index 2ba12c4eb1..52352b5b76 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -17,6 +17,7 @@ CLASS ccn net/minecraft/world/gen/surfacebuilder/SurfaceBuilder FIELD P FROZEN_OCEAN Lccn; FIELD Q NETHER Lccn; FIELD R EMPTY Lccn; + FIELD a factory Ljava/util/function/Function; FIELD f AIR Lboj; FIELD g DIRT Lboj; FIELD h GRASS_BLOCK Lboj;