diff --git a/build.gradle b/build.gradle index 3b749ce6c0..8f020029da 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "22w05a" +def minecraft_version = "22w06a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/Bootstrap.mapping b/mappings/net/minecraft/Bootstrap.mapping index 1df8b182f4..1e038d0f3c 100644 --- a/mappings/net/minecraft/Bootstrap.mapping +++ b/mappings/net/minecraft/Bootstrap.mapping @@ -26,6 +26,4 @@ CLASS net/minecraft/class_2966 net/minecraft/Bootstrap ARG 0 callerGetter METHOD method_39889 (Lnet/minecraft/class_1959;)V ARG 0 biome - METHOD method_39890 (Ljava/util/function/Supplier;)V - ARG 0 placedFeatureSupplier METHOD method_39891 logMissingBiomePlacementModifier ()V diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 2321e1ef1d..69659ef910 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -429,8 +429,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 block ARG 2 propertyMap ARG 3 codec - METHOD method_26164 isIn (Lnet/minecraft/class_3494;)Z - ARG 1 tag + METHOD method_26164 isIn (Lnet/minecraft/class_6862;)Z METHOD method_26165 calcBlockBreakingDelta (Lnet/minecraft/class_1657;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F ARG 1 player ARG 2 world @@ -650,7 +649,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_26234 isFullCube (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos - METHOD method_27851 isIn (Lnet/minecraft/class_3494;Ljava/util/function/Predicate;)Z + METHOD method_27851 isIn (Lnet/minecraft/class_6862;Ljava/util/function/Predicate;)Z ARG 1 tag ARG 2 predicate METHOD method_27852 isOf (Lnet/minecraft/class_2248;)Z diff --git a/mappings/net/minecraft/block/EntityShapeContext.mapping b/mappings/net/minecraft/block/EntityShapeContext.mapping index 8a631f308a..01abf76db6 100644 --- a/mappings/net/minecraft/block/EntityShapeContext.mapping +++ b/mappings/net/minecraft/block/EntityShapeContext.mapping @@ -13,8 +13,4 @@ CLASS net/minecraft/class_3727 net/minecraft/block/EntityShapeContext ARG 4 heldItem ARG 5 walkOnFluidPredicate ARG 6 entity - METHOD method_27867 (Lnet/minecraft/class_3611;)Z - ARG 0 fluid - METHOD method_27868 (Lnet/minecraft/class_3611;)Z - ARG 0 fluid METHOD method_32480 getEntity ()Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/block/ShapeContext.mapping b/mappings/net/minecraft/block/ShapeContext.mapping index fc8a9ee3f6..cbd125ac24 100644 --- a/mappings/net/minecraft/block/ShapeContext.mapping +++ b/mappings/net/minecraft/block/ShapeContext.mapping @@ -9,6 +9,5 @@ CLASS net/minecraft/class_3726 net/minecraft/block/ShapeContext ARG 0 entity METHOD method_17785 isHolding (Lnet/minecraft/class_1792;)Z ARG 1 item - METHOD method_27866 canWalkOnFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_3609;)Z + METHOD method_27866 canWalkOnFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_3610;)Z ARG 1 state - ARG 2 fluid diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index b7b8f66cd2..dafbcabfcd 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 0 recipe ARG 1 slots ARG 2 count - METHOD method_11194 addFuel (Ljava/util/Map;Lnet/minecraft/class_3494;I)V + METHOD method_11194 addFuel (Ljava/util/Map;Lnet/minecraft/class_6862;I)V ARG 0 fuelTimes ARG 1 tag ARG 2 fuelTime diff --git a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping index 029c9e3def..90d3061372 100644 --- a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2650 net/minecraft/block/sapling/LargeTreeSaplingGener ARG 2 pos ARG 3 x ARG 4 z - METHOD method_11443 getLargeTreeFeature (Ljava/util/Random;)Lnet/minecraft/class_2975; + METHOD method_11443 getLargeTreeFeature (Ljava/util/Random;)Lnet/minecraft/class_6880; ARG 1 random METHOD method_11444 generateLargeTree (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;II)Z ARG 1 world diff --git a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping index a46a2f78bc..e0206985b6 100644 --- a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2647 net/minecraft/block/sapling/SaplingGenerator - METHOD method_11430 getTreeFeature (Ljava/util/Random;Z)Lnet/minecraft/class_2975; + METHOD method_11430 getTreeFeature (Ljava/util/Random;Z)Lnet/minecraft/class_6880; ARG 1 random ARG 2 bees METHOD method_11431 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z diff --git a/mappings/net/minecraft/class_6864.mapping b/mappings/net/minecraft/class_6864.mapping new file mode 100644 index 0000000000..4b39ea6d05 --- /dev/null +++ b/mappings/net/minecraft/class_6864.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_6864 + CLASS class_5748 Serialized + COMMENT A serialization-friendly POJO representation of a {@linkplain + COMMENT TagGroup tag group}. This allows easy transport of tag groups + COMMENT over Minecraft network protocol. + COMMENT + COMMENT

This stores tag entries with raw integer IDs and requires a registry + COMMENT for raw ID access to {@linkplain TagGroup#serialize(Registry) serialize} + COMMENT or {@linkplain TagGroup#deserialize(TagGroup.Serialized, Registry) + COMMENT deserialize} tag groups. + FIELD field_28304 contents Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 contents + METHOD method_33159 writeBuf (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_33160 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6864$class_5748; + ARG 0 buf diff --git a/mappings/net/minecraft/class_6895.mapping b/mappings/net/minecraft/class_6895.mapping new file mode 100644 index 0000000000..c857e60223 --- /dev/null +++ b/mappings/net/minecraft/class_6895.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_6895 + CLASS class_5501 RegistryManagerEntry + FIELD comp_290 key Lnet/minecraft/class_5321; + FIELD comp_291 rawId I + FIELD comp_292 entry Ljava/lang/Object; + METHOD (Lnet/minecraft/class_5321;ILjava/lang/Object;)V + ARG 1 key + ARG 2 rawId + ARG 3 entry + METHOD comp_290 key ()Lnet/minecraft/class_5321; + METHOD comp_291 rawId ()I + METHOD comp_292 entry ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 2277cf1cfe..2ee3957000 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -100,7 +100,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1742 itemRenderer Lnet/minecraft/class_918; FIELD field_1743 skipGameRender Z FIELD field_1744 connectedToRealms Z - FIELD field_1745 resourceManager Lnet/minecraft/class_3296; + FIELD field_1745 resourceManager Lnet/minecraft/class_3304; FIELD field_1746 integratedServerConnection Lnet/minecraft/class_2535; COMMENT The client connection to the integrated server. COMMENT This is only used when connecting to the integrated server. @@ -350,7 +350,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_24043 createV4ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 0 packFactory METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;)V - ARG 1 exception METHOD method_24228 (Ljava/util/concurrent/CompletableFuture;Ljava/util/Optional;)V ARG 2 throwable METHOD method_24287 getWindowTitle ()Ljava/lang/String; @@ -377,15 +376,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT them. ARG 1 sender METHOD method_29043 isMultiplayerEnabled ()Z - METHOD method_29597 (Lnet/minecraft/class_1940;Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_5359; + METHOD method_29597 (Lnet/minecraft/class_1940;Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_6904$class_6905; ARG 1 session - METHOD method_29598 loadDataPackSettings (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_5359; - ARG 0 storageSession - METHOD method_29599 createSaveProperties (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lnet/minecraft/class_5219; - ARG 0 session - ARG 1 registryTracker - ARG 2 resourceManager - ARG 3 dataPackSettings METHOD method_29600 (Ljava/lang/String;Ljava/lang/Runnable;ZZ)V ARG 3 shouldBackup ARG 4 eraseCache @@ -394,48 +386,23 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 2 levelName ARG 3 legacyCustomized ARG 4 onConfirm - METHOD method_29603 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_310$class_5367;Lnet/minecraft/class_5219;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljava/lang/Thread;)Lnet/minecraft/class_1132; - ARG 1 registryTracker - ARG 2 session + METHOD method_29603 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljava/lang/Thread;)Lnet/minecraft/class_1132; ARG 3 resourceManager - ARG 4 saveProperties - ARG 5 sessionService - ARG 6 profileRepository - ARG 7 userCache - ARG 8 serverThread - METHOD method_29604 createIntegratedResourceManager (Lnet/minecraft/class_5455$class_5457;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;ZLnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_310$class_5367; - ARG 1 registryManager - ARG 2 dataPackSettingsGetter - ARG 3 savePropertiesGetter - ARG 4 safeMode - ARG 5 storageSession METHOD method_29605 (Ljava/lang/Runnable;Ljava/lang/String;Z)V ARG 3 confirmed METHOD method_29606 startIntegratedServer (Ljava/lang/String;)V ARG 1 worldName - METHOD method_29607 createWorld (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;)V + METHOD method_29607 createWorld (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)V ARG 1 worldName ARG 2 levelInfo ARG 3 registryTracker ARG 4 generatorOptions - METHOD method_29610 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_5455$class_5457;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;ZLnet/minecraft/class_310$class_5366;)V + METHOD method_29610 startIntegratedServer (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;ZLnet/minecraft/class_310$class_5366;)V ARG 1 worldName - ARG 2 registryTracker - ARG 3 dataPackSettingsGetter - ARG 4 savePropertiesGetter - ARG 5 safeMode - ARG 6 worldLoadAction METHOD method_29611 isFabulousGraphicsOrBetter ()Z METHOD method_29970 setScreenAndRender (Lnet/minecraft/class_437;)V ARG 1 screen METHOD method_30049 getVideoWarningManager ()Lnet/minecraft/class_5407; - METHOD method_31125 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;Lnet/minecraft/class_1940;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lnet/minecraft/class_5219; - ARG 3 session - ARG 4 registryManager - ARG 5 resourceManager - ARG 6 dataPackSettings - METHOD method_31126 (Lnet/minecraft/class_5382;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 1 json METHOD method_31186 onResourceReloadFailure (Ljava/lang/Throwable;Lnet/minecraft/class_2561;)V ARG 1 exception ARG 2 resourceName @@ -506,17 +473,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_38736 createTelemetrySender ()Lnet/minecraft/class_6628; METHOD method_38932 loadBlockList ()V CLASS class_5366 WorldLoadAction - CLASS class_5367 IntegratedResourceManager - FIELD field_25439 resourcePackManager Lnet/minecraft/class_3283; - FIELD field_25440 serverResourceManager Lnet/minecraft/class_5350; - FIELD field_25441 saveProperties Lnet/minecraft/class_5219; - METHOD (Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;)V - ARG 1 resourcePackManager - ARG 2 serverResourceManager - ARG 3 saveProperties - METHOD method_29612 getResourcePackManager ()Lnet/minecraft/class_3283; - METHOD method_29613 getServerResourceManager ()Lnet/minecraft/class_5350; - METHOD method_29614 getSaveProperties ()Lnet/minecraft/class_5219; CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index ac804015a0..e7efe83521 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -15,8 +15,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud FIELD field_32180 MAX_MESSAGES I METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_1802 scroll (D)V - ARG 1 amount + METHOD method_1802 scroll (I)V METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V ARG 1 message METHOD method_1804 addMessage (Lnet/minecraft/class_2561;I)V diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index 07769ad605..92b8e1505e 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -14,8 +14,7 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud ARG 3 x ARG 4 y ARG 5 state - METHOD method_1976 cycleSlot (D)V - ARG 1 offset + METHOD method_1976 cycleSlot (I)V METHOD method_1977 selectSlot (I)V ARG 1 slot METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_4587;)V diff --git a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping index d9f7d621c3..61f58baa75 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen FIELD field_2382 chatField Lnet/minecraft/class_342; FIELD field_2387 messageHistorySize I FIELD field_2389 chatLastMessage Ljava/lang/String; - FIELD field_32237 SHIFT_SCROLL_AMOUNT I + FIELD field_32237 SHIFT_SCROLL_AMOUNT D FIELD field_33953 USAGE_TEXT Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;)V ARG 1 originalChatText diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping index ec8d1f1ed7..099616404f 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping @@ -3,14 +3,13 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev FIELD field_2441 biomeSelectionList Lnet/minecraft/class_415$class_4190; FIELD field_24562 parent Lnet/minecraft/class_437; FIELD field_24563 onDone Ljava/util/function/Consumer; - FIELD field_25040 biome Lnet/minecraft/class_1959; + FIELD field_25040 biome Lnet/minecraft/class_6880; FIELD field_25888 biomeRegistry Lnet/minecraft/class_2378; FIELD field_26535 BUFFET_BIOME_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_5455;Ljava/util/function/Consumer;Lnet/minecraft/class_1959;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_5455;Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)V ARG 1 parent ARG 2 registryManager ARG 3 onDone - ARG 4 biome METHOD method_19801 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_2151 refreshConfirmButton ()V @@ -20,14 +19,10 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev ARG 1 entry CLASS class_4190 BuffetBiomesListWidget FIELD field_18736 screen Lnet/minecraft/class_415; - METHOD method_28060 (Ljava/util/Map$Entry;)Lnet/minecraft/class_415$class_4190$class_4191; - ARG 1 entry METHOD method_40075 (Lnet/minecraft/class_415$class_4190;Lnet/minecraft/class_350$class_351;)V ARG 1 entry METHOD method_40076 (Lnet/minecraft/class_415$class_4190$class_4191;)Ljava/lang/String; ARG 0 biome CLASS class_4191 BuffetBiomeItem - FIELD field_24564 biome Lnet/minecraft/class_1959; + FIELD field_24564 biome Lnet/minecraft/class_6880$class_6883; FIELD field_26536 text Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_415$class_4190;Lnet/minecraft/class_1959;)V - ARG 2 biome diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index d7d0490bc8..e390d31819 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -45,9 +45,7 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen ARG 0 biomeRegistry ARG 1 preset ARG 2 generatorConfig - METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_2378;Lnet/minecraft/class_3232;)Ljava/lang/String; - ARG 0 biomeRegistry - ARG 1 generatorConfig + METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_3232;)Ljava/lang/String; METHOD method_31127 (Ljava/util/List;ZZZ[Lnet/minecraft/class_3229;Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; ARG 6 biomeRegistry CLASS class_431 SuperflatPreset diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index 80d040f8f7..273bb8d275 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen - FIELD field_16201 searchResultTags Ljava/util/Map; + FIELD field_16201 searchResultTags Ljava/util/Set; FIELD field_26563 DELETE_ITEM_SLOT_TEXT Lnet/minecraft/class_2561; FIELD field_2886 slots Ljava/util/List; FIELD field_2887 lastClickOutsideBounds Z @@ -25,11 +25,6 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 1 player METHOD method_15871 searchForTags (Ljava/lang/String;)V ARG 1 id - METHOD method_15872 (Lnet/minecraft/class_1799;Ljava/util/List;Lnet/minecraft/class_2960;Lnet/minecraft/class_3494;)V - ARG 2 id - ARG 3 tag - METHOD method_15873 (Lnet/minecraft/class_5414;Lnet/minecraft/class_2960;)V - ARG 2 id METHOD method_15874 (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2960;)Z ARG 2 id METHOD method_15875 (Ljava/lang/String;Lnet/minecraft/class_2960;)Z diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index caacd84a2c..36a77d0d5a 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -32,13 +32,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3202 moreOptionsOpen Z FIELD field_3205 createLevelButton Lnet/minecraft/class_4185; FIELD field_32434 TEMP_DIR_PREFIX Ljava/lang/String; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Ljava/nio/file/Path;Lnet/minecraft/class_5359;Lnet/minecraft/class_5455$class_5457;)V - ARG 1 parent - ARG 2 levelInfo - ARG 3 generatorOptions - ARG 4 dataPackTempDir - ARG 5 dataPackSettings - ARG 6 registryManager METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_5359;Lnet/minecraft/class_5292;)V ARG 1 parent ARG 2 dataPackSettings @@ -114,7 +107,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_32671 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; ARG 1 button METHOD method_32672 getDifficulty ()Lnet/minecraft/class_1267; - METHOD method_37088 (Lnet/minecraft/class_5359;Lnet/minecraft/class_5350;)V + METHOD method_37088 (Lnet/minecraft/class_5359;Lnet/minecraft/class_6904;)V ARG 2 serverResourceManager METHOD method_37089 (Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object; ARG 1 v diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping index bfde024672..96be67bdf6 100644 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping @@ -12,13 +12,13 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions FIELD field_25047 CUSTOM_TEXT Lnet/minecraft/class_2561; FIELD field_25048 importSettingsButton Lnet/minecraft/class_4185; FIELD field_25049 generatorType Ljava/util/Optional; - FIELD field_25483 registryManager Lnet/minecraft/class_5455$class_5457; + FIELD field_25483 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_26604 MAP_FEATURES_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_28000 SELECT_SETTINGS_FILE_TEXT Lnet/minecraft/class_2561; FIELD field_28001 unchangeableMapTypeButton Lnet/minecraft/class_4185; FIELD field_35754 AMPLIFIED_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_35755 amplifiedInfoText Lnet/minecraft/class_5489; - METHOD (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;Ljava/util/Optional;Ljava/util/OptionalLong;)V + METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;Ljava/util/Optional;Ljava/util/OptionalLong;)V ARG 1 registryManager ARG 2 generatorOptions ARG 3 generatorType @@ -38,24 +38,19 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions ARG 1 seedText METHOD method_28101 setVisible (Z)V ARG 1 visible - METHOD method_29069 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;Z)V + METHOD method_29069 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_5455$class_6893;Lnet/minecraft/class_5285;Z)V ARG 5 confirmed - METHOD method_29070 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_5455$class_5457;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5285;)V + METHOD method_29070 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_5455$class_6893;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5285;)V ARG 5 generatorOptions METHOD method_29071 (Lnet/minecraft/class_525;Lnet/minecraft/class_310;Lnet/minecraft/class_4185;)V ARG 3 button - METHOD method_29073 importOptions (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;)V + METHOD method_29073 importOptions (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)V ARG 1 registryManager ARG 2 generatorOptions - METHOD method_29700 getRegistryManager ()Lnet/minecraft/class_5455$class_5457; + METHOD method_29700 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_30510 seedToString (Ljava/util/OptionalLong;)Ljava/lang/String; ARG 0 seed - METHOD method_31131 (Lnet/minecraft/class_5382;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 1 json - METHOD method_31132 loadDatapacks (Lnet/minecraft/class_5350;)V - ARG 1 serverResourceManager - METHOD method_31133 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;)V - ARG 2 generatorOptions + METHOD method_31132 loadDatapacks (Lnet/minecraft/class_6904;)V METHOD method_32676 (Lnet/minecraft/class_4185;)V ARG 0 button METHOD method_32678 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 78d7df864b..b7357e4574 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -40,8 +40,6 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid ARG 2 levelList ARG 3 level METHOD method_20164 play ()V - METHOD method_20165 (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Ljava/nio/file/Path;Lnet/minecraft/class_5359;Lnet/minecraft/class_5455$class_5457;Z)V - ARG 6 confirmed METHOD method_20167 (ZZ)V ARG 1 backup ARG 2 eraseCache diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 39ae83874f..fcaf499c2d 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_16771 sessionId Ljava/util/UUID; FIELD field_19144 chunkLoadDistance I FIELD field_24321 worldProperties Lnet/minecraft/class_638$class_5271; - FIELD field_25063 registryManager Lnet/minecraft/class_5455; + FIELD field_25063 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_25273 worldKeys Ljava/util/Set; FIELD field_26620 DISCONNECT_LOST_TEXT Lnet/minecraft/class_2561; FIELD field_34963 telemetrySender Lnet/minecraft/class_6628; @@ -14,7 +14,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_3691 commandSource Lnet/minecraft/class_637; FIELD field_3692 dataQueryHandler Lnet/minecraft/class_300; FIELD field_3693 playerListEntries Ljava/util/Map; - FIELD field_3694 tagManager Lnet/minecraft/class_5415; FIELD field_3695 LOGGER Lorg/slf4j/Logger; FIELD field_3696 commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; FIELD field_3697 profile Lcom/mojang/authlib/GameProfile; @@ -30,7 +29,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_16690 getSessionId ()Ljava/util/UUID; METHOD method_19691 getActiveTotemOfUndying (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 0 player - METHOD method_2867 getTagManager ()Lnet/minecraft/class_5415; METHOD method_2868 clearWorld ()V METHOD method_2869 getAdvancementHandler ()Lnet/minecraft/class_632; METHOD method_2870 updateLighting (IILnet/minecraft/class_3568;Lnet/minecraft/class_1944;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;Z)V diff --git a/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping index 6cce047f30..dab21b573e 100644 --- a/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping @@ -7,6 +7,6 @@ CLASS net/minecraft/class_1149 net/minecraft/client/tutorial/CraftPlanksTutorial FIELD field_5612 DESCRIPTION Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_1156;)V ARG 1 manager - METHOD method_4895 hasCrafted (Lnet/minecraft/class_746;Lnet/minecraft/class_3494;)Z + METHOD method_4895 hasCrafted (Lnet/minecraft/class_746;Lnet/minecraft/class_6862;)Z ARG 0 player ARG 1 tag diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index a6771979f5..4072a25242 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -17,11 +17,10 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_3727 networkHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3733 scoreboard Lnet/minecraft/class_269; - METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;IILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V + METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;IILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V ARG 1 netHandler ARG 2 properties ARG 3 registryRef - ARG 4 dimensionType ARG 5 loadDistance ARG 6 simulationDistance ARG 7 profiler @@ -184,5 +183,5 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 difficultyLocked METHOD method_28105 getSkyDarknessHeight (Lnet/minecraft/class_5539;)D ARG 1 world - METHOD method_28106 getHorizonShadingRatio ()D + METHOD method_28106 getHorizonShadingRatio ()F CLASS class_5612 ClientEntityHandler diff --git a/mappings/net/minecraft/client/world/GeneratorType.mapping b/mappings/net/minecraft/client/world/GeneratorType.mapping index 12d634129f..e06cf19262 100644 --- a/mappings/net/minecraft/client/world/GeneratorType.mapping +++ b/mappings/net/minecraft/client/world/GeneratorType.mapping @@ -14,28 +14,21 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType METHOD method_29076 getChunkGenerator (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2794; ARG 1 registryManager ARG 2 seed - METHOD method_29077 createDefaultOptions (Lnet/minecraft/class_5455$class_5457;JZZ)Lnet/minecraft/class_5285; + METHOD method_29077 createDefaultOptions (Lnet/minecraft/class_5455;JZZ)Lnet/minecraft/class_5285; ARG 1 registryManager ARG 2 seed ARG 4 generateStructures ARG 5 bonusChest METHOD method_29078 fromGeneratorOptions (Lnet/minecraft/class_5285;)Ljava/util/Optional; ARG 0 generatorOptions - METHOD method_29079 createFixedBiomeOptions (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_5317;Lnet/minecraft/class_1959;)Lnet/minecraft/class_5285; + METHOD method_29079 createFixedBiomeOptions (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5285; ARG 0 registryManager ARG 1 generatorOptions - ARG 2 type - ARG 3 biome METHOD method_29082 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_3232;)V ARG 2 config - METHOD method_29083 getFirstBiome (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)Lnet/minecraft/class_1959; - ARG 0 registryManager - ARG 1 options METHOD method_29086 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; ARG 0 screen ARG 1 generatorOptions - METHOD method_29087 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_1959;)V - ARG 2 biome METHOD method_29088 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; ARG 0 screen ARG 1 generatorOptions diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping index df5182a056..b8b77a637a 100644 --- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping +++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping @@ -79,8 +79,6 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions ARG 0 reader METHOD method_9949 (Lnet/minecraft/class_2303;)Z ARG 0 reader - METHOD method_9950 (Lnet/minecraft/class_2960;ZLnet/minecraft/class_1297;)Z - ARG 2 entity METHOD method_9951 (Lnet/minecraft/class_2303;)V ARG 0 reader METHOD method_9952 (Lnet/minecraft/class_2303;)Z diff --git a/mappings/net/minecraft/command/argument/BlockArgumentParser.mapping b/mappings/net/minecraft/command/argument/BlockArgumentParser.mapping index 3056f1e65d..965c2064ee 100644 --- a/mappings/net/minecraft/command/argument/BlockArgumentParser.mapping +++ b/mappings/net/minecraft/command/argument/BlockArgumentParser.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParser - FIELD field_10681 tagId Lnet/minecraft/class_2960; + FIELD field_10681 tagId Lnet/minecraft/class_6862; FIELD field_10682 SUGGEST_DEFAULT Ljava/util/function/BiFunction; FIELD field_10683 INVALID_PROPERTY_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; FIELD field_10684 UNCLOSED_PROPERTIES_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; @@ -27,9 +27,8 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse METHOD (Lcom/mojang/brigadier/StringReader;Z)V ARG 1 reader ARG 2 allowTag - METHOD method_29383 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_29383 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 0 builder - ARG 1 tagGroup METHOD method_9659 parseBlockProperties ()V METHOD method_9660 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 block @@ -45,76 +44,60 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse ARG 0 builder ARG 1 property ARG 2 value - METHOD method_9664 getTagId ()Lnet/minecraft/class_2960; - METHOD method_9665 suggestBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9664 getTagId ()Lnet/minecraft/class_6862; + METHOD method_9665 suggestBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup - METHOD method_9666 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9666 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup - METHOD method_9667 suggestTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9667 suggestTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup METHOD method_9668 parsePropertyValue (Lnet/minecraft/class_2769;Ljava/lang/String;I)V ARG 1 property ARG 2 value ARG 3 cursor METHOD method_9669 getBlockState ()Lnet/minecraft/class_2680; - METHOD method_9670 suggestIdentifiers (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9670 suggestIdentifiers (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup - METHOD method_9671 suggestBlockPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9671 suggestBlockPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup METHOD method_9672 parseSnbt ()V - METHOD method_9673 suggestBlockOrTagId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9673 suggestBlockOrTagId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup - METHOD method_9674 suggestTagPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9674 suggestTagPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup METHOD method_9675 parseBlockId ()V - METHOD method_9676 hasBlockEntity (Lnet/minecraft/class_5414;)Z - ARG 1 tagGroup + METHOD method_9676 hasBlockEntity (Lnet/minecraft/class_2378;)Z METHOD method_9677 parseTagId ()V METHOD method_9678 parse (Z)Lnet/minecraft/class_2259; ARG 1 allowNbt - METHOD method_9679 suggestSnbtOrTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9679 suggestSnbtOrTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup METHOD method_9680 parseTagProperties ()V - METHOD method_9681 suggestSnbtOrBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9681 suggestSnbtOrBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup METHOD method_9682 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 block - METHOD method_9683 (Ljava/lang/String;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9683 (Ljava/lang/String;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 2 builder - ARG 3 tagGroup - METHOD method_9684 (Lnet/minecraft/class_2769;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9684 (Lnet/minecraft/class_2769;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup METHOD method_9685 stringifyBlockState (Lnet/minecraft/class_2680;)Ljava/lang/String; ARG 0 state METHOD method_9686 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 block ARG 1 property - METHOD method_9687 suggestSnbt (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9687 suggestSnbt (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup METHOD method_9688 getProperties ()Ljava/util/Map; - METHOD method_9689 suggestCommaOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9689 suggestCommaOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup - METHOD method_9690 suggestTagPropertyValues (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9690 suggestTagPropertyValues (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup ARG 3 propertyName METHOD method_9691 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 block ARG 1 property METHOD method_9692 getBlockProperties ()Ljava/util/Map; - METHOD method_9693 suggestEqualsCharacter (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9693 suggestEqualsCharacter (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 tagGroup METHOD method_9694 getNbtData ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping index 0ba189d337..bc603b674c 100644 --- a/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping @@ -13,8 +13,6 @@ CLASS net/minecraft/class_2252 net/minecraft/command/argument/BlockPredicateArgu METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader CLASS 2 - METHOD method_38561 (Lnet/minecraft/class_2960;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; - ARG 0 id CLASS class_2253 StatePredicate FIELD field_10673 properties Ljava/util/Set; FIELD field_10674 state Lnet/minecraft/class_2680; @@ -28,13 +26,12 @@ CLASS net/minecraft/class_2252 net/minecraft/command/argument/BlockPredicateArgu ARG 1 context CLASS class_2254 BlockPredicate METHOD method_38559 hasNbt ()Z - METHOD method_38560 create (Lnet/minecraft/class_5415;)Ljava/util/function/Predicate; - ARG 1 manager + METHOD method_38560 create (Lnet/minecraft/class_2378;)Ljava/util/function/Predicate; CLASS class_2255 TagPredicate - FIELD field_10676 tag Lnet/minecraft/class_3494; + FIELD field_10676 tag Lnet/minecraft/class_6862; FIELD field_10677 nbt Lnet/minecraft/class_2487; FIELD field_10678 properties Ljava/util/Map; - METHOD (Lnet/minecraft/class_3494;Ljava/util/Map;Lnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_6862;Ljava/util/Map;Lnet/minecraft/class_2487;)V ARG 1 tag ARG 2 properties ARG 3 nbt diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping index 916435cd3c..23f855336c 100644 --- a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping @@ -4,13 +4,9 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder - METHOD method_33308 (Lnet/minecraft/class_2960;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; - ARG 0 id METHOD method_9801 itemPredicate ()Lnet/minecraft/class_2293; METHOD method_9802 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_9803 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2291;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; - ARG 2 context METHOD method_9804 getItemPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate; ARG 0 context ARG 1 name @@ -30,9 +26,9 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum METHOD create (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; ARG 1 context CLASS class_2296 TagPredicate - FIELD field_10815 tag Lnet/minecraft/class_3494; + FIELD field_10815 tag Lnet/minecraft/class_6862; FIELD field_10816 compound Lnet/minecraft/class_2487; - METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_2487;)V ARG 1 tag ARG 2 nbt METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping index 8e9cd9ca0f..bfec54801a 100644 --- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping @@ -7,34 +7,29 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader FIELD field_10805 suggestions Ljava/util/function/BiFunction; FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction; FIELD field_10807 nbt Lnet/minecraft/class_2487; - FIELD field_10808 id Lnet/minecraft/class_2960; + FIELD field_10808 id Lnet/minecraft/class_6862; FIELD field_10809 cursor I FIELD field_33066 LEFT_CURLY_BRACKET C FIELD field_33067 HASH_SIGN C METHOD (Lcom/mojang/brigadier/StringReader;Z)V ARG 1 reader ARG 2 allowTag - METHOD method_29394 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_29394 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 0 builder - ARG 1 group METHOD method_9786 getItem ()Lnet/minecraft/class_1792; METHOD method_9787 readTag ()V METHOD method_9788 readNbt ()V METHOD method_9789 consume ()Lnet/minecraft/class_2291; - METHOD method_9790 getId ()Lnet/minecraft/class_2960; - METHOD method_9791 suggestAny (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9790 getId ()Lnet/minecraft/class_6862; + METHOD method_9791 suggestAny (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 group METHOD method_9792 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 group - METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 group METHOD method_9795 readItem ()V - METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - ARG 2 group METHOD method_9797 getNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping index 9023cdaf72..0d08324438 100644 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping @@ -9,13 +9,13 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider ARG 2 registry METHOD method_10510 getOutput (Lnet/minecraft/class_2960;)Ljava/nio/file/Path; ARG 1 id - METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2474$class_5124; + METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124; ARG 1 tag METHOD method_10514 configure ()V METHOD method_27046 (Lnet/minecraft/class_2408;Lnet/minecraft/class_2960;Lnet/minecraft/class_3494$class_3495;)V ARG 2 id ARG 3 builder - METHOD method_27169 getTagBuilder (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_3494$class_3495; + METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3494$class_3495; ARG 1 tag METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494$class_3495; ARG 0 id @@ -29,7 +29,7 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider ARG 1 builder ARG 2 registry ARG 3 source - METHOD method_26792 addTag (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2474$class_5124; + METHOD method_26792 addTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124; ARG 1 identifiedTag METHOD method_26793 add (Ljava/lang/Object;)Lnet/minecraft/class_2474$class_5124; ARG 1 element diff --git a/mappings/net/minecraft/data/server/ItemTagsProvider.mapping b/mappings/net/minecraft/data/server/ItemTagsProvider.mapping index 168326bc5d..9760926415 100644 --- a/mappings/net/minecraft/data/server/ItemTagsProvider.mapping +++ b/mappings/net/minecraft/data/server/ItemTagsProvider.mapping @@ -3,6 +3,6 @@ CLASS net/minecraft/class_2471 net/minecraft/data/server/ItemTagsProvider METHOD (Lnet/minecraft/class_2403;Lnet/minecraft/class_2466;)V ARG 1 root ARG 2 blockTagsProvider - METHOD method_10505 copy (Lnet/minecraft/class_3494$class_5123;Lnet/minecraft/class_3494$class_5123;)V + METHOD method_10505 copy (Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V ARG 1 blockTag ARG 2 itemTag diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index c921fcaa84..88c588a190 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider ARG 1 root METHOD method_10419 generate (Ljava/util/function/Consumer;)V ARG 0 exporter - METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2066$class_2068; + METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2066$class_2068; ARG 0 tag METHOD method_10421 (Ljava/util/Set;Lnet/minecraft/class_2408;Ljava/nio/file/Path;Lnet/minecraft/class_2444;)V ARG 3 provider @@ -38,7 +38,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider ARG 1 cooker ARG 2 serializer ARG 3 cookingTime - METHOD method_24475 offerPlanksRecipe2 (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_3494;)V + METHOD method_24475 offerPlanksRecipe2 (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;)V ARG 0 exporter ARG 1 output ARG 2 input @@ -46,7 +46,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider ARG 0 exporter ARG 1 output ARG 2 input - METHOD method_24477 offerPlanksRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_3494;)V + METHOD method_24477 offerPlanksRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;)V ARG 0 exporter ARG 1 output ARG 2 input diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping index c1f420ee29..c769f975b5 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson ARG 2 ingredient METHOD method_10432 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId - METHOD method_10433 input (Ljava/lang/Character;Lnet/minecraft/class_3494;)Lnet/minecraft/class_2447; + METHOD method_10433 input (Ljava/lang/Character;Lnet/minecraft/class_6862;)Lnet/minecraft/class_2447; ARG 1 c ARG 2 tag METHOD method_10434 input (Ljava/lang/Character;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447; diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping index d571f298a6..f31e9d54f5 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ ARG 2 outputCount METHOD method_10445 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId - METHOD method_10446 input (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2450; + METHOD method_10446 input (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2450; ARG 1 tag METHOD method_10447 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2450; ARG 0 output diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index c2cb2cb540..df8607414e 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@link FallingBlockEntity}, and {@link LivingEntity}. COMMENT Intersection with {@link net.minecraft.entity.decoration.ArmorStandEntity} is checked if COMMENT it is not a {@link net.minecraft.entity.decoration.ArmorStandEntity#isMarker marker}. - FIELD field_25599 submergedFluidTag Lnet/minecraft/class_3494; + FIELD field_25599 submergedFluidTag Ljava/util/Set; FIELD field_25750 trackedPosition Lnet/minecraft/class_243; FIELD field_26994 lastChimeAge I FIELD field_26995 removalReason Lnet/minecraft/class_1297$class_5529; @@ -575,7 +575,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 hand COMMENT the hand the player used to interact with this entity METHOD method_5691 getPermissionLevel ()I - METHOD method_5692 updateMovementInFluid (Lnet/minecraft/class_3494;D)Z + METHOD method_5692 updateMovementInFluid (Lnet/minecraft/class_6862;D)Z ARG 1 tag ARG 2 speed METHOD method_5693 initDataTracker ()V @@ -744,7 +744,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5775 dropStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1542; ARG 1 stack METHOD method_5776 hasWings ()Z - METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_3494;)Z + METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_6862;)Z ARG 1 fluidTag METHOD method_5778 isBeingRainedOn ()Z METHOD method_5779 isPartOf (Lnet/minecraft/class_1297;)Z @@ -890,7 +890,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 5 destZ METHOD method_5860 canStartRiding (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_5861 getFluidHeight (Lnet/minecraft/class_3494;)D + METHOD method_5861 getFluidHeight (Lnet/minecraft/class_6862;)D ARG 1 fluid METHOD method_5862 doesRenderOnFire ()Z METHOD method_5863 collides ()Z diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 66fdf4cd90..ebbb3812bb 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_6101 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6106 translationKey Ljava/lang/String; METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_4048;II)V - ARG 1 factory ARG 2 spawnGroup ARG 3 saveable ARG 4 summonable @@ -55,8 +54,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_18388 getTrackTickInterval ()I METHOD method_18389 alwaysUpdateVelocity ()Z METHOD method_19946 isFireImmune ()Z - METHOD method_20210 isIn (Lnet/minecraft/class_3494;)Z - ARG 1 tag + METHOD method_20210 isIn (Lnet/minecraft/class_6862;)Z METHOD method_20814 isSpawnableFarFromPlayer ()Z METHOD method_29496 isInvalidSpawn (Lnet/minecraft/class_2680;)Z COMMENT Returns whether the EntityType can spawn inside the given block. diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index e385fbd6db..e60e66341d 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -223,8 +223,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_26318 applyMovementInput (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243; ARG 1 movementInput ARG 2 slipperiness - METHOD method_26319 canWalkOnFluid (Lnet/minecraft/class_3611;)Z - ARG 1 fluid + METHOD method_26319 canWalkOnFluid (Lnet/minecraft/class_3610;)Z METHOD method_26825 getAttributeValue (Lnet/minecraft/class_1320;)D ARG 1 attribute METHOD method_26826 getAttributeBaseValue (Lnet/minecraft/class_1320;)D @@ -347,7 +346,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 effect ARG 2 reapplyEffect ARG 3 source - METHOD method_6010 swimUpward (Lnet/minecraft/class_3494;)V + METHOD method_6010 swimUpward (Lnet/minecraft/class_6862;)V ARG 1 fluid METHOD method_6011 getHurtSound (Lnet/minecraft/class_1282;)Lnet/minecraft/class_3414; ARG 1 source @@ -367,8 +366,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT this call ARG 1 type METHOD method_6017 getSoundPitch ()F - METHOD method_6018 setRiptideTicks (I)V - ARG 1 riptideTicks METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V ARG 1 hand METHOD method_6020 onStatusEffectApplied (Lnet/minecraft/class_1293;Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping index 684a55695c..688e5d90c1 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask METHOD (Lnet/minecraft/class_1311;F)V ARG 1 group ARG 2 maxDistance - METHOD (Lnet/minecraft/class_3494;F)V + METHOD (Lnet/minecraft/class_6862;F)V ARG 1 entityType ARG 2 maxDistance METHOD method_18997 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z @@ -22,5 +22,5 @@ CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask ARG 1 entity METHOD method_24599 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_35087 (Lnet/minecraft/class_3494;Lnet/minecraft/class_1309;)Z + METHOD method_35087 (Lnet/minecraft/class_6862;Lnet/minecraft/class_1309;)Z ARG 1 entity diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index e75707c265..77b3589a1f 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit COMMENT (yaw, y, ?) FIELD field_7027 slowedDownByBlock Z FIELD field_7028 phaseManager Lnet/minecraft/class_1526; - FIELD field_7029 damageDuringSitting I + FIELD field_7029 damageDuringSitting F FIELD field_7030 wingPosition F FIELD field_7031 ticksSinceDeath I FIELD field_7032 parts [Lnet/minecraft/class_1508; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 8166504ab2..146b9d8f17 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -13,8 +13,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -43,8 +41,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 5 showParticles ARG 6 showIcon ARG 7 hiddenEffect - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 toCopy METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 52f22a6c82..e626697f18 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -181,8 +181,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18310 getKey ()Ljava/lang/String; METHOD method_18311 fromId (I)Lnet/minecraft/class_4019$class_4039; ARG 0 id - METHOD method_18313 fromBiome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_4019$class_4039; - ARG 0 biome + METHOD method_18313 fromBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_4019$class_4039; METHOD method_18314 byName (Ljava/lang/String;)Lnet/minecraft/class_4019$class_4039; ARG 0 name METHOD method_18317 getId ()I diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 64adc216a0..5e17df9dbe 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity FIELD field_18528 levelUpTimer I FIELD field_18529 levelingUp Z FIELD field_18530 lastCustomer Lnet/minecraft/class_1657; - FIELD field_18533 foodLevel B + FIELD field_18533 foodLevel I FIELD field_18534 gossip Lnet/minecraft/class_4136; FIELD field_18535 gossipStartTime J FIELD field_18536 experience I diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 1d59950e57..51dfa7ed2c 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -74,7 +74,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory METHOD method_7380 isValidHotbarIndex (I)Z ARG 0 slot METHOD method_7381 updateItems ()V - METHOD method_7382 contains (Lnet/minecraft/class_3494;)Z + METHOD method_7382 contains (Lnet/minecraft/class_6862;)Z ARG 1 tag METHOD method_7384 writeNbt (Lnet/minecraft/class_2499;)Lnet/minecraft/class_2499; ARG 1 nbtList diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 7560c10eaf..3a4b530e99 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -42,8 +42,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 1 world METHOD method_15790 toBlockState (Lnet/minecraft/class_3610;)Lnet/minecraft/class_2680; ARG 1 state - METHOD method_15791 isIn (Lnet/minecraft/class_3494;)Z - ARG 1 tag + METHOD method_15791 isIn (Lnet/minecraft/class_6862;)Z METHOD method_15792 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 7822e53008..17c5759791 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState ARG 3 fluid ARG 4 direction METHOD method_15766 getParticle ()Lnet/minecraft/class_2394; - METHOD method_15767 isIn (Lnet/minecraft/class_3494;)Z + METHOD method_15767 isIn (Lnet/minecraft/class_6862;)Z ARG 1 tag METHOD method_15768 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 world diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping index 5ca1e147b9..0b8d41f161 100644 --- a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping +++ b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping @@ -17,11 +17,10 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker ARG 1 key COMMENT the sub NBT key that stores the predicate, for COMMENT example {@code "CanPlaceOn"} - METHOD method_38070 check (Lnet/minecraft/class_1799;Lnet/minecraft/class_5415;Lnet/minecraft/class_2694;)Z + METHOD method_38070 check (Lnet/minecraft/class_1799;Lnet/minecraft/class_2378;Lnet/minecraft/class_2694;)Z COMMENT {@return true if any of the predicates in the {@code stack}'s NBT COMMENT matched against the block at {@code pos}, false otherwise} ARG 1 stack - ARG 2 tagManager ARG 3 pos METHOD method_38071 canUseCache (Lnet/minecraft/class_2694;Lnet/minecraft/class_2694;Z)Z ARG 0 pos diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 8eb8c6d1ed..fc056fdf4b 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -143,8 +143,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_30268 addHideFlag (Lnet/minecraft/class_1799$class_5422;)V ARG 1 tooltipSection METHOD method_31572 getEquipSound ()Lnet/minecraft/class_3414; - METHOD method_31573 isIn (Lnet/minecraft/class_3494;)Z - ARG 1 tag + METHOD method_31573 isIn (Lnet/minecraft/class_6862;)Z METHOD method_31574 isOf (Lnet/minecraft/class_1792;)Z ARG 1 item METHOD method_31575 onStackClicked (Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1657;)Z @@ -238,8 +237,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT Sets the count of items in this item stack. ARG 1 count COMMENT the count of items - METHOD method_7940 canDestroy (Lnet/minecraft/class_5415;Lnet/minecraft/class_2694;)Z - ARG 1 tagManager + METHOD method_7940 canDestroy (Lnet/minecraft/class_2378;Lnet/minecraft/class_2694;)Z ARG 2 pos METHOD method_7941 getSubNbt (Ljava/lang/String;)Lnet/minecraft/class_2487; COMMENT {@return the NBT compound at the specified key in this item stack's custom NBT, may be {@code null}} @@ -247,8 +245,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see Item Stack NBT Operations ARG 1 key METHOD method_7942 hasEnchantments ()Z - METHOD method_7944 canPlaceOn (Lnet/minecraft/class_5415;Lnet/minecraft/class_2694;)Z - ARG 1 tagManager + METHOD method_7944 canPlaceOn (Lnet/minecraft/class_2378;Lnet/minecraft/class_2694;)Z ARG 2 pos METHOD method_7945 getFrame ()Lnet/minecraft/class_1533; METHOD method_7946 isStackable ()Z diff --git a/mappings/net/minecraft/item/MiningToolItem.mapping b/mappings/net/minecraft/item/MiningToolItem.mapping index d32ddd3f3f..a2ba3e4dc1 100644 --- a/mappings/net/minecraft/item/MiningToolItem.mapping +++ b/mappings/net/minecraft/item/MiningToolItem.mapping @@ -2,8 +2,8 @@ CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem FIELD field_23742 attributeModifiers Lcom/google/common/collect/Multimap; FIELD field_7939 attackDamage F FIELD field_7940 miningSpeed F - FIELD field_7941 effectiveBlocks Lnet/minecraft/class_3494; - METHOD (FFLnet/minecraft/class_1832;Lnet/minecraft/class_3494;Lnet/minecraft/class_1792$class_1793;)V + FIELD field_7941 effectiveBlocks Lnet/minecraft/class_6862; + METHOD (FFLnet/minecraft/class_1832;Lnet/minecraft/class_6862;Lnet/minecraft/class_1792$class_1793;)V ARG 1 attackDamage ARG 2 attackSpeed ARG 3 material diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index 420e44c861..7c399f60a1 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -1,32 +1,28 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry - FIELD field_1005 name Lnet/minecraft/class_3494; + FIELD field_1005 name Lnet/minecraft/class_6862; FIELD field_1006 expand Z - METHOD (Lnet/minecraft/class_3494;ZII[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_6862;ZII[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V ARG 1 name ARG 2 expand ARG 3 weight ARG 4 quality ARG 5 conditions ARG 6 functions - METHOD method_35517 builder (Lnet/minecraft/class_3494;)Lnet/minecraft/class_85$class_86; + METHOD method_35517 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_85$class_86; ARG 0 name - METHOD method_35518 (Lnet/minecraft/class_3494;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_35518 (Lnet/minecraft/class_6862;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions - METHOD method_444 (Lnet/minecraft/class_3494;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_444 (Lnet/minecraft/class_6862;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions - METHOD method_445 expandBuilder (Lnet/minecraft/class_3494;)Lnet/minecraft/class_85$class_86; + METHOD method_445 expandBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_85$class_86; ARG 0 name METHOD method_447 grow (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander - METHOD method_449 (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;)V - ARG 1 item CLASS class_92 Serializer - METHOD method_33283 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonParseException; - ARG 0 id diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 5edee48b91..f995797280 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -7,14 +7,14 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD comp_90 gameMode Lnet/minecraft/class_1934; FIELD comp_91 previousGameMode Lnet/minecraft/class_1934; FIELD comp_92 dimensionIds Ljava/util/Set; - FIELD comp_93 registryManager Lnet/minecraft/class_5455$class_5457; - FIELD comp_94 dimensionType Lnet/minecraft/class_2874; + FIELD comp_93 registryManager Lnet/minecraft/class_5455$class_6890; + FIELD comp_94 dimensionType Lnet/minecraft/class_6880; FIELD comp_95 dimensionId Lnet/minecraft/class_5321; FIELD comp_96 sha256Seed J FIELD comp_97 maxPlayers I FIELD comp_98 viewDistance I FIELD comp_99 reducedDebugInfo Z - METHOD (IZLnet/minecraft/class_1934;Lnet/minecraft/class_1934;Ljava/util/Set;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_2874;Lnet/minecraft/class_5321;JIIIZZZZ)V + METHOD (IZLnet/minecraft/class_1934;Lnet/minecraft/class_1934;Ljava/util/Set;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;JIIIZZZZ)V ARG 1 playerEntityId ARG 3 previousGameMode ARG 11 maxPlayers @@ -29,8 +29,8 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C METHOD comp_90 gameMode ()Lnet/minecraft/class_1934; METHOD comp_91 previousGameMode ()Lnet/minecraft/class_1934; METHOD comp_92 dimensionIds ()Ljava/util/Set; - METHOD comp_93 registryManager ()Lnet/minecraft/class_5455$class_5457; - METHOD comp_94 dimensionType ()Lnet/minecraft/class_2874; + METHOD comp_93 registryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD comp_94 dimensionType ()Lnet/minecraft/class_6880; METHOD comp_95 dimensionId ()Lnet/minecraft/class_5321; METHOD comp_96 sha256Seed ()J METHOD comp_97 maxPlayers ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 693b4475cf..b0c8db1abb 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -5,12 +5,11 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa FIELD field_24451 keepPlayerAttributes Z FIELD field_24620 debugWorld Z FIELD field_24621 flatWorld Z - FIELD field_25322 dimensionType Lnet/minecraft/class_2874; + FIELD field_25322 dimensionType Lnet/minecraft/class_6880; FIELD field_25714 previousGameMode Lnet/minecraft/class_1934; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_2874;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZZ)V - ARG 1 dimensionType + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZZ)V ARG 2 dimension ARG 3 sha256Seed ARG 5 gameMode @@ -24,5 +23,5 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa METHOD method_27904 shouldKeepPlayerAttributes ()Z METHOD method_28120 isDebugWorld ()Z METHOD method_28121 isFlatWorld ()Z - METHOD method_29445 getDimensionType ()Lnet/minecraft/class_2874; + METHOD method_29445 getDimensionType ()Lnet/minecraft/class_6880; METHOD method_30117 getPreviousGameMode ()Lnet/minecraft/class_1934; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping index 6c62b67879..b0e864964f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/play/Synchronize METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12000 getGroups ()Ljava/util/Map; - METHOD method_34203 (Lnet/minecraft/class_2540;Lnet/minecraft/class_5414$class_5748;)V + METHOD method_34203 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6864$class_5748;)V ARG 0 buf ARG 1 serializedGroup METHOD method_34204 (Lnet/minecraft/class_2540;Lnet/minecraft/class_5321;)V diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 673f64c70c..28ae921c01 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate FIELD field_20692 ANY Lnet/minecraft/class_4550; - FIELD field_20693 tag Lnet/minecraft/class_3494; + FIELD field_20693 tag Lnet/minecraft/class_6862; FIELD field_20694 blocks Ljava/util/Set; FIELD field_20695 state Lnet/minecraft/class_4559; FIELD field_20696 nbt Lnet/minecraft/class_2105; - METHOD (Lnet/minecraft/class_3494;Ljava/util/Set;Lnet/minecraft/class_4559;Lnet/minecraft/class_2105;)V + METHOD (Lnet/minecraft/class_6862;Ljava/util/Set;Lnet/minecraft/class_4559;Lnet/minecraft/class_2105;)V ARG 1 tag ARG 2 blocks ARG 3 state @@ -19,7 +19,7 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate ARG 0 id CLASS class_4710 Builder FIELD field_21572 blocks Ljava/util/Set; - FIELD field_21573 tag Lnet/minecraft/class_3494; + FIELD field_21573 tag Lnet/minecraft/class_6862; FIELD field_21574 state Lnet/minecraft/class_4559; FIELD field_21575 nbt Lnet/minecraft/class_2105; METHOD method_23880 create ()Lnet/minecraft/class_4550$class_4710; @@ -28,7 +28,7 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate ARG 1 blocks METHOD method_27963 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4550$class_4710; ARG 1 state - METHOD method_29233 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_4550$class_4710; + METHOD method_29233 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_4550$class_4710; ARG 1 tag METHOD method_35042 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4550$class_4710; ARG 1 nbt diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping index 11bfae810e..1044698515 100644 --- a/mappings/net/minecraft/predicate/FluidPredicate.mapping +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate FIELD field_20708 ANY Lnet/minecraft/class_4551; - FIELD field_20709 tag Lnet/minecraft/class_3494; + FIELD field_20709 tag Lnet/minecraft/class_6862; FIELD field_20710 fluid Lnet/minecraft/class_3611; FIELD field_20711 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_3611;Lnet/minecraft/class_4559;)V + METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_3611;Lnet/minecraft/class_4559;)V ARG 1 tag ARG 2 fluid ARG 3 state @@ -13,14 +13,12 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate METHOD method_22475 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos - METHOD method_33259 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; - ARG 0 id CLASS class_6079 Builder FIELD field_30912 fluid Lnet/minecraft/class_3611; - FIELD field_30913 tag Lnet/minecraft/class_3494; + FIELD field_30913 tag Lnet/minecraft/class_6862; FIELD field_30914 state Lnet/minecraft/class_4559; METHOD method_35221 create ()Lnet/minecraft/class_4551$class_6079; - METHOD method_35222 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_4551$class_6079; + METHOD method_35222 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_4551$class_6079; ARG 1 tag METHOD method_35223 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4551$class_6079; ARG 1 state diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 354b0c39cc..bf470bd727 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -113,7 +113,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate METHOD method_8920 build ()Lnet/minecraft/class_2048; METHOD method_8921 type (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2048$class_2049; ARG 1 type - METHOD method_8922 type (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2048$class_2049; + METHOD method_8922 type (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2048$class_2049; ARG 1 tag METHOD method_8923 effects (Lnet/minecraft/class_2102;)Lnet/minecraft/class_2048$class_2049; ARG 1 effects diff --git a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping index 4636b7d7b8..3495cbe5a6 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypePredicat FIELD field_9609 ANY Lnet/minecraft/class_2050; METHOD method_8925 matches (Lnet/minecraft/class_1299;)Z ARG 1 type - METHOD method_8926 create (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2050; + METHOD method_8926 create (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2050; ARG 0 tag METHOD method_8927 toJson ()Lcom/google/gson/JsonElement; METHOD method_8928 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2050; @@ -11,8 +11,8 @@ CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypePredicat METHOD method_8929 create (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2050; ARG 0 type CLASS class_2051 Tagged - FIELD field_9610 tag Lnet/minecraft/class_3494; - METHOD (Lnet/minecraft/class_3494;)V + FIELD field_9610 tag Lnet/minecraft/class_6862; + METHOD (Lnet/minecraft/class_6862;)V ARG 1 tag CLASS class_2052 Single FIELD field_9611 type Lnet/minecraft/class_1299; diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index e006e124a1..fe4de0d75f 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -3,12 +3,12 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate FIELD field_9640 ANY Lnet/minecraft/class_2073; FIELD field_9641 count Lnet/minecraft/class_2096$class_2100; FIELD field_9642 potion Lnet/minecraft/class_1842; - FIELD field_9643 tag Lnet/minecraft/class_3494; + FIELD field_9643 tag Lnet/minecraft/class_6862; FIELD field_9644 items Ljava/util/Set; FIELD field_9645 nbt Lnet/minecraft/class_2105; FIELD field_9646 durability Lnet/minecraft/class_2096$class_2100; FIELD field_9647 enchantments [Lnet/minecraft/class_2035; - METHOD (Lnet/minecraft/class_3494;Ljava/util/Set;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V + METHOD (Lnet/minecraft/class_6862;Ljava/util/Set;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V ARG 1 tag ARG 2 items ARG 3 count @@ -32,7 +32,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate FIELD field_9649 enchantments Ljava/util/List; FIELD field_9650 item Ljava/util/Set; FIELD field_9651 potion Lnet/minecraft/class_1842; - FIELD field_9652 tag Lnet/minecraft/class_3494; + FIELD field_9652 tag Lnet/minecraft/class_6862; FIELD field_9653 durability Lnet/minecraft/class_2096$class_2100; FIELD field_9654 nbt Lnet/minecraft/class_2105; METHOD method_20399 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; @@ -46,7 +46,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate METHOD method_35235 durability (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 durability METHOD method_8973 create ()Lnet/minecraft/class_2073$class_2074; - METHOD method_8975 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2073$class_2074; + METHOD method_8975 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2073$class_2074; ARG 1 tag METHOD method_8976 build ()Lnet/minecraft/class_2073; METHOD method_8977 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2073$class_2074; diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index ac9efb6c09..2df293dc14 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient ARG 0 json METHOD method_8103 isEmpty ()Z METHOD method_8105 getMatchingStacks ()[Lnet/minecraft/class_1799; - METHOD method_8106 fromTag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_1856; + METHOD method_8106 fromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_1856; ARG 0 tag METHOD method_8107 entryFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1856$class_1859; ARG 0 json @@ -40,8 +40,8 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient METHOD (Lnet/minecraft/class_1799;)V ARG 1 stack CLASS class_1858 TagEntry - FIELD field_9022 tag Lnet/minecraft/class_3494; - METHOD (Lnet/minecraft/class_3494;)V + FIELD field_9022 tag Lnet/minecraft/class_6862; + METHOD (Lnet/minecraft/class_6862;)V ARG 1 tag CLASS class_1859 Entry METHOD method_8108 getStacks ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/resource/ReloadableResourceManager.mapping b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping deleted file mode 100644 index a5f7a0abe8..0000000000 --- a/mappings/net/minecraft/resource/ReloadableResourceManager.mapping +++ /dev/null @@ -1,46 +0,0 @@ -CLASS net/minecraft/class_3296 net/minecraft/resource/ReloadableResourceManager - COMMENT A resource manager that has a reload mechanism. Reloading allows - COMMENT reloaders to update when resources change. Accessing resources in - COMMENT reloads can reduce impact on game performance as well. - COMMENT - COMMENT

In each reload, all reloaders in this resource manager will have - COMMENT their {@linkplain ResourceReloader#reload reload} called. - COMMENT - COMMENT @see ResourceReloader - METHOD method_14477 registerReloader (Lnet/minecraft/class_3302;)V - COMMENT Registers a resource reloader to this manager. - ARG 1 reloader - COMMENT the reloader - METHOD method_14478 reload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; - COMMENT Performs a reload. This returns a future that is completed when the - COMMENT reload is completed. - COMMENT - COMMENT @return the future of the reload - COMMENT @see #reload(Executor, Executor, CompletableFuture, List) - ARG 1 prepareExecutor - COMMENT an executor for the prepare stage - ARG 2 applyExecutor - COMMENT an executor for the apply stage - ARG 3 packs - COMMENT a list of resource packs providing resources - ARG 4 initialStage - COMMENT a completable future to be completed before this reload - METHOD method_18232 reload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lnet/minecraft/class_4011; - COMMENT Performs a reload. Returns an object that yields some insights to the - COMMENT reload. - COMMENT - COMMENT

{@code prepareExecutor} may be asynchronous. {@code applyExecutor} must - COMMENT synchronize with the game engine so changes are properly made to it. - COMMENT The reload will only begin after {@code initialStage} has completed. - COMMENT Earlier elements in {@code packs} have lower priorities. - COMMENT - COMMENT @return the reload - COMMENT @see ResourceReloader#reload - ARG 1 prepareExecutor - COMMENT an executor for the prepare stage - ARG 2 applyExecutor - COMMENT an executor for the apply stage - ARG 3 initialStage - COMMENT a completable future to be completed before this reload - ARG 4 packs - COMMENT a list of resource packs providing resources diff --git a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping index 817f5bd417..5b038bced4 100644 --- a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping @@ -1,23 +1,8 @@ CLASS net/minecraft/class_3304 net/minecraft/resource/ReloadableResourceManagerImpl - FIELD field_14292 namespaces Ljava/util/Set; - FIELD field_14293 namespaceManagers Ljava/util/Map; FIELD field_14294 type Lnet/minecraft/class_3264; FIELD field_14295 LOGGER Lorg/slf4j/Logger; FIELD field_17935 reloaders Ljava/util/List; - FIELD field_25145 packs Ljava/util/List; METHOD (Lnet/minecraft/class_3264;)V ARG 1 type - METHOD method_14475 addPack (Lnet/minecraft/class_3262;)V - ARG 1 pack - METHOD method_14495 clear ()V - CLASS class_4742 FailedReload - FIELD field_21810 exception Lnet/minecraft/class_3304$class_4743; - FIELD field_21811 future Ljava/util/concurrent/CompletableFuture; - METHOD (Lnet/minecraft/class_3304$class_4743;)V - ARG 1 exception - CLASS class_4743 PackAdditionFailedException - FIELD field_21812 pack Lnet/minecraft/class_3262; - METHOD (Lnet/minecraft/class_3262;Ljava/lang/Throwable;)V - ARG 1 pack - ARG 2 cause - METHOD method_24234 getPack ()Lnet/minecraft/class_3262; + METHOD method_14477 registerReloader (Lnet/minecraft/class_3302;)V + METHOD method_18232 reload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lnet/minecraft/class_4011; diff --git a/mappings/net/minecraft/resource/ServerResourceManager.mapping b/mappings/net/minecraft/resource/ServerResourceManager.mapping index c1bf059177..2e9d878a43 100644 --- a/mappings/net/minecraft/resource/ServerResourceManager.mapping +++ b/mappings/net/minecraft/resource/ServerResourceManager.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager FIELD field_25334 COMPLETED_UNIT Ljava/util/concurrent/CompletableFuture; - FIELD field_25335 resourceManager Lnet/minecraft/class_3296; FIELD field_25336 commandManager Lnet/minecraft/class_2170; FIELD field_25337 recipeManager Lnet/minecraft/class_1863; FIELD field_25338 registryTagManager Lnet/minecraft/class_3505; @@ -9,26 +8,18 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989; FIELD field_25342 functionLoader Lnet/minecraft/class_5349; FIELD field_28017 lootFunctionManager Lnet/minecraft/class_5640; - METHOD (Lnet/minecraft/class_5455;Lnet/minecraft/class_2170$class_5364;I)V - ARG 1 registryManager + METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_2170$class_5364;I)V ARG 2 commandEnvironment ARG 3 functionPermissionLevel METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; - METHOD method_29466 reload (Ljava/util/List;Lnet/minecraft/class_5455;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 0 packs - ARG 1 registryManager + METHOD method_29466 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 2 commandEnvironment ARG 3 functionPermissionLevel ARG 4 prepareExecutor ARG 5 applyExecutor METHOD method_29468 getLootConditionManager ()Lnet/minecraft/class_4567; METHOD method_29469 getLootManager ()Lnet/minecraft/class_60; - METHOD method_29470 getRegistryTagManager ()Lnet/minecraft/class_5415; METHOD method_29471 getRecipeManager ()Lnet/minecraft/class_1863; METHOD method_29472 getCommandManager ()Lnet/minecraft/class_2170; METHOD method_29473 getServerAdvancementLoader ()Lnet/minecraft/class_2989; - METHOD method_29474 getResourceManager ()Lnet/minecraft/class_3300; - METHOD method_29475 loadRegistryTags ()V - METHOD method_29774 (Lnet/minecraft/class_5350;Lnet/minecraft/class_3902;Ljava/lang/Throwable;)V - ARG 2 throwable METHOD method_32703 getLootFunctionManager ()Lnet/minecraft/class_5640; diff --git a/mappings/net/minecraft/resource/SimpleResourceReload.mapping b/mappings/net/minecraft/resource/SimpleResourceReload.mapping index 64bafefc37..efc342633b 100644 --- a/mappings/net/minecraft/resource/SimpleResourceReload.mapping +++ b/mappings/net/minecraft/resource/SimpleResourceReload.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_4014 net/minecraft/resource/SimpleResourceReload COMMENT A simple implementation of resource reload. COMMENT COMMENT @param the result type for each reloader in the reload - FIELD field_17927 manager Lnet/minecraft/class_3300; FIELD field_18042 prepareStageFuture Ljava/util/concurrent/CompletableFuture; FIELD field_18043 applyStageFuture Ljava/util/concurrent/CompletableFuture; FIELD field_18044 waitingReloaders Ljava/util/Set; @@ -26,8 +25,6 @@ CLASS net/minecraft/class_4014 net/minecraft/resource/SimpleResourceReload ARG 4 reloaders ARG 5 factory ARG 6 initialStage - METHOD method_18366 (Ljava/util/List;)Lnet/minecraft/class_3902; - ARG 0 results METHOD method_18367 (Ljava/util/concurrent/Executor;Ljava/lang/Runnable;)V ARG 2 application METHOD method_18368 (Ljava/util/concurrent/Executor;Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3302;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index 7117cc0416..875268909f 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -8,21 +8,3 @@ CLASS net/minecraft/server/Main ARG 2 eraseCache ARG 3 continueCheck ARG 4 generatorOptions - METHOD method_29734 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;Lnet/minecraft/class_3807;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176; - ARG 0 registryTracker - ARG 1 session - ARG 2 resourcePackManager - ARG 3 serverResourceManager - ARG 4 saveProperties - ARG 5 propertiesLoader - ARG 6 sessionService - ARG 7 profileRepository - ARG 8 userCache - ARG 9 optionSet - ARG 10 singleplayer - ARG 11 serverPort - ARG 12 demo - ARG 13 serverId - ARG 14 noGui - ARG 15 nonOptions - ARG 16 serverThread diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index ee817198dc..df72130430 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -30,8 +30,8 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_24370 structureManager Lnet/minecraft/class_3485; FIELD field_24371 saveHandler Lnet/minecraft/class_29; FIELD field_24372 saveProperties Lnet/minecraft/class_5219; - FIELD field_25132 registryManager Lnet/minecraft/class_5455$class_5457; - FIELD field_25318 serverResourceManager Lnet/minecraft/class_5350; + FIELD field_25132 registryManager Lnet/minecraft/class_5455$class_6890; + FIELD field_25318 serverResourceManager Lnet/minecraft/server/MinecraftServer$class_6897; FIELD field_33205 MILLISECONDS_PER_TICK J FIELD field_33207 LEVEL_PROTOCOL_NAME Ljava/lang/String; FIELD field_33208 LEVEL_PROTOCOL Ljava/lang/String; @@ -88,19 +88,8 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4604 pvpEnabled Z FIELD field_4607 resourcePackUrl Ljava/lang/String; FIELD field_4608 gameProfileRepo Lcom/mojang/authlib/GameProfileRepository; - METHOD (Ljava/lang/Thread;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5219;Lnet/minecraft/class_3283;Ljava/net/Proxy;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5350;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V + METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/net/Proxy;Lcom/mojang/datafixers/DataFixer;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread - ARG 2 registryManager - ARG 3 session - ARG 4 saveProperties - ARG 5 dataPackManager - ARG 6 proxy - ARG 7 dataFixer - ARG 8 serverResourceManager - ARG 9 sessionService - ARG 10 gameProfileRepo - ARG 11 userCache - ARG 12 worldGenerationProgressListenerFactory METHOD method_15876 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_16043 isStopping ()Z METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695; @@ -158,10 +147,6 @@ CLASS net/minecraft/server/MinecraftServer COMMENT @return a completable future which specifies whether the reload was successful COMMENT A reload has failed when the future is exceptionally completed. COMMENT @see CompletableFuture - ARG 1 datapacks - COMMENT a collection of datapacks to reload with - METHOD method_29440 (Ljava/util/Collection;Lnet/minecraft/class_5350;)V - ARG 2 serverResourceManager METHOD method_29735 createDataPackSettings (Lnet/minecraft/class_3283;)Lnet/minecraft/class_5359; ARG 0 dataPackManager METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;Z)Lnet/minecraft/class_5359; @@ -172,7 +157,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 0 serverFactory METHOD method_29741 runServer ()V METHOD method_30002 getOverworld ()Lnet/minecraft/class_3218; - METHOD method_30611 getRegistryManager ()Lnet/minecraft/class_5455; + METHOD method_30611 getRegistryManager ()Lnet/minecraft/class_5455$class_6890; METHOD method_30612 getRateLimit ()I METHOD method_31371 createFilterer (Lnet/minecraft/class_3222;)Lnet/minecraft/class_5513; ARG 1 player @@ -310,7 +295,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3796 shouldSpawnAnimals ()Z METHOD method_3798 getOpPermissionLevel ()I METHOD method_3799 isDemo ()Z - METHOD method_3801 getTagManager ()Lnet/minecraft/class_5415; METHOD method_3802 getMaxPlayerCount ()I METHOD method_3803 setPlayerIdleTimeout (I)V ARG 1 playerIdleTimeout diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 8761600a17..9364dc9c2d 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -20,10 +20,10 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager FIELD field_14361 whitelist Lnet/minecraft/class_3337; FIELD field_14362 statisticsMap Ljava/util/Map; FIELD field_14364 BANNED_IPS_FILE Ljava/io/File; - FIELD field_24626 registryManager Lnet/minecraft/class_5455$class_5457; + FIELD field_24626 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_29790 LATENCY_UPDATE_INTERVAL I FIELD field_34895 simulationDistance I - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_29;I)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;I)V ARG 1 server ARG 2 registryManager ARG 3 saveHandler diff --git a/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping index 20e2e31ef2..b8e1e9810a 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3174 net/minecraft/server/dedicated/DedicatedPlayerManager FIELD field_13804 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_3176;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_29;)V + METHOD (Lnet/minecraft/class_3176;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;)V ARG 1 server ARG 2 tracker ARG 3 saveHandler diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 90ac2fc5f8..049fb41c34 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -9,19 +9,8 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated FIELD field_16800 gui Lnet/minecraft/class_3182; FIELD field_26898 filterer Lnet/minecraft/class_5514; FIELD field_33431 resourcePackPrompt Lnet/minecraft/class_2561; - METHOD (Ljava/lang/Thread;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;Lnet/minecraft/class_3807;Lcom/mojang/datafixers/DataFixer;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V + METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lcom/mojang/datafixers/DataFixer;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread - ARG 2 registryManager - ARG 3 session - ARG 4 dataPackManager - ARG 5 serverResourceManager - ARG 6 saveProperties - ARG 7 propertiesLoader - ARG 8 dataFixer - ARG 9 sessionService - ARG 10 gameProfileRepo - ARG 11 userCache - ARG 12 worldGenerationProgressListenerFactory METHOD method_13941 executeQueuedCommands ()V METHOD method_13942 sleepFiveSeconds ()V METHOD method_13944 getMaxTickTime ()J diff --git a/mappings/net/minecraft/server/function/FunctionLoader.mapping b/mappings/net/minecraft/server/function/FunctionLoader.mapping index f9ffba51d5..6b33f9af6d 100644 --- a/mappings/net/minecraft/server/function/FunctionLoader.mapping +++ b/mappings/net/minecraft/server/function/FunctionLoader.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader FIELD field_25330 tagLoader Lnet/minecraft/class_3503; FIELD field_25331 level I FIELD field_25332 commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; - FIELD field_25801 tags Lnet/minecraft/class_5414; + FIELD field_25801 tags Ljava/util/Map; FIELD field_33385 EXTENSION Ljava/lang/String; METHOD (ILcom/mojang/brigadier/CommandDispatcher;)V ARG 1 level @@ -46,6 +46,6 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader METHOD method_29457 (Lnet/minecraft/class_2960;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2158;Ljava/lang/Throwable;)Ljava/lang/Object; ARG 2 function ARG 3 ex - METHOD method_29458 getTags ()Lnet/minecraft/class_5414; + METHOD method_29458 getTags ()Ljava/lang/Iterable; METHOD method_29459 getTagOrEmpty (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; ARG 1 id diff --git a/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping index 83399f878a..34ddc28fe0 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1130 net/minecraft/server/integrated/IntegratedPlayerManager FIELD field_5514 userData Lnet/minecraft/class_2487; - METHOD (Lnet/minecraft/class_1132;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_29;)V + METHOD (Lnet/minecraft/class_1132;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;)V ARG 1 server ARG 2 registryManager ARG 3 saveHandler diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 374427ab6e..0346e76dd0 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -7,18 +7,9 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer FIELD field_5521 localPlayerUuid Ljava/util/UUID; FIELD field_5522 lanPort I FIELD field_5524 paused Z - METHOD (Ljava/lang/Thread;Lnet/minecraft/class_310;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V + METHOD (Ljava/lang/Thread;Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 serverThread ARG 2 client - ARG 3 registryManager - ARG 4 session - ARG 5 dataPackManager - ARG 6 serverResourceManager - ARG 7 saveProperties - ARG 8 sessionService - ARG 9 gameProfileRepo - ARG 10 userCache - ARG 11 worldGenerationProgressListenerFactory METHOD method_36439 incrementTotalWorldTimeStat ()V METHOD method_4817 setLocalPlayerUuid (Ljava/util/UUID;)V ARG 1 localPlayerUuid diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 8144c67424..2b67b11ed4 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -29,13 +29,12 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_35565 blockEventQueue Ljava/util/List; FIELD field_36208 structureLocator Lnet/minecraft/class_6832; FIELD field_36317 duringListenerUpdate Z - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJLjava/util/List;Z)V + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJLjava/util/List;Z)V ARG 1 server ARG 2 workerExecutor ARG 3 session ARG 4 properties ARG 5 worldKey - ARG 6 dimensionType ARG 7 worldGenerationProgressListener ARG 8 chunkGenerator ARG 9 debugWorld @@ -245,8 +244,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_23659 (Lnet/minecraft/class_3341;Lnet/minecraft/class_1919;)Z ARG 1 event METHOD method_23660 wakeSleepingPlayers ()V - METHOD method_24500 locateBiome (Lnet/minecraft/class_1959;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338; - ARG 1 biome + METHOD method_24500 locateBiome (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338; ARG 2 pos ARG 3 radius ARG 4 blockCheckInterval diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 4169699e71..954de9f905 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -262,7 +262,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 4 distance METHOD method_39992 shouldDelayShutdown ()Z COMMENT {@return whether the server shutdown should be delayed to process some tasks} - METHOD method_40067 crash (Ljava/lang/IllegalStateException;)V + METHOD method_40067 crash (Ljava/lang/IllegalStateException;Ljava/lang/String;)Lnet/minecraft/class_148; ARG 1 exception METHOD method_40068 (Ljava/lang/StringBuilder;Lnet/minecraft/class_3193;)V ARG 1 chunkHolder diff --git a/mappings/net/minecraft/structure/BastionRemnantGenerator.mapping b/mappings/net/minecraft/structure/BastionRemnantGenerator.mapping index e3e75dc01d..87fdbf9d82 100644 --- a/mappings/net/minecraft/structure/BastionRemnantGenerator.mapping +++ b/mappings/net/minecraft/structure/BastionRemnantGenerator.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_5179 net/minecraft/structure/BastionRemnantGenerator - FIELD field_25941 STRUCTURE_POOLS Lnet/minecraft/class_3785; + FIELD field_25941 STRUCTURE_POOLS Lnet/minecraft/class_6880; METHOD method_27201 init ()V diff --git a/mappings/net/minecraft/structure/DesertVillageData.mapping b/mappings/net/minecraft/structure/DesertVillageData.mapping index 35b4eafba2..b3729107a4 100644 --- a/mappings/net/minecraft/structure/DesertVillageData.mapping +++ b/mappings/net/minecraft/structure/DesertVillageData.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3868 net/minecraft/structure/DesertVillageData - FIELD field_25948 STRUCTURE_POOLS Lnet/minecraft/class_3785; + FIELD field_25948 STRUCTURE_POOLS Lnet/minecraft/class_6880; METHOD method_17037 init ()V diff --git a/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping b/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping index 4406d0ce0b..dc1f55286d 100644 --- a/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping +++ b/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3791 net/minecraft/structure/PillagerOutpostGenerator - FIELD field_26252 STRUCTURE_POOLS Lnet/minecraft/class_3785; + FIELD field_26252 STRUCTURE_POOLS Lnet/minecraft/class_6880; METHOD method_27235 init ()V diff --git a/mappings/net/minecraft/structure/PlainsVillageData.mapping b/mappings/net/minecraft/structure/PlainsVillageData.mapping index 5d95d4c118..12e6f8195b 100644 --- a/mappings/net/minecraft/structure/PlainsVillageData.mapping +++ b/mappings/net/minecraft/structure/PlainsVillageData.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3815 net/minecraft/structure/PlainsVillageData - FIELD field_26253 STRUCTURE_POOLS Lnet/minecraft/class_3785; + FIELD field_26253 STRUCTURE_POOLS Lnet/minecraft/class_6880; METHOD method_16754 init ()V diff --git a/mappings/net/minecraft/structure/SavannaVillageData.mapping b/mappings/net/minecraft/structure/SavannaVillageData.mapping index a487808601..70cd68e25d 100644 --- a/mappings/net/minecraft/structure/SavannaVillageData.mapping +++ b/mappings/net/minecraft/structure/SavannaVillageData.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3834 net/minecraft/structure/SavannaVillageData - FIELD field_26285 STRUCTURE_POOLS Lnet/minecraft/class_3785; + FIELD field_26285 STRUCTURE_POOLS Lnet/minecraft/class_6880; METHOD method_16844 init ()V diff --git a/mappings/net/minecraft/structure/SnowyVillageData.mapping b/mappings/net/minecraft/structure/SnowyVillageData.mapping index 3c65a0240f..597d21cf92 100644 --- a/mappings/net/minecraft/structure/SnowyVillageData.mapping +++ b/mappings/net/minecraft/structure/SnowyVillageData.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3836 net/minecraft/structure/SnowyVillageData - FIELD field_26286 STRUCTURE_POOLS Lnet/minecraft/class_3785; + FIELD field_26286 STRUCTURE_POOLS Lnet/minecraft/class_6880; METHOD method_16845 init ()V diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index d6a4e13ea3..6509d63f20 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -76,8 +76,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_15179 spawnEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;Z)V ARG 1 world ARG 2 pos - ARG 3 mirror - ARG 4 rotation ARG 5 pivot ARG 6 area ARG 7 initializeMobs @@ -108,7 +106,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_17916 getEntity (Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional; ARG 0 world ARG 1 nbt - METHOD method_17917 (Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_243;ZLnet/minecraft/class_5425;Lnet/minecraft/class_2487;Lnet/minecraft/class_1297;)V + METHOD method_17917 (Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_243;ZLnet/minecraft/class_5425;Lnet/minecraft/class_2487;Lnet/minecraft/class_1297;)V ARG 6 entity METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V ARG 0 world diff --git a/mappings/net/minecraft/structure/TaigaVillageData.mapping b/mappings/net/minecraft/structure/TaigaVillageData.mapping index ce20a30376..9c616d60ce 100644 --- a/mappings/net/minecraft/structure/TaigaVillageData.mapping +++ b/mappings/net/minecraft/structure/TaigaVillageData.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3870 net/minecraft/structure/TaigaVillageData - FIELD field_26341 STRUCTURE_POOLS Lnet/minecraft/class_3785; + FIELD field_26341 STRUCTURE_POOLS Lnet/minecraft/class_6880; METHOD method_17038 init ()V diff --git a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping index 13e5092b8c..3b11fb0d43 100644 --- a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_3776 net/minecraft/structure/pool/FeaturePoolElement - FIELD field_16661 feature Ljava/util/function/Supplier; + FIELD field_16661 feature Lnet/minecraft/class_6880; FIELD field_16662 nbt Lnet/minecraft/class_2487; FIELD field_24948 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/function/Supplier;Lnet/minecraft/class_3785$class_3786;)V - ARG 1 feature + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3785$class_3786;)V ARG 2 projection METHOD method_19299 createDefaultJigsawNbt ()Lnet/minecraft/class_2487; METHOD method_28871 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping index a05c2f0203..0e89568f2b 100644 --- a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement - FIELD field_16674 processors Ljava/util/function/Supplier; + FIELD field_16674 processors Lnet/minecraft/class_6880; FIELD field_24015 location Lcom/mojang/datafixers/util/Either; - METHOD (Lcom/mojang/datafixers/util/Either;Ljava/util/function/Supplier;Lnet/minecraft/class_3785$class_3786;)V + METHOD (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_6880;Lnet/minecraft/class_3785$class_3786;)V ARG 1 location - ARG 2 processors ARG 3 projection METHOD (Lnet/minecraft/class_3499;)V ARG 1 structure diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index 9b5e891ba5..6e85064344 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -37,15 +37,14 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 6 box METHOD method_16757 getType ()Lnet/minecraft/class_3816; METHOD method_19308 getGroundLevelDelta ()I - METHOD method_30421 ofFeature (Lnet/minecraft/class_6796;)Ljava/util/function/Function; - METHOD method_30422 (Lnet/minecraft/class_6796;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3776; + METHOD method_30421 ofFeature (Lnet/minecraft/class_6880;)Ljava/util/function/Function; + METHOD method_30422 (Lnet/minecraft/class_6880;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3776; ARG 1 projection METHOD method_30425 ofLegacySingle (Ljava/lang/String;)Ljava/util/function/Function; ARG 0 id - METHOD method_30426 ofProcessedLegacySingle (Ljava/lang/String;Lnet/minecraft/class_5497;)Ljava/util/function/Function; + METHOD method_30426 ofProcessedLegacySingle (Ljava/lang/String;Lnet/minecraft/class_6880;)Ljava/util/function/Function; ARG 0 id - ARG 1 processors - METHOD method_30427 (Ljava/lang/String;Lnet/minecraft/class_5497;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3781; + METHOD method_30427 (Ljava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3781; ARG 2 projection METHOD method_30428 (Ljava/lang/String;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3781; ARG 1 projection @@ -56,11 +55,6 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 0 projection METHOD method_30434 ofSingle (Ljava/lang/String;)Ljava/util/function/Function; ARG 0 id - METHOD method_30435 ofProcessedSingle (Ljava/lang/String;Lnet/minecraft/class_5497;)Ljava/util/function/Function; + METHOD method_30435 ofProcessedSingle (Ljava/lang/String;Lnet/minecraft/class_6880;)Ljava/util/function/Function; ARG 0 id - ARG 1 processors - METHOD method_30436 (Ljava/lang/String;Lnet/minecraft/class_5497;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_5188; - ARG 2 projection - METHOD method_30437 (Ljava/lang/String;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_5188; - ARG 1 projection METHOD method_30438 ofEmpty ()Ljava/util/function/Function; diff --git a/mappings/net/minecraft/structure/pool/StructurePools.mapping b/mappings/net/minecraft/structure/pool/StructurePools.mapping index 6e4ef2465b..de3c0218b3 100644 --- a/mappings/net/minecraft/structure/pool/StructurePools.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePools.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_5468 net/minecraft/structure/pool/StructurePools FIELD field_26254 EMPTY Lnet/minecraft/class_5321; - FIELD field_26255 INVALID Lnet/minecraft/class_3785; - METHOD method_30599 initDefaultPools ()Lnet/minecraft/class_3785; - METHOD method_30600 register (Lnet/minecraft/class_3785;)Lnet/minecraft/class_3785; + FIELD field_26255 INVALID Lnet/minecraft/class_6880; + METHOD method_30599 initDefaultPools ()Lnet/minecraft/class_6880; + METHOD method_30600 register (Lnet/minecraft/class_3785;)Lnet/minecraft/class_6880; ARG 0 templatePool diff --git a/mappings/net/minecraft/structure/processor/ProtectedBlocksStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/ProtectedBlocksStructureProcessor.mapping index 8ee2cae9a9..7f8b16825e 100644 --- a/mappings/net/minecraft/structure/processor/ProtectedBlocksStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/ProtectedBlocksStructureProcessor.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_6378 net/minecraft/structure/processor/ProtectedBlocksStructureProcessor - FIELD field_33771 protectedBlocksTag Lnet/minecraft/class_2960; + FIELD field_33771 protectedBlocksTag Lnet/minecraft/class_6862; FIELD field_33772 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 protectedBlocksTag diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping index 83bf14caeb..c08e349e5d 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_5469 net/minecraft/structure/processor/StructureProcessorLists FIELD field_26621 BLACKSTONE_TO_GILDED_BLACKSTONE Lnet/minecraft/class_3821; FIELD field_26622 GILDED_BLACKSTONE_TO_BLACKSTONE Lnet/minecraft/class_3821; - METHOD method_30601 register (Ljava/lang/String;Lcom/google/common/collect/ImmutableList;)Lnet/minecraft/class_5497; + METHOD method_30601 register (Ljava/lang/String;Lcom/google/common/collect/ImmutableList;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 processorList diff --git a/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping index e5458ac3e2..e60721b977 100644 --- a/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3798 net/minecraft/structure/rule/TagMatchRuleTest - FIELD field_16747 tag Lnet/minecraft/class_3494; + FIELD field_16747 tag Lnet/minecraft/class_6862; FIELD field_25014 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3494;)V + METHOD (Lnet/minecraft/class_6862;)V ARG 1 tag diff --git a/mappings/net/minecraft/tag/BlockTags.mapping b/mappings/net/minecraft/tag/BlockTags.mapping index 0dd72f895f..a13f7c8da8 100644 --- a/mappings/net/minecraft/tag/BlockTags.mapping +++ b/mappings/net/minecraft/tag/BlockTags.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_3481 net/minecraft/tag/BlockTags - FIELD field_23678 REQUIRED_TAGS Lnet/minecraft/class_5120; - METHOD method_15069 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; + METHOD method_15069 register (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id - METHOD method_15073 getTagGroup ()Lnet/minecraft/class_5414; diff --git a/mappings/net/minecraft/tag/EntityTypeTags.mapping b/mappings/net/minecraft/tag/EntityTypeTags.mapping index 295142d67e..246f548295 100644 --- a/mappings/net/minecraft/tag/EntityTypeTags.mapping +++ b/mappings/net/minecraft/tag/EntityTypeTags.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_3483 net/minecraft/tag/EntityTypeTags - FIELD field_23679 REQUIRED_TAGS Lnet/minecraft/class_5120; - METHOD method_15077 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; + METHOD method_15077 register (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id - METHOD method_15082 getTagGroup ()Lnet/minecraft/class_5414; diff --git a/mappings/net/minecraft/tag/FluidTags.mapping b/mappings/net/minecraft/tag/FluidTags.mapping index 56c64b82df..01bceea047 100644 --- a/mappings/net/minecraft/tag/FluidTags.mapping +++ b/mappings/net/minecraft/tag/FluidTags.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_3486 net/minecraft/tag/FluidTags - FIELD field_23680 REQUIRED_TAGS Lnet/minecraft/class_5120; - FIELD field_28298 TAGS Ljava/util/List; - METHOD method_15095 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; + METHOD method_15095 register (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id - METHOD method_33145 getTags ()Ljava/util/List; - METHOD method_34889 getTagGroup ()Lnet/minecraft/class_5414; diff --git a/mappings/net/minecraft/tag/GameEventTags.mapping b/mappings/net/minecraft/tag/GameEventTags.mapping index d6e729477b..d7ec61722b 100644 --- a/mappings/net/minecraft/tag/GameEventTags.mapping +++ b/mappings/net/minecraft/tag/GameEventTags.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_5698 net/minecraft/tag/GameEventTags - FIELD field_28092 REQUIRED_TAGS Lnet/minecraft/class_5120; - METHOD method_32823 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; + METHOD method_32823 register (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id - METHOD method_34890 getTagGroup ()Lnet/minecraft/class_5414; diff --git a/mappings/net/minecraft/tag/ItemTags.mapping b/mappings/net/minecraft/tag/ItemTags.mapping index b5bb3c28fe..da27e42b62 100644 --- a/mappings/net/minecraft/tag/ItemTags.mapping +++ b/mappings/net/minecraft/tag/ItemTags.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_3489 net/minecraft/tag/ItemTags - FIELD field_23681 REQUIRED_TAGS Lnet/minecraft/class_5120; - METHOD method_15102 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; + METHOD method_15102 register (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id - METHOD method_15106 getTagGroup ()Lnet/minecraft/class_5414; diff --git a/mappings/net/minecraft/tag/RequiredTagList.mapping b/mappings/net/minecraft/tag/RequiredTagList.mapping deleted file mode 100644 index 49d9cbf8b0..0000000000 --- a/mappings/net/minecraft/tag/RequiredTagList.mapping +++ /dev/null @@ -1,39 +0,0 @@ -CLASS net/minecraft/class_5120 net/minecraft/tag/RequiredTagList - COMMENT Stores all required tags of a given type, so they can be updated to point to the new tag instances on datapack reload. - COMMENT - COMMENT

The propagation of data pack reload is done by {@link RequiredTagListRegistry}. - FIELD field_23682 group Lnet/minecraft/class_5414; - FIELD field_23683 tags Ljava/util/List; - FIELD field_28301 registryKey Lnet/minecraft/class_5321; - FIELD field_28302 dataType Ljava/lang/String; - METHOD (Lnet/minecraft/class_5321;Ljava/lang/String;)V - ARG 1 registryKey - ARG 2 dataType - METHOD method_26770 getGroup ()Lnet/minecraft/class_5414; - METHOD method_26771 updateTagManager (Lnet/minecraft/class_5415;)V - ARG 1 tagManager - METHOD method_26772 (Lnet/minecraft/class_5414;Lnet/minecraft/class_5120$class_5121;)V - ARG 1 tag - METHOD method_26773 add (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; - ARG 1 id - METHOD method_27061 clearAllTags ()V - METHOD method_27062 (Lnet/minecraft/class_3494;Lnet/minecraft/class_5120$class_5121;)V - ARG 1 tag - METHOD method_27063 (Lnet/minecraft/class_3494;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; - ARG 1 id - METHOD method_29224 getMissingTags (Lnet/minecraft/class_5415;)Ljava/util/Set; - COMMENT Gets the required tags which are not supplied by the current datapacks. - ARG 1 tagManager - METHOD method_33147 addToManager (Lnet/minecraft/class_5415$class_5749;)V - ARG 1 manager - METHOD method_33148 getRegistryKey ()Lnet/minecraft/class_5321; - COMMENT {@return the registry key representing the type of object in this list} - METHOD method_33149 getDataType ()Ljava/lang/String; - CLASS class_5121 TagWrapper - FIELD field_23684 id Lnet/minecraft/class_2960; - FIELD field_23685 delegate Lnet/minecraft/class_3494; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id - METHOD method_26775 updateDelegate (Ljava/util/function/Function;)V - ARG 1 tagFactory - METHOD method_26776 get ()Lnet/minecraft/class_3494; diff --git a/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping b/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping deleted file mode 100644 index 54174f5602..0000000000 --- a/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping +++ /dev/null @@ -1,36 +0,0 @@ -CLASS net/minecraft/class_5413 net/minecraft/tag/RequiredTagListRegistry - FIELD field_25741 ALL Ljava/util/List; - FIELD field_28303 REQUIRED_LIST_KEYS Ljava/util/Set; - METHOD method_30196 clearAllTags ()V - METHOD method_30198 updateTagManager (Lnet/minecraft/class_5415;)V - ARG 0 tagManager - METHOD method_30199 (Lnet/minecraft/class_5415;Lnet/minecraft/class_5120;)V - ARG 1 list - METHOD method_30200 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_5415;Lnet/minecraft/class_5120;)V - ARG 2 list - METHOD method_30201 register (Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_5120; - COMMENT Creates and registers a required tag list. - COMMENT - COMMENT

The registered tag must be in the set returned by {@link #getBuiltinTags()}, - COMMENT or the registry will fail {@linkplain #validate() validation}. - COMMENT - COMMENT @return the created and registered list - COMMENT @throws IllegalStateException if there is a list with a duplicate {@code registryKey} - ARG 0 registryKey - COMMENT the key representing the element type of the tags - ARG 1 dataType - COMMENT the data type, or ID's path prefix, for the tag JSONs in the data pack - METHOD method_30202 validateRegistrations ()V - METHOD method_30203 getMissingTags (Lnet/minecraft/class_5415;)Lcom/google/common/collect/Multimap; - ARG 0 tagManager - METHOD method_33150 (Lnet/minecraft/class_5415$class_5749;Lnet/minecraft/class_5120;)V - ARG 1 list - METHOD method_33151 forEach (Ljava/util/function/Consumer;)V - ARG 0 consumer - METHOD method_33152 createBuiltinTagManager ()Lnet/minecraft/class_5415; - METHOD method_33153 getBuiltinTags ()Ljava/util/Set; - METHOD method_33154 validate ()V - COMMENT Ensures that each key in {@link #REQUIRED_LIST_KEYS} have a corresponding list - COMMENT in the return value of {@link #getBuiltinTags()}. - COMMENT - COMMENT @throws IllegalStateException when the validation fails diff --git a/mappings/net/minecraft/tag/ServerTagManagerHolder.mapping b/mappings/net/minecraft/tag/ServerTagManagerHolder.mapping deleted file mode 100644 index 1b310d9e24..0000000000 --- a/mappings/net/minecraft/tag/ServerTagManagerHolder.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_5323 net/minecraft/tag/ServerTagManagerHolder - COMMENT A class containing the single static instance of {@link TagManager} on the server. - FIELD field_25149 tagManager Lnet/minecraft/class_5415; - METHOD method_29219 setTagManager (Lnet/minecraft/class_5415;)V - ARG 0 tagManager - METHOD method_29223 getTagManager ()Lnet/minecraft/class_5415; diff --git a/mappings/net/minecraft/tag/SetTag.mapping b/mappings/net/minecraft/tag/SetTag.mapping deleted file mode 100644 index ead648fa60..0000000000 --- a/mappings/net/minecraft/tag/SetTag.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_5394 net/minecraft/tag/SetTag - FIELD field_25591 type Ljava/lang/Class; - FIELD field_25593 valueList Lcom/google/common/collect/ImmutableList; - FIELD field_25594 valueSet Ljava/util/Set; - METHOD (Ljava/util/Set;Ljava/lang/Class;)V - ARG 1 values - ARG 2 type - METHOD method_29898 empty ()Lnet/minecraft/class_5394; - METHOD method_29899 getCommonType (Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/Class; - ARG 0 first - ARG 1 second - METHOD method_29900 of (Ljava/util/Set;)Lnet/minecraft/class_5394; - ARG 0 values - METHOD method_29901 getCommonType (Ljava/util/Set;)Ljava/lang/Class; - ARG 0 values diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping index 334adfdc8d..e37f75c05b 100644 --- a/mappings/net/minecraft/tag/Tag.mapping +++ b/mappings/net/minecraft/tag/Tag.mapping @@ -10,16 +10,6 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag COMMENT

Its entries' iteration may be ordered COMMENT or unordered, depending on the configuration from the tag builder. METHOD method_15138 values ()Ljava/util/List; - METHOD method_15141 contains (Ljava/lang/Object;)Z - ARG 1 entry - METHOD method_15142 getRandom (Ljava/util/Random;)Ljava/util/Optional; - ARG 1 random - METHOD method_26777 of (Ljava/util/Set;)Lnet/minecraft/class_3494; - ARG 0 values - METHOD method_28134 codec (Ljava/util/function/Supplier;)Lcom/mojang/serialization/Codec; - ARG 0 groupGetter - METHOD method_28136 (Ljava/util/function/Supplier;Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; - ARG 1 id CLASS class_3495 Builder COMMENT A builder class to ease the creation of tags. It can also be used as a COMMENT mutable form of a tag. @@ -80,16 +70,14 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag FIELD field_23689 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id - CLASS class_5123 Identified - METHOD method_26791 getId ()Lnet/minecraft/class_2960; CLASS class_5145 TrackedEntry - FIELD field_23805 entry Lnet/minecraft/class_3494$class_3496; - FIELD field_23806 source Ljava/lang/String; + FIELD comp_324 entry Lnet/minecraft/class_3494$class_3496; + FIELD comp_325 source Ljava/lang/String; METHOD (Lnet/minecraft/class_3494$class_3496;Ljava/lang/String;)V ARG 1 entry ARG 2 source - METHOD method_27067 getEntry ()Lnet/minecraft/class_3494$class_3496; - METHOD method_34893 getSource ()Ljava/lang/String; + METHOD comp_324 entry ()Lnet/minecraft/class_3494$class_3496; + METHOD comp_325 source ()Ljava/lang/String; CLASS class_5479 OptionalObjectEntry FIELD field_26383 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V diff --git a/mappings/net/minecraft/tag/TagGroup.mapping b/mappings/net/minecraft/tag/TagGroup.mapping deleted file mode 100644 index 7b0fa65158..0000000000 --- a/mappings/net/minecraft/tag/TagGroup.mapping +++ /dev/null @@ -1,52 +0,0 @@ -CLASS net/minecraft/class_5414 net/minecraft/tag/TagGroup - COMMENT Contains the set of tags all of the same type. - METHOD method_30204 getTags ()Ljava/util/Map; - METHOD method_30205 getUncheckedTagId (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2960; - ARG 1 tag - METHOD method_30206 getTagsFor (Ljava/lang/Object;)Ljava/util/Collection; - COMMENT Gets the identifiers of all tags an object is applicable to. - ARG 1 object - METHOD method_30207 create (Ljava/util/Map;)Lnet/minecraft/class_5414; - ARG 0 tags - METHOD method_30208 serialize (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5414$class_5748; - COMMENT Serializes this tag group. - ARG 1 registry - METHOD method_30210 getTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; - ARG 1 id - METHOD method_30211 getTagIds ()Ljava/util/Collection; - METHOD method_30213 getTagOrEmpty (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; - ARG 1 id - METHOD method_30214 createEmpty ()Lnet/minecraft/class_5414; - METHOD method_33155 deserialize (Lnet/minecraft/class_5414$class_5748;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5414; - COMMENT Deserializes a serialized tag group. - ARG 0 serialized - ARG 1 registry - METHOD method_33156 (Lnet/minecraft/class_2378;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3494;)V - ARG 2 id - ARG 3 tag - METHOD method_33157 (Lnet/minecraft/class_2378;Ljava/util/Map;Lnet/minecraft/class_2960;Lit/unimi/dsi/fastutil/ints/IntList;)V - ARG 2 id - ARG 3 entries - METHOD method_34894 getId (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2960; - ARG 1 tag - METHOD method_34895 contains (Lnet/minecraft/class_2960;)Z - ARG 1 id - CLASS 1 - FIELD field_25742 tags Lcom/google/common/collect/BiMap; - FIELD field_25743 emptyTag Lnet/minecraft/class_3494; - CLASS class_5748 Serialized - COMMENT A serialization-friendly POJO representation of a {@linkplain - COMMENT TagGroup tag group}. This allows easy transport of tag groups - COMMENT over Minecraft network protocol. - COMMENT - COMMENT

This stores tag entries with raw integer IDs and requires a registry - COMMENT for raw ID access to {@linkplain TagGroup#serialize(Registry) serialize} - COMMENT or {@linkplain TagGroup#deserialize(TagGroup.Serialized, Registry) - COMMENT deserialize} tag groups. - FIELD field_28304 contents Ljava/util/Map; - METHOD (Ljava/util/Map;)V - ARG 1 contents - METHOD method_33159 writeBuf (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_33160 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5414$class_5748; - ARG 0 buf diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping index b598c1b1ca..8fd452cb9d 100644 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -8,11 +8,11 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader METHOD (Ljava/util/function/Function;Ljava/lang/String;)V ARG 1 registryGetter ARG 2 dataType - METHOD method_18242 buildGroup (Ljava/util/Map;)Lnet/minecraft/class_5414; + METHOD method_18242 buildGroup (Ljava/util/Map;)Ljava/util/Map; ARG 1 tags METHOD method_26799 (Lnet/minecraft/class_2960;)Ljava/lang/Object; ARG 1 id METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map; ARG 1 manager - METHOD method_33176 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5414; + METHOD method_33176 load (Lnet/minecraft/class_3300;)Ljava/util/Map; ARG 1 manager diff --git a/mappings/net/minecraft/tag/TagManager.mapping b/mappings/net/minecraft/tag/TagManager.mapping deleted file mode 100644 index 88ced70d8a..0000000000 --- a/mappings/net/minecraft/tag/TagManager.mapping +++ /dev/null @@ -1,51 +0,0 @@ -CLASS net/minecraft/class_5415 net/minecraft/tag/TagManager - FIELD field_25744 EMPTY Lnet/minecraft/class_5415; - FIELD field_28305 LOGGER Lorg/slf4j/Logger; - FIELD field_28306 tagGroups Ljava/util/Map; - METHOD (Ljava/util/Map;)V - ARG 1 tagGroups - METHOD method_30217 toPacket (Lnet/minecraft/class_5455;)Ljava/util/Map; - ARG 1 registryManager - METHOD method_30219 fromPacket (Lnet/minecraft/class_5455;Ljava/util/Map;)Lnet/minecraft/class_5415; - ARG 0 registryManager - ARG 1 groups - METHOD method_30222 apply ()V - METHOD method_33161 accept (Lnet/minecraft/class_5415$class_5750;)V - ARG 1 visitor - METHOD method_33162 offerTo (Lnet/minecraft/class_5415$class_5750;Lnet/minecraft/class_5321;Lnet/minecraft/class_5414;)V - ARG 0 visitor - ARG 1 type - ARG 2 group - METHOD method_33163 tryAdd (Lnet/minecraft/class_5455;Lnet/minecraft/class_5415$class_5749;Lnet/minecraft/class_5321;Lnet/minecraft/class_5414$class_5748;)V - ARG 0 registryManager - ARG 1 builder - ARG 2 type - ARG 3 group - METHOD method_33164 getOrCreateTagGroup (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5414; - ARG 1 registryKey - METHOD method_33165 getTagId (Lnet/minecraft/class_5321;Lnet/minecraft/class_3494;Ljava/util/function/Supplier;)Lnet/minecraft/class_2960; - ARG 1 registryKey - ARG 2 tag - ARG 3 exceptionSupplier - METHOD method_33166 getTag (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;Ljava/util/function/Function;)Lnet/minecraft/class_3494; - ARG 1 registryKey - ARG 2 id - ARG 3 exceptionFactory - METHOD method_33168 (Lnet/minecraft/class_5415$class_5750;Lnet/minecraft/class_5321;Lnet/minecraft/class_5414;)V - ARG 1 type - ARG 2 group - METHOD method_33169 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5415$class_5749;Lnet/minecraft/class_5321;Lnet/minecraft/class_5414$class_5748;)V - ARG 2 type - ARG 3 group - METHOD method_33170 getTagGroup (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5414; - ARG 1 registryKey - CLASS class_5749 Builder - FIELD field_28310 groups Lcom/google/common/collect/ImmutableMap$Builder; - METHOD method_33171 build ()Lnet/minecraft/class_5415; - METHOD method_33172 add (Lnet/minecraft/class_5321;Lnet/minecraft/class_5414;)Lnet/minecraft/class_5415$class_5749; - ARG 1 type - ARG 2 tagGroup - CLASS class_5750 Visitor - METHOD method_33173 visit (Lnet/minecraft/class_5321;Lnet/minecraft/class_5414;)V - ARG 1 type - ARG 2 group diff --git a/mappings/net/minecraft/tag/TagManagerLoader.mapping b/mappings/net/minecraft/tag/TagManagerLoader.mapping index 7661a22d34..d9cb314ed3 100644 --- a/mappings/net/minecraft/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/tag/TagManagerLoader.mapping @@ -1,25 +1,8 @@ CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader - FIELD field_25749 tagManager Lnet/minecraft/class_5415; - FIELD field_28311 LOGGER Lorg/slf4j/Logger; FIELD field_28312 registryManager Lnet/minecraft/class_5455; METHOD (Lnet/minecraft/class_5455;)V ARG 1 registryManager - METHOD method_30223 getTagManager ()Lnet/minecraft/class_5415; - METHOD method_30224 (Lnet/minecraft/class_3505$class_5751;)Ljava/util/concurrent/CompletableFuture; - ARG 0 requiredGroup - METHOD method_33178 buildRequiredGroup (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5120;)Lnet/minecraft/class_3505$class_5751; + METHOD method_33178 buildRequiredGroup (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5455$class_6892;)Ljava/util/concurrent/CompletableFuture; ARG 1 resourceManager ARG 2 prepareExecutor ARG 3 requirement - METHOD method_33179 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/List;Lnet/minecraft/class_5120;)V - ARG 4 requiredTagList - METHOD method_33180 (Lnet/minecraft/class_5415$class_5749;Lnet/minecraft/class_3505$class_5751;)V - ARG 1 requiredGroup - CLASS class_5751 RequiredGroup - FIELD field_28313 requirement Lnet/minecraft/class_5120; - FIELD field_28314 groupLoadFuture Ljava/util/concurrent/CompletableFuture; - METHOD (Lnet/minecraft/class_5120;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 requirement - ARG 2 groupLoadFuture - METHOD method_33183 addTo (Lnet/minecraft/class_5415$class_5749;)V - ARG 1 builder diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 35c90bef8b..a9fd19624d 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -5,24 +5,13 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer FIELD field_33160 GAME_RULES Lnet/minecraft/class_1928; FIELD field_33161 TEST_LEVEL Lnet/minecraft/class_1940; FIELD field_33162 testSet Lnet/minecraft/class_4524; - METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_5455$class_5457;)V + METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Collection;Lnet/minecraft/class_2338;)V ARG 1 serverThread ARG 2 session ARG 3 dataPackManager ARG 4 serverResourceManager ARG 5 batches ARG 6 pos - ARG 7 registryManager - METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V - ARG 1 serverThread - ARG 2 session - ARG 3 dataPackManager - ARG 4 serverResourceManager - ARG 5 batches - ARG 6 pos - ARG 7 registryManager - ARG 8 biomeRegistry - ARG 9 dimensionTypeRegistry METHOD method_36094 (Lnet/minecraft/class_1928;)V ARG 0 gameRules METHOD method_36095 (Lnet/minecraft/class_4517;)V diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6876.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6876.mapping new file mode 100644 index 0000000000..cf0ea2fd9d --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo6876.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_6876 net/minecraft/unused/packageinfo/PackageInfo6876 diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 8677e7546b..a4ce8716da 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -44,12 +44,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 v METHOD method_36973 nonEmptyList (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 originalCodec - METHOD method_37349 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; - ARG 0 suppliers - METHOD method_37350 (Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult; - ARG 0 supplier - METHOD method_37351 createPresentValuesChecker ()Ljava/util/function/Function; - METHOD method_37352 createPresentValueChecker ()Ljava/util/function/Function; METHOD method_37928 rangedFloat (FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 min ARG 1 max diff --git a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping index 62ce3a1257..c958c6fe46 100644 --- a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping +++ b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping @@ -24,7 +24,7 @@ CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader CLASS class_5507 Impl FIELD field_26741 values Ljava/util/Map; FIELD field_36187 LOGGER Lorg/slf4j/Logger; - METHOD method_31159 add (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Encoder;ILjava/lang/Object;Lcom/mojang/serialization/Lifecycle;)V + METHOD method_31159 add (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Encoder;ILjava/lang/Object;Lcom/mojang/serialization/Lifecycle;)V ARG 1 registryManager ARG 2 key ARG 3 encoder diff --git a/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping deleted file mode 100644 index 988f898de4..0000000000 --- a/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping +++ /dev/null @@ -1,28 +0,0 @@ -CLASS net/minecraft/class_5380 net/minecraft/util/dynamic/RegistryCodec - COMMENT A codec for {@link SimpleRegistry}. - COMMENT - COMMENT

Compared to regular codec, this codec performs additional work when - COMMENT decoding, loading its elements from the given resource manager's JSON - COMMENT files. - COMMENT - COMMENT @param the registry's element type - COMMENT @see RegistryElementCodec - COMMENT @see RegistryOps - FIELD field_25504 delegate Lcom/mojang/serialization/Codec; - FIELD field_25505 registryRef Lnet/minecraft/class_5321; - FIELD field_25506 elementCodec Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)V - ARG 1 registryRef - ARG 2 lifecycle - ARG 3 codec - METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - ARG 2 input - METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 input - ARG 2 ops - ARG 3 prefix - METHOD method_29745 of (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5380; - ARG 0 registryRef - ARG 1 lifecycle - ARG 2 codec diff --git a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping index f3560f3f7c..33282895f2 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping @@ -17,9 +17,6 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec ARG 1 registryRef ARG 2 elementCodec ARG 3 allowInlineDefinitions - METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - ARG 2 input METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 input ARG 2 ops @@ -31,6 +28,3 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec ARG 0 registryRef ARG 1 elementCodec ARG 2 allowInlineDefinitions - METHOD method_31194 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 0 registryRef - ARG 1 elementCodec diff --git a/mappings/net/minecraft/util/dynamic/RegistryLookupCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryLookupCodec.mapping deleted file mode 100644 index 183b41c7c4..0000000000 --- a/mappings/net/minecraft/util/dynamic/RegistryLookupCodec.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_5505 net/minecraft/util/dynamic/RegistryLookupCodec - FIELD field_26737 registryKey Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_5321;)V - ARG 1 registryKey - METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; - ARG 1 registry - METHOD method_31148 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5505; - ARG 0 registryKey diff --git a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping deleted file mode 100644 index 1660d0af6e..0000000000 --- a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping +++ /dev/null @@ -1,58 +0,0 @@ -CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps - FIELD field_25511 registryManager Lnet/minecraft/class_5455; - FIELD field_25512 valueHolders Ljava/util/Map; - FIELD field_26738 entryLoader Lnet/minecraft/class_5506; - FIELD field_26739 entryOps Lnet/minecraft/class_5382; - METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5506;Lnet/minecraft/class_5455;Ljava/util/IdentityHashMap;)V - ARG 1 delegate - ARG 2 entryLoader - ARG 3 registryManager - ARG 4 valueHolders - METHOD method_29753 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; - ARG 0 delegate - ARG 1 resourceManager - ARG 2 registryManager - METHOD method_29755 loadToRegistry (Lnet/minecraft/class_2370;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; - COMMENT Loads elements into a registry just loaded from a decoder. - ARG 1 registry - ARG 2 key - ARG 3 codec - METHOD method_29759 decodeOrId (Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/DataResult; - COMMENT Encode an id for a registry element than a full object if possible. - COMMENT - COMMENT

This method is called by casting an arbitrary dynamic ops to a registry - COMMENT reading ops. - COMMENT - COMMENT @see RegistryReadingOps#encodeOrId(Object, Object, RegistryKey, Codec) - ARG 2 key - ARG 3 codec - ARG 4 allowInlineDefinitions - METHOD method_29761 getValueHolder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5382$class_5383; - ARG 1 registryRef - METHOD method_29763 readSupplier (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; - COMMENT Reads a supplier for a registry element. - COMMENT - COMMENT

This logic is used by both {@code decodeOrId} and {@code loadToRegistry}. - ARG 3 codec - METHOD method_31150 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5506;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; - ARG 0 delegate - ARG 1 entryLoader - ARG 2 registryManager - METHOD method_31152 getRegistry (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; - ARG 1 key - METHOD method_36574 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; - ARG 0 ops - ARG 1 resourceManager - ARG 2 registryManager - METHOD method_36575 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5506;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; - ARG 0 ops - ARG 1 entryLoader - ARG 2 registryManager - METHOD method_39743 createEntrySupplier (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/function/Supplier; - ARG 0 registry - ARG 1 key - METHOD method_39744 createLazyEntrySupplier (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;)Ljava/util/function/Supplier; - ARG 0 registry - ARG 1 key - CLASS class_5383 ValueHolder - FIELD field_25513 values Ljava/util/Map; diff --git a/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping deleted file mode 100644 index 7e40f61ad4..0000000000 --- a/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping +++ /dev/null @@ -1,22 +0,0 @@ -CLASS net/minecraft/class_5384 net/minecraft/util/dynamic/RegistryReadingOps - COMMENT A dynamic ops that encode an id for a registry element rather than a full object. - COMMENT - COMMENT @see RegistryElementCodec#encode(Object, DynamicOps, Object) - FIELD field_25514 manager Lnet/minecraft/class_5455; - METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;)V - ARG 1 delegate - ARG 2 tracker - METHOD method_29771 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5384; - ARG 0 delegate - ARG 1 tracker - METHOD method_29772 encodeOrId (Ljava/lang/Object;Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; - COMMENT Encode an id for a registry element than a full object if possible. - COMMENT - COMMENT

This method is called by casting an arbitrary dynamic ops to a registry - COMMENT reading ops. - COMMENT - COMMENT @see RegistryOps#decodeOrId(Object, RegistryKey, Codec, boolean) - ARG 1 input - ARG 2 prefix - ARG 3 registryReference - ARG 4 codec diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping index 696db6de94..8e82ee6c97 100644 --- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping +++ b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping @@ -22,15 +22,11 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries FIELD field_35435 NOISE_PARAMETERS Lnet/minecraft/class_2378; FIELD field_35761 PLACED_FEATURE Lnet/minecraft/class_2378; METHOD method_30559 init ()V - METHOD method_30560 set (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 registry - ARG 1 key - ARG 2 object - METHOD method_30561 add (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; + METHOD method_30561 add (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_6880; ARG 0 registry ARG 1 id ARG 2 object - METHOD method_30562 add (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; + METHOD method_30562 add (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Lnet/minecraft/class_6880; ARG 0 registry ARG 1 id ARG 2 object @@ -49,7 +45,7 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries METHOD method_30566 (Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V ARG 0 id ARG 1 supplier - METHOD method_39203 add (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; + METHOD method_39203 add (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Lnet/minecraft/class_6880; ARG 0 registry ARG 1 key ARG 2 object diff --git a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping index 7dfbafe033..68cd61c752 100644 --- a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping +++ b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2348 net/minecraft/util/registry/DefaultedRegistry FIELD field_11014 defaultId Lnet/minecraft/class_2960; - FIELD field_11015 defaultValue Ljava/lang/Object; - METHOD (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V + FIELD field_11015 defaultValue Lnet/minecraft/class_6880; + METHOD (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;)V ARG 1 defaultId ARG 2 key ARG 3 lifecycle diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index 04784579b4..cdc936e2d5 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -11,37 +11,20 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage COMMENT or configuration of dynamic registries. FIELD field_25918 LOGGER Lorg/slf4j/Logger; FIELD field_25919 INFOS Ljava/util/Map; - FIELD field_26733 BUILTIN Lnet/minecraft/class_5455$class_5457; - METHOD method_30519 load (Lnet/minecraft/class_5455;Lnet/minecraft/class_5382;)V + FIELD field_26733 BUILTIN Ljava/util/function/Supplier; + METHOD method_30519 load (Lnet/minecraft/class_5455$class_6893;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6900;)V COMMENT Loads a dynamic registry manager from the resource manager's data files. - ARG 0 manager - ARG 1 ops METHOD method_30520 register (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V ARG 0 infosBuilder ARG 1 registryRef ARG 2 entryCodec - METHOD method_30524 addBuiltinEntries (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_2378;)V - COMMENT Add all entries of the {@code registry} to the corresponding registry - COMMENT within this manager. - ARG 0 manager - ARG 1 registry - METHOD method_30525 copyFromBuiltin (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5321;)V - COMMENT Add all entries of the registry referred by {@code registryRef} to the - COMMENT corresponding registry within this manager. - ARG 0 manager - ARG 1 registryRef - METHOD method_30526 load (Lnet/minecraft/class_5382;Lnet/minecraft/class_5455;Lnet/minecraft/class_5455$class_5456;)V + METHOD method_30526 load (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6900$class_6901;Lnet/minecraft/class_5455$class_5456;)V COMMENT Loads elements from the {@code ops} into the registry specified by {@code COMMENT info} within the {@code manager}. Note that the resource manager instance COMMENT is kept within the {@code ops}. - ARG 0 ops - ARG 1 manager - ARG 2 info METHOD method_30527 getOptionalMutable (Lnet/minecraft/class_5321;)Ljava/util/Optional; COMMENT Retrieves a registry optionally from this manager. ARG 1 key - METHOD method_30528 create ()Lnet/minecraft/class_5455$class_5457; - COMMENT Creates a default dynamic registry manager. METHOD method_30530 get (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; COMMENT Retrieves a registry from this manager, or throws an exception when the COMMENT registry does not exist. @@ -53,11 +36,11 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage ARG 1 registryRef ARG 2 entryCodec ARG 3 networkEntryCodec - METHOD method_31141 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V + METHOD method_31141 (Lnet/minecraft/class_5455$class_6893;Lnet/minecraft/class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V ARG 0 registryManager ARG 1 entryLoader ARG 2 info - METHOD method_33309 getMutable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2385; + METHOD method_33309 getMutable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; ARG 1 key METHOD method_33310 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 1 key @@ -77,17 +60,3 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage METHOD comp_294 entryCodec ()Lcom/mojang/serialization/Codec; METHOD comp_295 networkEntryCodec ()Lcom/mojang/serialization/Codec; METHOD method_30537 isSynced ()Z - CLASS class_5457 Impl - COMMENT An immutable implementation of the dynamic registry manager, representing - COMMENT a specialized configuration of registries. It has a codec that allows - COMMENT conversion from and to data pack JSON or packet NBT. - FIELD field_25923 CODEC Lcom/mojang/serialization/Codec; - FIELD field_25924 registries Ljava/util/Map; - METHOD (Ljava/util/Map;)V - ARG 1 registries - METHOD method_30538 fromRegistryCodecs (Lcom/mojang/serialization/codecs/UnboundedMapCodec;)Lcom/mojang/serialization/Codec; - METHOD method_30546 setupCodec ()Lcom/mojang/serialization/Codec; - METHOD method_30547 getDataResultForCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; - ARG 0 registryRef - METHOD method_30548 createRegistry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2370; - ARG 0 registryRef diff --git a/mappings/net/minecraft/util/registry/MutableRegistry.mapping b/mappings/net/minecraft/util/registry/MutableRegistry.mapping index 04d41abb77..b26ec39c13 100644 --- a/mappings/net/minecraft/util/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/util/registry/MutableRegistry.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry - METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Ljava/lang/Object; + METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; ARG 1 key ARG 2 entry ARG 3 lifecycle - METHOD method_10273 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Ljava/lang/Object; + METHOD method_10273 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; ARG 1 rawId ARG 2 key ARG 3 entry ARG 4 lifecycle - METHOD method_31062 replace (Ljava/util/OptionalInt;Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Ljava/lang/Object; + METHOD method_31062 replace (Ljava/util/OptionalInt;Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; COMMENT If the given key is already present in the registry, replaces the entry associated with the given COMMENT key with the new entry. This method asserts that the raw ID is equal to the value already in COMMENT the registry. The raw ID not being present may lead to buggy behavior. diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index a9d828c8ee..5f507db3f2 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -150,18 +150,16 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 1 entry METHOD method_10223 get (Lnet/minecraft/class_2960;)Ljava/lang/Object; ARG 1 id - METHOD method_10224 create (Lnet/minecraft/class_5321;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_2348; + METHOD method_10224 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; ARG 0 key ARG 1 defaultId - ARG 2 defaultEntry METHOD method_10226 register (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id ARG 2 entry - METHOD method_10227 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385; + METHOD method_10227 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_2378$class_6889;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385; ARG 0 key ARG 1 registry - ARG 2 defaultEntry ARG 3 lifecycle METHOD method_10230 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry @@ -173,30 +171,26 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 2 id ARG 3 entry METHOD method_10235 getIds ()Ljava/util/Set; - METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object; + METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/util/Optional; ARG 1 random - METHOD method_10247 create (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; + METHOD method_10247 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378; ARG 0 key - ARG 1 defaultEntry METHOD method_10250 containsId (Lnet/minecraft/class_2960;)Z ARG 1 id METHOD method_17966 getOrEmpty (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id - METHOD method_29103 validate (Lnet/minecraft/class_2385;)V - ARG 0 registry + METHOD method_29103 validate (Lnet/minecraft/class_2378;)V METHOD method_29106 createRegistryKey (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 registryId METHOD method_29107 get (Lnet/minecraft/class_5321;)Ljava/lang/Object; ARG 1 key - METHOD method_29108 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; + METHOD method_29108 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378; ARG 0 key ARG 1 lifecycle - ARG 2 defaultEntry - METHOD method_29109 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Supplier;)Lnet/minecraft/class_2348; + METHOD method_29109 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; ARG 0 key ARG 1 defaultId ARG 2 lifecycle - ARG 3 defaultEntry METHOD method_29113 getKey (Ljava/lang/Object;)Ljava/util/Optional; ARG 1 entry METHOD method_29722 getEntries ()Ljava/util/Set; diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index a711e8b21f..c778a2e007 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -1,44 +1,12 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry - FIELD field_11107 idToEntry Lcom/google/common/collect/BiMap; - FIELD field_11108 randomEntries [Ljava/lang/Object; + FIELD field_11107 idToEntry Ljava/util/Map; + FIELD field_11108 randomEntries Ljava/util/List; FIELD field_11109 nextId I - FIELD field_11111 LOGGER Lorg/slf4j/Logger; - FIELD field_25067 keyToEntry Lcom/google/common/collect/BiMap; + FIELD field_25067 keyToEntry Ljava/util/Map; FIELD field_26682 rawIdToEntry Lit/unimi/dsi/fastutil/objects/ObjectList; FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_26731 entryToLifecycle Ljava/util/Map; FIELD field_26732 lifecycle Lcom/mojang/serialization/Lifecycle; - METHOD method_29098 createRegistryManagerCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 0 key - ARG 1 lifecycle - ARG 2 entryCodec - METHOD method_29721 createRegistryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 0 registryRef - ARG 1 lifecycle - ARG 2 entryCodec - METHOD method_30929 createRegistryManagerEntryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; - ARG 0 key - ARG 1 entryCodec - METHOD method_31051 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;Z)Ljava/lang/Object; + METHOD method_31051 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;Z)Lnet/minecraft/class_6880; ARG 1 rawId - ARG 2 key - ARG 3 entry - ARG 4 lifecycle ARG 5 checkDuplicateKeys - METHOD method_31055 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 2 instance - METHOD method_31059 createCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 0 key - ARG 1 lifecycle - ARG 2 entryCodec - CLASS class_5501 RegistryManagerEntry - FIELD comp_290 key Lnet/minecraft/class_5321; - FIELD comp_291 rawId I - FIELD comp_292 entry Ljava/lang/Object; - METHOD (Lnet/minecraft/class_5321;ILjava/lang/Object;)V - ARG 1 key - ARG 2 rawId - ARG 3 entry - METHOD comp_290 key ()Lnet/minecraft/class_5321; - METHOD comp_291 rawId ()I - METHOD comp_292 entry ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/village/VillagerType.mapping b/mappings/net/minecraft/village/VillagerType.mapping index da3f6b810f..c8348df85e 100644 --- a/mappings/net/minecraft/village/VillagerType.mapping +++ b/mappings/net/minecraft/village/VillagerType.mapping @@ -10,11 +10,8 @@ CLASS net/minecraft/class_3854 net/minecraft/village/VillagerType FIELD field_26690 name Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 name - METHOD method_16930 forBiome (Ljava/util/Optional;)Lnet/minecraft/class_3854; - ARG 0 biomeKey + METHOD method_16930 forBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_3854; METHOD method_16931 create (Ljava/lang/String;)Lnet/minecraft/class_3854; ARG 0 id METHOD method_16932 (Ljava/util/HashMap;)V ARG 0 map - METHOD method_31080 (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 0 biomeKey diff --git a/mappings/net/minecraft/world/RegistryWorldView.mapping b/mappings/net/minecraft/world/RegistryWorldView.mapping index 8a3e069ab2..a40e6bdfc3 100644 --- a/mappings/net/minecraft/world/RegistryWorldView.mapping +++ b/mappings/net/minecraft/world/RegistryWorldView.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_5423 net/minecraft/world/RegistryWorldView COMMENT COMMENT @see #getRegistryManager() METHOD method_30349 getRegistryManager ()Lnet/minecraft/class_5455; - METHOD method_31081 getBiomeKey (Lnet/minecraft/class_2338;)Ljava/util/Optional; - ARG 1 pos diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 4652a86ef1..dc443746d4 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -46,13 +46,12 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper METHOD method_27822 getBiomeDirectly (Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Lnet/minecraft/class_1959; ARG 0 pos ARG 1 chunk - METHOD method_29950 getSpawnEntries (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;Lnet/minecraft/class_1959;)Lnet/minecraft/class_6012; + METHOD method_29950 getSpawnEntries (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Lnet/minecraft/class_6012; ARG 0 world ARG 1 structureAccessor ARG 2 chunkGenerator ARG 3 spawnGroup ARG 4 pos - ARG 5 biome METHOD method_35238 (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Z ARG 0 type ARG 1 pos @@ -89,9 +88,8 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 1 world ARG 2 pos ARG 3 entityType - METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_1959;Lnet/minecraft/class_1923;Ljava/util/Random;)V + METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_6880;Lnet/minecraft/class_1923;Ljava/util/Random;)V ARG 0 world - ARG 1 biome ARG 2 chunkPos ARG 3 random METHOD method_8662 isClearForSpawn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_1299;)Z diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping index f172381747..de3cc75043 100644 --- a/mappings/net/minecraft/world/StructureLocator.mapping +++ b/mappings/net/minecraft/world/StructureLocator.mapping @@ -70,7 +70,5 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator ARG 1 referencesByStructure ARG 2 feature ARG 3 skipExistingChunk - METHOD method_39841 (Ljava/util/Collection;Lnet/minecraft/class_1959;)Z - ARG 2 biome METHOD method_39842 collectStructuresAndReferences (Lnet/minecraft/class_2487;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 1 nbt diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index b703bd8ca2..78a967df19 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_30971 MIN_Y I FIELD field_35455 tickOrder J FIELD field_9223 border Lnet/minecraft/class_2784; - FIELD field_9224 LOGGER Lorg/slf4j/Logger; FIELD field_9226 ambientDarkness I FIELD field_9229 random Ljava/util/Random; FIELD field_9232 properties Lnet/minecraft/class_5269; @@ -30,10 +29,9 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9251 thunderGradientPrev F FIELD field_9253 rainGradientPrev F FIELD field_9256 lcgBlockSeed I - METHOD (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;Ljava/util/function/Supplier;ZZJ)V + METHOD (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Ljava/util/function/Supplier;ZZJ)V ARG 1 properties ARG 2 registryRef - ARG 3 dimensionType ARG 4 profiler ARG 5 isClient ARG 6 debugWorld @@ -328,7 +326,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT

Time is used to track scheduled ticks and cannot be modified or frozen. COMMENT COMMENT @see WorldProperties#getTime - METHOD method_8514 getTagManager ()Lnet/minecraft/class_5415; METHOD method_8515 isTopSolid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z ARG 1 pos ARG 2 entity diff --git a/mappings/net/minecraft/world/WorldView.mapping b/mappings/net/minecraft/world/WorldView.mapping index 308fc7ec9e..a0525dd72c 100644 --- a/mappings/net/minecraft/world/WorldView.mapping +++ b/mappings/net/minecraft/world/WorldView.mapping @@ -46,11 +46,11 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView METHOD method_22351 isWater (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_22385 getBiomeAccess ()Lnet/minecraft/class_4543; - METHOD method_22387 getGeneratorStoredBiome (III)Lnet/minecraft/class_1959; + METHOD method_22387 getGeneratorStoredBiome (III)Lnet/minecraft/class_6880; ARG 1 biomeX ARG 2 biomeY ARG 3 biomeZ - METHOD method_23753 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; + METHOD method_23753 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6880; ARG 1 pos METHOD method_29556 getStatesInBoxIfLoaded (Lnet/minecraft/class_238;)Ljava/util/stream/Stream; ARG 1 box diff --git a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping index cc84dfd61d..1b8c5027f7 100644 --- a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping +++ b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_5504 net/minecraft/world/biome/BuiltinBiomes - FIELD field_26734 PLAINS Lnet/minecraft/class_1959; - FIELD field_26735 THE_VOID Lnet/minecraft/class_1959; - METHOD method_31145 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1959;)Lnet/minecraft/class_1959; + METHOD method_31145 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1959;)V ARG 0 key ARG 1 biome diff --git a/mappings/net/minecraft/world/biome/GenerationSettings.mapping b/mappings/net/minecraft/world/biome/GenerationSettings.mapping index d04351da95..35b70272e6 100644 --- a/mappings/net/minecraft/world/biome/GenerationSettings.mapping +++ b/mappings/net/minecraft/world/biome/GenerationSettings.mapping @@ -4,14 +4,14 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings FIELD field_26416 features Ljava/util/List; FIELD field_26638 LOGGER Lorg/slf4j/Logger; FIELD field_26639 INSTANCE Lnet/minecraft/class_5485; - FIELD field_26640 flowerFeatures Ljava/util/List; - FIELD field_34465 allowedFeatures Ljava/util/Set; + FIELD field_26640 flowerFeatures Ljava/util/function/Supplier; + FIELD field_34465 allowedFeatures Ljava/util/function/Supplier; METHOD (Ljava/util/Map;Ljava/util/List;)V ARG 1 carvers ARG 2 features METHOD method_30802 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_30976 getCarversForStep (Lnet/minecraft/class_2893$class_2894;)Ljava/util/List; + METHOD method_30976 getCarversForStep (Lnet/minecraft/class_2893$class_2894;)Ljava/lang/Iterable; ARG 1 carverStep METHOD method_30982 getFlowerFeatures ()Ljava/util/List; METHOD method_30983 getFeatures ()Ljava/util/List; @@ -25,12 +25,11 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings METHOD method_30987 build ()Lnet/minecraft/class_5485; METHOD method_30988 addFeatureStep (I)V ARG 1 stepIndex - METHOD method_30989 feature (ILjava/util/function/Supplier;)Lnet/minecraft/class_5485$class_5495; + METHOD method_30989 feature (ILnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_5495; ARG 1 stepIndex - ARG 2 featureSupplier - METHOD method_30991 carver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_2922;)Lnet/minecraft/class_5485$class_5495; + METHOD method_30991 carver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_5495; ARG 1 carverStep ARG 2 carver - METHOD method_30992 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_6796;)Lnet/minecraft/class_5485$class_5495; + METHOD method_30992 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_5495; ARG 1 featureStep ARG 2 feature diff --git a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping index f82e506898..0950af63c0 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping @@ -5,24 +5,24 @@ CLASS net/minecraft/class_4543 net/minecraft/world/biome/source/BiomeAccess METHOD (Lnet/minecraft/class_4543$class_4544;J)V ARG 1 storage ARG 2 seed - METHOD method_22393 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; + METHOD method_22393 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6880; ARG 1 pos - METHOD method_24854 getBiomeForNoiseGen (III)Lnet/minecraft/class_1959; + METHOD method_24854 getBiomeForNoiseGen (III)Lnet/minecraft/class_6880; ARG 1 biomeX ARG 2 biomeY ARG 3 biomeZ - METHOD method_24938 getBiomeForNoiseGen (DDD)Lnet/minecraft/class_1959; + METHOD method_24938 getBiomeForNoiseGen (DDD)Lnet/minecraft/class_6880; ARG 1 x ARG 3 y ARG 5 z - METHOD method_27344 getBiomeForNoiseGen (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; + METHOD method_27344 getBiomeForNoiseGen (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6880; ARG 1 pos METHOD method_27984 hashSeed (J)J ARG 0 seed METHOD method_38107 withSource (Lnet/minecraft/class_4543$class_4544;)Lnet/minecraft/class_4543; ARG 1 storage CLASS class_4544 Storage - METHOD method_16359 getBiomeForNoiseGen (III)Lnet/minecraft/class_1959; + METHOD method_16359 getBiomeForNoiseGen (III)Lnet/minecraft/class_6880; ARG 1 biomeX ARG 2 biomeY ARG 3 biomeZ diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index e07434f8fc..92cd1af98f 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource METHOD method_27985 withSeed (J)Lnet/minecraft/class_1966; ARG 1 seed METHOD method_28442 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_28443 getBiomes ()Ljava/util/Set; + METHOD method_28443 getBiomes ()Ljava/util/stream/Stream; METHOD method_38114 addDebugInfo (Ljava/util/List;Lnet/minecraft/class_2338;Lnet/minecraft/class_6544$class_6552;)V ARG 1 info ARG 2 pos diff --git a/mappings/net/minecraft/world/biome/source/BiomeSupplier.mapping b/mappings/net/minecraft/world/biome/source/BiomeSupplier.mapping index 1346057501..f3a0dd4531 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSupplier.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSupplier.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_6780 net/minecraft/world/biome/source/BiomeSupplier - METHOD method_38109 getBiome (IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959; + METHOD method_38109 getBiome (IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_6880; ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping index 9f6f84cc11..f4bfe8282a 100644 --- a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping @@ -2,9 +2,8 @@ CLASS net/minecraft/class_1973 net/minecraft/world/biome/source/CheckerboardBiom FIELD field_24715 CODEC Lcom/mojang/serialization/Codec; FIELD field_24716 scale I FIELD field_9480 gridSize I - FIELD field_9481 biomeArray Ljava/util/List; - METHOD (Ljava/util/List;I)V - ARG 1 biomeArray + FIELD field_9481 biomeArray Lnet/minecraft/class_6885; + METHOD (Lnet/minecraft/class_6885;I)V ARG 2 size METHOD method_28454 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping index 92a1567290..a21d7a47a0 100644 --- a/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_1992 net/minecraft/world/biome/source/FixedBiomeSource FIELD field_24717 CODEC Lcom/mojang/serialization/Codec; - FIELD field_9486 biome Ljava/util/function/Supplier; - METHOD (Ljava/util/function/Supplier;)V - ARG 1 biome - METHOD (Lnet/minecraft/class_1959;)V - ARG 1 biome + FIELD field_9486 biome Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index 2b8f1fcf0f..02ccfd98ab 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS ARG 1 biomeEntries ARG 2 instance METHOD method_31085 getInstance ()Ljava/util/Optional; - METHOD method_38167 getBiomeAtPoint (Lnet/minecraft/class_6544$class_6553;)Lnet/minecraft/class_1959; + METHOD method_38167 getBiomeAtPoint (Lnet/minecraft/class_6544$class_6553;)Lnet/minecraft/class_6880; ARG 1 point METHOD method_38168 matchesInstance (Lnet/minecraft/class_4766$class_5305;)Z ARG 1 instance diff --git a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping index c64fac9bc5..29962366ae 100644 --- a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping @@ -1,24 +1,15 @@ CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSource FIELD field_24730 CODEC Lcom/mojang/serialization/Codec; FIELD field_24731 seed J - FIELD field_26699 biomeRegistry Lnet/minecraft/class_2378; - FIELD field_26700 centerBiome Lnet/minecraft/class_1959; - FIELD field_26701 highlandsBiome Lnet/minecraft/class_1959; - FIELD field_26702 midlandsBiome Lnet/minecraft/class_1959; - FIELD field_26703 smallIslandsBiome Lnet/minecraft/class_1959; - FIELD field_26704 barrensBiome Lnet/minecraft/class_1959; + FIELD field_26700 centerBiome Lnet/minecraft/class_6880; + FIELD field_26701 highlandsBiome Lnet/minecraft/class_6880; + FIELD field_26702 midlandsBiome Lnet/minecraft/class_6880; + FIELD field_26703 smallIslandsBiome Lnet/minecraft/class_6880; + FIELD field_26704 barrensBiome Lnet/minecraft/class_6880; FIELD field_9831 noise Lnet/minecraft/class_3541; METHOD (Lnet/minecraft/class_2378;J)V ARG 1 biomeRegistry ARG 2 seed - METHOD (Lnet/minecraft/class_2378;JLnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;Lnet/minecraft/class_1959;)V - ARG 1 biomeRegistry - ARG 2 seed - ARG 4 centerBiome - ARG 5 highlandsBiome - ARG 6 midlandsBiome - ARG 7 smallIslandsBiome - ARG 8 barrensBiome METHOD method_28479 matches (J)Z ARG 1 seed METHOD method_31105 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping b/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping index 7566eefe67..bc103f5d38 100644 --- a/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping +++ b/mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping @@ -17,11 +17,9 @@ CLASS net/minecraft/class_6746 net/minecraft/world/chunk/BelowZeroRetrogen ARG 0 chunk METHOD method_39471 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_39767 getBiomeSupplier (Lnet/minecraft/class_6780;Lnet/minecraft/class_2378;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6780; + METHOD method_39767 getBiomeSupplier (Lnet/minecraft/class_6780;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6780; ARG 0 biomeSupplier - ARG 1 biomeRegistry - ARG 2 chunk - METHOD method_39768 (Lnet/minecraft/class_6780;Ljava/util/Set;Lnet/minecraft/class_2791;IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959; + METHOD method_39768 (Lnet/minecraft/class_6780;Ljava/util/function/Predicate;Lnet/minecraft/class_2791;IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_6880; ARG 3 x ARG 4 y ARG 5 z diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index fcbd87b865..cd7bc246b1 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk FIELD field_34545 sectionArray [Lnet/minecraft/class_2826; FIELD field_34549 lightOn Z FIELD field_34550 inhabitedTime J - FIELD field_34551 biome Lnet/minecraft/class_1959; + FIELD field_34551 biome Lnet/minecraft/class_6880; FIELD field_34552 structureStarts Ljava/util/Map; FIELD field_34553 structureReferences Ljava/util/Map; FIELD field_35468 blendingData Lnet/minecraft/class_6749; @@ -99,7 +99,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_38257 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;)V ARG 1 biomeSupplier ARG 2 sampler - METHOD method_38258 setBiomeIfAbsent (Ljava/util/function/Supplier;)Lnet/minecraft/class_1959; + METHOD method_38258 setBiomeIfAbsent (Ljava/util/function/Supplier;)Lnet/minecraft/class_6880; ARG 1 biomeSupplier METHOD method_38259 getSection (I)Lnet/minecraft/class_2826; ARG 1 yIndex diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index f8ec654b4e..ecb4c6ce0f 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -46,9 +46,6 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection METHOD method_16677 unlock ()V METHOD method_19523 hasAny (Ljava/util/function/Predicate;)Z ARG 1 predicate - METHOD method_21731 (Lnet/minecraft/class_2680;I)V - ARG 1 state - ARG 2 count METHOD method_31729 blockCoordFromChunkCoord (I)I ARG 0 chunkPos METHOD method_38291 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;II)V @@ -57,7 +54,7 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection ARG 3 x ARG 4 z METHOD method_38292 isEmpty ()Z - METHOD method_38293 getBiome (III)Lnet/minecraft/class_1959; + METHOD method_38293 getBiome (III)Lnet/minecraft/class_6880; ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 86d7375701..9f510a00dc 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -10,9 +10,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_35471 blockTickScheduler Lnet/minecraft/class_6755; FIELD field_35472 fluidTickScheduler Lnet/minecraft/class_6755; FIELD field_36218 shouldRenderOnUpdate Z - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;)V - ARG 1 world - ARG 2 pos METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_6755;Lnet/minecraft/class_6755;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_2818$class_6829;Lnet/minecraft/class_6749;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping index 66afd87d66..ba0bcf8a0b 100644 --- a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping @@ -4,16 +4,13 @@ CLASS net/minecraft/class_5363 net/minecraft/world/dimension/DimensionOptions FIELD field_25413 NETHER Lnet/minecraft/class_5321; FIELD field_25414 END Lnet/minecraft/class_5321; FIELD field_25415 BASE_DIMENSIONS Ljava/util/Set; - FIELD field_25416 dimensionTypeSupplier Ljava/util/function/Supplier; + FIELD field_25416 dimensionTypeSupplier Lnet/minecraft/class_6880; FIELD field_25417 chunkGenerator Lnet/minecraft/class_2794; - METHOD (Ljava/util/function/Supplier;Lnet/minecraft/class_2794;)V - ARG 1 typeSupplier + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)V ARG 2 chunkGenerator - METHOD method_29566 getDimensionTypeSupplier ()Ljava/util/function/Supplier; - METHOD method_29567 hasDefaultSettings (JLnet/minecraft/class_2370;)Z + METHOD method_29566 getDimensionTypeSupplier ()Lnet/minecraft/class_6880; + METHOD method_29567 hasDefaultSettings (JLnet/minecraft/class_2378;)Z ARG 0 seed - ARG 2 options METHOD method_29568 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_29570 getDimensionType ()Lnet/minecraft/class_2874; METHOD method_29571 getChunkGenerator ()Lnet/minecraft/class_2794; diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 4f66685b91..3495313b8e 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_25614 respawnAnchorWorks Z FIELD field_25615 hasRaids Z FIELD field_25616 minimumY I - FIELD field_25617 infiniburn Lnet/minecraft/class_2960; + FIELD field_25617 infiniburn Lnet/minecraft/class_6862; FIELD field_26706 coordinateScale D FIELD field_26751 effects Lnet/minecraft/class_2960; FIELD field_26752 OVERWORLD_ID Lnet/minecraft/class_2960; @@ -35,7 +35,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_28134 MAX_HEIGHT I FIELD field_28135 MAX_COLUMN_HEIGHT I FIELD field_28136 MIN_HEIGHT I - METHOD (Ljava/util/OptionalLong;ZZZZDZZZZIIILnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)V + METHOD (Ljava/util/OptionalLong;ZZZZDZZZZIIILnet/minecraft/class_6862;Lnet/minecraft/class_2960;F)V ARG 1 fixedTime ARG 2 hasSkylight ARG 3 hasCeiling @@ -49,10 +49,9 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 12 minimumY ARG 13 height ARG 14 logicalHeight - ARG 15 infiniburn ARG 16 effects ARG 17 ambientLight - METHOD (Ljava/util/OptionalLong;ZZZZDZZZZZIIILnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)V + METHOD (Ljava/util/OptionalLong;ZZZZDZZZZZIIILnet/minecraft/class_6862;Lnet/minecraft/class_2960;F)V ARG 1 fixedTime ARG 2 hasSkylight ARG 3 hasCeiling @@ -67,7 +66,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 13 minimumY ARG 14 height ARG 15 logicalHeight - ARG 16 infiniburn ARG 17 effects ARG 18 ambientLight METHOD method_12488 getSaveDirectory (Lnet/minecraft/class_5321;Ljava/nio/file/Path;)Ljava/nio/file/Path; @@ -81,14 +79,14 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 0 ambientLight METHOD method_28516 getBrightness (I)F ARG 1 lightLevel - METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_5455;JZ)Lnet/minecraft/class_2370; + METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_5455;JZ)Lnet/minecraft/class_2378; ARG 0 registryManager ARG 1 seed METHOD method_28521 worldFromDimensionNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; ARG 0 nbt METHOD method_28522 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455; + METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455$class_6893;)Lnet/minecraft/class_5455$class_6893; ARG 0 registryManager METHOD method_28528 getSkyAngle (J)F ARG 1 time @@ -106,7 +104,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_29958 hasRaids ()Z METHOD method_29959 getMinimumY ()I METHOD method_29960 hasFixedTime ()Z - METHOD method_29961 getInfiniburnBlocks ()Lnet/minecraft/class_3494; + METHOD method_29961 getInfiniburnBlocks ()Lnet/minecraft/class_6862; METHOD method_31108 equals (Lnet/minecraft/class_2874;)Z ARG 1 dimensionType METHOD method_31109 getCoordinateScaleFactor (Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)D @@ -117,7 +115,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType COMMENT {@return the ID of this dimension's {@linkplain net.minecraft.client.render.DimensionEffects effects}} COMMENT COMMENT @see net.minecraft.client.render.DimensionEffects#byDimensionType(DimensionType) - METHOD method_32922 create (Ljava/util/OptionalLong;ZZZZDZZZZZIIILnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)Lnet/minecraft/class_2874; + METHOD method_32922 create (Ljava/util/OptionalLong;ZZZZDZZZZZIIILnet/minecraft/class_6862;Lnet/minecraft/class_2960;F)Lnet/minecraft/class_2874; ARG 0 fixedTime ARG 1 hasSkylight ARG 2 hasCeiling @@ -132,13 +130,12 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 12 minimumY ARG 13 height ARG 14 logicalHeight - ARG 15 infiniburn ARG 16 effects ARG 17 ambientLight METHOD method_32923 checkHeight (Lnet/minecraft/class_2874;)Lcom/mojang/serialization/DataResult; ARG 0 type METHOD method_32924 getHeight ()I METHOD method_32925 getLogicalHeight ()I - METHOD method_39540 createDefaultDimensionOptions (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2370; + METHOD method_39540 createDefaultDimensionOptions (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2378; ARG 0 registryManager ARG 1 seed diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index 2373ac0db0..4dc09a04b9 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent FIELD field_28154 range I FIELD field_31449 DEFAULT_RANGE I METHOD (Ljava/lang/String;I)V - ARG 1 id ARG 2 range METHOD method_32938 getId ()Ljava/lang/String; METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_5712; diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index f958b8867a..df468abb47 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -5,17 +5,15 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions FIELD field_24528 bonusChest Z FIELD field_24532 legacyCustomOptions Ljava/util/Optional; FIELD field_24826 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24827 options Lnet/minecraft/class_2370; - METHOD (JZZLnet/minecraft/class_2370;)V + FIELD field_24827 options Lnet/minecraft/class_2378; + METHOD (JZZLnet/minecraft/class_2378;)V ARG 1 seed ARG 3 generateStructures ARG 4 bonusChest - ARG 5 options - METHOD (JZZLnet/minecraft/class_2370;Ljava/util/Optional;)V + METHOD (JZZLnet/minecraft/class_2378;Ljava/util/Optional;)V ARG 1 seed ARG 3 generateStructures ARG 4 bonusChest - ARG 5 options ARG 6 legacyCustomOptions METHOD method_28009 getDefaultOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; ARG 0 registryManager @@ -40,17 +38,14 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions ARG 1 seed METHOD method_28606 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28608 getRegistryWithReplacedOverworldGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2370;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2370; + METHOD method_28608 getRegistryWithReplacedOverworldGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; ARG 0 dimensionTypeRegistry - ARG 1 optionsRegistry ARG 2 overworldGenerator - METHOD method_28609 getDimensions ()Lnet/minecraft/class_2370; + METHOD method_28609 getDimensions ()Lnet/minecraft/class_2378; METHOD method_28610 validate ()Lcom/mojang/serialization/DataResult; METHOD method_28611 isStable ()Z METHOD method_29575 getWorlds ()Lcom/google/common/collect/ImmutableSet; - METHOD method_29962 getRegistryWithReplacedOverworld (Lnet/minecraft/class_2370;Ljava/util/function/Supplier;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2370; - ARG 0 optionsRegistry - ARG 1 overworldDimensionType + METHOD method_29962 getRegistryWithReplacedOverworld (Lnet/minecraft/class_2378;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; ARG 2 overworldGenerator METHOD method_31112 createDemo (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; ARG 0 registryManager diff --git a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping index 92db7e4fb3..ee9e59fcf9 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping @@ -43,9 +43,9 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi METHOD method_39585 solid ()Lnet/minecraft/class_6646; METHOD method_39586 insideWorldBounds (Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; ARG 0 offset - METHOD method_39907 matchingBlockTag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_6646; + METHOD method_39907 matchingBlockTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6646; ARG 0 offset - METHOD method_39908 matchingBlockTag (Lnet/minecraft/class_3494;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; + METHOD method_39908 matchingBlockTag (Lnet/minecraft/class_6862;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; ARG 0 tag ARG 1 offset METHOD method_39909 hasSturdyFace (Lnet/minecraft/class_2382;Lnet/minecraft/class_2350;)Lnet/minecraft/class_6646; diff --git a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate.mapping index 78aa485c98..67de9d588a 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_6848 net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate - FIELD field_36287 tag Lnet/minecraft/class_3494; + FIELD field_36287 tag Lnet/minecraft/class_6862; FIELD field_36288 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_2382;Lnet/minecraft/class_3494;)V + METHOD (Lnet/minecraft/class_2382;Lnet/minecraft/class_6862;)V ARG 1 offset ARG 2 tag diff --git a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping index 3783336e24..bb6954949d 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_6649 net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate FIELD field_35062 CODEC Lcom/mojang/serialization/Codec; - FIELD field_35063 blocks Ljava/util/List; - METHOD (Lnet/minecraft/class_2382;Ljava/util/List;)V + FIELD field_35063 blocks Lnet/minecraft/class_6885; + METHOD (Lnet/minecraft/class_2382;Lnet/minecraft/class_6885;)V ARG 1 offset - ARG 2 blocks METHOD method_38894 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_38896 (Lnet/minecraft/class_6649;)Ljava/util/List; + METHOD method_38896 (Lnet/minecraft/class_6649;)Lnet/minecraft/class_6885; ARG 0 predicate diff --git a/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping index cf5abdb1d6..6a1fd4ab22 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_6650 net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate FIELD field_35065 CODEC Lcom/mojang/serialization/Codec; - FIELD field_35066 fluids Ljava/util/List; - METHOD (Lnet/minecraft/class_2382;Ljava/util/List;)V + FIELD field_35066 fluids Lnet/minecraft/class_6885; + METHOD (Lnet/minecraft/class_2382;Lnet/minecraft/class_6885;)V ARG 1 offset - ARG 2 fluids METHOD method_38898 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_38900 (Lnet/minecraft/class_6650;)Ljava/util/List; + METHOD method_38900 (Lnet/minecraft/class_6650;)Lnet/minecraft/class_6885; ARG 0 predicate diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping index 838de40f7a..39069129fe 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping @@ -1,12 +1,14 @@ CLASS net/minecraft/class_2922 net/minecraft/world/gen/carver/ConfiguredCarver - FIELD field_13278 config Lnet/minecraft/class_5871; - FIELD field_13279 carver Lnet/minecraft/class_2939; + FIELD comp_330 carver Lnet/minecraft/class_2939; + FIELD comp_331 config Lnet/minecraft/class_5871; FIELD field_24828 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_25832 CODEC Lcom/mojang/serialization/Codec; FIELD field_26755 LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2939;Lnet/minecraft/class_5871;)V ARG 1 carver ARG 2 config + METHOD comp_330 carver ()Lnet/minecraft/class_2939; + METHOD comp_331 config ()Lnet/minecraft/class_5871; METHOD method_12668 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Lnet/minecraft/class_6643;)Z ARG 1 context ARG 2 chunk @@ -17,4 +19,3 @@ CLASS net/minecraft/class_2922 net/minecraft/world/gen/carver/ConfiguredCarver ARG 7 mask METHOD method_12669 shouldCarve (Ljava/util/Random;)Z ARG 1 random - METHOD method_30378 getConfig ()Lnet/minecraft/class_5871; diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarvers.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarvers.mapping index 44e3588e10..3276d8278b 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarvers.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarvers.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_5463 net/minecraft/world/gen/carver/ConfiguredCarvers - METHOD method_30588 register (Ljava/lang/String;Lnet/minecraft/class_2922;)Lnet/minecraft/class_2922; + METHOD method_30588 register (Ljava/lang/String;Lnet/minecraft/class_2922;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 configuredCarver diff --git a/mappings/net/minecraft/world/gen/chunk/Blender.mapping b/mappings/net/minecraft/world/gen/chunk/Blender.mapping index 473d5bbed8..5aef47a0b0 100644 --- a/mappings/net/minecraft/world/gen/chunk/Blender.mapping +++ b/mappings/net/minecraft/world/gen/chunk/Blender.mapping @@ -3,12 +3,12 @@ CLASS net/minecraft/class_6748 net/minecraft/world/gen/chunk/Blender METHOD method_39336 getNoBlending ()Lnet/minecraft/class_6748; METHOD method_39342 getBlender (Lnet/minecraft/class_3233;)Lnet/minecraft/class_6748; ARG 0 chunkRegion - METHOD method_39561 blendBiome (II)Lnet/minecraft/class_1959; + METHOD method_39561 blendBiome (II)Lnet/minecraft/class_6880; ARG 1 x ARG 2 y METHOD method_39563 getBiomeSupplier (Lnet/minecraft/class_6780;)Lnet/minecraft/class_6780; ARG 1 biomeSupplier - METHOD method_39564 (Lnet/minecraft/class_6780;IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959; + METHOD method_39564 (Lnet/minecraft/class_6780;IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_6880; ARG 2 x ARG 3 y ARG 4 z diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 8fa34b10d4..afe5c78930 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -9,11 +9,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator FIELD field_16567 structuresConfig Lnet/minecraft/class_5311; FIELD field_24746 CODEC Lcom/mojang/serialization/Codec; FIELD field_24747 biomeSource Lnet/minecraft/class_1966; - FIELD field_24748 worldSeed J - FIELD field_24749 strongholds Ljava/util/List; METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;Lnet/minecraft/class_5311;J)V - ARG 1 populationSource - ARG 2 biomeSource ARG 3 structuresConfig ARG 4 worldSeed METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_5311;)V @@ -41,7 +37,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT COMMENT @return {@code null} if no structure could be found within the given search radius ARG 1 world - ARG 2 structureFeature ARG 3 center ARG 4 radius COMMENT the search radius in chunks around the chunk the given block position is in; a radius of 0 will only search in the given chunk @@ -64,15 +59,13 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 region ARG 2 structures ARG 3 chunk - METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_1959;Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6012; - ARG 1 biome + METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_6880;Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6012; ARG 2 accessor ARG 3 group ARG 4 pos METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V COMMENT Determines which structures should start in the given chunk and creates their starting points. ARG 1 registryManager - ARG 2 structureAccessor ARG 3 chunk ARG 4 structureManager ARG 5 worldSeed @@ -107,31 +100,19 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_27997 withSeed (J)Lnet/minecraft/class_2794; ARG 1 seed METHOD method_28506 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_28507 isStrongholdStartingChunk (Lnet/minecraft/class_1923;)Z - ARG 1 pos - METHOD method_28509 generateStrongholdPositions ()V + METHOD method_28509 generateStrongholdPositions (Lnet/minecraft/class_3195;Lnet/minecraft/class_6871;)V METHOD method_33730 getMinimumY ()I METHOD method_38264 getStructureReferences (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)I ARG 0 structureAccessor ARG 1 chunk ARG 2 sectionPos ARG 3 structureFeature - METHOD method_38266 canPlaceStrongholdInBiome (Lnet/minecraft/class_1959;)Z - ARG 0 biome - METHOD method_38273 (Lnet/minecraft/class_2378;Ljava/util/Map$Entry;Lnet/minecraft/class_1959;)Z - ARG 3 b - METHOD method_38274 testBiomeByKey (Lnet/minecraft/class_2378;Ljava/util/function/Predicate;Lnet/minecraft/class_1959;)Z - ARG 1 registry - ARG 2 condition - ARG 3 biome METHOD method_38275 populateBiomes (Lnet/minecraft/class_2378;Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 biomeRegistry ARG 3 blender ARG 4 structureAccessor ARG 5 chunk METHOD method_38276 getMultiNoiseSampler ()Lnet/minecraft/class_6544$class_6552; - METHOD method_38669 (Lnet/minecraft/class_2378;Lnet/minecraft/class_1959;)Ljava/util/stream/Stream; - ARG 1 biome METHOD method_39301 getCodecKey ()Ljava/util/Optional; METHOD method_39462 getBlockBoxForChunk (Lnet/minecraft/class_2791;)Lnet/minecraft/class_3341; ARG 0 chunk diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 94b4cfa2a3..7222f86207 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -54,7 +54,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_30644 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)V ARG 0 registryKey ARG 1 settings - METHOD method_31111 getInstance ()Lnet/minecraft/class_5284; + METHOD method_31111 getInstance ()Lnet/minecraft/class_6880; METHOD method_33757 hasAquifers ()Z METHOD method_33758 hasNoiseCaves ()Z METHOD method_36396 hasOreVeins ()Z diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index e852a072f6..01ebe664b4 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC FIELD field_14064 LOGGER Lorg/slf4j/Logger; FIELD field_14072 layers Ljava/util/List; FIELD field_14077 hasNoTerrain Z - FIELD field_14081 biome Ljava/util/function/Supplier; + FIELD field_14081 biome Lnet/minecraft/class_6880; FIELD field_14082 layerBlocks Ljava/util/List; FIELD field_24560 structuresConfig Lnet/minecraft/class_5311; FIELD field_24975 CODEC Lcom/mojang/serialization/Codec; @@ -22,9 +22,8 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC METHOD method_14309 getDefaultConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; ARG 0 biomeRegistry METHOD method_14312 getLayerBlocks ()Ljava/util/List; - METHOD method_14325 setBiome (Ljava/util/function/Supplier;)V - ARG 1 biome - METHOD method_14326 getBiome ()Lnet/minecraft/class_1959; + METHOD method_14325 setBiome (Lnet/minecraft/class_6880;)V + METHOD method_14326 getBiome ()Lnet/minecraft/class_6880; METHOD method_14327 getLayers ()Ljava/util/List; METHOD method_14330 updateLayerBlocks ()V METHOD method_28051 getStructuresConfig ()Lnet/minecraft/class_5311; @@ -34,7 +33,7 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC METHOD method_28913 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_28916 enableLakes ()V - METHOD method_28917 createBiome ()Lnet/minecraft/class_1959; + METHOD method_28917 createBiome ()Lnet/minecraft/class_6880; METHOD method_29965 withLayers (Ljava/util/List;Lnet/minecraft/class_5311;)Lnet/minecraft/class_3232; ARG 1 layers ARG 2 structuresConfig diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 725d84ab00..eb7545872f 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_16576 defaultBlock Lnet/minecraft/class_2680; FIELD field_16648 AIR Lnet/minecraft/class_2680; FIELD field_24773 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24774 settings Ljava/util/function/Supplier; + FIELD field_24774 settings Lnet/minecraft/class_6880; FIELD field_24778 seed J FIELD field_28746 EMPTY [Lnet/minecraft/class_2680; FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_5818; @@ -10,17 +10,15 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_34591 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; FIELD field_35183 surfaceBuilder Lnet/minecraft/class_6724; FIELD field_35361 noiseRegistry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V + METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V ARG 1 noiseRegistry ARG 2 biomeSource ARG 3 seed - ARG 5 settings - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V + METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V ARG 1 noiseRegistry ARG 2 populationSource ARG 3 biomeSource ARG 4 seed - ARG 6 settings METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;II)Ljava/util/OptionalInt; ARG 3 states ARG 4 predicate @@ -33,7 +31,7 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 1 blender ARG 2 structureAccessor ARG 3 chunk - METHOD method_38322 (III)Lnet/minecraft/class_1959; + METHOD method_38322 (III)Lnet/minecraft/class_6880; ARG 1 x ARG 2 y ARG 3 z @@ -47,11 +45,7 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 2 x ARG 3 y ARG 4 z - METHOD method_38327 populateBiomes (Lnet/minecraft/class_2378;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V - ARG 1 biomeRegistry - ARG 2 blender - ARG 3 structureAccessor - ARG 4 chunk + METHOD method_38327 populateBiomes (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V METHOD method_39041 applyMaterialRule (Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; ARG 1 context ARG 2 posToBiome diff --git a/mappings/net/minecraft/world/gen/chunk/StrongholdConfig.mapping b/mappings/net/minecraft/world/gen/chunk/StrongholdConfig.mapping deleted file mode 100644 index f6d784c381..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/StrongholdConfig.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/class_5313 net/minecraft/world/gen/chunk/StrongholdConfig - FIELD field_24913 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24914 distance I - FIELD field_24915 spread I - FIELD field_24916 count I - METHOD (III)V - ARG 1 distance - ARG 2 spread - ARG 3 count - METHOD method_28799 getDistance ()I - METHOD method_28800 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_28801 getSpread ()I - METHOD method_28802 getCount ()I diff --git a/mappings/net/minecraft/world/gen/chunk/StructureConfig.mapping b/mappings/net/minecraft/world/gen/chunk/StructureConfig.mapping deleted file mode 100644 index 9f466bd76a..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/StructureConfig.mapping +++ /dev/null @@ -1,48 +0,0 @@ -CLASS net/minecraft/class_5314 net/minecraft/world/gen/chunk/StructureConfig - COMMENT Contains parameters for placement of a single type of {@link net.minecraft.world.gen.feature.StructureFeature} during chunk - COMMENT generation. - FIELD field_24917 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24918 spacing I - COMMENT Defines the width and height of a cell in the structure placement grid in chunks. - COMMENT

- COMMENT For each cell in the grid, the chunk generator will attempt to place the start of a structure. - COMMENT

- COMMENT Minimum is 1, which means the structure will potentially be placed in every chunk. - COMMENT 2 leads to one structure per 2x2 chunks, and so on. - FIELD field_24919 separation I - COMMENT Defines the margin of each cell in the placement grid, which leads to guaranteeing - COMMENT a certain minimum distance between each placed structure. - COMMENT

- COMMENT The margin is effectively subtracted from the width and height of a cell when - COMMENT trying to determine the actual starting chunk within the cell. - COMMENT

- COMMENT A value of 0 means that the structure can be placed in any chunk within a grid cell, - COMMENT which also means two structures from adjacent grid cells could be placed directly - COMMENT next to each other. - COMMENT

- COMMENT A value that equals {@link #spacing} - 1 will restrict placement of the structure to the - COMMENT chunk at 0,0 of the grid cell. - COMMENT

- COMMENT This value must be between 0 and {@link #spacing} - 1, and is expressed in chunks. - FIELD field_24920 salt I - COMMENT Used together with the world seed and a grid cell's x,y coordinates to seed the RNG when deciding - COMMENT whether a structure should really be placed in a grid cell or not. - COMMENT This is used to avoid that two types of structures that have the same spacing always occur - COMMENT in the same chunks of their placement grid, and thus in the same world chunk. - METHOD (III)V - ARG 1 spacing - ARG 2 separation - ARG 3 salt - METHOD method_28803 getSpacing ()I - METHOD method_28804 (Lnet/minecraft/class_5314;)Ljava/lang/Integer; - ARG 0 config - METHOD method_28805 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_28806 getSeparation ()I - METHOD method_28807 (Lnet/minecraft/class_5314;)Ljava/lang/Integer; - ARG 0 config - METHOD method_28808 getSalt ()I - METHOD method_28809 (Lnet/minecraft/class_5314;)Ljava/lang/Integer; - ARG 0 config - METHOD method_29298 (Lnet/minecraft/class_5314;)Lcom/mojang/serialization/DataResult; - ARG 0 config diff --git a/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping b/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping index b8b96370e7..b9ee349c70 100644 --- a/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/StructuresConfig.mapping @@ -7,19 +7,12 @@ CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/StructuresConfig COMMENT configuration in this map. If mods register structures after this class COMMENT has been initialized, the check will already have been made and a COMMENT bad default configuration will be used instead (see below). - FIELD field_24823 DEFAULT_STRONGHOLD Lnet/minecraft/class_5313; + FIELD field_24823 DEFAULT_STRONGHOLD Lnet/minecraft/class_6871; COMMENT Default placement settings for the stronghold. FIELD field_24824 structures Ljava/util/Map; - FIELD field_24825 stronghold Lnet/minecraft/class_5313; - COMMENT Placement settings for the stronghold for this particular combination of settings, - COMMENT may be null to disable placement of strongholds. FIELD field_34696 configuredStructures Lcom/google/common/collect/ImmutableMap; - METHOD (Ljava/util/Map;Lnet/minecraft/class_5313;)V + METHOD (Ljava/util/Map;)V ARG 1 structures - ARG 2 stronghold - METHOD (Ljava/util/Optional;Ljava/util/Map;)V - ARG 1 stronghold - ARG 2 structures METHOD (Z)V COMMENT Creates a new structure placement configuration with default values. ARG 1 withStronghold @@ -27,18 +20,12 @@ CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/StructuresConfig METHOD method_28598 getStructures ()Ljava/util/Map; METHOD method_28599 (Lnet/minecraft/class_5311;)Ljava/util/Map; ARG 0 config - METHOD method_28600 getForType (Lnet/minecraft/class_3195;)Lnet/minecraft/class_5314; + METHOD method_28600 getForType (Lnet/minecraft/class_3195;)Lnet/minecraft/class_6874; COMMENT Gets the placement configuration for a specific structure type, or COMMENT a default placement if placement for the structure was not explicitly configured. ARG 1 structureType METHOD method_28601 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28602 getStronghold ()Lnet/minecraft/class_5313; - METHOD method_28603 (Lnet/minecraft/class_5311;)Ljava/util/Optional; - ARG 0 config - METHOD method_38422 (Ljava/util/HashMap;Lnet/minecraft/class_5312;Lnet/minecraft/class_5321;)V - ARG 1 feature - ARG 2 biome METHOD method_38423 (Ljava/util/Map$Entry;)Lcom/google/common/collect/ImmutableMultimap; ARG 0 entry METHOD method_38424 getConfiguredStructureFeature (Lnet/minecraft/class_3195;)Lcom/google/common/collect/ImmutableMultimap; diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 0b93b3e54b..363f296514 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature - FIELD field_13375 config Lnet/minecraft/class_3037; - FIELD field_13376 feature Lnet/minecraft/class_3031; + FIELD comp_332 feature Lnet/minecraft/class_3031; + FIELD comp_333 config Lnet/minecraft/class_3037; FIELD field_24833 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_25833 CODEC Lcom/mojang/serialization/Codec; FIELD field_26756 LIST_CODEC Lcom/mojang/serialization/Codec; @@ -8,32 +8,10 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature METHOD (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)V ARG 1 feature ARG 2 config + METHOD comp_332 feature ()Lnet/minecraft/class_3031; + METHOD comp_333 config ()Lnet/minecraft/class_3037; METHOD method_12862 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z - ARG 1 world ARG 2 chunkGenerator ARG 3 random ARG 4 origin - METHOD method_30380 getFeature ()Lnet/minecraft/class_3031; - METHOD method_30381 getConfig ()Lnet/minecraft/class_3037; METHOD method_30648 getDecoratedFeatures ()Ljava/util/stream/Stream; - METHOD method_39591 withWouldSurviveFilter (Lnet/minecraft/class_2248;)Lnet/minecraft/class_6796; - ARG 1 block - METHOD method_39592 withBlockPredicateFilter (Lnet/minecraft/class_6646;)Lnet/minecraft/class_6796; - ARG 1 predicate - METHOD method_39593 withPlacement (Ljava/util/List;)Lnet/minecraft/class_6796; - COMMENT Attaches placement modifiers to this configured feature. Attached - COMMENT placement modifiers will be applied before this configured feature is - COMMENT generated. - COMMENT - COMMENT @see #withPlacement(PlacementModifier...) - COMMENT @see PlacedFeature#generate(StructureWorldAccess, ChunkGenerator, Random, BlockPos) - ARG 1 modifiers - METHOD method_39594 withPlacement ([Lnet/minecraft/class_6797;)Lnet/minecraft/class_6796; - COMMENT Attaches placement modifiers to this configured feature. Attached - COMMENT placement modifiers will be applied before this configured feature is - COMMENT generated. - COMMENT - COMMENT @see #withPlacement(List) - COMMENT @see PlacedFeature#generate(StructureWorldAccess, ChunkGenerator, Random, BlockPos) - ARG 1 modifiers - METHOD method_39595 withInAirFilter ()Lnet/minecraft/class_6796; diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping index e0f6767bf4..43030ea033 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping @@ -1,19 +1,12 @@ CLASS net/minecraft/class_6803 net/minecraft/world/gen/feature/ConfiguredFeatures - METHOD method_39702 getDefaultConfiguredFeature ()Lnet/minecraft/class_2975; - METHOD method_39703 createRandomPatchFeatureConfig (ILnet/minecraft/class_6796;)Lnet/minecraft/class_4638; + METHOD method_39702 getDefaultConfiguredFeature ()Lnet/minecraft/class_6880; + METHOD method_39703 createRandomPatchFeatureConfig (ILnet/minecraft/class_6880;)Lnet/minecraft/class_4638; ARG 0 tries ARG 1 feature - METHOD method_39704 createRandomPatchFeatureConfig (Lnet/minecraft/class_2975;)Lnet/minecraft/class_4638; - ARG 0 feature - METHOD method_39705 createRandomPatchFeatureConfig (Lnet/minecraft/class_2975;Ljava/util/List;)Lnet/minecraft/class_4638; - ARG 0 feature - ARG 1 validGround - METHOD method_39706 createRandomPatchFeatureConfig (Lnet/minecraft/class_2975;Ljava/util/List;I)Lnet/minecraft/class_4638; - ARG 0 feature - ARG 1 validGround - ARG 2 tries - METHOD method_39708 register (Ljava/lang/String;Lnet/minecraft/class_2975;)Lnet/minecraft/class_2975; + METHOD method_39704 createRandomPatchFeatureConfig (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)Lnet/minecraft/class_4638; + METHOD method_39705 createRandomPatchFeatureConfig (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;Ljava/util/List;)Lnet/minecraft/class_4638; + METHOD method_39706 createRandomPatchFeatureConfig (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;Ljava/util/List;I)Lnet/minecraft/class_4638; + METHOD method_39708 register (Ljava/lang/String;Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)Lnet/minecraft/class_6880; ARG 0 id - ARG 1 configuredFeature METHOD method_39709 createBlockPredicate (Ljava/util/List;)Lnet/minecraft/class_6646; ARG 0 validGround diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping index 15e602f864..a3d146d010 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructu METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_3037;)V ARG 1 feature ARG 2 config - METHOD method_28622 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5314;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; + METHOD method_28622 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; COMMENT @see StructureFeature#tryPlaceStart ARG 1 registryManager ARG 2 chunkGenerator @@ -16,6 +16,3 @@ CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructu ARG 5 worldSeed ARG 7 chunkPos ARG 8 structureReferences - ARG 9 structureConfig - ARG 10 world - ARG 11 biomeLimit diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping index 484db1403c..63d960603f 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping @@ -1,17 +1,12 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/feature/ConfiguredStructureFeatures - METHOD method_30603 register (Ljava/lang/String;Lnet/minecraft/class_5312;)Lnet/minecraft/class_5312; + METHOD method_30603 register (Ljava/lang/String;Lnet/minecraft/class_5312;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 configuredStructureFeature - METHOD method_38569 getDefault ()Lnet/minecraft/class_5312; - METHOD method_38570 registerAll (Ljava/util/function/BiConsumer;)V - ARG 0 registrar - METHOD method_38571 register (Ljava/util/function/BiConsumer;Lnet/minecraft/class_5312;Ljava/util/Set;)V - ARG 0 registrar - ARG 1 feature + METHOD method_38569 getDefault ()Lnet/minecraft/class_6880; + METHOD method_38570 registerAll (Lnet/minecraft/class_5470$class_6896;)V + METHOD method_38571 register (Lnet/minecraft/class_5470$class_6896;Lnet/minecraft/class_6880;Ljava/util/Set;)V ARG 2 biomes - METHOD method_38572 register (Ljava/util/function/BiConsumer;Lnet/minecraft/class_5312;Lnet/minecraft/class_5321;)V - ARG 0 registrar - ARG 1 feature + METHOD method_38572 register (Lnet/minecraft/class_5470$class_6896;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;)V ARG 2 biome - METHOD method_38573 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_5312;Lnet/minecraft/class_5321;)V + METHOD method_38573 (Lnet/minecraft/class_5470$class_6896;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;)V ARG 2 biome diff --git a/mappings/net/minecraft/world/gen/feature/EndConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/EndConfiguredFeatures.mapping index 8854a2edaf..35cd8a71e6 100644 --- a/mappings/net/minecraft/world/gen/feature/EndConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndConfiguredFeatures.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_6802 net/minecraft/world/gen/feature/EndConfiguredFeatures - FIELD field_35795 END_SPIKE Lnet/minecraft/class_2975; - FIELD field_35796 END_GATEWAY_RETURN Lnet/minecraft/class_2975; - FIELD field_35797 END_GATEWAY_DELAYED Lnet/minecraft/class_2975; - FIELD field_35798 CHORUS_PLANT Lnet/minecraft/class_2975; - FIELD field_35799 END_ISLAND Lnet/minecraft/class_2975; + FIELD field_35795 END_SPIKE Lnet/minecraft/class_6880; + FIELD field_35796 END_GATEWAY_RETURN Lnet/minecraft/class_6880; + FIELD field_35797 END_GATEWAY_DELAYED Lnet/minecraft/class_6880; + FIELD field_35798 CHORUS_PLANT Lnet/minecraft/class_6880; + FIELD field_35799 END_ISLAND Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/EndPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/EndPlacedFeatures.mapping index 989e62847d..451bc737b1 100644 --- a/mappings/net/minecraft/world/gen/feature/EndPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndPlacedFeatures.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_6813 net/minecraft/world/gen/feature/EndPlacedFeatures - FIELD field_35997 END_SPIKE Lnet/minecraft/class_6796; - FIELD field_35998 END_GATEWAY_RETURN Lnet/minecraft/class_6796; - FIELD field_35999 CHORUS_PLANT Lnet/minecraft/class_6796; - FIELD field_36000 END_ISLAND_DECORATED Lnet/minecraft/class_6796; + FIELD field_35997 END_SPIKE Lnet/minecraft/class_6880; + FIELD field_35998 END_GATEWAY_RETURN Lnet/minecraft/class_6880; + FIELD field_35999 CHORUS_PLANT Lnet/minecraft/class_6880; + FIELD field_36000 END_ISLAND_DECORATED Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index 75033936d7..359d3227cf 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature ARG 0 state METHOD method_23396 isSoil (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_23397 configure (Lnet/minecraft/class_3037;)Lnet/minecraft/class_2975; - ARG 1 config METHOD method_27368 isSoil (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos @@ -28,8 +26,6 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature ARG 0 world ARG 1 pos METHOD method_28627 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_28628 (Lnet/minecraft/class_2975;)Lnet/minecraft/class_3037; - ARG 0 feature METHOD method_28629 (Lnet/minecraft/class_3037;)Lnet/minecraft/class_2975; ARG 1 config METHOD method_33981 isExposedToAir (Ljava/util/function/Function;Lnet/minecraft/class_2338;)Z @@ -39,17 +35,14 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature ARG 0 posToState ARG 1 pos ARG 2 predicate - METHOD method_36997 (Lnet/minecraft/class_3494;Lnet/minecraft/class_2680;)Z + METHOD method_36997 (Lnet/minecraft/class_6862;Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_36998 setBlockStateIf (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/function/Predicate;)V ARG 1 world ARG 2 pos ARG 3 state ARG 4 predicate - METHOD method_36999 notInBlockTagPredicate (Lnet/minecraft/class_2960;)Ljava/util/function/Predicate; - ARG 0 tagId - METHOD method_37000 (Lnet/minecraft/class_2680;)Z - ARG 0 state + METHOD method_36999 notInBlockTagPredicate (Lnet/minecraft/class_6862;)Ljava/util/function/Predicate; METHOD method_37256 markBlocksAboveForPostProcessing (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping b/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping index 9068e97b19..2935d5f428 100644 --- a/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/FossilFeature.mapping @@ -4,7 +4,3 @@ CLASS net/minecraft/class_3044 net/minecraft/world/gen/feature/FossilFeature ARG 1 box METHOD method_34296 (Lnet/minecraft/class_5281;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_2338;)V ARG 2 pos - METHOD method_34297 (Lnet/minecraft/class_3492;Lnet/minecraft/class_3491;)V - ARG 1 processor - METHOD method_34298 (Lnet/minecraft/class_3492;Lnet/minecraft/class_3491;)V - ARG 1 processor diff --git a/mappings/net/minecraft/world/gen/feature/FossilFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/FossilFeatureConfig.mapping index 56e1f176b2..b9136c6244 100644 --- a/mappings/net/minecraft/world/gen/feature/FossilFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/FossilFeatureConfig.mapping @@ -2,20 +2,12 @@ CLASS net/minecraft/class_5919 net/minecraft/world/gen/feature/FossilFeatureConf FIELD field_29253 CODEC Lcom/mojang/serialization/Codec; FIELD field_29254 fossilStructures Ljava/util/List; FIELD field_29255 overlayStructures Ljava/util/List; - FIELD field_29256 fossilProcessors Ljava/util/function/Supplier; - FIELD field_29257 overlayProcessors Ljava/util/function/Supplier; + FIELD field_29256 fossilProcessors Lnet/minecraft/class_6880; + FIELD field_29257 overlayProcessors Lnet/minecraft/class_6880; FIELD field_29258 maxEmptyCorners I - METHOD (Ljava/util/List;Ljava/util/List;Ljava/util/function/Supplier;Ljava/util/function/Supplier;I)V + METHOD (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;I)V ARG 1 fossilStructures ARG 2 overlayStructures - ARG 3 fossilProcessors - ARG 4 overlayProcessors - ARG 5 maxEmptyCorners - METHOD (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_5497;Lnet/minecraft/class_5497;I)V - ARG 1 fossilStructures - ARG 2 overlayStructures - ARG 3 fossilProcessors - ARG 4 overlayProcessors ARG 5 maxEmptyCorners METHOD method_34299 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/GeodeLayerConfig.mapping b/mappings/net/minecraft/world/gen/feature/GeodeLayerConfig.mapping index b86b3a57ba..1025a0fc83 100644 --- a/mappings/net/minecraft/world/gen/feature/GeodeLayerConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/GeodeLayerConfig.mapping @@ -6,16 +6,14 @@ CLASS net/minecraft/class_5585 net/minecraft/world/gen/feature/GeodeLayerConfig FIELD field_27299 outerLayerProvider Lnet/minecraft/class_4651; FIELD field_27300 innerBlocks Ljava/util/List; FIELD field_27301 CODEC Lcom/mojang/serialization/Codec; - FIELD field_33769 cannotReplace Lnet/minecraft/class_2960; - FIELD field_33931 invalidBlocks Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Ljava/util/List;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + FIELD field_33769 cannotReplace Lnet/minecraft/class_6862; + FIELD field_33931 invalidBlocks Lnet/minecraft/class_6862; + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Ljava/util/List;Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V ARG 1 fillingProvider ARG 2 innerLayerProvider ARG 3 alternateInnerLayerProvider ARG 4 middleLayerProvider ARG 5 outerLayerProvider ARG 6 innerBlocks - ARG 7 cannotReplace - ARG 8 invalidBlocks METHOD method_31887 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/GlowLichenFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/GlowLichenFeatureConfig.mapping index 7112976d9e..7944067a71 100644 --- a/mappings/net/minecraft/world/gen/feature/GlowLichenFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/GlowLichenFeatureConfig.mapping @@ -5,14 +5,13 @@ CLASS net/minecraft/class_5780 net/minecraft/world/gen/feature/GlowLichenFeature FIELD field_28432 placeOnCeiling Z FIELD field_28433 placeOnWalls Z FIELD field_28434 spreadChance F - FIELD field_28435 canPlaceOn Ljava/util/List; + FIELD field_28435 canPlaceOn Lnet/minecraft/class_6885; FIELD field_28436 directions Ljava/util/List; - METHOD (IZZZFLjava/util/List;)V + METHOD (IZZZFLnet/minecraft/class_6885;)V ARG 1 searchRange ARG 2 placeOnFloor ARG 3 placeOnCeiling ARG 4 placeOnWalls ARG 5 spreadChance - ARG 6 canPlaceOn METHOD method_33398 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping index 18b9d15f4a..efe8d5583e 100644 --- a/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping @@ -1,18 +1,18 @@ CLASS net/minecraft/class_6804 net/minecraft/world/gen/feature/MiscConfiguredFeatures - FIELD field_35800 ICE_SPIKE Lnet/minecraft/class_2975; - FIELD field_35801 ICE_PATCH Lnet/minecraft/class_2975; - FIELD field_35802 FOREST_ROCK Lnet/minecraft/class_2975; - FIELD field_35803 ICEBERG_PACKED Lnet/minecraft/class_2975; - FIELD field_35804 ICEBERG_BLUE Lnet/minecraft/class_2975; - FIELD field_35805 BLUE_ICE Lnet/minecraft/class_2975; - FIELD field_35806 LAKE_LAVA Lnet/minecraft/class_2975; - FIELD field_35807 DISK_CLAY Lnet/minecraft/class_2975; - FIELD field_35808 DISK_GRAVEL Lnet/minecraft/class_2975; - FIELD field_35809 DISK_SAND Lnet/minecraft/class_2975; - FIELD field_35810 FREEZE_TOP_LAYER Lnet/minecraft/class_2975; - FIELD field_35811 BONUS_CHEST Lnet/minecraft/class_2975; - FIELD field_35812 VOID_START_PLATFORM Lnet/minecraft/class_2975; - FIELD field_35813 DESERT_WELL Lnet/minecraft/class_2975; - FIELD field_35814 SPRING_LAVA_OVERWORLD Lnet/minecraft/class_2975; - FIELD field_35815 SPRING_LAVA_FROZEN Lnet/minecraft/class_2975; - FIELD field_35816 SPRING_WATER Lnet/minecraft/class_2975; + FIELD field_35800 ICE_SPIKE Lnet/minecraft/class_6880; + FIELD field_35801 ICE_PATCH Lnet/minecraft/class_6880; + FIELD field_35802 FOREST_ROCK Lnet/minecraft/class_6880; + FIELD field_35803 ICEBERG_PACKED Lnet/minecraft/class_6880; + FIELD field_35804 ICEBERG_BLUE Lnet/minecraft/class_6880; + FIELD field_35805 BLUE_ICE Lnet/minecraft/class_6880; + FIELD field_35806 LAKE_LAVA Lnet/minecraft/class_6880; + FIELD field_35807 DISK_CLAY Lnet/minecraft/class_6880; + FIELD field_35808 DISK_GRAVEL Lnet/minecraft/class_6880; + FIELD field_35809 DISK_SAND Lnet/minecraft/class_6880; + FIELD field_35810 FREEZE_TOP_LAYER Lnet/minecraft/class_6880; + FIELD field_35811 BONUS_CHEST Lnet/minecraft/class_6880; + FIELD field_35812 VOID_START_PLATFORM Lnet/minecraft/class_6880; + FIELD field_35813 DESERT_WELL Lnet/minecraft/class_6880; + FIELD field_35814 SPRING_LAVA_OVERWORLD Lnet/minecraft/class_6880; + FIELD field_35815 SPRING_LAVA_FROZEN Lnet/minecraft/class_6880; + FIELD field_35816 SPRING_WATER Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping index 5b22f28eb9..92ddad1fdc 100644 --- a/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping @@ -1,18 +1,18 @@ CLASS net/minecraft/class_6814 net/minecraft/world/gen/feature/MiscPlacedFeatures - FIELD field_36001 ICE_SPIKE Lnet/minecraft/class_6796; - FIELD field_36002 ICE_PATCH Lnet/minecraft/class_6796; - FIELD field_36003 FOREST_ROCK Lnet/minecraft/class_6796; - FIELD field_36004 ICEBERG_PACKED Lnet/minecraft/class_6796; - FIELD field_36005 ICEBERG_BLUE Lnet/minecraft/class_6796; - FIELD field_36006 BLUE_ICE Lnet/minecraft/class_6796; - FIELD field_36007 LAKE_LAVA_UNDERGROUND Lnet/minecraft/class_6796; - FIELD field_36008 LAKE_LAVA_SURFACE Lnet/minecraft/class_6796; - FIELD field_36009 DISK_CLAY Lnet/minecraft/class_6796; - FIELD field_36010 DISK_GRAVEL Lnet/minecraft/class_6796; - FIELD field_36011 DISK_SAND Lnet/minecraft/class_6796; - FIELD field_36012 FREEZE_TOP_LAYER Lnet/minecraft/class_6796; - FIELD field_36013 VOID_START_PLATFORM Lnet/minecraft/class_6796; - FIELD field_36014 DESERT_WELL Lnet/minecraft/class_6796; - FIELD field_36015 SPRING_LAVA Lnet/minecraft/class_6796; - FIELD field_36016 SPRING_LAVA_FROZEN Lnet/minecraft/class_6796; - FIELD field_36017 SPRING_WATER Lnet/minecraft/class_6796; + FIELD field_36001 ICE_SPIKE Lnet/minecraft/class_6880; + FIELD field_36002 ICE_PATCH Lnet/minecraft/class_6880; + FIELD field_36003 FOREST_ROCK Lnet/minecraft/class_6880; + FIELD field_36004 ICEBERG_PACKED Lnet/minecraft/class_6880; + FIELD field_36005 ICEBERG_BLUE Lnet/minecraft/class_6880; + FIELD field_36006 BLUE_ICE Lnet/minecraft/class_6880; + FIELD field_36007 LAKE_LAVA_UNDERGROUND Lnet/minecraft/class_6880; + FIELD field_36008 LAKE_LAVA_SURFACE Lnet/minecraft/class_6880; + FIELD field_36009 DISK_CLAY Lnet/minecraft/class_6880; + FIELD field_36010 DISK_GRAVEL Lnet/minecraft/class_6880; + FIELD field_36011 DISK_SAND Lnet/minecraft/class_6880; + FIELD field_36012 FREEZE_TOP_LAYER Lnet/minecraft/class_6880; + FIELD field_36013 VOID_START_PLATFORM Lnet/minecraft/class_6880; + FIELD field_36014 DESERT_WELL Lnet/minecraft/class_6880; + FIELD field_36015 SPRING_LAVA Lnet/minecraft/class_6880; + FIELD field_36016 SPRING_LAVA_FROZEN Lnet/minecraft/class_6880; + FIELD field_36017 SPRING_WATER Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/NetherConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/NetherConfiguredFeatures.mapping index 5612116e27..a071579aaa 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherConfiguredFeatures.mapping @@ -1,25 +1,25 @@ CLASS net/minecraft/class_6805 net/minecraft/world/gen/feature/NetherConfiguredFeatures - FIELD field_35817 DELTA Lnet/minecraft/class_2975; - FIELD field_35818 SMALL_BASALT_COLUMNS Lnet/minecraft/class_2975; - FIELD field_35819 SMALL_BASALT_COLUMNS_TEMP Lnet/minecraft/class_2975; - FIELD field_35820 BASALT_BLOBS Lnet/minecraft/class_2975; - FIELD field_35821 BLACKSTONE_BLOBS Lnet/minecraft/class_2975; - FIELD field_35822 GLOWSTONE_EXTRA Lnet/minecraft/class_2975; + FIELD field_35817 DELTA Lnet/minecraft/class_6880; + FIELD field_35818 SMALL_BASALT_COLUMNS Lnet/minecraft/class_6880; + FIELD field_35819 SMALL_BASALT_COLUMNS_TEMP Lnet/minecraft/class_6880; + FIELD field_35820 BASALT_BLOBS Lnet/minecraft/class_6880; + FIELD field_35821 BLACKSTONE_BLOBS Lnet/minecraft/class_6880; + FIELD field_35822 GLOWSTONE_EXTRA Lnet/minecraft/class_6880; FIELD field_35823 CRIMSON_FOREST_VEGETATION_PROVIDER Lnet/minecraft/class_4657; - FIELD field_35824 CRIMSON_FOREST_VEGETATION Lnet/minecraft/class_2975; - FIELD field_35825 CRIMSON_FOREST_VEGETATION_BONEMEAL Lnet/minecraft/class_2975; + FIELD field_35824 CRIMSON_FOREST_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35825 CRIMSON_FOREST_VEGETATION_BONEMEAL Lnet/minecraft/class_6880; FIELD field_35826 WARPED_FOREST_VEGETATION_PROVIDER Lnet/minecraft/class_4657; - FIELD field_35827 WARPED_FOREST_VEGETATION Lnet/minecraft/class_2975; - FIELD field_35828 WARPED_FOREST_VEGETATION_BONEMEAL Lnet/minecraft/class_2975; - FIELD field_35829 NETHER_SPROUTS Lnet/minecraft/class_2975; - FIELD field_35830 NETHER_SPROUTS_BONEMEAL Lnet/minecraft/class_2975; - FIELD field_35831 TWISTING_VINES Lnet/minecraft/class_2975; - FIELD field_35832 TWISTING_VINES_BONEMEAL Lnet/minecraft/class_2975; - FIELD field_35833 WEEPING_VINES Lnet/minecraft/class_2975; - FIELD field_35834 PATCH_CRIMSON_ROOTS Lnet/minecraft/class_2975; - FIELD field_35835 BASALT_PILLAR Lnet/minecraft/class_2975; - FIELD field_35836 SPRING_LAVA_NETHER Lnet/minecraft/class_2975; - FIELD field_35837 SPRING_NETHER_CLOSED Lnet/minecraft/class_2975; - FIELD field_35838 SPRING_NETHER_OPEN Lnet/minecraft/class_2975; - FIELD field_35839 PATCH_FIRE Lnet/minecraft/class_2975; - FIELD field_35840 PATCH_SOUL_FIRE Lnet/minecraft/class_2975; + FIELD field_35827 WARPED_FOREST_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35828 WARPED_FOREST_VEGETATION_BONEMEAL Lnet/minecraft/class_6880; + FIELD field_35829 NETHER_SPROUTS Lnet/minecraft/class_6880; + FIELD field_35830 NETHER_SPROUTS_BONEMEAL Lnet/minecraft/class_6880; + FIELD field_35831 TWISTING_VINES Lnet/minecraft/class_6880; + FIELD field_35832 TWISTING_VINES_BONEMEAL Lnet/minecraft/class_6880; + FIELD field_35833 WEEPING_VINES Lnet/minecraft/class_6880; + FIELD field_35834 PATCH_CRIMSON_ROOTS Lnet/minecraft/class_6880; + FIELD field_35835 BASALT_PILLAR Lnet/minecraft/class_6880; + FIELD field_35836 SPRING_LAVA_NETHER Lnet/minecraft/class_6880; + FIELD field_35837 SPRING_NETHER_CLOSED Lnet/minecraft/class_6880; + FIELD field_35838 SPRING_NETHER_OPEN Lnet/minecraft/class_6880; + FIELD field_35839 PATCH_FIRE Lnet/minecraft/class_6880; + FIELD field_35840 PATCH_SOUL_FIRE Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/NetherPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/NetherPlacedFeatures.mapping index 9d6283658f..2c217d24cd 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherPlacedFeatures.mapping @@ -1,22 +1,22 @@ CLASS net/minecraft/class_6815 net/minecraft/world/gen/feature/NetherPlacedFeatures - FIELD field_36018 DELTA Lnet/minecraft/class_6796; - FIELD field_36019 SMALL_BASALT_COLUMNS Lnet/minecraft/class_6796; - FIELD field_36020 LARGE_BASALT_COLUMNS Lnet/minecraft/class_6796; - FIELD field_36021 BASALT_BLOBS Lnet/minecraft/class_6796; - FIELD field_36022 BLACKSTONE_BLOBS Lnet/minecraft/class_6796; - FIELD field_36023 GLOWSTONE_EXTRA Lnet/minecraft/class_6796; - FIELD field_36024 GLOWSTONE Lnet/minecraft/class_6796; - FIELD field_36025 CRIMSON_FOREST_VEGETATION Lnet/minecraft/class_6796; - FIELD field_36026 WARPED_FOREST_VEGETATION Lnet/minecraft/class_6796; - FIELD field_36027 NETHER_SPROUTS Lnet/minecraft/class_6796; - FIELD field_36028 TWISTING_VINES Lnet/minecraft/class_6796; - FIELD field_36029 WEEPING_VINES Lnet/minecraft/class_6796; - FIELD field_36030 PATCH_CRIMSON_ROOTS Lnet/minecraft/class_6796; - FIELD field_36031 BASALT_PILLAR Lnet/minecraft/class_6796; - FIELD field_36032 SPRING_DELTA Lnet/minecraft/class_6796; - FIELD field_36033 SPRING_CLOSED Lnet/minecraft/class_6796; - FIELD field_36034 SPRING_CLOSED_DOUBLE Lnet/minecraft/class_6796; - FIELD field_36035 SPRING_OPEN Lnet/minecraft/class_6796; + FIELD field_36018 DELTA Lnet/minecraft/class_6880; + FIELD field_36019 SMALL_BASALT_COLUMNS Lnet/minecraft/class_6880; + FIELD field_36020 LARGE_BASALT_COLUMNS Lnet/minecraft/class_6880; + FIELD field_36021 BASALT_BLOBS Lnet/minecraft/class_6880; + FIELD field_36022 BLACKSTONE_BLOBS Lnet/minecraft/class_6880; + FIELD field_36023 GLOWSTONE_EXTRA Lnet/minecraft/class_6880; + FIELD field_36024 GLOWSTONE Lnet/minecraft/class_6880; + FIELD field_36025 CRIMSON_FOREST_VEGETATION Lnet/minecraft/class_6880; + FIELD field_36026 WARPED_FOREST_VEGETATION Lnet/minecraft/class_6880; + FIELD field_36027 NETHER_SPROUTS Lnet/minecraft/class_6880; + FIELD field_36028 TWISTING_VINES Lnet/minecraft/class_6880; + FIELD field_36029 WEEPING_VINES Lnet/minecraft/class_6880; + FIELD field_36030 PATCH_CRIMSON_ROOTS Lnet/minecraft/class_6880; + FIELD field_36031 BASALT_PILLAR Lnet/minecraft/class_6880; + FIELD field_36032 SPRING_DELTA Lnet/minecraft/class_6880; + FIELD field_36033 SPRING_CLOSED Lnet/minecraft/class_6880; + FIELD field_36034 SPRING_CLOSED_DOUBLE Lnet/minecraft/class_6880; + FIELD field_36035 SPRING_OPEN Lnet/minecraft/class_6880; FIELD field_36036 FIRE_MODIFIERS Ljava/util/List; - FIELD field_36037 PATCH_SOUL_FIRE Lnet/minecraft/class_6796; - FIELD field_36038 PATCH_FIRE Lnet/minecraft/class_6796; + FIELD field_36037 PATCH_SOUL_FIRE Lnet/minecraft/class_6880; + FIELD field_36038 PATCH_FIRE Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/OceanConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/OceanConfiguredFeatures.mapping index de6bb00504..b0431d2a66 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanConfiguredFeatures.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_6800 net/minecraft/world/gen/feature/OceanConfiguredFeatures - FIELD field_35762 SEAGRASS_SHORT Lnet/minecraft/class_2975; - FIELD field_35763 SEAGRASS_SLIGHTLY_LESS_SHORT Lnet/minecraft/class_2975; - FIELD field_35764 SEAGRASS_MID Lnet/minecraft/class_2975; - FIELD field_35765 SEAGRASS_TALL Lnet/minecraft/class_2975; - FIELD field_35766 SEA_PICKLE Lnet/minecraft/class_2975; - FIELD field_35767 SEAGRASS_SIMPLE Lnet/minecraft/class_2975; - FIELD field_35768 KELP Lnet/minecraft/class_2975; - FIELD field_35769 WARM_OCEAN_VEGETATION Lnet/minecraft/class_2975; + FIELD field_35762 SEAGRASS_SHORT Lnet/minecraft/class_6880; + FIELD field_35763 SEAGRASS_SLIGHTLY_LESS_SHORT Lnet/minecraft/class_6880; + FIELD field_35764 SEAGRASS_MID Lnet/minecraft/class_6880; + FIELD field_35765 SEAGRASS_TALL Lnet/minecraft/class_6880; + FIELD field_35766 SEA_PICKLE Lnet/minecraft/class_6880; + FIELD field_35767 SEAGRASS_SIMPLE Lnet/minecraft/class_6880; + FIELD field_35768 KELP Lnet/minecraft/class_6880; + FIELD field_35769 WARM_OCEAN_VEGETATION Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/OceanPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/OceanPlacedFeatures.mapping index fca91fc2db..b20d7ef75c 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanPlacedFeatures.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_6811 net/minecraft/world/gen/feature/OceanPlacedFeatures - FIELD field_35967 SEAGRASS_WARM Lnet/minecraft/class_6796; - FIELD field_35968 SEAGRASS_NORMAL Lnet/minecraft/class_6796; - FIELD field_35969 SEAGRASS_COLD Lnet/minecraft/class_6796; - FIELD field_35970 SEAGRASS_RIVER Lnet/minecraft/class_6796; - FIELD field_35971 SEAGRASS_SWAMP Lnet/minecraft/class_6796; - FIELD field_35972 SEAGRASS_DEEP_WARM Lnet/minecraft/class_6796; - FIELD field_35973 SEAGRASS_DEEP Lnet/minecraft/class_6796; - FIELD field_35974 SEAGRASS_DEEP_COLD Lnet/minecraft/class_6796; - FIELD field_35975 SEAGRASS_SIMPLE Lnet/minecraft/class_6796; - FIELD field_35976 SEA_PICKLE Lnet/minecraft/class_6796; - FIELD field_35977 KELP_COLD Lnet/minecraft/class_6796; - FIELD field_35978 KELP_WARM Lnet/minecraft/class_6796; - FIELD field_35979 WARM_OCEAN_VEGETATION Lnet/minecraft/class_6796; + FIELD field_35967 SEAGRASS_WARM Lnet/minecraft/class_6880; + FIELD field_35968 SEAGRASS_NORMAL Lnet/minecraft/class_6880; + FIELD field_35969 SEAGRASS_COLD Lnet/minecraft/class_6880; + FIELD field_35970 SEAGRASS_RIVER Lnet/minecraft/class_6880; + FIELD field_35971 SEAGRASS_SWAMP Lnet/minecraft/class_6880; + FIELD field_35972 SEAGRASS_DEEP_WARM Lnet/minecraft/class_6880; + FIELD field_35973 SEAGRASS_DEEP Lnet/minecraft/class_6880; + FIELD field_35974 SEAGRASS_DEEP_COLD Lnet/minecraft/class_6880; + FIELD field_35975 SEAGRASS_SIMPLE Lnet/minecraft/class_6880; + FIELD field_35976 SEA_PICKLE Lnet/minecraft/class_6880; + FIELD field_35977 KELP_COLD Lnet/minecraft/class_6880; + FIELD field_35978 KELP_WARM Lnet/minecraft/class_6880; + FIELD field_35979 WARM_OCEAN_VEGETATION Lnet/minecraft/class_6880; METHOD method_39731 seagrassModifiers (I)Ljava/util/List; ARG 0 count diff --git a/mappings/net/minecraft/world/gen/feature/OreConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/OreConfiguredFeatures.mapping index 719a5c7591..c408b57a80 100644 --- a/mappings/net/minecraft/world/gen/feature/OreConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreConfiguredFeatures.mapping @@ -1,20 +1,20 @@ CLASS net/minecraft/class_6806 net/minecraft/world/gen/feature/OreConfiguredFeatures - FIELD field_35841 ORE_IRON_SMALL Lnet/minecraft/class_2975; - FIELD field_35842 ORE_GOLD Lnet/minecraft/class_2975; - FIELD field_35843 ORE_GOLD_BURIED Lnet/minecraft/class_2975; - FIELD field_35844 ORE_REDSTONE Lnet/minecraft/class_2975; - FIELD field_35845 ORE_DIAMOND_SMALL Lnet/minecraft/class_2975; - FIELD field_35846 ORE_DIAMOND_LARGE Lnet/minecraft/class_2975; - FIELD field_35847 ORE_DIAMOND_BURIED Lnet/minecraft/class_2975; - FIELD field_35848 ORE_LAPIS Lnet/minecraft/class_2975; - FIELD field_35849 ORE_LAPIS_BURIED Lnet/minecraft/class_2975; - FIELD field_35850 ORE_INFESTED Lnet/minecraft/class_2975; - FIELD field_35851 ORE_EMERALD Lnet/minecraft/class_2975; - FIELD field_35852 ORE_ANCIENT_DEBRIS_LARGE Lnet/minecraft/class_2975; - FIELD field_35853 ORE_ANCIENT_DEBRIS_SMALL Lnet/minecraft/class_2975; - FIELD field_35854 ORE_COPPER_SMALL Lnet/minecraft/class_2975; - FIELD field_35855 ORE_COPPER_LARGE Lnet/minecraft/class_2975; - FIELD field_35856 ORE_CLAY Lnet/minecraft/class_2975; + FIELD field_35841 ORE_IRON_SMALL Lnet/minecraft/class_6880; + FIELD field_35842 ORE_GOLD Lnet/minecraft/class_6880; + FIELD field_35843 ORE_GOLD_BURIED Lnet/minecraft/class_6880; + FIELD field_35844 ORE_REDSTONE Lnet/minecraft/class_6880; + FIELD field_35845 ORE_DIAMOND_SMALL Lnet/minecraft/class_6880; + FIELD field_35846 ORE_DIAMOND_LARGE Lnet/minecraft/class_6880; + FIELD field_35847 ORE_DIAMOND_BURIED Lnet/minecraft/class_6880; + FIELD field_35848 ORE_LAPIS Lnet/minecraft/class_6880; + FIELD field_35849 ORE_LAPIS_BURIED Lnet/minecraft/class_6880; + FIELD field_35850 ORE_INFESTED Lnet/minecraft/class_6880; + FIELD field_35851 ORE_EMERALD Lnet/minecraft/class_6880; + FIELD field_35852 ORE_ANCIENT_DEBRIS_LARGE Lnet/minecraft/class_6880; + FIELD field_35853 ORE_ANCIENT_DEBRIS_SMALL Lnet/minecraft/class_6880; + FIELD field_35854 ORE_COPPER_SMALL Lnet/minecraft/class_6880; + FIELD field_35855 ORE_COPPER_LARGE Lnet/minecraft/class_6880; + FIELD field_35856 ORE_CLAY Lnet/minecraft/class_6880; FIELD field_35857 BASE_STONE_OVERWORLD Lnet/minecraft/class_3825; FIELD field_35858 STONE_ORE_REPLACEABLES Lnet/minecraft/class_3825; FIELD field_35859 DEEPSLATE_ORE_REPLACEABLES Lnet/minecraft/class_3825; @@ -26,18 +26,18 @@ CLASS net/minecraft/class_6806 net/minecraft/world/gen/feature/OreConfiguredFeat FIELD field_35865 LAPIS_ORES Ljava/util/List; FIELD field_35866 COPPER_ORES Ljava/util/List; FIELD field_35867 COAL_ORES Ljava/util/List; - FIELD field_35868 ORE_MAGMA Lnet/minecraft/class_2975; - FIELD field_35869 ORE_SOUL_SAND Lnet/minecraft/class_2975; - FIELD field_35870 ORE_NETHER_GOLD Lnet/minecraft/class_2975; - FIELD field_35871 ORE_QUARTZ Lnet/minecraft/class_2975; - FIELD field_35872 ORE_GRAVEL_NETHER Lnet/minecraft/class_2975; - FIELD field_35873 ORE_BLACKSTONE Lnet/minecraft/class_2975; - FIELD field_35874 ORE_DIRT Lnet/minecraft/class_2975; - FIELD field_35875 ORE_GRAVEL Lnet/minecraft/class_2975; - FIELD field_35876 ORE_GRANITE Lnet/minecraft/class_2975; - FIELD field_35877 ORE_DIORITE Lnet/minecraft/class_2975; - FIELD field_35878 ORE_ANDESITE Lnet/minecraft/class_2975; - FIELD field_35879 ORE_TUFF Lnet/minecraft/class_2975; - FIELD field_35880 ORE_COAL Lnet/minecraft/class_2975; - FIELD field_35881 ORE_COAL_BURIED Lnet/minecraft/class_2975; - FIELD field_35882 ORE_IRON Lnet/minecraft/class_2975; + FIELD field_35868 ORE_MAGMA Lnet/minecraft/class_6880; + FIELD field_35869 ORE_SOUL_SAND Lnet/minecraft/class_6880; + FIELD field_35870 ORE_NETHER_GOLD Lnet/minecraft/class_6880; + FIELD field_35871 ORE_QUARTZ Lnet/minecraft/class_6880; + FIELD field_35872 ORE_GRAVEL_NETHER Lnet/minecraft/class_6880; + FIELD field_35873 ORE_BLACKSTONE Lnet/minecraft/class_6880; + FIELD field_35874 ORE_DIRT Lnet/minecraft/class_6880; + FIELD field_35875 ORE_GRAVEL Lnet/minecraft/class_6880; + FIELD field_35876 ORE_GRANITE Lnet/minecraft/class_6880; + FIELD field_35877 ORE_DIORITE Lnet/minecraft/class_6880; + FIELD field_35878 ORE_ANDESITE Lnet/minecraft/class_6880; + FIELD field_35879 ORE_TUFF Lnet/minecraft/class_6880; + FIELD field_35880 ORE_COAL Lnet/minecraft/class_6880; + FIELD field_35881 ORE_COAL_BURIED Lnet/minecraft/class_6880; + FIELD field_35882 ORE_IRON Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/OrePlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/OrePlacedFeatures.mapping index 1cdf4549bd..62f1d8fa5a 100644 --- a/mappings/net/minecraft/world/gen/feature/OrePlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/OrePlacedFeatures.mapping @@ -1,43 +1,43 @@ CLASS net/minecraft/class_6816 net/minecraft/world/gen/feature/OrePlacedFeatures - FIELD field_36039 ORE_REDSTONE_LOWER Lnet/minecraft/class_6796; - FIELD field_36040 ORE_DIAMOND Lnet/minecraft/class_6796; - FIELD field_36041 ORE_DIAMOND_LARGE Lnet/minecraft/class_6796; - FIELD field_36042 ORE_DIAMOND_BURIED Lnet/minecraft/class_6796; - FIELD field_36043 ORE_LAPIS Lnet/minecraft/class_6796; - FIELD field_36044 ORE_LAPIS_BURIED Lnet/minecraft/class_6796; - FIELD field_36045 ORE_INFESTED Lnet/minecraft/class_6796; - FIELD field_36046 ORE_EMERALD Lnet/minecraft/class_6796; - FIELD field_36047 ORE_ANCIENT_DEBRIS_LARGE Lnet/minecraft/class_6796; - FIELD field_36048 ORE_DEBRIS_SMALL Lnet/minecraft/class_6796; - FIELD field_36049 ORE_COPPER Lnet/minecraft/class_6796; - FIELD field_36050 ORE_COPPER_LARGE Lnet/minecraft/class_6796; - FIELD field_36051 ORE_CLAY Lnet/minecraft/class_6796; - FIELD field_36052 ORE_MAGMA Lnet/minecraft/class_6796; - FIELD field_36053 ORE_SOUL_SAND Lnet/minecraft/class_6796; - FIELD field_36054 ORE_GOLD_DELTAS Lnet/minecraft/class_6796; - FIELD field_36055 ORE_QUARTZ_DELTAS Lnet/minecraft/class_6796; - FIELD field_36056 ORE_GOLD_NETHER Lnet/minecraft/class_6796; - FIELD field_36057 ORE_QUARTZ_NETHER Lnet/minecraft/class_6796; - FIELD field_36058 ORE_GRAVEL_NETHER Lnet/minecraft/class_6796; - FIELD field_36059 ORE_BLACKSTONE Lnet/minecraft/class_6796; - FIELD field_36060 ORE_DIRT Lnet/minecraft/class_6796; - FIELD field_36061 ORE_GRAVEL Lnet/minecraft/class_6796; - FIELD field_36062 ORE_GRANITE_UPPER Lnet/minecraft/class_6796; - FIELD field_36063 ORE_GRANITE_LOWER Lnet/minecraft/class_6796; - FIELD field_36064 ORE_DIORITE_UPPER Lnet/minecraft/class_6796; - FIELD field_36065 ORE_DIORITE_LOWER Lnet/minecraft/class_6796; - FIELD field_36066 ORE_ANDESITE_UPPER Lnet/minecraft/class_6796; - FIELD field_36067 ORE_ANDESITE_LOWER Lnet/minecraft/class_6796; - FIELD field_36068 ORE_TUFF Lnet/minecraft/class_6796; - FIELD field_36069 ORE_COAL_UPPER Lnet/minecraft/class_6796; - FIELD field_36070 ORE_COAL_LOWER Lnet/minecraft/class_6796; - FIELD field_36071 ORE_IRON_UPPER Lnet/minecraft/class_6796; - FIELD field_36072 ORE_IRON_MIDDLE Lnet/minecraft/class_6796; - FIELD field_36073 ORE_IRON_SMALL Lnet/minecraft/class_6796; - FIELD field_36074 ORE_GOLD_EXTRA Lnet/minecraft/class_6796; - FIELD field_36075 ORE_GOLD Lnet/minecraft/class_6796; - FIELD field_36076 ORE_GOLD_LOWER Lnet/minecraft/class_6796; - FIELD field_36077 ORE_REDSTONE Lnet/minecraft/class_6796; + FIELD field_36039 ORE_REDSTONE_LOWER Lnet/minecraft/class_6880; + FIELD field_36040 ORE_DIAMOND Lnet/minecraft/class_6880; + FIELD field_36041 ORE_DIAMOND_LARGE Lnet/minecraft/class_6880; + FIELD field_36042 ORE_DIAMOND_BURIED Lnet/minecraft/class_6880; + FIELD field_36043 ORE_LAPIS Lnet/minecraft/class_6880; + FIELD field_36044 ORE_LAPIS_BURIED Lnet/minecraft/class_6880; + FIELD field_36045 ORE_INFESTED Lnet/minecraft/class_6880; + FIELD field_36046 ORE_EMERALD Lnet/minecraft/class_6880; + FIELD field_36047 ORE_ANCIENT_DEBRIS_LARGE Lnet/minecraft/class_6880; + FIELD field_36048 ORE_DEBRIS_SMALL Lnet/minecraft/class_6880; + FIELD field_36049 ORE_COPPER Lnet/minecraft/class_6880; + FIELD field_36050 ORE_COPPER_LARGE Lnet/minecraft/class_6880; + FIELD field_36051 ORE_CLAY Lnet/minecraft/class_6880; + FIELD field_36052 ORE_MAGMA Lnet/minecraft/class_6880; + FIELD field_36053 ORE_SOUL_SAND Lnet/minecraft/class_6880; + FIELD field_36054 ORE_GOLD_DELTAS Lnet/minecraft/class_6880; + FIELD field_36055 ORE_QUARTZ_DELTAS Lnet/minecraft/class_6880; + FIELD field_36056 ORE_GOLD_NETHER Lnet/minecraft/class_6880; + FIELD field_36057 ORE_QUARTZ_NETHER Lnet/minecraft/class_6880; + FIELD field_36058 ORE_GRAVEL_NETHER Lnet/minecraft/class_6880; + FIELD field_36059 ORE_BLACKSTONE Lnet/minecraft/class_6880; + FIELD field_36060 ORE_DIRT Lnet/minecraft/class_6880; + FIELD field_36061 ORE_GRAVEL Lnet/minecraft/class_6880; + FIELD field_36062 ORE_GRANITE_UPPER Lnet/minecraft/class_6880; + FIELD field_36063 ORE_GRANITE_LOWER Lnet/minecraft/class_6880; + FIELD field_36064 ORE_DIORITE_UPPER Lnet/minecraft/class_6880; + FIELD field_36065 ORE_DIORITE_LOWER Lnet/minecraft/class_6880; + FIELD field_36066 ORE_ANDESITE_UPPER Lnet/minecraft/class_6880; + FIELD field_36067 ORE_ANDESITE_LOWER Lnet/minecraft/class_6880; + FIELD field_36068 ORE_TUFF Lnet/minecraft/class_6880; + FIELD field_36069 ORE_COAL_UPPER Lnet/minecraft/class_6880; + FIELD field_36070 ORE_COAL_LOWER Lnet/minecraft/class_6880; + FIELD field_36071 ORE_IRON_UPPER Lnet/minecraft/class_6880; + FIELD field_36072 ORE_IRON_MIDDLE Lnet/minecraft/class_6880; + FIELD field_36073 ORE_IRON_SMALL Lnet/minecraft/class_6880; + FIELD field_36074 ORE_GOLD_EXTRA Lnet/minecraft/class_6880; + FIELD field_36075 ORE_GOLD Lnet/minecraft/class_6880; + FIELD field_36076 ORE_GOLD_LOWER Lnet/minecraft/class_6880; + FIELD field_36077 ORE_REDSTONE Lnet/minecraft/class_6880; METHOD method_39732 modifiersWithCount (ILnet/minecraft/class_6797;)Ljava/util/List; ARG 0 count ARG 1 heightModifier diff --git a/mappings/net/minecraft/world/gen/feature/PileConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/PileConfiguredFeatures.mapping index 6391d00951..c397b20147 100644 --- a/mappings/net/minecraft/world/gen/feature/PileConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/PileConfiguredFeatures.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_6807 net/minecraft/world/gen/feature/PileConfiguredFeatures - FIELD field_35883 PILE_HAY Lnet/minecraft/class_2975; - FIELD field_35884 PILE_MELON Lnet/minecraft/class_2975; - FIELD field_35885 PILE_SNOW Lnet/minecraft/class_2975; - FIELD field_35886 PILE_ICE Lnet/minecraft/class_2975; - FIELD field_35887 PILE_PUMPKIN Lnet/minecraft/class_2975; + FIELD field_35883 PILE_HAY Lnet/minecraft/class_6880; + FIELD field_35884 PILE_MELON Lnet/minecraft/class_6880; + FIELD field_35885 PILE_SNOW Lnet/minecraft/class_6880; + FIELD field_35886 PILE_ICE Lnet/minecraft/class_6880; + FIELD field_35887 PILE_PUMPKIN Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping b/mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping index 117a9c6e8a..b0f06f7759 100644 --- a/mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/class_6796 net/minecraft/world/gen/feature/PlacedFeature + FIELD comp_334 feature Lnet/minecraft/class_6880; + FIELD comp_335 placementModifiers Ljava/util/List; FIELD field_35729 CODEC Lcom/mojang/serialization/Codec; FIELD field_35730 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_35731 LIST_CODEC Lcom/mojang/serialization/Codec; - FIELD field_35732 feature Ljava/util/function/Supplier; - FIELD field_35733 placementModifiers Ljava/util/List; - METHOD (Ljava/util/function/Supplier;Ljava/util/List;)V - ARG 1 feature + METHOD (Lnet/minecraft/class_6880;Ljava/util/List;)V ARG 2 placementModifiers + METHOD comp_334 feature ()Lnet/minecraft/class_6880; + METHOD comp_335 placementModifiers ()Ljava/util/List; METHOD method_39643 getDecoratedFeatures ()Ljava/util/stream/Stream; METHOD method_39644 generateUnregistered (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z ARG 1 world @@ -30,4 +31,3 @@ CLASS net/minecraft/class_6796 net/minecraft/world/gen/feature/PlacedFeature ARG 2 generator ARG 3 random ARG 4 pos - METHOD method_39825 getPlacementModifiers ()Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping index 9c743ed5db..62870d8d4a 100644 --- a/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping @@ -8,11 +8,10 @@ CLASS net/minecraft/class_6817 net/minecraft/world/gen/feature/PlacedFeatures FIELD field_36084 EIGHT_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797; FIELD field_36085 FOUR_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797; FIELD field_36086 BOTTOM_TO_120_RANGE Lnet/minecraft/class_6797; - METHOD method_39735 getDefaultPlacedFeature ()Lnet/minecraft/class_6796; + METHOD method_39735 getDefaultPlacedFeature ()Lnet/minecraft/class_6880; METHOD method_39736 createCountExtraModifier (IFI)Lnet/minecraft/class_6797; ARG 0 count ARG 1 extraChance ARG 2 extraCount - METHOD method_39737 register (Ljava/lang/String;Lnet/minecraft/class_6796;)Lnet/minecraft/class_6796; + METHOD method_39737 register (Ljava/lang/String;Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_6880; ARG 0 id - ARG 1 feature diff --git a/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping index 03786de315..4603bf0d6e 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_3137 net/minecraft/world/gen/feature/RandomBooleanFeatureConfig - FIELD field_13739 featureFalse Ljava/util/function/Supplier; - FIELD field_13740 featureTrue Ljava/util/function/Supplier; + FIELD field_13739 featureFalse Lnet/minecraft/class_6880; + FIELD field_13740 featureTrue Lnet/minecraft/class_6880; FIELD field_24900 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/function/Supplier;Ljava/util/function/Supplier;)V - ARG 1 featureTrue - ARG 2 featureFalse METHOD method_28750 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping index 0f5c2287cb..9154c43324 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_3141 net/minecraft/world/gen/feature/RandomFeatureConfig FIELD field_13744 features Ljava/util/List; - FIELD field_13745 defaultFeature Ljava/util/function/Supplier; + FIELD field_13745 defaultFeature Lnet/minecraft/class_6880; FIELD field_24901 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/List;Ljava/util/function/Supplier;)V + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;)V ARG 1 features - ARG 2 defaultFeature - METHOD (Ljava/util/List;Lnet/minecraft/class_6796;)V - ARG 1 features - ARG 2 defaultFeature METHOD method_28753 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping index b0cf0b4ddc..34ffbddea0 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_3226 net/minecraft/world/gen/feature/RandomFeatureEntry FIELD field_14011 chance F - FIELD field_14013 feature Ljava/util/function/Supplier; + FIELD field_14013 feature Lnet/minecraft/class_6880; FIELD field_24864 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/function/Supplier;F)V - ARG 1 feature - ARG 2 chance - METHOD (Lnet/minecraft/class_6796;F)V - ARG 1 feature + METHOD (Lnet/minecraft/class_6880;F)V ARG 2 chance METHOD method_14271 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z ARG 1 world diff --git a/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping b/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping index a8c5217f8c..6f21e9dd82 100644 --- a/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5921 net/minecraft/world/gen/feature/RootSystemFeature - METHOD method_34307 (Lnet/minecraft/class_3494;Lnet/minecraft/class_2680;)Z + METHOD method_34307 (Lnet/minecraft/class_5926;Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_34308 generateTreeAndRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5926;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338;)Z ARG 0 world @@ -25,8 +25,6 @@ CLASS net/minecraft/class_5921 net/minecraft/world/gen/feature/RootSystemFeature ARG 2 random ARG 3 pos ARG 4 mutablePos - METHOD method_34313 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_36419 isAirOrWater (Lnet/minecraft/class_2680;II)Z ARG 0 state ARG 1 height diff --git a/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping index 340bb715fd..5adb0905f5 100644 --- a/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_5926 net/minecraft/world/gen/feature/RootSystemFeatureConfig FIELD field_29267 CODEC Lcom/mojang/serialization/Codec; - FIELD field_29268 feature Ljava/util/function/Supplier; + FIELD field_29268 feature Lnet/minecraft/class_6880; FIELD field_29269 requiredVerticalSpaceForTree I FIELD field_29270 rootRadius I - FIELD field_29271 rootReplaceable Lnet/minecraft/class_2960; + FIELD field_29271 rootReplaceable Lnet/minecraft/class_6862; FIELD field_29272 rootStateProvider Lnet/minecraft/class_4651; FIELD field_29273 rootPlacementAttempts I FIELD field_29274 maxRootColumnHeight I @@ -13,11 +13,9 @@ CLASS net/minecraft/class_5926 net/minecraft/world/gen/feature/RootSystemFeature FIELD field_29278 hangingRootPlacementAttempts I FIELD field_33616 allowedVerticalWaterForTree I FIELD field_36289 predicate Lnet/minecraft/class_6646; - METHOD (Ljava/util/function/Supplier;IILnet/minecraft/class_2960;Lnet/minecraft/class_4651;IIIILnet/minecraft/class_4651;IILnet/minecraft/class_6646;)V - ARG 1 feature + METHOD (Lnet/minecraft/class_6880;IILnet/minecraft/class_6862;Lnet/minecraft/class_4651;IIIILnet/minecraft/class_4651;IILnet/minecraft/class_6646;)V ARG 2 requiredVerticalSpaceForTree ARG 3 rootRadius - ARG 4 rootReplaceable ARG 5 rootStateProvider ARG 6 rootPlacementAttempts ARG 7 maxRootColumnHeight diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping index 0606a8ec02..71c6f8d000 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping @@ -5,9 +5,8 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu ARG 1 configCodec METHOD method_27205 (Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4966; ARG 2 pos - METHOD method_27209 isColdAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_1959;)Z + METHOD method_27209 isColdAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Z ARG 0 pos - ARG 1 biome METHOD method_27210 choosePlacementHeight (Ljava/util/Random;II)I ARG 0 random ARG 1 min diff --git a/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping index ef8853dd25..648b4aa634 100644 --- a/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_3179 net/minecraft/world/gen/feature/SimpleRandomFeatureConfig - FIELD field_13827 features Ljava/util/List; + FIELD field_13827 features Lnet/minecraft/class_6885; FIELD field_24910 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/List;)V - ARG 1 features diff --git a/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping index ab5c1cb490..8380423bfc 100644 --- a/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping @@ -3,13 +3,12 @@ CLASS net/minecraft/class_4642 net/minecraft/world/gen/feature/SpringFeatureConf FIELD field_21284 requiresBlockBelow Z FIELD field_21285 rockCount I FIELD field_21286 holeCount I - FIELD field_21287 validBlocks Ljava/util/Set; + FIELD field_21287 validBlocks Lnet/minecraft/class_6885; FIELD field_24912 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3610;ZIILjava/util/Set;)V + METHOD (Lnet/minecraft/class_3610;ZIILnet/minecraft/class_6885;)V ARG 1 state ARG 2 requiresBlockBelow ARG 3 rockCount ARG 4 holeCount - ARG 5 validBlocks METHOD method_28794 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index ba7d3ed38f..baee168276 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -14,43 +14,8 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 1 configCodec ARG 2 piecesGenerator ARG 3 postPlacementProcessor - METHOD method_14015 locateStructure (Lnet/minecraft/class_4538;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;IZJLnet/minecraft/class_5314;)Lnet/minecraft/class_2338; - COMMENT Tries to find the closest structure of this type near a given block. - COMMENT

- COMMENT This method relies on the given world generation settings (seed and placement configuration) - COMMENT to match the time at which the structure was generated, otherwise it will not be found. - COMMENT

- COMMENT New chunks will only be generated up to the {@link net.minecraft.world.chunk.ChunkStatus#STRUCTURE_STARTS} phase by this method. - COMMENT - COMMENT @return {@code null} if no structure could be found within the given search radius - ARG 1 world - ARG 2 structureAccessor - ARG 3 searchStartPos - ARG 4 searchRadius - COMMENT the search radius in chunks around the chunk the given block position is in; a radius of 0 will only search in the given chunk - ARG 5 skipExistingChunks - ARG 6 worldSeed - ARG 8 config METHOD method_14019 getName ()Ljava/lang/String; - METHOD method_27218 getStartChunk (Lnet/minecraft/class_5314;JII)Lnet/minecraft/class_1923; - COMMENT Determines the cell of the structure placement grid a chunk belongs to, and - COMMENT returns the chunk within that cell, that this structure will actually be placed at. - COMMENT - COMMENT

If the {@link StructureConfig} uses a separation setting greater than 0, the - COMMENT placement will be constrained to [0, spacing - separation] within the grid cell. - COMMENT If a non-uniform distribution is used for placement, then this also moves - COMMENT the center towards the origin. - COMMENT - COMMENT @see #isUniformDistribution() - ARG 1 config - ARG 2 seed - ARG 4 x - ARG 5 z - METHOD method_27219 isUniformDistribution ()Z - COMMENT If true, this structure's start position will be uniformly distributed within - COMMENT a placement grid cell. If false, the structure's starting point will be biased - COMMENT towards the center of the cell. - METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5314;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; + METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; COMMENT Tries to place a starting point for this type of structure in the given chunk. COMMENT

COMMENT If this structure doesn't have a starting point in the chunk, {@link StructureStart#DEFAULT} @@ -62,10 +27,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 5 worldSeed ARG 7 pos ARG 8 structureReferences - ARG 9 structureConfig - ARG 10 config - ARG 11 world - ARG 12 biomePredicate METHOD method_28659 configure (Lnet/minecraft/class_3037;)Lnet/minecraft/class_5312; ARG 1 config METHOD method_28660 readStructureStart (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449; @@ -83,7 +44,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature METHOD method_28665 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_36217 calculateBoundingBox (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3341; ARG 1 box - METHOD method_38671 getLocatedPos (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2338; + METHOD method_38671 getLocatedPos (Lnet/minecraft/class_6872;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2338; COMMENT {@return a block position for feature location} ARG 1 chunkPos METHOD method_38688 (Lnet/minecraft/class_5312;)Lnet/minecraft/class_3037; diff --git a/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping index 9840ea19bc..c5f7c8f64e 100644 --- a/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping @@ -2,12 +2,11 @@ CLASS net/minecraft/class_3812 net/minecraft/world/gen/feature/StructurePoolFeat COMMENT A feature config that specifies a starting pool and a size for {@linkplain COMMENT net.minecraft.structure.pool.StructurePoolBasedGenerator#generate}. FIELD field_16860 size I - FIELD field_16861 startPool Ljava/util/function/Supplier; + FIELD field_16861 startPool Lnet/minecraft/class_6880; FIELD field_24886 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/function/Supplier;I)V - ARG 1 startPool + METHOD (Lnet/minecraft/class_6880;I)V ARG 2 size METHOD method_27222 getSize ()I - METHOD method_27223 getStartPool ()Ljava/util/function/Supplier; + METHOD method_27223 getStartPool ()Lnet/minecraft/class_6880; METHOD method_28724 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping index c4baf47445..9369e29f57 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping @@ -1,41 +1,41 @@ CLASS net/minecraft/class_6808 net/minecraft/world/gen/feature/TreeConfiguredFeatures - FIELD field_35888 BIRCH_BEES_0002 Lnet/minecraft/class_2975; - FIELD field_35889 BIRCH_BEES_002 Lnet/minecraft/class_2975; - FIELD field_35890 BIRCH_BEES_005 Lnet/minecraft/class_2975; - FIELD field_35891 FANCY_OAK_BEES_0002 Lnet/minecraft/class_2975; - FIELD field_35892 FANCY_OAK_BEES_002 Lnet/minecraft/class_2975; - FIELD field_35893 FANCY_OAK_BEES_005 Lnet/minecraft/class_2975; - FIELD field_35894 FANCY_OAK_BEES Lnet/minecraft/class_2975; + FIELD field_35888 BIRCH_BEES_0002 Lnet/minecraft/class_6880; + FIELD field_35889 BIRCH_BEES_002 Lnet/minecraft/class_6880; + FIELD field_35890 BIRCH_BEES_005 Lnet/minecraft/class_6880; + FIELD field_35891 FANCY_OAK_BEES_0002 Lnet/minecraft/class_6880; + FIELD field_35892 FANCY_OAK_BEES_002 Lnet/minecraft/class_6880; + FIELD field_35893 FANCY_OAK_BEES_005 Lnet/minecraft/class_6880; + FIELD field_35894 FANCY_OAK_BEES Lnet/minecraft/class_6880; FIELD field_35895 BEES_0002 Lnet/minecraft/class_4659; FIELD field_35896 BEES_002 Lnet/minecraft/class_4659; FIELD field_35897 BEES_005 Lnet/minecraft/class_4659; FIELD field_35898 BEES Lnet/minecraft/class_4659; - FIELD field_35899 CRIMSON_FUNGUS Lnet/minecraft/class_2975; - FIELD field_35900 CRIMSON_FUNGUS_PLANTED Lnet/minecraft/class_2975; - FIELD field_35901 WARPED_FUNGUS Lnet/minecraft/class_2975; - FIELD field_35902 WARPED_FUNGUS_PLANTED Lnet/minecraft/class_2975; - FIELD field_35903 HUGE_BROWN_MUSHROOM Lnet/minecraft/class_2975; - FIELD field_35904 HUGE_RED_MUSHROOM Lnet/minecraft/class_2975; - FIELD field_35905 OAK Lnet/minecraft/class_2975; - FIELD field_35906 DARK_OAK Lnet/minecraft/class_2975; - FIELD field_35907 BIRCH Lnet/minecraft/class_2975; - FIELD field_35908 ACACIA Lnet/minecraft/class_2975; - FIELD field_35909 SPRUCE Lnet/minecraft/class_2975; - FIELD field_35910 PINE Lnet/minecraft/class_2975; - FIELD field_35911 JUNGLE_TREE Lnet/minecraft/class_2975; - FIELD field_35912 FANCY_OAK Lnet/minecraft/class_2975; - FIELD field_35913 JUNGLE_TREE_NO_VINE Lnet/minecraft/class_2975; - FIELD field_35914 MEGA_JUNGLE_TREE Lnet/minecraft/class_2975; - FIELD field_35915 MEGA_SPRUCE Lnet/minecraft/class_2975; - FIELD field_35916 MEGA_PINE Lnet/minecraft/class_2975; - FIELD field_35917 SUPER_BIRCH_BEES_0002 Lnet/minecraft/class_2975; - FIELD field_35918 SUPER_BIRCH_BEES Lnet/minecraft/class_2975; - FIELD field_35919 SWAMP_OAK Lnet/minecraft/class_2975; - FIELD field_35920 JUNGLE_BUSH Lnet/minecraft/class_2975; - FIELD field_35921 AZALEA_TREE Lnet/minecraft/class_2975; - FIELD field_35922 OAK_BEES_0002 Lnet/minecraft/class_2975; - FIELD field_35923 OAK_BEES_002 Lnet/minecraft/class_2975; - FIELD field_35924 OAK_BEES_005 Lnet/minecraft/class_2975; + FIELD field_35899 CRIMSON_FUNGUS Lnet/minecraft/class_6880; + FIELD field_35900 CRIMSON_FUNGUS_PLANTED Lnet/minecraft/class_6880; + FIELD field_35901 WARPED_FUNGUS Lnet/minecraft/class_6880; + FIELD field_35902 WARPED_FUNGUS_PLANTED Lnet/minecraft/class_6880; + FIELD field_35903 HUGE_BROWN_MUSHROOM Lnet/minecraft/class_6880; + FIELD field_35904 HUGE_RED_MUSHROOM Lnet/minecraft/class_6880; + FIELD field_35905 OAK Lnet/minecraft/class_6880; + FIELD field_35906 DARK_OAK Lnet/minecraft/class_6880; + FIELD field_35907 BIRCH Lnet/minecraft/class_6880; + FIELD field_35908 ACACIA Lnet/minecraft/class_6880; + FIELD field_35909 SPRUCE Lnet/minecraft/class_6880; + FIELD field_35910 PINE Lnet/minecraft/class_6880; + FIELD field_35911 JUNGLE_TREE Lnet/minecraft/class_6880; + FIELD field_35912 FANCY_OAK Lnet/minecraft/class_6880; + FIELD field_35913 JUNGLE_TREE_NO_VINE Lnet/minecraft/class_6880; + FIELD field_35914 MEGA_JUNGLE_TREE Lnet/minecraft/class_6880; + FIELD field_35915 MEGA_SPRUCE Lnet/minecraft/class_6880; + FIELD field_35916 MEGA_PINE Lnet/minecraft/class_6880; + FIELD field_35917 SUPER_BIRCH_BEES_0002 Lnet/minecraft/class_6880; + FIELD field_35918 SUPER_BIRCH_BEES Lnet/minecraft/class_6880; + FIELD field_35919 SWAMP_OAK Lnet/minecraft/class_6880; + FIELD field_35920 JUNGLE_BUSH Lnet/minecraft/class_6880; + FIELD field_35921 AZALEA_TREE Lnet/minecraft/class_6880; + FIELD field_35922 OAK_BEES_0002 Lnet/minecraft/class_6880; + FIELD field_35923 OAK_BEES_002 Lnet/minecraft/class_6880; + FIELD field_35924 OAK_BEES_005 Lnet/minecraft/class_6880; METHOD method_39710 oak ()Lnet/minecraft/class_4643$class_4644; METHOD method_39711 builder (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;IIII)Lnet/minecraft/class_4643$class_4644; ARG 0 log diff --git a/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping index adddeb88e0..4219911a9c 100644 --- a/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping @@ -1,28 +1,28 @@ CLASS net/minecraft/class_6818 net/minecraft/world/gen/feature/TreePlacedFeatures - FIELD field_36087 FANCY_OAK_BEES Lnet/minecraft/class_6796; - FIELD field_36088 CRIMSON_FUNGI Lnet/minecraft/class_6796; - FIELD field_36089 WARPED_FUNGI Lnet/minecraft/class_6796; - FIELD field_36090 OAK_CHECKED Lnet/minecraft/class_6796; - FIELD field_36091 DARK_OAK_CHECKED Lnet/minecraft/class_6796; - FIELD field_36092 BIRCH_CHECKED Lnet/minecraft/class_6796; - FIELD field_36093 ACACIA_CHECKED Lnet/minecraft/class_6796; - FIELD field_36094 SPRUCE_CHECKED Lnet/minecraft/class_6796; + FIELD field_36087 FANCY_OAK_BEES Lnet/minecraft/class_6880; + FIELD field_36088 CRIMSON_FUNGI Lnet/minecraft/class_6880; + FIELD field_36089 WARPED_FUNGI Lnet/minecraft/class_6880; + FIELD field_36090 OAK_CHECKED Lnet/minecraft/class_6880; + FIELD field_36091 DARK_OAK_CHECKED Lnet/minecraft/class_6880; + FIELD field_36092 BIRCH_CHECKED Lnet/minecraft/class_6880; + FIELD field_36093 ACACIA_CHECKED Lnet/minecraft/class_6880; + FIELD field_36094 SPRUCE_CHECKED Lnet/minecraft/class_6880; FIELD field_36095 ON_SNOW_PREDICATE Lnet/minecraft/class_6646; FIELD field_36096 ON_SNOW_MODIFIERS Ljava/util/List; - FIELD field_36097 PINE_ON_SNOW Lnet/minecraft/class_6796; - FIELD field_36098 SPRUCE_ON_SNOW Lnet/minecraft/class_6796; - FIELD field_36099 PINE_CHECKED Lnet/minecraft/class_6796; - FIELD field_36100 JUNGLE_TREE Lnet/minecraft/class_6796; - FIELD field_36101 FANCY_OAK_CHECKED Lnet/minecraft/class_6796; - FIELD field_36102 MEGA_JUNGLE_TREE_CHECKED Lnet/minecraft/class_6796; - FIELD field_36103 MEGA_SPRUCE_CHECKED Lnet/minecraft/class_6796; - FIELD field_36104 MEGA_PINE_CHECKED Lnet/minecraft/class_6796; - FIELD field_36105 JUNGLE_BUSH Lnet/minecraft/class_6796; - FIELD field_36106 SUPER_BIRCH_BEES_0002 Lnet/minecraft/class_6796; - FIELD field_36107 SUPER_BIRCH_BEES Lnet/minecraft/class_6796; - FIELD field_36108 OAK_BEES_0002 Lnet/minecraft/class_6796; - FIELD field_36109 OAK_BEES_002 Lnet/minecraft/class_6796; - FIELD field_36110 BIRCH_BEES_0002 Lnet/minecraft/class_6796; - FIELD field_36111 BIRCH_BEES_002 Lnet/minecraft/class_6796; - FIELD field_36112 FANCY_OAK_BEES_0002 Lnet/minecraft/class_6796; - FIELD field_36113 FANCY_OAK_BEES_002 Lnet/minecraft/class_6796; + FIELD field_36097 PINE_ON_SNOW Lnet/minecraft/class_6880; + FIELD field_36098 SPRUCE_ON_SNOW Lnet/minecraft/class_6880; + FIELD field_36099 PINE_CHECKED Lnet/minecraft/class_6880; + FIELD field_36100 JUNGLE_TREE Lnet/minecraft/class_6880; + FIELD field_36101 FANCY_OAK_CHECKED Lnet/minecraft/class_6880; + FIELD field_36102 MEGA_JUNGLE_TREE_CHECKED Lnet/minecraft/class_6880; + FIELD field_36103 MEGA_SPRUCE_CHECKED Lnet/minecraft/class_6880; + FIELD field_36104 MEGA_PINE_CHECKED Lnet/minecraft/class_6880; + FIELD field_36105 JUNGLE_BUSH Lnet/minecraft/class_6880; + FIELD field_36106 SUPER_BIRCH_BEES_0002 Lnet/minecraft/class_6880; + FIELD field_36107 SUPER_BIRCH_BEES Lnet/minecraft/class_6880; + FIELD field_36108 OAK_BEES_0002 Lnet/minecraft/class_6880; + FIELD field_36109 OAK_BEES_002 Lnet/minecraft/class_6880; + FIELD field_36110 BIRCH_BEES_0002 Lnet/minecraft/class_6880; + FIELD field_36111 BIRCH_BEES_002 Lnet/minecraft/class_6880; + FIELD field_36112 FANCY_OAK_BEES_0002 Lnet/minecraft/class_6880; + FIELD field_36113 FANCY_OAK_BEES_002 Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping index 4dabfc62c0..5af97055a4 100644 --- a/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping @@ -1,29 +1,29 @@ CLASS net/minecraft/class_6801 net/minecraft/world/gen/feature/UndergroundConfiguredFeatures - FIELD field_35770 MONSTER_ROOM Lnet/minecraft/class_2975; - FIELD field_35771 FOSSIL_COAL Lnet/minecraft/class_2975; - FIELD field_35772 FOSSIL_DIAMONDS Lnet/minecraft/class_2975; - FIELD field_35773 DRIPSTONE_CLUSTER Lnet/minecraft/class_2975; - FIELD field_35774 LARGE_DRIPSTONE Lnet/minecraft/class_2975; - FIELD field_35775 POINTED_DRIPSTONE Lnet/minecraft/class_2975; - FIELD field_35776 UNDERWATER_MAGMA Lnet/minecraft/class_2975; - FIELD field_35777 GLOW_LICHEN Lnet/minecraft/class_2975; - FIELD field_35778 ROOTED_AZALEA_TREE Lnet/minecraft/class_2975; - FIELD field_35779 CAVE_VINE Lnet/minecraft/class_2975; - FIELD field_35780 CAVE_VINE_IN_MOSS Lnet/minecraft/class_2975; - FIELD field_35781 MOSS_VEGETATION Lnet/minecraft/class_2975; - FIELD field_35782 MOSS_PATCH Lnet/minecraft/class_2975; - FIELD field_35783 MOSS_PATCH_BONEMEAL Lnet/minecraft/class_2975; - FIELD field_35784 DRIPLEAF Lnet/minecraft/class_2975; - FIELD field_35785 CLAY_WITH_DRIPLEAVES Lnet/minecraft/class_2975; - FIELD field_35786 CLAY_POOL_WITH_DRIPLEAVES Lnet/minecraft/class_2975; - FIELD field_35787 LUSH_CAVES_CLAY Lnet/minecraft/class_2975; - FIELD field_35788 MOSS_PATCH_CEILING Lnet/minecraft/class_2975; - FIELD field_35789 SPORE_BLOSSOM Lnet/minecraft/class_2975; - FIELD field_35790 AMETHYST_GEODE Lnet/minecraft/class_2975; + FIELD field_35770 MONSTER_ROOM Lnet/minecraft/class_6880; + FIELD field_35771 FOSSIL_COAL Lnet/minecraft/class_6880; + FIELD field_35772 FOSSIL_DIAMONDS Lnet/minecraft/class_6880; + FIELD field_35773 DRIPSTONE_CLUSTER Lnet/minecraft/class_6880; + FIELD field_35774 LARGE_DRIPSTONE Lnet/minecraft/class_6880; + FIELD field_35775 POINTED_DRIPSTONE Lnet/minecraft/class_6880; + FIELD field_35776 UNDERWATER_MAGMA Lnet/minecraft/class_6880; + FIELD field_35777 GLOW_LICHEN Lnet/minecraft/class_6880; + FIELD field_35778 ROOTED_AZALEA_TREE Lnet/minecraft/class_6880; + FIELD field_35779 CAVE_VINE Lnet/minecraft/class_6880; + FIELD field_35780 CAVE_VINE_IN_MOSS Lnet/minecraft/class_6880; + FIELD field_35781 MOSS_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35782 MOSS_PATCH Lnet/minecraft/class_6880; + FIELD field_35783 MOSS_PATCH_BONEMEAL Lnet/minecraft/class_6880; + FIELD field_35784 DRIPLEAF Lnet/minecraft/class_6880; + FIELD field_35785 CLAY_WITH_DRIPLEAVES Lnet/minecraft/class_6880; + FIELD field_35786 CLAY_POOL_WITH_DRIPLEAVES Lnet/minecraft/class_6880; + FIELD field_35787 LUSH_CAVES_CLAY Lnet/minecraft/class_6880; + FIELD field_35788 MOSS_PATCH_CEILING Lnet/minecraft/class_6880; + FIELD field_35789 SPORE_BLOSSOM Lnet/minecraft/class_6880; + FIELD field_35790 AMETHYST_GEODE Lnet/minecraft/class_6880; FIELD field_35791 FOSSIL_IDS Ljava/util/List; FIELD field_35792 COAL_FOSSIL_IDS Ljava/util/List; FIELD field_35793 CAVE_VINES_PLANT_PROVIDER Lnet/minecraft/class_4657; FIELD field_35794 RANDOMIZED_AGE_CAVE_VINES_PROVIDER Lnet/minecraft/class_5929; - METHOD method_39686 createSmallDripleafFeature ()Lnet/minecraft/class_6796; - METHOD method_39687 createBigDripleafFeature (Lnet/minecraft/class_2350;)Lnet/minecraft/class_6796; + METHOD method_39686 createSmallDripleafFeature ()Lnet/minecraft/class_6880; + METHOD method_39687 createBigDripleafFeature (Lnet/minecraft/class_2350;)Lnet/minecraft/class_6880; ARG 0 direction diff --git a/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping index 9d5360e836..7f58b7d76e 100644 --- a/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping @@ -1,18 +1,18 @@ CLASS net/minecraft/class_6812 net/minecraft/world/gen/feature/UndergroundPlacedFeatures - FIELD field_35980 MONSTER_ROOM Lnet/minecraft/class_6796; - FIELD field_35981 MONSTER_ROOM_DEEP Lnet/minecraft/class_6796; - FIELD field_35982 FOSSIL_UPPER Lnet/minecraft/class_6796; - FIELD field_35983 FOSSIL_LOWER Lnet/minecraft/class_6796; - FIELD field_35984 DRIPSTONE_CLUSTER Lnet/minecraft/class_6796; - FIELD field_35985 LARGE_DRIPSTONE Lnet/minecraft/class_6796; - FIELD field_35986 POINTED_DRIPSTONE Lnet/minecraft/class_6796; - FIELD field_35987 UNDERWATER_MAGMA Lnet/minecraft/class_6796; - FIELD field_35988 GLOW_LICHEN Lnet/minecraft/class_6796; - FIELD field_35989 ROOTED_AZALEA_TREE Lnet/minecraft/class_6796; - FIELD field_35990 CAVE_VINES Lnet/minecraft/class_6796; - FIELD field_35991 LUSH_CAVES_VEGETATION Lnet/minecraft/class_6796; - FIELD field_35992 LUSH_CAVES_CLAY Lnet/minecraft/class_6796; - FIELD field_35993 LUSH_CAVES_CEILING_VEGETATION Lnet/minecraft/class_6796; - FIELD field_35994 SPORE_BLOSSOM Lnet/minecraft/class_6796; - FIELD field_35995 CLASSIC_VINES_CAVE_FEATURE Lnet/minecraft/class_6796; - FIELD field_35996 AMETHYST_GEODE Lnet/minecraft/class_6796; + FIELD field_35980 MONSTER_ROOM Lnet/minecraft/class_6880; + FIELD field_35981 MONSTER_ROOM_DEEP Lnet/minecraft/class_6880; + FIELD field_35982 FOSSIL_UPPER Lnet/minecraft/class_6880; + FIELD field_35983 FOSSIL_LOWER Lnet/minecraft/class_6880; + FIELD field_35984 DRIPSTONE_CLUSTER Lnet/minecraft/class_6880; + FIELD field_35985 LARGE_DRIPSTONE Lnet/minecraft/class_6880; + FIELD field_35986 POINTED_DRIPSTONE Lnet/minecraft/class_6880; + FIELD field_35987 UNDERWATER_MAGMA Lnet/minecraft/class_6880; + FIELD field_35988 GLOW_LICHEN Lnet/minecraft/class_6880; + FIELD field_35989 ROOTED_AZALEA_TREE Lnet/minecraft/class_6880; + FIELD field_35990 CAVE_VINES Lnet/minecraft/class_6880; + FIELD field_35991 LUSH_CAVES_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35992 LUSH_CAVES_CLAY Lnet/minecraft/class_6880; + FIELD field_35993 LUSH_CAVES_CEILING_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35994 SPORE_BLOSSOM Lnet/minecraft/class_6880; + FIELD field_35995 CLASSIC_VINES_CAVE_FEATURE Lnet/minecraft/class_6880; + FIELD field_35996 AMETHYST_GEODE Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping index aa38918b7d..3d9a34f1e0 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping @@ -1,46 +1,46 @@ CLASS net/minecraft/class_6809 net/minecraft/world/gen/feature/VegetationConfiguredFeatures - FIELD field_35925 TREES_FLOWER_FOREST Lnet/minecraft/class_2975; - FIELD field_35926 MEADOW_TREES Lnet/minecraft/class_2975; - FIELD field_35927 TREES_TAIGA Lnet/minecraft/class_2975; - FIELD field_35928 TREES_GROVE Lnet/minecraft/class_2975; - FIELD field_35929 TREES_SAVANNA Lnet/minecraft/class_2975; - FIELD field_35930 BIRCH_TALL Lnet/minecraft/class_2975; - FIELD field_35931 TREES_WINDSWEPT_HILLS Lnet/minecraft/class_2975; - FIELD field_35932 TREES_WATER Lnet/minecraft/class_2975; - FIELD field_35933 TREES_BIRCH_AND_OAK Lnet/minecraft/class_2975; - FIELD field_35934 TREES_PLAINS Lnet/minecraft/class_2975; - FIELD field_35935 TREES_SPARSE_JUNGLE Lnet/minecraft/class_2975; - FIELD field_35936 TREES_OLD_GROWTH_SPRUCE_TAIGA Lnet/minecraft/class_2975; - FIELD field_35937 TREES_OLD_GROWTH_PINE_TAIGA Lnet/minecraft/class_2975; - FIELD field_35938 TREES_JUNGLE Lnet/minecraft/class_2975; - FIELD field_35939 BAMBOO_VEGETATION Lnet/minecraft/class_2975; - FIELD field_35940 MUSHROOM_ISLAND_VEGETATION Lnet/minecraft/class_2975; - FIELD field_35941 BAMBOO_NO_PODZOL Lnet/minecraft/class_2975; - FIELD field_35942 BAMBOO_SOME_PODZOL Lnet/minecraft/class_2975; - FIELD field_35943 VINES Lnet/minecraft/class_2975; - FIELD field_35944 PATCH_BROWN_MUSHROOM Lnet/minecraft/class_2975; - FIELD field_35945 PATCH_RED_MUSHROOM Lnet/minecraft/class_2975; - FIELD field_35946 PATCH_SUNFLOWER Lnet/minecraft/class_2975; - FIELD field_35947 PATCH_PUMPKIN Lnet/minecraft/class_2975; - FIELD field_35948 PATCH_BERRY_BUSH Lnet/minecraft/class_2975; - FIELD field_35949 PATCH_TAIGA_GRASS Lnet/minecraft/class_2975; - FIELD field_35950 PATCH_GRASS Lnet/minecraft/class_2975; - FIELD field_35951 PATCH_GRASS_JUNGLE Lnet/minecraft/class_2975; - FIELD field_35952 SINGLE_PIECE_OF_GRASS Lnet/minecraft/class_2975; - FIELD field_35953 PATCH_DEAD_BUSH Lnet/minecraft/class_2975; - FIELD field_35954 PATCH_MELON Lnet/minecraft/class_2975; - FIELD field_35955 PATCH_WATERLILY Lnet/minecraft/class_2975; - FIELD field_35956 PATCH_TALL_GRASS Lnet/minecraft/class_2975; - FIELD field_35957 PATCH_LARGE_FERN Lnet/minecraft/class_2975; - FIELD field_35958 PATCH_CACTUS Lnet/minecraft/class_2975; - FIELD field_35959 PATCH_SUGAR_CANE Lnet/minecraft/class_2975; - FIELD field_35960 FLOWER_DEFAULT Lnet/minecraft/class_2975; - FIELD field_35961 FLOWER_FLOWER_FOREST Lnet/minecraft/class_2975; - FIELD field_35962 FLOWER_SWAMP Lnet/minecraft/class_2975; - FIELD field_35963 FLOWER_PLAIN Lnet/minecraft/class_2975; - FIELD field_35964 FLOWER_MEADOW Lnet/minecraft/class_2975; - FIELD field_35965 FOREST_FLOWERS Lnet/minecraft/class_2975; - FIELD field_35966 DARK_FOREST_VEGETATION Lnet/minecraft/class_2975; + FIELD field_35925 TREES_FLOWER_FOREST Lnet/minecraft/class_6880; + FIELD field_35926 MEADOW_TREES Lnet/minecraft/class_6880; + FIELD field_35927 TREES_TAIGA Lnet/minecraft/class_6880; + FIELD field_35928 TREES_GROVE Lnet/minecraft/class_6880; + FIELD field_35929 TREES_SAVANNA Lnet/minecraft/class_6880; + FIELD field_35930 BIRCH_TALL Lnet/minecraft/class_6880; + FIELD field_35931 TREES_WINDSWEPT_HILLS Lnet/minecraft/class_6880; + FIELD field_35932 TREES_WATER Lnet/minecraft/class_6880; + FIELD field_35933 TREES_BIRCH_AND_OAK Lnet/minecraft/class_6880; + FIELD field_35934 TREES_PLAINS Lnet/minecraft/class_6880; + FIELD field_35935 TREES_SPARSE_JUNGLE Lnet/minecraft/class_6880; + FIELD field_35936 TREES_OLD_GROWTH_SPRUCE_TAIGA Lnet/minecraft/class_6880; + FIELD field_35937 TREES_OLD_GROWTH_PINE_TAIGA Lnet/minecraft/class_6880; + FIELD field_35938 TREES_JUNGLE Lnet/minecraft/class_6880; + FIELD field_35939 BAMBOO_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35940 MUSHROOM_ISLAND_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35941 BAMBOO_NO_PODZOL Lnet/minecraft/class_6880; + FIELD field_35942 BAMBOO_SOME_PODZOL Lnet/minecraft/class_6880; + FIELD field_35943 VINES Lnet/minecraft/class_6880; + FIELD field_35944 PATCH_BROWN_MUSHROOM Lnet/minecraft/class_6880; + FIELD field_35945 PATCH_RED_MUSHROOM Lnet/minecraft/class_6880; + FIELD field_35946 PATCH_SUNFLOWER Lnet/minecraft/class_6880; + FIELD field_35947 PATCH_PUMPKIN Lnet/minecraft/class_6880; + FIELD field_35948 PATCH_BERRY_BUSH Lnet/minecraft/class_6880; + FIELD field_35949 PATCH_TAIGA_GRASS Lnet/minecraft/class_6880; + FIELD field_35950 PATCH_GRASS Lnet/minecraft/class_6880; + FIELD field_35951 PATCH_GRASS_JUNGLE Lnet/minecraft/class_6880; + FIELD field_35952 SINGLE_PIECE_OF_GRASS Lnet/minecraft/class_6880; + FIELD field_35953 PATCH_DEAD_BUSH Lnet/minecraft/class_6880; + FIELD field_35954 PATCH_MELON Lnet/minecraft/class_6880; + FIELD field_35955 PATCH_WATERLILY Lnet/minecraft/class_6880; + FIELD field_35956 PATCH_TALL_GRASS Lnet/minecraft/class_6880; + FIELD field_35957 PATCH_LARGE_FERN Lnet/minecraft/class_6880; + FIELD field_35958 PATCH_CACTUS Lnet/minecraft/class_6880; + FIELD field_35959 PATCH_SUGAR_CANE Lnet/minecraft/class_6880; + FIELD field_35960 FLOWER_DEFAULT Lnet/minecraft/class_6880; + FIELD field_35961 FLOWER_FLOWER_FOREST Lnet/minecraft/class_6880; + FIELD field_35962 FLOWER_SWAMP Lnet/minecraft/class_6880; + FIELD field_35963 FLOWER_PLAIN Lnet/minecraft/class_6880; + FIELD field_35964 FLOWER_MEADOW Lnet/minecraft/class_6880; + FIELD field_35965 FOREST_FLOWERS Lnet/minecraft/class_6880; + FIELD field_35966 DARK_FOREST_VEGETATION Lnet/minecraft/class_6880; METHOD method_39717 createRandomPatchFeatureConfig (Lnet/minecraft/class_4651;I)Lnet/minecraft/class_4638; ARG 0 block ARG 1 tries diff --git a/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping b/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping index 03539bb1f4..bf1445edfc 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_5922 net/minecraft/world/gen/feature/VegetationPatchFeature - METHOD method_34314 (Lnet/minecraft/class_3494;Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_34315 generateVegetationFeature (Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 config @@ -30,9 +28,5 @@ CLASS net/minecraft/class_5922 net/minecraft/world/gen/feature/VegetationPatchFe ARG 5 positions ARG 6 radiusX ARG 7 radiusZ - METHOD method_34319 getReplaceablePredicate (Lnet/minecraft/class_5927;)Ljava/util/function/Predicate; - ARG 0 config - METHOD method_34320 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_34321 (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/world/gen/feature/VegetationPatchFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/VegetationPatchFeatureConfig.mapping index 0ee2b5f6a2..8975217144 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationPatchFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationPatchFeatureConfig.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_5927 net/minecraft/world/gen/feature/VegetationPatchFeatureConfig FIELD field_29285 CODEC Lcom/mojang/serialization/Codec; - FIELD field_29286 replaceable Lnet/minecraft/class_2960; + FIELD field_29286 replaceable Lnet/minecraft/class_6862; FIELD field_29287 groundState Lnet/minecraft/class_4651; - FIELD field_29288 vegetationFeature Ljava/util/function/Supplier; + FIELD field_29288 vegetationFeature Lnet/minecraft/class_6880; FIELD field_29289 surface Lnet/minecraft/class_5932; FIELD field_29290 depth Lnet/minecraft/class_6017; FIELD field_29291 extraBottomBlockChance F @@ -10,10 +10,8 @@ CLASS net/minecraft/class_5927 net/minecraft/world/gen/feature/VegetationPatchFe FIELD field_29293 vegetationChance F FIELD field_29294 horizontalRadius Lnet/minecraft/class_6017; FIELD field_29295 extraEdgeColumnChance F - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_4651;Ljava/util/function/Supplier;Lnet/minecraft/class_5932;Lnet/minecraft/class_6017;FIFLnet/minecraft/class_6017;F)V - ARG 1 replaceable + METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_4651;Lnet/minecraft/class_6880;Lnet/minecraft/class_5932;Lnet/minecraft/class_6017;FIFLnet/minecraft/class_6017;F)V ARG 2 groundState - ARG 3 vegetationFeature ARG 4 surface ARG 5 depth ARG 6 extraBottomBlockChance diff --git a/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping index e606bbf12f..32361f73a8 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping @@ -1,77 +1,77 @@ CLASS net/minecraft/class_6819 net/minecraft/world/gen/feature/VegetationPlacedFeatures - FIELD field_36114 PATCH_SUGAR_CANE_SWAMP Lnet/minecraft/class_6796; - FIELD field_36115 PATCH_SUGAR_CANE_DESERT Lnet/minecraft/class_6796; - FIELD field_36116 PATCH_SUGAR_CANE_BADLANDS Lnet/minecraft/class_6796; - FIELD field_36117 PATCH_SUGAR_CANE Lnet/minecraft/class_6796; - FIELD field_36118 BROWN_MUSHROOM_NETHER Lnet/minecraft/class_6796; - FIELD field_36119 RED_MUSHROOM_NETHER Lnet/minecraft/class_6796; - FIELD field_36120 BROWN_MUSHROOM_NORMAL Lnet/minecraft/class_6796; - FIELD field_36121 RED_MUSHROOM_NORMAL Lnet/minecraft/class_6796; - FIELD field_36122 BROWN_MUSHROOM_TAIGA Lnet/minecraft/class_6796; - FIELD field_36123 RED_MUSHROOM_TAIGA Lnet/minecraft/class_6796; - FIELD field_36124 BROWN_MUSHROOM_OLD_GROWTH Lnet/minecraft/class_6796; - FIELD field_36125 RED_MUSHROOM_OLD_GROWTH Lnet/minecraft/class_6796; - FIELD field_36126 BROWN_MUSHROOM_SWAMP Lnet/minecraft/class_6796; - FIELD field_36127 RED_MUSHROOM_SWAMP Lnet/minecraft/class_6796; - FIELD field_36128 FLOWER_WARM Lnet/minecraft/class_6796; - FIELD field_36129 FLOWER_DEFAULT Lnet/minecraft/class_6796; - FIELD field_36130 FLOWER_FLOWER_FOREST Lnet/minecraft/class_6796; - FIELD field_36131 FLOWER_SWAMP Lnet/minecraft/class_6796; - FIELD field_36132 FLOWER_PLAIN Lnet/minecraft/class_6796; - FIELD field_36133 FLOWER_MEADOW Lnet/minecraft/class_6796; + FIELD field_36114 PATCH_SUGAR_CANE_SWAMP Lnet/minecraft/class_6880; + FIELD field_36115 PATCH_SUGAR_CANE_DESERT Lnet/minecraft/class_6880; + FIELD field_36116 PATCH_SUGAR_CANE_BADLANDS Lnet/minecraft/class_6880; + FIELD field_36117 PATCH_SUGAR_CANE Lnet/minecraft/class_6880; + FIELD field_36118 BROWN_MUSHROOM_NETHER Lnet/minecraft/class_6880; + FIELD field_36119 RED_MUSHROOM_NETHER Lnet/minecraft/class_6880; + FIELD field_36120 BROWN_MUSHROOM_NORMAL Lnet/minecraft/class_6880; + FIELD field_36121 RED_MUSHROOM_NORMAL Lnet/minecraft/class_6880; + FIELD field_36122 BROWN_MUSHROOM_TAIGA Lnet/minecraft/class_6880; + FIELD field_36123 RED_MUSHROOM_TAIGA Lnet/minecraft/class_6880; + FIELD field_36124 BROWN_MUSHROOM_OLD_GROWTH Lnet/minecraft/class_6880; + FIELD field_36125 RED_MUSHROOM_OLD_GROWTH Lnet/minecraft/class_6880; + FIELD field_36126 BROWN_MUSHROOM_SWAMP Lnet/minecraft/class_6880; + FIELD field_36127 RED_MUSHROOM_SWAMP Lnet/minecraft/class_6880; + FIELD field_36128 FLOWER_WARM Lnet/minecraft/class_6880; + FIELD field_36129 FLOWER_DEFAULT Lnet/minecraft/class_6880; + FIELD field_36130 FLOWER_FLOWER_FOREST Lnet/minecraft/class_6880; + FIELD field_36131 FLOWER_SWAMP Lnet/minecraft/class_6880; + FIELD field_36132 FLOWER_PLAIN Lnet/minecraft/class_6880; + FIELD field_36133 FLOWER_MEADOW Lnet/minecraft/class_6880; FIELD field_36134 NOT_IN_SURFACE_WATER_MODIFIER Lnet/minecraft/class_6797; - FIELD field_36135 TREES_PLAINS Lnet/minecraft/class_6796; - FIELD field_36136 DARK_FOREST_VEGETATION Lnet/minecraft/class_6796; - FIELD field_36137 FLOWER_FOREST_FLOWERS Lnet/minecraft/class_6796; - FIELD field_36138 FOREST_FLOWERS Lnet/minecraft/class_6796; - FIELD field_36139 TREES_FLOWER_FOREST Lnet/minecraft/class_6796; - FIELD field_36140 BAMBOO_LIGHT Lnet/minecraft/class_6796; - FIELD field_36141 TREES_MEADOW Lnet/minecraft/class_6796; - FIELD field_36142 TREES_TAIGA Lnet/minecraft/class_6796; - FIELD field_36143 TREES_GROVE Lnet/minecraft/class_6796; - FIELD field_36144 TREES_BADLANDS Lnet/minecraft/class_6796; - FIELD field_36145 TREES_SNOWY Lnet/minecraft/class_6796; - FIELD field_36146 TREES_SWAMP Lnet/minecraft/class_6796; - FIELD field_36147 TREES_WINDSWEPT_SAVANNA Lnet/minecraft/class_6796; - FIELD field_36148 TREES_SAVANNA Lnet/minecraft/class_6796; - FIELD field_36149 BIRCH_TALL Lnet/minecraft/class_6796; - FIELD field_36150 TREES_BIRCH Lnet/minecraft/class_6796; - FIELD field_36151 TREES_WINDSWEPT_FOREST Lnet/minecraft/class_6796; - FIELD field_36152 TREES_WINDSWEPT_HILLS Lnet/minecraft/class_6796; - FIELD field_36153 TREES_WATER Lnet/minecraft/class_6796; - FIELD field_36154 TREES_BIRCH_AND_OAK Lnet/minecraft/class_6796; - FIELD field_36155 TREES_SPARSE_JUNGLE Lnet/minecraft/class_6796; - FIELD field_36156 TREES_OLD_GROWTH_SPRUCE_TAIGA Lnet/minecraft/class_6796; - FIELD field_36157 TREES_OLD_GROWTH_PINE_TAIGA Lnet/minecraft/class_6796; - FIELD field_36158 TREES_JUNGLE Lnet/minecraft/class_6796; - FIELD field_36159 BAMBOO_VEGETATION Lnet/minecraft/class_6796; - FIELD field_36160 MUSHROOM_ISLAND_VEGETATION Lnet/minecraft/class_6796; - FIELD field_36161 BAMBOO Lnet/minecraft/class_6796; - FIELD field_36162 VINES Lnet/minecraft/class_6796; - FIELD field_36163 PATCH_SUNFLOWER Lnet/minecraft/class_6796; - FIELD field_36164 PATCH_PUMPKIN Lnet/minecraft/class_6796; - FIELD field_36165 PATCH_GRASS_PLAIN Lnet/minecraft/class_6796; - FIELD field_36166 PATCH_GRASS_FOREST Lnet/minecraft/class_6796; - FIELD field_36167 PATCH_GRASS_BADLANDS Lnet/minecraft/class_6796; - FIELD field_36168 PATCH_GRASS_SAVANNA Lnet/minecraft/class_6796; - FIELD field_36169 PATCH_GRASS_NORMAL Lnet/minecraft/class_6796; - FIELD field_36170 PATCH_GRASS_TAIGA_2 Lnet/minecraft/class_6796; - FIELD field_36171 PATCH_GRASS_TAIGA Lnet/minecraft/class_6796; - FIELD field_36172 PATCH_GRASS_JUNGLE Lnet/minecraft/class_6796; - FIELD field_36173 GRASS_BONEMEAL Lnet/minecraft/class_6796; - FIELD field_36174 PATCH_DEAD_BUSH_2 Lnet/minecraft/class_6796; - FIELD field_36175 PATCH_DEAD_BUSH Lnet/minecraft/class_6796; - FIELD field_36176 PATCH_DEAD_BUSH_BADLANDS Lnet/minecraft/class_6796; - FIELD field_36177 PATCH_MELON Lnet/minecraft/class_6796; - FIELD field_36178 PATCH_BERRY_COMMON Lnet/minecraft/class_6796; - FIELD field_36179 PATCH_BERRY_RARE Lnet/minecraft/class_6796; - FIELD field_36180 PATCH_WATERLILY Lnet/minecraft/class_6796; - FIELD field_36181 PATCH_TALL_GRASS_2 Lnet/minecraft/class_6796; - FIELD field_36182 PATCH_TALL_GRASS Lnet/minecraft/class_6796; - FIELD field_36183 PATCH_LARGE_FERN Lnet/minecraft/class_6796; - FIELD field_36184 PATCH_CACTUS_DESERT Lnet/minecraft/class_6796; - FIELD field_36185 PATCH_CACTUS_DECORATED Lnet/minecraft/class_6796; - FIELD field_36292 PATCH_MELON_SPARSE Lnet/minecraft/class_6796; + FIELD field_36135 TREES_PLAINS Lnet/minecraft/class_6880; + FIELD field_36136 DARK_FOREST_VEGETATION Lnet/minecraft/class_6880; + FIELD field_36137 FLOWER_FOREST_FLOWERS Lnet/minecraft/class_6880; + FIELD field_36138 FOREST_FLOWERS Lnet/minecraft/class_6880; + FIELD field_36139 TREES_FLOWER_FOREST Lnet/minecraft/class_6880; + FIELD field_36140 BAMBOO_LIGHT Lnet/minecraft/class_6880; + FIELD field_36141 TREES_MEADOW Lnet/minecraft/class_6880; + FIELD field_36142 TREES_TAIGA Lnet/minecraft/class_6880; + FIELD field_36143 TREES_GROVE Lnet/minecraft/class_6880; + FIELD field_36144 TREES_BADLANDS Lnet/minecraft/class_6880; + FIELD field_36145 TREES_SNOWY Lnet/minecraft/class_6880; + FIELD field_36146 TREES_SWAMP Lnet/minecraft/class_6880; + FIELD field_36147 TREES_WINDSWEPT_SAVANNA Lnet/minecraft/class_6880; + FIELD field_36148 TREES_SAVANNA Lnet/minecraft/class_6880; + FIELD field_36149 BIRCH_TALL Lnet/minecraft/class_6880; + FIELD field_36150 TREES_BIRCH Lnet/minecraft/class_6880; + FIELD field_36151 TREES_WINDSWEPT_FOREST Lnet/minecraft/class_6880; + FIELD field_36152 TREES_WINDSWEPT_HILLS Lnet/minecraft/class_6880; + FIELD field_36153 TREES_WATER Lnet/minecraft/class_6880; + FIELD field_36154 TREES_BIRCH_AND_OAK Lnet/minecraft/class_6880; + FIELD field_36155 TREES_SPARSE_JUNGLE Lnet/minecraft/class_6880; + FIELD field_36156 TREES_OLD_GROWTH_SPRUCE_TAIGA Lnet/minecraft/class_6880; + FIELD field_36157 TREES_OLD_GROWTH_PINE_TAIGA Lnet/minecraft/class_6880; + FIELD field_36158 TREES_JUNGLE Lnet/minecraft/class_6880; + FIELD field_36159 BAMBOO_VEGETATION Lnet/minecraft/class_6880; + FIELD field_36160 MUSHROOM_ISLAND_VEGETATION Lnet/minecraft/class_6880; + FIELD field_36161 BAMBOO Lnet/minecraft/class_6880; + FIELD field_36162 VINES Lnet/minecraft/class_6880; + FIELD field_36163 PATCH_SUNFLOWER Lnet/minecraft/class_6880; + FIELD field_36164 PATCH_PUMPKIN Lnet/minecraft/class_6880; + FIELD field_36165 PATCH_GRASS_PLAIN Lnet/minecraft/class_6880; + FIELD field_36166 PATCH_GRASS_FOREST Lnet/minecraft/class_6880; + FIELD field_36167 PATCH_GRASS_BADLANDS Lnet/minecraft/class_6880; + FIELD field_36168 PATCH_GRASS_SAVANNA Lnet/minecraft/class_6880; + FIELD field_36169 PATCH_GRASS_NORMAL Lnet/minecraft/class_6880; + FIELD field_36170 PATCH_GRASS_TAIGA_2 Lnet/minecraft/class_6880; + FIELD field_36171 PATCH_GRASS_TAIGA Lnet/minecraft/class_6880; + FIELD field_36172 PATCH_GRASS_JUNGLE Lnet/minecraft/class_6880; + FIELD field_36173 GRASS_BONEMEAL Lnet/minecraft/class_6880; + FIELD field_36174 PATCH_DEAD_BUSH_2 Lnet/minecraft/class_6880; + FIELD field_36175 PATCH_DEAD_BUSH Lnet/minecraft/class_6880; + FIELD field_36176 PATCH_DEAD_BUSH_BADLANDS Lnet/minecraft/class_6880; + FIELD field_36177 PATCH_MELON Lnet/minecraft/class_6880; + FIELD field_36178 PATCH_BERRY_COMMON Lnet/minecraft/class_6880; + FIELD field_36179 PATCH_BERRY_RARE Lnet/minecraft/class_6880; + FIELD field_36180 PATCH_WATERLILY Lnet/minecraft/class_6880; + FIELD field_36181 PATCH_TALL_GRASS_2 Lnet/minecraft/class_6880; + FIELD field_36182 PATCH_TALL_GRASS Lnet/minecraft/class_6880; + FIELD field_36183 PATCH_LARGE_FERN Lnet/minecraft/class_6880; + FIELD field_36184 PATCH_CACTUS_DESERT Lnet/minecraft/class_6880; + FIELD field_36185 PATCH_CACTUS_DECORATED Lnet/minecraft/class_6880; + FIELD field_36292 PATCH_MELON_SPARSE Lnet/minecraft/class_6880; METHOD method_39738 modifiers (I)Ljava/util/List; ARG 0 count METHOD method_39739 modifiersWithChance (ILnet/minecraft/class_6797;)Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/feature/VillagePlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VillagePlacedFeatures.mapping index ce8287ef9d..12bccbc13d 100644 --- a/mappings/net/minecraft/world/gen/feature/VillagePlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VillagePlacedFeatures.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_6825 net/minecraft/world/gen/feature/VillagePlacedFeatures - FIELD field_36195 PILE_HAY Lnet/minecraft/class_6796; - FIELD field_36196 PILE_MELON Lnet/minecraft/class_6796; - FIELD field_36197 PILE_SNOW Lnet/minecraft/class_6796; - FIELD field_36198 PILE_ICE Lnet/minecraft/class_6796; - FIELD field_36199 PILE_PUMPKIN Lnet/minecraft/class_6796; - FIELD field_36200 OAK Lnet/minecraft/class_6796; - FIELD field_36201 ACACIA Lnet/minecraft/class_6796; - FIELD field_36202 SPRUCE Lnet/minecraft/class_6796; - FIELD field_36203 PINE Lnet/minecraft/class_6796; - FIELD field_36204 PATCH_CACTUS Lnet/minecraft/class_6796; - FIELD field_36205 FLOWER_PLAIN Lnet/minecraft/class_6796; - FIELD field_36206 PATCH_TAIGA_GRASS Lnet/minecraft/class_6796; - FIELD field_36207 PATCH_BERRY_BUSH Lnet/minecraft/class_6796; + FIELD field_36195 PILE_HAY Lnet/minecraft/class_6880; + FIELD field_36196 PILE_MELON Lnet/minecraft/class_6880; + FIELD field_36197 PILE_SNOW Lnet/minecraft/class_6880; + FIELD field_36198 PILE_ICE Lnet/minecraft/class_6880; + FIELD field_36199 PILE_PUMPKIN Lnet/minecraft/class_6880; + FIELD field_36200 OAK Lnet/minecraft/class_6880; + FIELD field_36201 ACACIA Lnet/minecraft/class_6880; + FIELD field_36202 SPRUCE Lnet/minecraft/class_6880; + FIELD field_36203 PINE Lnet/minecraft/class_6880; + FIELD field_36204 PATCH_CACTUS Lnet/minecraft/class_6880; + FIELD field_36205 FLOWER_PLAIN Lnet/minecraft/class_6880; + FIELD field_36206 PATCH_TAIGA_GRASS Lnet/minecraft/class_6880; + FIELD field_36207 PATCH_BERRY_BUSH Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping b/mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping index 28163474d5..945c84b9f5 100644 --- a/mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping +++ b/mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_6736 net/minecraft/world/gen/noise/BuiltinNoiseParameters - METHOD method_39216 init ()Lnet/minecraft/class_5216$class_5487; + METHOD method_39216 init ()Lnet/minecraft/class_6880; METHOD method_39217 register (Lnet/minecraft/class_5321;ID[D)V ARG 0 noise ARG 1 firstOctave diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index 4f4522b279..571b59258b 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -75,7 +75,7 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu CLASS class_6693 MaterialCondition FIELD field_35232 CODEC Lcom/mojang/serialization/Codec; METHOD method_39064 codec ()Lcom/mojang/serialization/Codec; - METHOD method_39070 registerAndGetDefault ()Lcom/mojang/serialization/Codec; + METHOD method_39070 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec; CLASS class_6694 MaterialRuleContext FIELD field_35233 surfaceBuilder Lnet/minecraft/class_6724; FIELD field_35234 biomeTemperaturePredicate Lnet/minecraft/class_6686$class_6692; @@ -85,7 +85,6 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35604 surfacePredicate Lnet/minecraft/class_6686$class_6692; FIELD field_35605 chunk Lnet/minecraft/class_2791; FIELD field_35606 posToBiome Ljava/util/function/Function; - FIELD field_35607 biomeRegistry Lnet/minecraft/class_2378; FIELD field_35608 uniqueHorizontalPosValue J FIELD field_35609 x I FIELD field_35610 z I @@ -93,7 +92,6 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35612 uniquePosValue J FIELD field_35613 pos Lnet/minecraft/class_2338$class_2339; FIELD field_35614 biomeSupplier Ljava/util/function/Supplier; - FIELD field_35615 biomeKeySupplier Ljava/util/function/Supplier; FIELD field_35616 surfaceMinY I FIELD field_35617 y I FIELD field_35618 fluidHeight I @@ -150,7 +148,7 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu CLASS class_6708 MaterialRule FIELD field_35252 CODEC Lcom/mojang/serialization/Codec; METHOD method_39061 codec ()Lcom/mojang/serialization/Codec; - METHOD method_39085 registerAndGetDefault ()Lcom/mojang/serialization/Codec; + METHOD method_39085 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec; CLASS class_6709 SequenceBlockStateRule COMMENT Applies the given block state rules in sequence, and returns the first result that COMMENT isn't {@code null}. Returns {@code null} if none of the passed rules match.