diff --git a/build.gradle b/build.gradle index 284006e260..d75c505772 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w20b" +def minecraft_version = "20w21a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index 6c569f23c4..8977d90246 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -1,18 +1,18 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimensionCriterion FIELD field_9493 ID Lnet/minecraft/class_2960; - METHOD method_8794 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)V + METHOD method_8794 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V ARG 1 player ARG 2 from ARG 3 to CLASS class_2001 Conditions - FIELD field_9497 from Lnet/minecraft/class_2874; - FIELD field_9498 to Lnet/minecraft/class_2874; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)V + FIELD field_9497 from Lnet/minecraft/class_5321; + FIELD field_9498 to Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V ARG 1 player ARG 2 from ARG 3 to - METHOD method_8799 to (Lnet/minecraft/class_2874;)Lnet/minecraft/class_1999$class_2001; + METHOD method_8799 to (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1999$class_2001; ARG 0 to - METHOD method_8800 matches (Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)Z + METHOD method_8800 matches (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Z ARG 1 from ARG 2 to diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 7fc3921351..251ca4b2f7 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -312,7 +312,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23176 blockVisionPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_23177 postProcessPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_23178 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973; - METHOD (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;)V + METHOD (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V ARG 1 block ARG 2 propertyMap METHOD method_26164 isIn (Lnet/minecraft/class_3494;)Z diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 8949375c5b..a1c2d58b22 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -1,6 +1 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState - METHOD method_11633 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2680; - ARG 0 dynamic - METHOD method_16550 serialize (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2680;)Lcom/mojang/datafixers/Dynamic; - ARG 0 ops - ARG 1 state diff --git a/mappings/net/minecraft/class_5219.mapping b/mappings/net/minecraft/class_5219.mapping index 5f06ea0083..e8a3e4c407 100644 --- a/mappings/net/minecraft/class_5219.mapping +++ b/mappings/net/minecraft/class_5219.mapping @@ -6,12 +6,9 @@ CLASS net/minecraft/class_5219 METHOD method_163 cloneWorldTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 tag METHOD method_168 getVersion ()I - METHOD method_171 isVersionSnapshot ()Z METHOD method_179 getEnabledDataPacks ()Ljava/util/Set; - METHOD method_180 getVersionId ()I METHOD method_186 setDifficultyLocked (Z)V ARG 1 locked - METHOD method_191 getLastPlayed ()J METHOD method_193 setGameMode (Lnet/minecraft/class_1934;)V ARG 1 gameMode METHOD method_194 areCommandsAllowed ()Z @@ -21,7 +18,6 @@ CLASS net/minecraft/class_5219 ARG 1 difficulty METHOD method_209 getDisabledDataPacks ()Ljava/util/Set; METHOD method_210 getGameMode ()Lnet/minecraft/class_1934; - METHOD method_219 getVersionName ()Ljava/lang/String; METHOD method_221 setCustomBossEvents (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_226 getPlayerData ()Lnet/minecraft/class_2487; @@ -32,10 +28,5 @@ CLASS net/minecraft/class_5219 METHOD method_27431 isModded ()Z METHOD method_27432 getServerBrands ()Ljava/util/Set; METHOD method_27433 getLevelInfo ()Lnet/minecraft/class_1940; - METHOD method_27434 getWorldData (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2487; - ARG 1 dimensionType - METHOD method_27435 setWorldData (Lnet/minecraft/class_2874;Lnet/minecraft/class_2487;)V - ARG 1 dimensionType - ARG 2 tag METHOD method_27440 getFormatName (I)Ljava/lang/String; ARG 1 id diff --git a/mappings/net/minecraft/class_5268.mapping b/mappings/net/minecraft/class_5268.mapping index f683c2cd87..cb1c2ba0ce 100644 --- a/mappings/net/minecraft/class_5268.mapping +++ b/mappings/net/minecraft/class_5268.mapping @@ -5,13 +5,10 @@ CLASS net/minecraft/class_5268 ARG 1 thundering METHOD method_150 getLevelName ()Ljava/lang/String; METHOD method_155 getClearWeatherTime ()I - METHOD method_160 setWorldData (Lnet/minecraft/class_2487;)V - ARG 1 tag METHOD method_164 setRainTime (I)V ARG 1 rainTime METHOD method_167 setClearWeatherTime (I)V ARG 1 clearWeatherTime - METHOD method_170 getWorldData ()Lnet/minecraft/class_2487; METHOD method_173 setThunderTime (I)V ARG 1 thunderTime METHOD method_18038 getWanderingTraderSpawnDelay ()I diff --git a/mappings/net/minecraft/class_5269.mapping b/mappings/net/minecraft/class_5269.mapping index e85abfc02e..224f5eb249 100644 --- a/mappings/net/minecraft/class_5269.mapping +++ b/mappings/net/minecraft/class_5269.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_5269 - METHOD method_165 setTimeOfDay (J)V - ARG 1 timeOfDay - METHOD method_177 setTime (J)V - ARG 1 time METHOD method_187 setSpawnPos (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_27416 setSpawnX (I)V diff --git a/mappings/net/minecraft/class_5284.mapping b/mappings/net/minecraft/class_5284.mapping index 1ac0c0f4bd..b799f4881e 100644 --- a/mappings/net/minecraft/class_5284.mapping +++ b/mappings/net/minecraft/class_5284.mapping @@ -1,15 +1,9 @@ CLASS net/minecraft/class_5284 FIELD field_24514 defaultBlock Lnet/minecraft/class_2680; FIELD field_24515 defaultFluid Lnet/minecraft/class_2680; - FIELD field_24516 config Lnet/minecraft/class_2888; - METHOD (Lnet/minecraft/class_2888;)V - ARG 1 config + FIELD field_24516 config Lnet/minecraft/class_5311; METHOD method_16400 getBedrockCeilingY ()I METHOD method_16401 getBedrockFloorY ()I - METHOD method_28003 setDefaultBlock (Lnet/minecraft/class_2680;)V - ARG 1 defaultBlock - METHOD method_28004 setDefaultFluid (Lnet/minecraft/class_2680;)V - ARG 1 defaultFluid METHOD method_28005 getDefaultBlock ()Lnet/minecraft/class_2680; METHOD method_28006 getDefaultFluid ()Lnet/minecraft/class_2680; - METHOD method_28007 getConfig ()Lnet/minecraft/class_2888; + METHOD method_28007 getConfig ()Lnet/minecraft/class_5311; diff --git a/mappings/net/minecraft/class_5304.mapping b/mappings/net/minecraft/class_5304.mapping new file mode 100644 index 0000000000..898f019b19 --- /dev/null +++ b/mappings/net/minecraft/class_5304.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5304 + METHOD method_6445 spawn (Lnet/minecraft/class_3218;ZZ)I diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index 378bda8423..ed9cafdf6a 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs FIELD field_3291 versionType Ljava/lang/String; FIELD field_3292 demo Z FIELD field_3293 version Ljava/lang/String; - METHOD (ZLjava/lang/String;Ljava/lang/String;)V + METHOD (ZLjava/lang/String;Ljava/lang/String;ZZ)V ARG 1 demo ARG 2 version ARG 3 versionType diff --git a/mappings/net/minecraft/client/gui/ClientChatListener.mapping b/mappings/net/minecraft/client/gui/ClientChatListener.mapping index 5f87973660..8e9b93927f 100644 --- a/mappings/net/minecraft/client/gui/ClientChatListener.mapping +++ b/mappings/net/minecraft/client/gui/ClientChatListener.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_334 net/minecraft/client/gui/ClientChatListener - METHOD method_1794 onChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;)V + METHOD method_1794 onChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Ljava/util/UUID;)V ARG 1 messageType ARG 2 message diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index 5ed8279958..7c3d7f0918 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -183,14 +183,11 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper METHOD method_25304 setZOffset (I)V ARG 1 zOffset METHOD method_25305 getZOffset ()I - METHOD method_27533 fillGradient (Lnet/minecraft/class_1159;IIIIII)V - ARG 1 matrix + METHOD method_27533 fillGradient (Lnet/minecraft/class_1159;Lnet/minecraft/class_287;IIIIIII)V ARG 2 xStart ARG 3 yStart ARG 4 xEnd ARG 5 yEnd - ARG 6 colorStart - ARG 7 colorEnd METHOD method_27534 drawCenteredText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V ARG 1 matrices ARG 2 textRenderer diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index e94b616605..1e4ed306f9 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -60,7 +60,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1753 render (Lnet/minecraft/class_4587;F)V METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V - METHOD method_1755 addChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;)V + METHOD method_1755 addChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Ljava/util/UUID;)V METHOD method_1756 getFontRenderer ()Lnet/minecraft/class_327; METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping index 1be4d4d15f..87109e06f7 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen FIELD field_2438 confirmButton Lnet/minecraft/class_4185; - FIELD field_2439 biomeListLength I FIELD field_2441 biomeSelectionList Lnet/minecraft/class_415$class_4190; METHOD method_2151 refreshConfirmButton ()V CLASS class_4190 BuffetBiomesListWidget diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping index 32d0250ce4..68bde574da 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping @@ -5,8 +5,5 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel FIELD field_2422 parent Lnet/minecraft/class_437; FIELD field_2424 layers Lnet/minecraft/class_413$class_4192; FIELD field_2425 heightText Lnet/minecraft/class_2561; - METHOD method_2138 getConfigString ()Ljava/lang/String; - METHOD method_2139 setConfigString (Ljava/lang/String;)V - ARG 1 config CLASS class_4192 SuperflatLayersListWidget CLASS class_4193 SuperflatLayerItem diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index 6337606a2b..307289d46f 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -10,18 +10,15 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen ARG 1 parent METHOD method_20102 updateSelectButton (Z)V ARG 1 hasSelected - METHOD method_2195 addPreset (Lnet/minecraft/class_2561;Lnet/minecraft/class_1935;Lnet/minecraft/class_1959;Ljava/util/List;[Lnet/minecraft/class_3229;)V + METHOD method_2195 addPreset (Lnet/minecraft/class_2561;Lnet/minecraft/class_1935;Lnet/minecraft/class_1959;Ljava/util/List;ZZZ[Lnet/minecraft/class_3229;)V ARG 1 icon ARG 2 biome ARG 3 structures - ARG 4 layers CLASS class_431 SuperflatPreset - FIELD field_2526 config Ljava/lang/String; FIELD field_2527 icon Lnet/minecraft/class_1792; FIELD field_2528 name Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_2561;Ljava/lang/String;)V + METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_2561;Lnet/minecraft/class_3232;)V ARG 1 icon - ARG 3 config CLASS class_4196 SuperflatPresetsListWidget CLASS class_432 SuperflatPresetEntry METHOD method_19389 setPreset ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index ed13954be8..232eb7c00c 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -18,7 +18,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_3700 advancementHandler Lnet/minecraft/class_632; FIELD field_3701 loginScreen Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;)V - ARG 1 client ARG 2 screen ARG 3 connection ARG 4 profile diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 4489497401..f847dfa4b6 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -3,11 +3,6 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast FIELD field_2214 justUpdated Z FIELD field_2215 title Ljava/lang/String; FIELD field_2216 startTime J - FIELD field_2217 description Ljava/lang/String; - METHOD (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V - ARG 1 type - ARG 2 title - ARG 3 description METHOD method_1990 show (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 0 manager ARG 1 type diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index bb43c3f8a7..9f15a75571 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -92,4 +92,8 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 2 parameters ARG 3 shape ARG 4 y + METHOD method_8435 setTimeOfDay (J)V METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V + CLASS class_5271 + METHOD method_165 setTimeOfDay (J)V + METHOD method_177 setTime (J)V diff --git a/mappings/net/minecraft/command/arguments/DimensionArgumentType.mapping b/mappings/net/minecraft/command/arguments/DimensionArgumentType.mapping index 077b490183..b400f1ce41 100644 --- a/mappings/net/minecraft/command/arguments/DimensionArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/DimensionArgumentType.mapping @@ -5,6 +5,6 @@ CLASS net/minecraft/class_2181 net/minecraft/command/arguments/DimensionArgument ARG 1 context ARG 2 builder METHOD method_9288 dimension ()Lnet/minecraft/class_2181; - METHOD method_9289 getDimensionArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2874; + METHOD method_9289 getDimensionArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/data/report/ItemListProvider.mapping b/mappings/net/minecraft/data/report/ItemListProvider.mapping index 1049dbed55..3c6ec5afad 100644 --- a/mappings/net/minecraft/data/report/ItemListProvider.mapping +++ b/mappings/net/minecraft/data/report/ItemListProvider.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_2427 net/minecraft/data/report/ItemListProvider FIELD field_11323 root Lnet/minecraft/class_2403; FIELD field_17170 GSON Lcom/google/gson/Gson; - METHOD method_17175 toJson (Lnet/minecraft/class_2385;)Lcom/google/gson/JsonElement; + METHOD method_17175 toJson (Lnet/minecraft/class_2378;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/datafixer/fix/AbstractUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/AbstractUuidFix.mapping index 8cc35d681f..47dc59e235 100644 --- a/mappings/net/minecraft/datafixer/fix/AbstractUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/AbstractUuidFix.mapping @@ -4,32 +4,25 @@ CLASS net/minecraft/class_4958 net/minecraft/datafixer/fix/AbstractUuidFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/DSL$TypeReference;)V ARG 1 outputSchema ARG 2 typeReference - METHOD method_26002 createArrayFromCompoundUuid (Lcom/mojang/datafixers/Dynamic;)Ljava/util/Optional; - ARG 0 uuidCompound - METHOD method_26003 createArray (Lcom/mojang/datafixers/Dynamic;JJ)Ljava/util/Optional; - ARG 0 parent + METHOD method_26002 createArrayFromCompoundUuid (Lcom/mojang/serialization/Dynamic;)Ljava/util/Optional; + METHOD method_26003 createArray (Lcom/mojang/serialization/Dynamic;JJ)Ljava/util/Optional; ARG 1 mostBits ARG 3 leastBits - METHOD method_26005 createArrayFromStringUuid (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;)Ljava/util/Optional; - ARG 0 parent + METHOD method_26005 createArrayFromStringUuid (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/util/Optional; ARG 1 key - METHOD method_26006 updateStringUuid (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; - ARG 0 parent + METHOD method_26006 updateStringUuid (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; ARG 1 oldKey ARG 2 newKey METHOD method_26009 updateTyped (Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/Typed; ARG 1 typed ARG 2 name ARG 3 updater - METHOD method_26011 updateCompoundUuid (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; - ARG 0 parent + METHOD method_26011 updateCompoundUuid (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; ARG 1 oldKey ARG 2 newKey - METHOD method_26013 updateRegularMostLeast (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; - ARG 0 parent + METHOD method_26013 updateRegularMostLeast (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; ARG 1 oldKey ARG 2 newKey - METHOD method_26014 createArrayFromMostLeastTags (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; - ARG 0 parent + METHOD method_26014 createArrayFromMostLeastTags (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; ARG 1 mostBitsKey ARG 2 leastBitsKey diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping index 505ad93a4e..91f3d09331 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping @@ -2,9 +2,4 @@ CLASS net/minecraft/class_3564 net/minecraft/datafixer/fix/BlockEntityBannerColo METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15546 fixBannerColor (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag - METHOD method_15547 (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag - METHOD method_15549 (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag + METHOD method_15546 fixBannerColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping index 354645dc8c..d2790d6fdb 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_3574 net/minecraft/datafixer/fix/BlockEntityKeepPacked METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15579 keepPacked (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag + METHOD method_15579 keepPacked (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping index 19d448e253..41b1245dd0 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping @@ -3,8 +3,7 @@ CLASS net/minecraft/class_3577 net/minecraft/datafixer/fix/BlockEntitySignTextSt METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15582 fix (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_15582 fix (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 2 lineName CLASS 1 METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityUuidFix.mapping index 5fba784c3a..5d27d1d01d 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityUuidFix.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_4959 net/minecraft/datafixer/fix/BlockEntityUuidFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema - METHOD method_26017 updateSkull (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root - METHOD method_26018 updateConduit (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 root + METHOD method_26017 updateSkull (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26018 updateConduit (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/BlockStateFlattening.mapping b/mappings/net/minecraft/datafixer/fix/BlockStateFlattening.mapping index c3900cdd39..698d4f2a46 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockStateFlattening.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockStateFlattening.mapping @@ -1,18 +1,15 @@ CLASS net/minecraft/class_3580 net/minecraft/datafixer/fix/BlockStateFlattening - FIELD field_15830 ID_TO_NEW_STATE [Lcom/mojang/datafixers/Dynamic; FIELD field_15831 OLD_STATE_TO_ID Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_15832 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_15833 OLD_BLOCK_TO_ID Lit/unimi/dsi/fastutil/objects/Object2IntMap; - FIELD field_20682 ID_TO_NEW_BLOCK [Lcom/mojang/datafixers/Dynamic; - METHOD method_15594 lookupState (I)Lcom/mojang/datafixers/Dynamic; + METHOD method_15594 lookupState (I)Lcom/mojang/serialization/Dynamic; ARG 0 stateId METHOD method_15596 putStates (ILjava/lang/String;[Ljava/lang/String;)V ARG 0 oldId ARG 1 newStateStr ARG 2 oldStateStrings - METHOD method_15597 lookupState (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 oldState - METHOD method_15598 parseState (Ljava/lang/String;)Lcom/mojang/datafixers/Dynamic; + METHOD method_15597 lookupState (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_15598 parseState (Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 0 stateStr METHOD method_15599 lookupStateBlock (I)Ljava/lang/String; ARG 0 stateId diff --git a/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping index d810f28138..75efc7eb8d 100644 --- a/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_3903 net/minecraft/datafixer/fix/CatTypeFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_17325 fixCatTypeData (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_17325 fixCatTypeData (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping index bf5fa61272..c9e492b910 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping @@ -1,23 +1,23 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageFix - FIELD field_15834 grassUpper Lcom/mojang/datafixers/Dynamic; - FIELD field_15835 roseUpper Lcom/mojang/datafixers/Dynamic; + FIELD field_15834 grassUpper Lcom/mojang/serialization/Dynamic; + FIELD field_15835 roseUpper Lcom/mojang/serialization/Dynamic; FIELD field_15836 door Ljava/util/Map; FIELD field_15837 colors Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - FIELD field_15838 snowyGrass Lcom/mojang/datafixers/Dynamic; - FIELD field_15839 sunflowerUpper Lcom/mojang/datafixers/Dynamic; - FIELD field_15840 pumpkin Lcom/mojang/datafixers/Dynamic; + FIELD field_15838 snowyGrass Lcom/mojang/serialization/Dynamic; + FIELD field_15839 sunflowerUpper Lcom/mojang/serialization/Dynamic; + FIELD field_15840 pumpkin Lcom/mojang/serialization/Dynamic; FIELD field_15841 flowerPot Ljava/util/Map; FIELD field_15842 blocksNeedingSideUpdate Ljava/util/BitSet; - FIELD field_15843 air Lcom/mojang/datafixers/Dynamic; + FIELD field_15843 air Lcom/mojang/serialization/Dynamic; FIELD field_15844 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_15845 fernUpper Lcom/mojang/datafixers/Dynamic; + FIELD field_15845 fernUpper Lcom/mojang/serialization/Dynamic; FIELD field_15846 noteblock Ljava/util/Map; - FIELD field_15847 peonyUpper Lcom/mojang/datafixers/Dynamic; - FIELD field_15848 lilacUpper Lcom/mojang/datafixers/Dynamic; + FIELD field_15847 peonyUpper Lcom/mojang/serialization/Dynamic; + FIELD field_15848 lilacUpper Lcom/mojang/serialization/Dynamic; FIELD field_15849 bed Ljava/util/Map; - FIELD field_15850 snowyMycelium Lcom/mojang/datafixers/Dynamic; + FIELD field_15850 snowyMycelium Lcom/mojang/serialization/Dynamic; FIELD field_15851 banner Ljava/util/Map; - FIELD field_15852 podzol Lcom/mojang/datafixers/Dynamic; + FIELD field_15852 podzol Lcom/mojang/serialization/Dynamic; FIELD field_15853 skull Ljava/util/Map; FIELD field_15854 blocksNeedingInPlaceUpdate Ljava/util/BitSet; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V @@ -37,12 +37,12 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF ARG 1 east ARG 2 north ARG 3 south - METHOD method_15616 addTo (Lnet/minecraft/class_3513;Lcom/mojang/datafixers/Dynamic;)I - METHOD method_15633 fixChunk (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_15616 addTo (Lnet/minecraft/class_3513;Lcom/mojang/serialization/Dynamic;)I + METHOD method_15633 fixChunk (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_15636 buildBed (Ljava/util/Map;ILjava/lang/String;)V ARG 0 out - METHOD method_15637 getName (Lcom/mojang/datafixers/Dynamic;)Ljava/lang/String; - METHOD method_15638 getProperty (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;)Ljava/lang/String; + METHOD method_15637 getName (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; + METHOD method_15638 getProperty (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/lang/String; CLASS class_3583 ChunkNibbleArray FIELD field_15855 contents [B METHOD method_15640 get (III)I @@ -68,33 +68,33 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF FIELD field_15875 seenStates Ljava/util/Set; FIELD field_15876 hasBlocks Z FIELD field_15877 states [I - FIELD field_15878 section Lcom/mojang/datafixers/Dynamic; + FIELD field_15878 section Lcom/mojang/serialization/Dynamic; FIELD field_15879 y I - FIELD field_15880 paletteData Lcom/mojang/datafixers/Dynamic; + FIELD field_15880 paletteData Ljava/util/List; FIELD field_15881 inPlaceUpdates Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_15882 paletteMap Lnet/minecraft/class_3513; - METHOD method_15647 setBlock (ILcom/mojang/datafixers/Dynamic;)V + METHOD method_15647 setBlock (ILcom/mojang/serialization/Dynamic;)V ARG 1 pos - METHOD method_15649 getBlock (I)Lcom/mojang/datafixers/Dynamic; + METHOD method_15649 getBlock (I)Lcom/mojang/serialization/Dynamic; ARG 1 index METHOD method_15650 addInPlaceUpdate (II)V ARG 1 section ARG 2 index - METHOD method_15651 transform ()Lcom/mojang/datafixers/Dynamic; + METHOD method_15651 transform ()Lcom/mojang/serialization/Dynamic; METHOD method_15652 visit (I)I ARG 1 sidesToUpgrade CLASS class_3588 Level FIELD field_15883 yPos I FIELD field_15884 xPos I FIELD field_15885 sidesToUpgrade I - FIELD field_15886 level Lcom/mojang/datafixers/Dynamic; + FIELD field_15886 level Lcom/mojang/serialization/Dynamic; FIELD field_15887 blockEntities Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_15888 sections [Lnet/minecraft/class_3582$class_3587; - METHOD method_15655 getBlockEntity (I)Lcom/mojang/datafixers/Dynamic; - METHOD method_15657 setBlock (ILcom/mojang/datafixers/Dynamic;)V + METHOD method_15655 getBlockEntity (I)Lcom/mojang/serialization/Dynamic; + METHOD method_15657 setBlock (ILcom/mojang/serialization/Dynamic;)V METHOD method_15658 getSection (I)Lnet/minecraft/class_3582$class_3587; - METHOD method_15660 removeBlockEntity (I)Lcom/mojang/datafixers/Dynamic; - METHOD method_15662 getBlock (I)Lcom/mojang/datafixers/Dynamic; + METHOD method_15660 removeBlockEntity (I)Lcom/mojang/serialization/Dynamic; + METHOD method_15662 getBlock (I)Lcom/mojang/serialization/Dynamic; METHOD method_15663 adjacentTo (ILnet/minecraft/class_3582$class_3584;)I ARG 1 direction - METHOD method_15664 transform ()Lcom/mojang/datafixers/Dynamic; + METHOD method_15664 transform ()Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping index 5b697dfc6a..d9f82097cc 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_3594 net/minecraft/datafixer/fix/EntityArmorStandSilen METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15679 fixSilent (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_15679 fixSilent (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityCustomNameToTextFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityCustomNameToTextFix.mapping index a9f8d3b5a5..65f555dafc 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityCustomNameToTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityCustomNameToTextFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_3597 net/minecraft/datafixer/fix/EntityCustomNameToTex METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15697 fixCustomName (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag + METHOD method_15697 fixCustomName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping index 8428231d11..11b46a2b5f 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping @@ -3,5 +3,4 @@ CLASS net/minecraft/class_3600 net/minecraft/datafixer/fix/EntityHealthFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15704 fixHealth (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_15704 fixHealth (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping index fa1520c582..e2ad98cd6f 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_3604 net/minecraft/datafixer/fix/EntityItemFrameDirect METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15711 fixDirection (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_15711 fixDirection (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_15712 updateDirection (B)B diff --git a/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping index fb8f444e37..34bf0a63a7 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping @@ -3,5 +3,4 @@ CLASS net/minecraft/class_3607 net/minecraft/datafixer/fix/EntityPaintingMotiveF METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15723 renameMotive (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 dynamic + METHOD method_15723 renameMotive (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping index a434c933a0..791d05f4f9 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping @@ -4,13 +4,12 @@ CLASS net/minecraft/class_4860 net/minecraft/datafixer/fix/EntityProjectileOwner METHOD method_24898 makeUuidArray (JJ)[I ARG 0 most ARG 2 least - METHOD method_24899 moveFlatOwnerMostLeastToArray (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_24900 insertOwnerUuidArray (Lcom/mojang/datafixers/Dynamic;JJ)Lcom/mojang/datafixers/Dynamic; - ARG 1 dynamic + METHOD method_24899 moveFlatOwnerMostLeastToArray (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_24900 insertOwnerUuidArray (Lcom/mojang/serialization/Dynamic;JJ)Lcom/mojang/serialization/Dynamic; ARG 2 most ARG 4 least METHOD method_24901 fixEntities (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; METHOD method_24902 update (Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/Typed; - METHOD method_24904 moveNestedOwnerMostLeastToArray (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_24905 renamePotionToItem (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_24906 moveOwnerToArray (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24904 moveNestedOwnerMostLeastToArray (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_24905 renamePotionToItem (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_24906 moveOwnerToArray (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping index cc170be272..99aae2fba4 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_1169 net/minecraft/datafixer/fix/EntityShulkerColorFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_4985 fixShulkerColor (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_4985 fixShulkerColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityShulkerRotationFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityShulkerRotationFix.mapping index c903947467..7af73b50b1 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityShulkerRotationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityShulkerRotationFix.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_5277 net/minecraft/datafixer/fix/EntityShulkerRotationFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema - METHOD method_27960 fixShulkerRotation (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_27960 fixShulkerRotation (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntitySimpleTransformFix.mapping b/mappings/net/minecraft/datafixer/fix/EntitySimpleTransformFix.mapping index 971a281e42..fc9c648779 100644 --- a/mappings/net/minecraft/datafixer/fix/EntitySimpleTransformFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntitySimpleTransformFix.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_1212 net/minecraft/datafixer/fix/EntitySimpleTransformFix - METHOD method_5164 transform (Ljava/lang/String;Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/util/Pair; + METHOD method_5164 transform (Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/datafixers/util/Pair; ARG 1 choice - ARG 2 tag diff --git a/mappings/net/minecraft/datafixer/fix/EntityTransformFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityTransformFix.mapping index 30d1408223..4e9aa12ef8 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityTransformFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityTransformFix.mapping @@ -6,4 +6,4 @@ CLASS net/minecraft/class_1167 net/minecraft/datafixer/fix/EntityTransformFix ARG 3 changesType METHOD method_4982 transform (Ljava/lang/String;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/util/Pair; ARG 1 choice - METHOD method_4983 makeTyped (Ljava/lang/Object;Lcom/mojang/datafixers/types/DynamicOps;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/Typed; + METHOD method_4983 makeTyped (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping index 1f6620243a..fc77182a84 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping @@ -7,17 +7,17 @@ CLASS net/minecraft/class_4960 net/minecraft/datafixer/fix/EntityUuidFix FIELD field_23127 PROJECTILES Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema - METHOD method_26022 updateAngryAtMemory (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26024 updateEvokerFangs (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26026 updateZombieVillager (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26028 updateAreaEffectCloud (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26030 updateShulkerBullet (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26031 updateItemEntity (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26032 updateFox (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26033 updateZombifiedPiglin (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26034 updateTameable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26035 updateBreedable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26036 updateLeashable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26037 updateLiving (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26038 updateProjectile (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_26039 updateSelfUuid (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_26022 updateAngryAtMemory (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26024 updateEvokerFangs (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26026 updateZombieVillager (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26028 updateAreaEffectCloud (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26030 updateShulkerBullet (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26031 updateItemEntity (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26032 updateFox (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26033 updateZombifiedPiglin (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26034 updateTameable (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26035 updateBreedable (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26036 updateLeashable (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26037 updateLiving (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26038 updateProjectile (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_26039 updateSelfUuid (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping index a5c2c18eb3..05d603b612 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_1172 net/minecraft/datafixer/fix/EntityWolfColorFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_4988 fixCollarColor (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_4988 fixCollarColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping index 506b5272cb..49b7bd12b6 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1174 net/minecraft/datafixer/fix/EntityZombieVillagerT METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_4990 fixZombieType (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_4990 fixZombieType (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_4991 clampType (I)I ARG 1 type diff --git a/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping b/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping index 22d49b9baa..1d98e40f34 100644 --- a/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_3606 net/minecraft/datafixer/fix/HangingEntityFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_15719 fixDecorationPosition (Lcom/mojang/datafixers/Dynamic;ZZ)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_15719 fixDecorationPosition (Lcom/mojang/serialization/Dynamic;ZZ)Lcom/mojang/serialization/Dynamic; ARG 2 isPainting ARG 3 isItemFrame diff --git a/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping index c2146a40c0..2778cb4e7b 100644 --- a/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_1177 net/minecraft/datafixer/fix/HeightmapRenamingFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_4998 renameHeightmapTags (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_4998 renameHeightmapTags (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping b/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping index 2b9c882d52..30bbaacda3 100644 --- a/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping @@ -2,9 +2,6 @@ CLASS net/minecraft/class_1176 net/minecraft/datafixer/fix/IglooMetadataRemovalF METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_4993 removeMetadata (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag - METHOD method_4996 removeIgloos (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag - METHOD method_4997 isIgloo (Lcom/mojang/datafixers/Dynamic;)Z - ARG 0 tag + METHOD method_4993 removeMetadata (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_4996 removeIgloos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_4997 isIgloo (Lcom/mojang/serialization/Dynamic;)Z diff --git a/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping index 5c7d2aaa7a..5ddd5be653 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_1178 net/minecraft/datafixer/fix/ItemCustomNameToCompo METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_5001 fixCustomName (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_5001 fixCustomName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping index 65ad7d8ee8..86237a354f 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping @@ -3,5 +3,4 @@ CLASS net/minecraft/class_1187 net/minecraft/datafixer/fix/ItemStackEnchantmentF METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_5035 fixEnchantments (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_5035 fixEnchantments (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping index 7bb0805bc6..7728cf1d8c 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_1194 net/minecraft/datafixer/fix/ItemWrittenBookPagesS METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_5085 fixBookPages (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_5085 fixBookPages (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/JigsawPropertiesFix.mapping b/mappings/net/minecraft/datafixer/fix/JigsawPropertiesFix.mapping index e891a40586..80c51d2130 100644 --- a/mappings/net/minecraft/datafixer/fix/JigsawPropertiesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/JigsawPropertiesFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_4977 net/minecraft/datafixer/fix/JigsawPropertiesFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_26300 renameProperties (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 data + METHOD method_26300 renameProperties (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/JigsawRotationFix.mapping b/mappings/net/minecraft/datafixer/fix/JigsawRotationFix.mapping index 2ccb24831e..e69408c886 100644 --- a/mappings/net/minecraft/datafixer/fix/JigsawRotationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/JigsawRotationFix.mapping @@ -3,5 +3,4 @@ CLASS net/minecraft/class_4978 net/minecraft/datafixer/fix/JigsawRotationFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_26301 updateBlockState (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 blockStateData + METHOD method_26301 updateBlockState (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping b/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping index 454e6e8a09..1f3fe61981 100644 --- a/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping @@ -12,11 +12,11 @@ CLASS net/minecraft/class_1191 net/minecraft/datafixer/fix/LeavesFix METHOD method_5068 isLog (I)Z METHOD method_5070 computeLeafStates (III)V METHOD method_5071 isLeaf (I)Z - METHOD method_5072 createLeafProperties (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;ZI)Lcom/mojang/datafixers/Dynamic; + METHOD method_5072 createLeafProperties (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;ZI)Lcom/mojang/serialization/Dynamic; CLASS class_1193 ListFixer FIELD field_5692 properties Ljava/util/List; - FIELD field_5696 blockStateMap Lnet/minecraft/class_3508; - METHOD method_5074 computeFixableBlockStates (Lcom/mojang/datafixers/Dynamic;)V + FIELD field_5696 blockStateMap Lnet/minecraft/class_5298; + METHOD method_5074 computeFixableBlockStates (Lcom/mojang/serialization/Dynamic;)V METHOD method_5075 needsFix (I)I METHOD method_5076 needsFix ()Z METHOD method_5079 isFixed ()Z diff --git a/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping b/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping index 7fae0ff980..f11d00be9a 100644 --- a/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_1196 net/minecraft/datafixer/fix/LevelDataGeneratorOpt ARG 2 changesType METHOD method_5099 parseFlatLayer (Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair; ARG 0 layer - METHOD method_5100 fixGeneratorOptions (Ljava/lang/String;Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + METHOD method_5100 fixGeneratorOptions (Ljava/lang/String;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; ARG 0 generatorOptions - ARG 1 ops METHOD method_5103 parseFlatLayers (Ljava/lang/String;)Ljava/util/List; ARG 0 layers diff --git a/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping b/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping index c58bd0aa43..b6d9f13c02 100644 --- a/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_1195 net/minecraft/datafixer/fix/LevelFlatGeneratorInf METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_5090 fixGeneratorOptions (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_5090 fixGeneratorOptions (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_5094 fixFlatGeneratorOptions (Ljava/lang/String;)Ljava/lang/String; ARG 1 generatorOptions diff --git a/mappings/net/minecraft/datafixer/fix/MemoryExpiryDataFix.mapping b/mappings/net/minecraft/datafixer/fix/MemoryExpiryDataFix.mapping index 9519f593ee..2845d82781 100644 --- a/mappings/net/minecraft/datafixer/fix/MemoryExpiryDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/MemoryExpiryDataFix.mapping @@ -2,8 +2,8 @@ CLASS net/minecraft/class_4803 net/minecraft/datafixer/fix/MemoryExpiryDataFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V ARG 1 outputSchema ARG 2 choiceName - METHOD method_24506 updateBrain (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24506 updateBrain (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_24507 updateMemoryMapValues (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; - METHOD method_24508 updateMemories (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_24509 updateMemoryMap (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_24510 updateMemoryMapValueEntry (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24508 updateMemories (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_24509 updateMemoryMap (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_24510 updateMemoryMapValueEntry (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping b/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping index e83ff1e821..7fd7e299b4 100644 --- a/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_1198 net/minecraft/datafixer/fix/MobSpawnerEntityIdent METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_5106 fixSpawner (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_5106 fixSpawner (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping index 9e45e8e53b..b8151a7fe3 100644 --- a/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_4299 net/minecraft/datafixer/fix/OminousBannerBlockEnt METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_20481 fixBannerName (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_20481 fixBannerName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping index b37ffc39f1..5b6dc0473d 100644 --- a/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_4294 net/minecraft/datafixer/fix/OminousBannerItemRena METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_20445 fixBannerName (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag + METHOD method_20445 fixBannerName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping b/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping index 5805506d0e..fb86c51672 100644 --- a/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_4285 net/minecraft/datafixer/fix/PointOfInterestReorga METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_20340 reorganize (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag + METHOD method_20340 reorganize (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/RedstoneConnectionsFix.mapping b/mappings/net/minecraft/datafixer/fix/RedstoneConnectionsFix.mapping index 5f1d5a2710..bc3345fe19 100644 --- a/mappings/net/minecraft/datafixer/fix/RedstoneConnectionsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RedstoneConnectionsFix.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_5255 net/minecraft/datafixer/fix/RedstoneConnectionsFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema - METHOD method_27778 updateBlockState (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 data + METHOD method_27778 updateBlockState (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_27780 hasObsoleteValue (Ljava/lang/String;)Z diff --git a/mappings/net/minecraft/datafixer/fix/RemovePoiValidTagFix.mapping b/mappings/net/minecraft/datafixer/fix/RemovePoiValidTagFix.mapping index 8bcad6eda6..4042c9fe3d 100644 --- a/mappings/net/minecraft/datafixer/fix/RemovePoiValidTagFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RemovePoiValidTagFix.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_4731 net/minecraft/datafixer/fix/RemovePoiValidTagFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_24157 removeValidTag (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24157 removeValidTag (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping index 724813c731..b4674b598f 100644 --- a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameItemStackAttrib FIELD field_23695 RENAMES Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema - METHOD method_26808 updateAttributeName (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 data + METHOD method_26808 updateAttributeName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_26810 updateAttributeModifiers (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; ARG 0 typed METHOD method_26814 updatePlayerAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping b/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping index 637b1b0c6d..3b315e34af 100644 --- a/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping @@ -4,14 +4,7 @@ CLASS net/minecraft/class_1209 net/minecraft/datafixer/fix/SavedDataVillageCropF ARG 2 changesType METHOD method_5151 fixVillageChildren (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; ARG 0 villageChildren - METHOD method_5152 (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 tag - METHOD method_5154 fixSmallPlotCropIds (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag - METHOD method_5155 fixLargePlotCropIds (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag - METHOD method_5156 fixCropId (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag + METHOD method_5154 fixSmallPlotCropIds (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_5155 fixLargePlotCropIds (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_5156 fixCropId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 1 cropId - METHOD method_5157 (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 0 tag diff --git a/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping b/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping index 3af6ffbee0..2875feacc5 100644 --- a/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_5256 net/minecraft/datafixer/fix/StriderGravityFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_27789 updateNoGravityTag (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - ARG 1 data + METHOD method_27789 updateNoGravityTag (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping b/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping index 66246bfa80..2f019de928 100644 --- a/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_4695 net/minecraft/datafixer/fix/StructureReferenceFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_23661 updateReferences (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_23661 updateReferences (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping b/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping index 11c552df21..43e0aa41fc 100644 --- a/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_4754 net/minecraft/datafixer/fix/WallPropertyFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_24323 updateWallProperties (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; - METHOD method_24324 updateWallValueReference (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24323 updateWallProperties (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_24324 updateWallValueReference (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; METHOD method_24326 booleanToWallType (Ljava/lang/String;)Ljava/lang/String; ARG 0 value diff --git a/mappings/net/minecraft/datafixer/schema/Schema2501.mapping b/mappings/net/minecraft/datafixer/schema/Schema2501.mapping index 43a3a91f9a..b1dafd306d 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2501.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2501.mapping @@ -3,6 +3,3 @@ CLASS net/minecraft/class_4755 net/minecraft/datafixer/schema/Schema2501 ARG 0 schema ARG 1 map ARG 2 name - METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V - ARG 2 entityTypes - ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 4c7fa178bf..e1bede7c61 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -72,7 +72,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6023 trackedY J FIELD field_6024 chunkX I FIELD field_6025 NULL_BOX Lnet/minecraft/class_238; - FIELD field_6026 dimension Lnet/minecraft/class_2874; FIELD field_6027 CUSTOM_NAME Lnet/minecraft/class_2940; FIELD field_6028 lastNetherPortalDirection Lnet/minecraft/class_2350; FIELD field_6029 scoreboardTags Ljava/util/Set; @@ -86,7 +85,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6039 prevHorizontalSpeed F METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type - ARG 2 world METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_17681 getWidth ()F @@ -426,7 +424,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 index ARG 2 value METHOD method_5730 setOnFireFromLava ()V - METHOD method_5731 changeDimension (Lnet/minecraft/class_2874;)Lnet/minecraft/class_1297; + METHOD method_5731 changeDimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1297; ARG 1 newDimension METHOD method_5732 isAttackable ()Z METHOD method_5733 shouldRenderName ()Z diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 7ffef6e5aa..4cfa84105a 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -130,8 +130,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_18866 eatFood (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 world ARG 2 stack - METHOD method_18867 deserializeBrain (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095; - ARG 1 data + METHOD method_18867 deserializeBrain (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_4095; METHOD method_18868 getBrain ()Lnet/minecraft/class_4095; METHOD method_18869 getEatSound (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3414; ARG 1 stack diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping index d32a53bc38..376f89b74b 100644 --- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping @@ -11,8 +11,6 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain FIELD field_22282 forgettingActivityMemories Ljava/util/Map; COMMENT The map from activities to the memories to forget after the activity is COMMENT completed. - METHOD (Ljava/util/Collection;Ljava/util/Collection;Lcom/mojang/datafixers/Dynamic;)V - ARG 1 memoryTypes METHOD method_18871 refreshActivities (JJ)V ARG 1 timeOfDay ARG 3 time @@ -22,9 +20,6 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain METHOD method_18876 isMemoryInState (Lnet/minecraft/class_4140;Lnet/minecraft/class_4141;)Z ARG 1 type ARG 2 state - METHOD method_18877 readMemory (Lnet/minecraft/class_4140;Lcom/mojang/datafixers/Dynamic;)V - ARG 1 type - ARG 2 data METHOD method_18878 remember (Lnet/minecraft/class_4140;Ljava/lang/Object;)V ARG 1 type ARG 2 value diff --git a/mappings/net/minecraft/entity/ai/brain/Memory.mapping b/mappings/net/minecraft/entity/ai/brain/Memory.mapping index cf1d15089a..6316c68947 100644 --- a/mappings/net/minecraft/entity/ai/brain/Memory.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Memory.mapping @@ -1,18 +1,7 @@ CLASS net/minecraft/class_4831 net/minecraft/entity/ai/brain/Memory FIELD field_22330 value Ljava/lang/Object; FIELD field_22331 expiry J - METHOD (Ljava/lang/Object;)V - ARG 1 value - METHOD (Ljava/lang/Object;J)V - ARG 1 value - ARG 2 expiry - METHOD (Ljava/util/function/Function;Lcom/mojang/datafixers/Dynamic;)V - ARG 1 valueReader - ARG 2 data METHOD method_24634 isExpired ()Z - METHOD method_24635 permanent (Ljava/lang/Object;)Lnet/minecraft/class_4831; - COMMENT Creates a permanent memory. - ARG 0 value METHOD method_24636 timed (Ljava/lang/Object;J)Lnet/minecraft/class_4831; COMMENT Creates a memory that has an expiry time. ARG 0 value diff --git a/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping b/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping index 57d67746a1..a11a11faa3 100644 --- a/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping +++ b/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/class_4140 net/minecraft/entity/ai/brain/MemoryModuleType - FIELD field_18454 factory Ljava/util/Optional; METHOD (Ljava/util/Optional;)V ARG 1 factory - METHOD method_19092 register (Ljava/lang/String;Ljava/util/Optional;)Lnet/minecraft/class_4140; + METHOD method_19092 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_4140; ARG 0 id - ARG 1 factory METHOD method_19093 getFactory ()Ljava/util/Optional; METHOD method_20738 register (Ljava/lang/String;)Lnet/minecraft/class_4140; ARG 0 id diff --git a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping index df93f29082..50f4f78ec9 100644 --- a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_1366 net/minecraft/entity/ai/goal/MeleeAttackGoal FIELD field_6502 pauseWhenMobIdle Z FIELD field_6503 mob Lnet/minecraft/class_1314; FIELD field_6504 attackIntervalTicks I - FIELD field_6505 ticksUntilAttack I FIELD field_6506 targetZ D FIELD field_6507 targetY D FIELD field_6508 targetX D diff --git a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping index 43f27ca605..709df529d1 100644 --- a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain ARG 0 hoglin ARG 1 target METHOD method_24666 addCoreTasks (Lnet/minecraft/class_4095;)V - METHOD method_24668 create (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095; + METHOD method_24668 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; METHOD method_24669 isWarpedFungusAround (Lnet/minecraft/class_4760;Lnet/minecraft/class_2338;)Z ARG 0 hoglin ARG 1 pos diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index e4fb0ef4ef..814d5a4e33 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -40,9 +40,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 0 piglin ARG 1 stack METHOD method_24731 drop (Lnet/minecraft/class_4836;Ljava/util/List;Lnet/minecraft/class_243;)V - METHOD method_24732 create (Lnet/minecraft/class_4836;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095; + METHOD method_24732 create (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 piglin - ARG 1 data METHOD method_24733 onGoldBlockBroken (Lnet/minecraft/class_1657;)V ARG 0 player METHOD method_24734 (Lnet/minecraft/class_1657;Lnet/minecraft/class_4836;)V diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 256d4acd09..441515a194 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -20,8 +20,6 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState ARG 2 pos ARG 3 fluid ARG 4 direction - METHOD method_15765 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3610; - ARG 0 dynamic METHOD method_15766 getParticle ()Lnet/minecraft/class_2394; METHOD method_15767 matches (Lnet/minecraft/class_3494;)Z ARG 1 tag @@ -36,9 +34,6 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_15771 isStill ()Z METHOD method_15772 getFluid ()Lnet/minecraft/class_3611; METHOD method_15773 hasRandomTicks ()Z - METHOD method_16458 serialize (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_3610;)Lcom/mojang/datafixers/Dynamic; - ARG 0 ops - ARG 1 state METHOD method_17776 getShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/fluid/FluidStateImpl.mapping b/mappings/net/minecraft/fluid/FluidStateImpl.mapping deleted file mode 100644 index 12ff3054ee..0000000000 --- a/mappings/net/minecraft/fluid/FluidStateImpl.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3613 net/minecraft/fluid/FluidStateImpl - METHOD (Lnet/minecraft/class_3611;Lcom/google/common/collect/ImmutableMap;)V - ARG 1 fluid - ARG 2 properties diff --git a/mappings/net/minecraft/item/BucketItem.mapping b/mappings/net/minecraft/item/BucketItem.mapping index f76d243b0a..b9d7d9a3db 100644 --- a/mappings/net/minecraft/item/BucketItem.mapping +++ b/mappings/net/minecraft/item/BucketItem.mapping @@ -19,7 +19,6 @@ CLASS net/minecraft/class_1755 net/minecraft/item/BucketItem ARG 1 player ARG 2 world ARG 3 pos - ARG 4 hitResult METHOD method_7732 getEmptiedStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 1 stack ARG 2 player diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 628486534b..07cceb8765 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 3 state METHOD method_7999 getMapColor (Lnet/minecraft/class_1799;)I ARG 0 stack - METHOD method_8000 createMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_2874;)Lnet/minecraft/class_22; + METHOD method_8000 createMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)Lnet/minecraft/class_22; ARG 0 stack ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 1a5f98e129..b526da7b4f 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState FIELD field_115 zCenter I FIELD field_116 xCenter I FIELD field_117 icons Ljava/util/Map; - FIELD field_118 dimension Lnet/minecraft/class_2874; + FIELD field_118 dimension Lnet/minecraft/class_5321; FIELD field_119 scale B FIELD field_120 updateTrackersByPlayer Ljava/util/Map; FIELD field_121 frames Ljava/util/Map; @@ -27,7 +27,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_104 removeFrame (Lnet/minecraft/class_2338;I)V ARG 1 pos ARG 2 id - METHOD method_105 init (IIIZZLnet/minecraft/class_2874;)V + METHOD method_105 init (IIIZZLnet/minecraft/class_5321;)V ARG 1 x ARG 2 z ARG 3 scale diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index 1ac3fa3972..450dd33262 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -2,20 +2,19 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc FIELD field_1032 searchRadius I FIELD field_1033 skipExistingChunks Z FIELD field_1034 DEFAULT_DECORATION Lnet/minecraft/class_20$class_21; - FIELD field_1035 destination Ljava/lang/String; + FIELD field_1035 destination Lnet/minecraft/class_3195; FIELD field_1036 decoration Lnet/minecraft/class_20$class_21; FIELD field_1037 zoom B FIELD field_1038 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_4570;Ljava/lang/String;Lnet/minecraft/class_20$class_21;BIZ)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_3195;Lnet/minecraft/class_20$class_21;BIZ)V ARG 1 conditions - ARG 2 destination ARG 3 decoration ARG 4 zoom ARG 5 searchRadius ARG 6 skipExistingChunks METHOD method_492 create ()Lnet/minecraft/class_111$class_112; CLASS class_112 Builder - FIELD field_1039 destination Ljava/lang/String; + FIELD field_1039 destination Lnet/minecraft/class_3195; FIELD field_1040 searchRadius I FIELD field_1041 skipExistingChunks Z FIELD field_1042 decoration Lnet/minecraft/class_20$class_21; @@ -24,8 +23,7 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc ARG 1 decoration METHOD method_500 withZoom (B)Lnet/minecraft/class_111$class_112; ARG 1 zoom - METHOD method_502 withDestination (Ljava/lang/String;)Lnet/minecraft/class_111$class_112; - ARG 1 destination + METHOD method_502 withDestination (Lnet/minecraft/class_3195;)Lnet/minecraft/class_111$class_112; METHOD method_503 withSkipExistingChunks (Z)Lnet/minecraft/class_111$class_112; ARG 1 skipExistingChunks CLASS class_113 Factory diff --git a/mappings/net/minecraft/nbt/AbstractListTag.mapping b/mappings/net/minecraft/nbt/AbstractListTag.mapping index e7cc6d4022..ad952ddab9 100644 --- a/mappings/net/minecraft/nbt/AbstractListTag.mapping +++ b/mappings/net/minecraft/nbt/AbstractListTag.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractListTag METHOD method_10535 setTag (ILnet/minecraft/class_2520;)Z ARG 1 index ARG 2 tag + METHOD method_10601 getElementType ()B METHOD remove (I)Ljava/lang/Object; ARG 1 index METHOD set (ILjava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/nbt/ListTag.mapping b/mappings/net/minecraft/nbt/ListTag.mapping index 60178a5194..2510094788 100644 --- a/mappings/net/minecraft/nbt/ListTag.mapping +++ b/mappings/net/minecraft/nbt/ListTag.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/ListTag METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_10600 getInt (I)I - METHOD method_10601 getElementType ()I METHOD method_10602 getCompound (I)Lnet/minecraft/class_2487; ARG 1 index METHOD method_10603 getList (I)Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 192b61fc84..660983b129 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -4,28 +4,22 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD field_12280 playerEntityId I FIELD field_12281 hardcore Z FIELD field_12282 gameMode Lnet/minecraft/class_1934; - FIELD field_12284 dimension Lnet/minecraft/class_2874; + FIELD field_12284 dimension Lnet/minecraft/class_5318$class_5319; FIELD field_19145 chunkLoadDistance I FIELD field_20665 seed J FIELD field_20666 flatWorld Z FIELD field_24618 reducedDebugInfo Z FIELD field_24619 showDeathScreen Z - METHOD (ILnet/minecraft/class_1934;JZLnet/minecraft/class_2874;IIZZZZ)V + METHOD (ILnet/minecraft/class_1934;JZLnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_2960;IIZZZZ)V ARG 1 playerEntityId ARG 2 gameMode ARG 3 seed ARG 5 hardcore ARG 6 dimensionType - ARG 7 maxPlayers - ARG 8 chunkLoadDistance - ARG 9 reducedDebugInfo - ARG 10 showDeathScreen - ARG 11 debugWorld - ARG 12 flatWorld METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934; METHOD method_11562 hasReducedDebugInfo ()Z METHOD method_11564 getEntityId ()I - METHOD method_11565 getDimension ()Lnet/minecraft/class_2874; + METHOD method_11565 getDimension ()Lnet/minecraft/class_5318; METHOD method_11568 isFlatWorld ()Z METHOD method_20204 getChunkLoadDistance ()I METHOD method_22423 getSeed ()J diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping index 4f1c7b3bdd..ec1a7d8cfd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_2635 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket FIELD field_12112 message Lnet/minecraft/class_2561; FIELD field_12113 location Lnet/minecraft/class_2556; - METHOD (Lnet/minecraft/class_2561;)V - ARG 1 message - METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;)V + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message ARG 2 location METHOD method_11387 isNonChat ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 99bb86897e..111c6dc379 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -1,17 +1,16 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket - FIELD field_12431 dimension Lnet/minecraft/class_2874; + FIELD field_12431 dimension Lnet/minecraft/class_2960; FIELD field_12434 gameMode Lnet/minecraft/class_1934; FIELD field_20667 sha256Seed J FIELD field_24451 keepPlayerAttributes Z FIELD field_24620 debugWorld Z FIELD field_24621 flatWorld Z - METHOD (Lnet/minecraft/class_2874;JLnet/minecraft/class_1934;ZZZ)V - ARG 1 dimension + METHOD (Lnet/minecraft/class_2960;JLnet/minecraft/class_1934;ZZZ)V ARG 2 sha256Seed ARG 5 debugWorld ARG 6 flatWorld ARG 7 keepPlayerAttributes - METHOD method_11779 getDimension ()Lnet/minecraft/class_2874; + METHOD method_11779 getDimension ()Lnet/minecraft/class_2960; METHOD method_11780 getGameMode ()Lnet/minecraft/class_1934; METHOD method_22425 getSha256Seed ()J METHOD method_27904 shouldKeepPlayerAttributes ()Z diff --git a/mappings/net/minecraft/particle/ParticleTypes.mapping b/mappings/net/minecraft/particle/ParticleTypes.mapping index 9beeca5002..35eab215fd 100644 --- a/mappings/net/minecraft/particle/ParticleTypes.mapping +++ b/mappings/net/minecraft/particle/ParticleTypes.mapping @@ -2,6 +2,6 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400; ARG 0 name ARG 1 alwaysShow - METHOD method_10304 register (Ljava/lang/String;Lnet/minecraft/class_2394$class_2395;)Lnet/minecraft/class_2396; + METHOD method_10304 register (Ljava/lang/String;Lnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;)Lnet/minecraft/class_2396; ARG 0 name ARG 1 factory diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 7ef9c80242..11d4c70b01 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -8,9 +8,9 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_9683 biome Lnet/minecraft/class_1959; FIELD field_9684 y Lnet/minecraft/class_2096$class_2099; FIELD field_9685 ANY Lnet/minecraft/class_2090; - FIELD field_9686 dimension Lnet/minecraft/class_2874; + FIELD field_9686 dimension Lnet/minecraft/class_5321; FIELD field_9687 feature Lnet/minecraft/class_3195; - METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;Lnet/minecraft/class_2874;Ljava/lang/Boolean;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V + METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;Lnet/minecraft/class_5321;Ljava/lang/Boolean;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V ARG 1 x ARG 2 y ARG 3 z @@ -21,7 +21,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 8 light ARG 9 block ARG 10 fluid - METHOD method_9016 dimension (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2090; + METHOD method_9016 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; ARG 0 dimension METHOD method_9017 feature (Lnet/minecraft/class_3195;)Lnet/minecraft/class_2090; ARG 0 feature @@ -48,7 +48,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_9688 feature Lnet/minecraft/class_3195; FIELD field_9689 y Lnet/minecraft/class_2096$class_2099; FIELD field_9690 biome Lnet/minecraft/class_1959; - FIELD field_9691 dimension Lnet/minecraft/class_2874; + FIELD field_9691 dimension Lnet/minecraft/class_5321; FIELD field_9692 z Lnet/minecraft/class_2096$class_2099; FIELD field_9693 x Lnet/minecraft/class_2096$class_2099; METHOD method_22484 create ()Lnet/minecraft/class_2090$class_2091; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index a42983e489..6273670646 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -227,7 +227,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3845 getScoreboard ()Lnet/minecraft/class_2995; METHOD method_3846 setPlayerManager (Lnet/minecraft/class_3324;)V ARG 1 playerManager - METHOD method_3847 getWorld (Lnet/minecraft/class_2874;)Lnet/minecraft/class_3218; + METHOD method_3847 getWorld (Lnet/minecraft/class_5321;)Lnet/minecraft/class_3218; METHOD method_3848 reload ()V METHOD method_3849 setServerName (Ljava/lang/String;)V ARG 1 serverName diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 5c12c3924d..b7a5da0442 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager FIELD field_14362 statisticsMap Ljava/util/Map; FIELD field_14363 gameMode Lnet/minecraft/class_1934; FIELD field_14364 BANNED_IPS_FILE Ljava/io/File; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_29;I)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_29;I)V ARG 1 server METHOD method_14556 respawnPlayer (Lnet/minecraft/class_3222;Z)Lnet/minecraft/class_3222; ARG 1 player @@ -72,15 +72,13 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14588 sendScoreboard (Lnet/minecraft/class_2995;Lnet/minecraft/class_3222;)V ARG 1 scoreboard ARG 2 player - METHOD method_14589 sendToDimension (Lnet/minecraft/class_2596;Lnet/minecraft/class_2874;)V + METHOD method_14589 sendToDimension (Lnet/minecraft/class_2596;Lnet/minecraft/class_5321;)V ARG 1 packet ARG 2 dimension METHOD method_14590 getWhitelist ()Lnet/minecraft/class_3337; METHOD method_14591 setMainWorld (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_14592 getMaxPlayerCount ()I - METHOD method_14593 sendToAll (Lnet/minecraft/class_2561;)V - ARG 1 message METHOD method_14594 sendPlayerStatus (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_14595 setGameMode (Lnet/minecraft/class_1934;)V @@ -98,7 +96,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14603 getOpList ()Lnet/minecraft/class_3326; METHOD method_14604 removeFromOperators (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile - METHOD method_14605 sendToAround (Lnet/minecraft/class_1657;DDDDLnet/minecraft/class_2874;Lnet/minecraft/class_2596;)V + METHOD method_14605 sendToAround (Lnet/minecraft/class_1657;DDDDLnet/minecraft/class_5321;Lnet/minecraft/class_2596;)V ARG 1 player ARG 2 x ARG 4 y @@ -122,7 +120,6 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 player ARG 2 oldPlayer ARG 3 world - METHOD method_14616 broadcastChatMessage (Lnet/minecraft/class_2561;Z)V + METHOD method_14616 broadcastChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message - ARG 2 system METHOD method_14617 saveAllPlayerData ()V diff --git a/mappings/net/minecraft/server/command/CommandOutput.mapping b/mappings/net/minecraft/server/command/CommandOutput.mapping index b5bbe2a585..1ec3e3ea04 100644 --- a/mappings/net/minecraft/server/command/CommandOutput.mapping +++ b/mappings/net/minecraft/server/command/CommandOutput.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_2165 net/minecraft/server/command/CommandOutput METHOD method_9200 shouldReceiveFeedback ()Z METHOD method_9201 shouldBroadcastConsoleToOps ()Z METHOD method_9202 shouldTrackOutput ()Z - METHOD method_9203 sendSystemMessage (Lnet/minecraft/class_2561;)V + METHOD method_9203 sendSystemMessage (Lnet/minecraft/class_2561;Ljava/util/UUID;)V ARG 1 message diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index b9c4fc0d14..9ac29ba961 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -7,9 +7,8 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 3 y2 METHOD method_13443 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_13457 execute (Lnet/minecraft/class_2168;Ljava/lang/String;)I + METHOD method_13457 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_3195;)I ARG 0 source - ARG 1 structure METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/lang/String;)I ARG 0 source ARG 1 structure diff --git a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping index e8fa6db451..449ce2a358 100644 --- a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping +++ b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping @@ -12,19 +12,16 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand ARG 8 maxZ METHOD method_13654 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_13656 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_241;FFZLjava/util/Collection;)I + METHOD method_13656 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_241;FFIZLjava/util/Collection;)I ARG 0 source ARG 1 center ARG 2 spreadDistance ARG 3 maxRange - ARG 4 respectTeams - ARG 5 targets - METHOD method_13657 getMinimumDistance (Ljava/util/Collection;Lnet/minecraft/class_3218;[Lnet/minecraft/class_3131$class_3132;Z)D + METHOD method_13657 getMinimumDistance (Ljava/util/Collection;Lnet/minecraft/class_3218;[Lnet/minecraft/class_3131$class_3132;IZ)D ARG 0 entities ARG 1 world ARG 2 piles - ARG 3 betweenTeams - METHOD method_13661 spread (Lnet/minecraft/class_241;DLnet/minecraft/class_3218;Ljava/util/Random;DDDD[Lnet/minecraft/class_3131$class_3132;Z)V + METHOD method_13661 spread (Lnet/minecraft/class_241;DLnet/minecraft/class_3218;Ljava/util/Random;DDDDI[Lnet/minecraft/class_3131$class_3132;Z)V ARG 0 center ARG 1 spreadDistance ARG 3 world @@ -33,12 +30,10 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand ARG 7 minZ ARG 9 maxX ARG 11 maxZ - ARG 13 piles - ARG 14 respectTeams CLASS class_3132 Pile FIELD field_13736 z D FIELD field_13737 x D - METHOD method_13662 isSafe (Lnet/minecraft/class_1922;)Z + METHOD method_13662 isSafe (Lnet/minecraft/class_1922;I)Z ARG 1 world METHOD method_13665 getDistance (Lnet/minecraft/class_3131$class_3132;)D ARG 1 other @@ -54,7 +49,7 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand ARG 6 maxX ARG 8 maxZ METHOD method_13668 absolute ()F - METHOD method_13669 getY (Lnet/minecraft/class_1922;)I + METHOD method_13669 getY (Lnet/minecraft/class_1922;I)I ARG 1 blockView METHOD method_13670 subtract (Lnet/minecraft/class_3131$class_3132;)V ARG 1 other diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 38faaaa706..b5916cd92e 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13995 server Lnet/minecraft/server/MinecraftServer; FIELD field_13996 recipeBook Lnet/minecraft/class_3441; FIELD field_13997 syncedHealth F - FIELD field_23191 spawnPointDimension Lnet/minecraft/class_2874; + FIELD field_23191 spawnPointDimension Lnet/minecraft/class_5321; FIELD field_23192 spawnPointPosition Lnet/minecraft/class_2338; FIELD field_23193 spawnPointSet Z METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_3225;)V @@ -97,7 +97,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14252 setExperienceLevel (I)V ARG 1 level METHOD method_14253 getRecipeBook ()Lnet/minecraft/class_3441; - METHOD method_14254 sendMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;)V + METHOD method_14254 sendMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message ARG 2 type METHOD method_14255 sendResourcePackUrl (Ljava/lang/String;Ljava/lang/String;)V @@ -108,9 +108,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_18783 dimensionChanged (Lnet/minecraft/class_3218;)V ARG 1 targetWorld METHOD method_26280 getSpawnPointPosition ()Lnet/minecraft/class_2338; - METHOD method_26281 getSpawnPointDimension ()Lnet/minecraft/class_2874; + METHOD method_26281 getSpawnPointDimension ()Lnet/minecraft/class_5321; METHOD method_26282 isSpawnPointSet ()Z - METHOD method_26284 setSpawnPoint (Lnet/minecraft/class_2874;Lnet/minecraft/class_2338;ZZ)V + METHOD method_26284 setSpawnPoint (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;ZZ)V ARG 1 dimension ARG 2 pos ARG 3 spawnPointSet diff --git a/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping b/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping deleted file mode 100644 index 4ebaf7f8db..0000000000 --- a/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3202 net/minecraft/server/world/SecondaryServerWorld diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 78e99f6816..56a8305754 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -15,13 +15,10 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_18260 entitiesToLoad Ljava/util/Queue; FIELD field_18261 players Ljava/util/List; FIELD field_18262 entityNavigations Ljava/util/Set; - FIELD field_18263 wanderingTraderManager Lnet/minecraft/class_3990; FIELD field_18264 inEntityTick Z FIELD field_18811 raidManager Lnet/minecraft/class_3767; FIELD field_23787 structureAccessor Lnet/minecraft/class_5138; - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJ)V - ARG 2 workerExecutor - ARG 4 properties + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJLjava/util/List;Z)V ARG 5 dimensionType METHOD method_14166 spawnParticles (Lnet/minecraft/class_3222;Lnet/minecraft/class_2394;ZDDDIDDDD)Z ARG 1 viewer @@ -35,7 +32,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 13 deltaY ARG 15 deltaZ ARG 17 speed - METHOD method_14169 getForcedSpawnPoint ()Lnet/minecraft/class_2338; METHOD method_14171 tickFluid (Lnet/minecraft/class_1954;)V ARG 1 tick METHOD method_14173 getPortalForcer ()Lnet/minecraft/class_1946; @@ -154,5 +150,5 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_27909 iterateEntities ()Ljava/lang/Iterable; METHOD method_8416 addLightning (Lnet/minecraft/class_1538;)V METHOD method_8448 updateSleepingPlayers ()V - METHOD method_8487 locateStructure (Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; + METHOD method_8487 locateStructure (Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; METHOD method_8554 setSpawnPos (Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/state/AbstractState.mapping b/mappings/net/minecraft/state/AbstractState.mapping deleted file mode 100644 index c8f27260f7..0000000000 --- a/mappings/net/minecraft/state/AbstractState.mapping +++ /dev/null @@ -1,25 +0,0 @@ -CLASS net/minecraft/class_2679 net/minecraft/state/AbstractState - FIELD field_12285 entries Lcom/google/common/collect/ImmutableMap; - FIELD field_12287 owner Ljava/lang/Object; - FIELD field_12288 withTable Lcom/google/common/collect/Table; - FIELD field_12289 PROPERTY_MAP_PRINTER Ljava/util/function/Function; - METHOD (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)V - ARG 1 owner - ARG 2 entries - METHOD method_11569 getProperties ()Ljava/util/Collection; - METHOD method_11570 contains (Lnet/minecraft/class_2769;)Z - ARG 1 property - METHOD method_11571 createWithTable (Ljava/util/Map;)V - ARG 1 states - METHOD method_11572 cycle (Lnet/minecraft/class_2769;)Ljava/lang/Object; - ARG 1 property - METHOD method_11573 toMapWith (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/util/Map; - ARG 1 property - ARG 2 value - METHOD method_11574 getNext (Ljava/util/Collection;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 values - ARG 1 value - CLASS 1 - METHOD method_11575 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; - ARG 1 property - ARG 2 value diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping index 04e99bb9e3..9d63a2575c 100644 --- a/mappings/net/minecraft/state/State.mapping +++ b/mappings/net/minecraft/state/State.mapping @@ -1,17 +1,11 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State - FIELD field_12313 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_11654 get (Lnet/minecraft/class_2769;)Ljava/lang/Comparable; ARG 1 property - METHOD method_11655 tryRead (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2688; - ARG 0 state - ARG 1 property - ARG 2 propertyName - ARG 3 input - ARG 4 valueName METHOD method_11656 getEntries ()Lcom/google/common/collect/ImmutableMap; METHOD method_11657 with (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object; ARG 1 property ARG 2 value - METHOD method_16551 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; - ARG 0 property - ARG 1 value + CLASS 1 + METHOD method_11575 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; + ARG 1 property + ARG 2 value diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping index a91e25a662..f7f58bd56b 100644 --- a/mappings/net/minecraft/state/StateManager.mapping +++ b/mappings/net/minecraft/state/StateManager.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager FIELD field_12315 states Lcom/google/common/collect/ImmutableList; FIELD field_12316 properties Lcom/google/common/collect/ImmutableSortedMap; FIELD field_12317 owner Ljava/lang/Object; - METHOD (Ljava/lang/Object;Lnet/minecraft/class_2689$class_2691;Ljava/util/Map;)V - ARG 1 owner - ARG 3 namedProperties METHOD method_11659 getProperties ()Ljava/util/Collection; METHOD method_11660 getOwner ()Ljava/lang/Object; METHOD method_11662 getStates ()Lcom/google/common/collect/ImmutableList; @@ -19,10 +16,10 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager ARG 1 owner METHOD method_11667 add ([Lnet/minecraft/class_2769;)Lnet/minecraft/class_2689$class_2690; ARG 1 properties - METHOD method_11668 build (Lnet/minecraft/class_2689$class_2691;)Lnet/minecraft/class_2689; + METHOD method_11668 build (Ljava/util/function/Function;Lnet/minecraft/class_2689$class_2691;)Lnet/minecraft/class_2689; METHOD method_11669 validate (Lnet/minecraft/class_2769;)V ARG 1 property CLASS class_2691 Factory - METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)Lnet/minecraft/class_2679; + METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)Ljava/lang/Object; ARG 1 owner ARG 2 entries diff --git a/mappings/net/minecraft/state/property/AbstractProperty.mapping b/mappings/net/minecraft/state/property/AbstractProperty.mapping deleted file mode 100644 index d2ebe70df5..0000000000 --- a/mappings/net/minecraft/state/property/AbstractProperty.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_2733 net/minecraft/state/property/AbstractProperty - FIELD field_12459 type Ljava/lang/Class; - FIELD field_12460 name Ljava/lang/String; - FIELD field_12461 computedHashCode Ljava/lang/Integer; - METHOD (Ljava/lang/String;Ljava/lang/Class;)V - ARG 1 name - ARG 2 type - METHOD equals (Ljava/lang/Object;)Z - ARG 1 obj - METHOD method_11799 computeHashCode ()I diff --git a/mappings/net/minecraft/state/property/Property.mapping b/mappings/net/minecraft/state/property/Property.mapping index 86875d3339..18c3bee522 100644 --- a/mappings/net/minecraft/state/property/Property.mapping +++ b/mappings/net/minecraft/state/property/Property.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2769 net/minecraft/state/property/Property + METHOD method_11799 computeHashCode ()I METHOD method_11898 getValues ()Ljava/util/Collection; METHOD method_11899 getName ()Ljava/lang/String; METHOD method_11900 parse (Ljava/lang/String;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/structure/IglooGenerator.mapping b/mappings/net/minecraft/structure/IglooGenerator.mapping index 4cb2097051..d0a2bd3d93 100644 --- a/mappings/net/minecraft/structure/IglooGenerator.mapping +++ b/mappings/net/minecraft/structure/IglooGenerator.mapping @@ -2,13 +2,12 @@ CLASS net/minecraft/class_3351 net/minecraft/structure/IglooGenerator FIELD field_14407 MIDDLE_TEMPLATE Lnet/minecraft/class_2960; FIELD field_14409 TOP_TEMPLATE Lnet/minecraft/class_2960; FIELD field_14410 BOTTOM_TEMPLATE Lnet/minecraft/class_2960; - METHOD method_14705 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Ljava/util/Random;Lnet/minecraft/class_3111;)V + METHOD method_14705 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Ljava/util/Random;)V ARG 0 manager ARG 1 pos ARG 2 rotation ARG 3 pieces ARG 4 random - ARG 5 defaultConfig CLASS class_3352 Piece FIELD field_14411 template Lnet/minecraft/class_2960; FIELD field_14412 rotation Lnet/minecraft/class_2470; diff --git a/mappings/net/minecraft/structure/JigsawJunction.mapping b/mappings/net/minecraft/structure/JigsawJunction.mapping index 41b1bd4f8a..796593df96 100644 --- a/mappings/net/minecraft/structure/JigsawJunction.mapping +++ b/mappings/net/minecraft/structure/JigsawJunction.mapping @@ -15,6 +15,4 @@ CLASS net/minecraft/class_3780 net/minecraft/structure/JigsawJunction METHOD method_16609 getSourceZ ()I METHOD method_16610 getSourceX ()I METHOD method_16611 getSourceGroundY ()I - METHOD method_16612 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - METHOD method_16613 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3780; - ARG 0 dynamic + METHOD method_16612 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/structure/StructureFeatures.mapping b/mappings/net/minecraft/structure/StructureFeatures.mapping deleted file mode 100644 index d6266c4902..0000000000 --- a/mappings/net/minecraft/structure/StructureFeatures.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_3420 net/minecraft/structure/StructureFeatures - FIELD field_15262 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_14842 readStructureStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449; - METHOD method_14846 register (Ljava/lang/String;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3195; - ARG 0 name - ARG 1 feature - METHOD method_16651 initialize ()V diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index d641630e0c..3d4e5bb883 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart ARG 2 chunkZ METHOD method_14974 generateStructure (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V METHOD method_14979 isInExistingChunk ()Z - METHOD method_16655 init (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;)V + METHOD method_16655 init (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;Lnet/minecraft/class_3037;)V ARG 1 chunkGenerator ARG 2 structureManager ARG 3 x diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index aaef121c11..66cec2c762 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement METHOD method_16622 setProjection (Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3784; ARG 1 projection METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786; - METHOD method_16625 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;Z)Z ARG 1 structureManager METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;)Ljava/util/List; @@ -15,6 +14,5 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 1 structureManager ARG 2 pos ARG 3 rotation - METHOD method_16755 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16757 getType ()Lnet/minecraft/class_3816; METHOD method_19308 getGroundLevelDelta ()I diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping index 413c9fe3ec..24d8d5ae4f 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_3816 net/minecraft/structure/pool/StructurePoolElementType - METHOD method_16814 register (Ljava/lang/String;Lnet/minecraft/class_3816;)Lnet/minecraft/class_3816; diff --git a/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping index e569f18b2d..19e1bc3a04 100644 --- a/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_5193 net/minecraft/structure/processor/BlockAgeStructureProcessor FIELD field_24042 mossiness F - METHOD (F)V - ARG 1 mossiness METHOD method_27256 processBlocks (Ljava/util/Random;)Lnet/minecraft/class_2680; METHOD method_27257 randomStairProperties (Ljava/util/Random;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; ARG 1 stairs diff --git a/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping index 017f3dcc72..9799b3650a 100644 --- a/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_3488 net/minecraft/structure/processor/BlockRotStructureProcessor FIELD field_15523 integrity F - METHOD (F)V - ARG 1 integrity diff --git a/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping index b9efbbe9e6..ff9d7cc9b9 100644 --- a/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_3795 net/minecraft/structure/processor/GravityStructureProcessor FIELD field_16723 heightmap Lnet/minecraft/class_2902$class_2903; FIELD field_16725 offset I - METHOD (Lnet/minecraft/class_2902$class_2903;I)V - ARG 1 heightmap - ARG 2 offset diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping index 29961fa2de..58f4d1f519 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProcessor METHOD method_15110 process (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; ARG 2 pos - METHOD method_16666 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - METHOD method_16771 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; METHOD method_16772 getType ()Lnet/minecraft/class_3828; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping index 506d752481..971fd5e4cd 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping @@ -9,5 +9,3 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces ARG 1 input ARG 2 location METHOD method_16763 getOutputState ()Lnet/minecraft/class_2680; - METHOD method_16764 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - METHOD method_16765 fromDynamic (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3821; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping index 12521a12ed..0af8f901af 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_3828 net/minecraft/structure/processor/StructureProcessorType - METHOD method_16822 register (Ljava/lang/String;Lnet/minecraft/class_3828;)Lnet/minecraft/class_3828; + METHOD method_16822 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_3828; ARG 0 id - ARG 1 processor diff --git a/mappings/net/minecraft/structure/rule/AxisAlignedLinearPosRuleTest.mapping b/mappings/net/minecraft/structure/rule/AxisAlignedLinearPosRuleTest.mapping index 8759a4da70..90d713187f 100644 --- a/mappings/net/minecraft/structure/rule/AxisAlignedLinearPosRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/AxisAlignedLinearPosRuleTest.mapping @@ -4,11 +4,3 @@ CLASS net/minecraft/class_4992 net/minecraft/structure/rule/AxisAlignedLinearPos FIELD field_23336 minDistance I FIELD field_23337 maxDistance I FIELD field_23338 axis Lnet/minecraft/class_2350$class_2351; - METHOD (FFIILnet/minecraft/class_2350$class_2351;)V - ARG 1 minChance - ARG 2 maxChance - ARG 3 minDistance - ARG 4 maxDistance - ARG 5 axis - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 data diff --git a/mappings/net/minecraft/structure/rule/BlockMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/BlockMatchRuleTest.mapping index b1818dc2d0..a495b8913b 100644 --- a/mappings/net/minecraft/structure/rule/BlockMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/BlockMatchRuleTest.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_3819 net/minecraft/structure/rule/BlockMatchRuleTest FIELD field_16869 block Lnet/minecraft/class_2248; - METHOD (Lnet/minecraft/class_2248;)V - ARG 1 block diff --git a/mappings/net/minecraft/structure/rule/BlockStateMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/BlockStateMatchRuleTest.mapping index 8e1d51437e..d36e69f317 100644 --- a/mappings/net/minecraft/structure/rule/BlockStateMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/BlockStateMatchRuleTest.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_3820 net/minecraft/structure/rule/BlockStateMatchRuleTest FIELD field_16870 blockState Lnet/minecraft/class_2680; - METHOD (Lnet/minecraft/class_2680;)V - ARG 1 blockState diff --git a/mappings/net/minecraft/structure/rule/LinearPosRuleTest.mapping b/mappings/net/minecraft/structure/rule/LinearPosRuleTest.mapping index 0b03ae7542..d8badd291b 100644 --- a/mappings/net/minecraft/structure/rule/LinearPosRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/LinearPosRuleTest.mapping @@ -3,10 +3,3 @@ CLASS net/minecraft/class_4993 net/minecraft/structure/rule/LinearPosRuleTest FIELD field_23340 maxChance F FIELD field_23341 minDistance I FIELD field_23342 maxDistance I - METHOD (FFII)V - ARG 1 minChance - ARG 2 maxChance - ARG 3 minDistance - ARG 4 maxDistance - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 data diff --git a/mappings/net/minecraft/structure/rule/PosRuleTest.mapping b/mappings/net/minecraft/structure/rule/PosRuleTest.mapping index 4822830a67..8bc6c6e67d 100644 --- a/mappings/net/minecraft/structure/rule/PosRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/PosRuleTest.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_4995 net/minecraft/structure/rule/PosRuleTest METHOD method_26404 getType ()Lnet/minecraft/class_4996; - METHOD method_26405 serializeContents (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops METHOD method_26406 test (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/Random;)Z - METHOD method_26407 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops diff --git a/mappings/net/minecraft/structure/rule/PosRuleTestType.mapping b/mappings/net/minecraft/structure/rule/PosRuleTestType.mapping index f760193bec..66f6c467f8 100644 --- a/mappings/net/minecraft/structure/rule/PosRuleTestType.mapping +++ b/mappings/net/minecraft/structure/rule/PosRuleTestType.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_4996 net/minecraft/structure/rule/PosRuleTestType - METHOD method_26409 register (Ljava/lang/String;Lnet/minecraft/class_4996;)Lnet/minecraft/class_4996; + METHOD method_26409 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_4996; ARG 0 id - ARG 1 object diff --git a/mappings/net/minecraft/structure/rule/RandomBlockMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/RandomBlockMatchRuleTest.mapping index 528dd9fbed..9f9e7bdd58 100644 --- a/mappings/net/minecraft/structure/rule/RandomBlockMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RandomBlockMatchRuleTest.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_3824 net/minecraft/structure/rule/RandomBlockMatchRuleTest FIELD field_16879 probability F FIELD field_16880 block Lnet/minecraft/class_2248; - METHOD (Lnet/minecraft/class_2248;F)V - ARG 1 block - ARG 2 probability diff --git a/mappings/net/minecraft/structure/rule/RandomBlockStateMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/RandomBlockStateMatchRuleTest.mapping index 512099c72a..ae206e19fb 100644 --- a/mappings/net/minecraft/structure/rule/RandomBlockStateMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RandomBlockStateMatchRuleTest.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_3823 net/minecraft/structure/rule/RandomBlockStateMatchRuleTest FIELD field_16877 probability F FIELD field_16878 blockState Lnet/minecraft/class_2680; - METHOD (Lnet/minecraft/class_2680;F)V - ARG 1 blockState - ARG 2 probability diff --git a/mappings/net/minecraft/structure/rule/RuleTest.mapping b/mappings/net/minecraft/structure/rule/RuleTest.mapping index cb6ccc90a3..2eaf86d5a7 100644 --- a/mappings/net/minecraft/structure/rule/RuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RuleTest.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_3825 net/minecraft/structure/rule/RuleTest COMMENT Rule tests are used in structure generation to check if a block state matches some condition. METHOD method_16766 getType ()Lnet/minecraft/class_3827; - METHOD method_16767 serializeWithId (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops METHOD method_16768 test (Lnet/minecraft/class_2680;Ljava/util/Random;)Z ARG 1 state ARG 2 random - METHOD method_16769 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops diff --git a/mappings/net/minecraft/structure/rule/RuleTestType.mapping b/mappings/net/minecraft/structure/rule/RuleTestType.mapping index 36136fa7f4..b150252239 100644 --- a/mappings/net/minecraft/structure/rule/RuleTestType.mapping +++ b/mappings/net/minecraft/structure/rule/RuleTestType.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_3827 net/minecraft/structure/rule/RuleTestType - METHOD method_16821 register (Ljava/lang/String;Lnet/minecraft/class_3827;)Lnet/minecraft/class_3827; + METHOD method_16821 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_3827; ARG 0 id - ARG 1 test diff --git a/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping b/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping index 51cb61153d..97f78c86f3 100644 --- a/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/TagMatchRuleTest.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_3798 net/minecraft/structure/rule/TagMatchRuleTest FIELD field_16747 tag Lnet/minecraft/class_3494; - METHOD (Lnet/minecraft/class_3494;)V - ARG 1 tag diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index 29ea434263..b961a1afa1 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -21,13 +21,9 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier METHOD method_12831 isCharValid (C)Z ARG 0 c METHOD method_12832 getPath ()Ljava/lang/String; - METHOD method_12834 (I)Z - ARG 0 c METHOD method_12835 fromCommandInput (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2960; ARG 0 reader METHOD method_12836 getNamespace ()Ljava/lang/String; - METHOD method_12837 (I)Z - ARG 0 c METHOD method_12838 splitOn (Ljava/lang/String;C)Lnet/minecraft/class_2960; ARG 0 id ARG 1 delimiter diff --git a/mappings/net/minecraft/util/collection/MapUtil.mapping b/mappings/net/minecraft/util/collection/MapUtil.mapping deleted file mode 100644 index 2f7f9d32f7..0000000000 --- a/mappings/net/minecraft/util/collection/MapUtil.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2367 net/minecraft/util/collection/MapUtil - METHOD method_10208 createMap (Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map; - ARG 0 keys - ARG 1 values - ARG 2 result - METHOD method_10209 createMap (Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Map; - ARG 0 keys - ARG 1 values diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index 3ad23f2656..5df3d2f230 100644 --- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray METHOD method_15211 get (I)I ARG 1 index METHOD method_15212 getStorage ()[J - METHOD method_15213 getElementBits ()I METHOD method_15214 setAndGetOldValue (II)I ARG 1 index ARG 2 value diff --git a/mappings/net/minecraft/util/collection/WeightedList.mapping b/mappings/net/minecraft/util/collection/WeightedList.mapping index d6b54f729e..1931aa9701 100644 --- a/mappings/net/minecraft/util/collection/WeightedList.mapping +++ b/mappings/net/minecraft/util/collection/WeightedList.mapping @@ -6,23 +6,15 @@ CLASS net/minecraft/class_4131 net/minecraft/util/collection/WeightedList ARG 1 item ARG 2 weight METHOD method_19032 stream ()Ljava/util/stream/Stream; - METHOD method_23330 serialize (Lcom/mojang/datafixers/types/DynamicOps;Ljava/util/function/Function;)Ljava/lang/Object; - ARG 1 ops - ARG 2 entrySerializer METHOD method_23333 shuffle (Ljava/util/Random;)Lnet/minecraft/class_4131; ARG 1 random METHOD method_23337 pickRandom (Ljava/util/Random;)Ljava/lang/Object; ARG 1 random - METHOD method_23338 streamEntries ()Ljava/util/stream/Stream; CLASS class_4132 Entry FIELD field_18400 item Ljava/lang/Object; FIELD field_18401 weight I FIELD field_18402 shuffledOrder D - METHOD (Lnet/minecraft/class_4131;Ljava/lang/Object;I)V - ARG 2 item - ARG 3 weight METHOD method_19033 getShuffledOrder ()D METHOD method_19034 setShuffledOrder (F)V ARG 1 random METHOD method_19035 getElement ()Ljava/lang/Object; - METHOD method_23341 getWeight ()I diff --git a/mappings/net/minecraft/util/dynamic/DynamicDeserializer.mapping b/mappings/net/minecraft/util/dynamic/DynamicDeserializer.mapping deleted file mode 100644 index 14ee651f1f..0000000000 --- a/mappings/net/minecraft/util/dynamic/DynamicDeserializer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_3817 net/minecraft/util/dynamic/DynamicDeserializer - FIELD field_16866 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD deserialize (Lcom/mojang/datafixers/Dynamic;)Ljava/lang/Object; - ARG 1 dynamic - METHOD method_16758 deserialize (Lcom/mojang/datafixers/Dynamic;Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 dynamic - ARG 2 registry - ARG 3 typeFieldName diff --git a/mappings/net/minecraft/util/dynamic/DynamicSerializable.mapping b/mappings/net/minecraft/util/dynamic/DynamicSerializable.mapping deleted file mode 100644 index 9c19e6623b..0000000000 --- a/mappings/net/minecraft/util/dynamic/DynamicSerializable.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4213 net/minecraft/util/dynamic/DynamicSerializable - METHOD method_19508 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; - ARG 1 ops diff --git a/mappings/net/minecraft/util/dynamic/DynamicSerializableBoolean.mapping b/mappings/net/minecraft/util/dynamic/DynamicSerializableBoolean.mapping deleted file mode 100644 index 8b5d4df54a..0000000000 --- a/mappings/net/minecraft/util/dynamic/DynamicSerializableBoolean.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_4909 net/minecraft/util/dynamic/DynamicSerializableBoolean - FIELD field_22829 value Z - METHOD (Z)V - ARG 1 value - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_25506 of (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4909; - ARG 0 dynamic - METHOD method_25507 of (Z)Lnet/minecraft/class_4909; - ARG 0 value diff --git a/mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping b/mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping index 7c270c9ba0..0bdb21ecdf 100644 --- a/mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping +++ b/mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/class_4844 net/minecraft/util/dynamic/DynamicSerializableUui METHOD (Ljava/util/UUID;)V ARG 1 uuid METHOD method_24814 getUuid ()Ljava/util/UUID; - METHOD method_24815 of (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4844; diff --git a/mappings/net/minecraft/util/dynamic/GlobalPos.mapping b/mappings/net/minecraft/util/dynamic/GlobalPos.mapping index b069d7b19e..0f4cff7c1d 100644 --- a/mappings/net/minecraft/util/dynamic/GlobalPos.mapping +++ b/mappings/net/minecraft/util/dynamic/GlobalPos.mapping @@ -1,15 +1,11 @@ CLASS net/minecraft/class_4208 net/minecraft/util/dynamic/GlobalPos - FIELD field_18790 dimension Lnet/minecraft/class_2874; + FIELD field_18790 dimension Lnet/minecraft/class_5321; FIELD field_18791 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2874;Lnet/minecraft/class_2338;)V - ARG 1 dimension + METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)V ARG 2 pos METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_19442 getDimension ()Lnet/minecraft/class_2874; - METHOD method_19443 create (Lnet/minecraft/class_2874;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4208; - ARG 0 dimension + METHOD method_19442 getDimension ()Lnet/minecraft/class_5321; + METHOD method_19443 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4208; ARG 1 pos - METHOD method_19444 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4208; - ARG 0 dynamic METHOD method_19446 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/util/dynamic/Timestamp.mapping b/mappings/net/minecraft/util/dynamic/Timestamp.mapping index 3906eb480f..316b675f0a 100644 --- a/mappings/net/minecraft/util/dynamic/Timestamp.mapping +++ b/mappings/net/minecraft/util/dynamic/Timestamp.mapping @@ -7,5 +7,3 @@ CLASS net/minecraft/class_4316 net/minecraft/util/dynamic/Timestamp METHOD method_20790 getTime ()J METHOD method_20791 of (J)Lnet/minecraft/class_4316; ARG 0 time - METHOD method_20792 of (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4316; - ARG 0 dynamic diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index d01a3c4e18..0632bba1a8 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -104,8 +104,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos ARG 3 endX ARG 4 endY ARG 5 endZ - METHOD method_19438 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2338; - ARG 0 dynamic METHOD method_20437 stream (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; ARG 0 start ARG 1 end diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 33b42a4edd..4914cb82a4 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -61,10 +61,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 value ARG 1 min ARG 2 max - METHOD method_15364 parseInt (Ljava/lang/String;II)I - ARG 0 string - ARG 1 fallback - ARG 2 minimum METHOD method_15365 fastFloor (D)I METHOD method_15366 nextDouble (Ljava/util/Random;DD)D ARG 0 random diff --git a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping index a1ecb016a4..53b5ebe62a 100644 --- a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping +++ b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping @@ -1,6 +1,6 @@ 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;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 defaultId METHOD method_10137 getDefaultId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/util/registry/MutableRegistry.mapping b/mappings/net/minecraft/util/registry/MutableRegistry.mapping index 97f82ee24f..4b28d1e2ea 100644 --- a/mappings/net/minecraft/util/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/util/registry/MutableRegistry.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry - METHOD method_10272 add (Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 id + METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; ARG 2 entry - METHOD method_10273 set (ILnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; + METHOD method_10273 set (ILnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 rawId - ARG 2 id ARG 3 entry - METHOD method_10274 isEmpty ()Z diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 178f63c968..f225257361 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_11139 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11140 DEFAULT_ENTRIES Ljava/util/Map; - FIELD field_11144 REGISTRIES Lnet/minecraft/class_2385; + FIELD field_11144 REGISTRIES Lnet/minecraft/class_2378; FIELD field_11150 PAINTING_MOTIVE Lnet/minecraft/class_2348; COMMENT The painting motive (theme, motif) registry FIELD field_11159 STATUS_EFFECT Lnet/minecraft/class_2378; @@ -11,14 +11,13 @@ 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 (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_2348; + METHOD method_10224 create (Lnet/minecraft/class_5321;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_2348; 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 putDefaultEntry (Ljava/lang/String;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;)Lnet/minecraft/class_2385; - ARG 0 id + METHOD method_10227 putDefaultEntry (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;)Lnet/minecraft/class_2385; METHOD method_10230 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id @@ -29,8 +28,7 @@ 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_10247 create (Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; - ARG 0 id + METHOD method_10247 create (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; METHOD method_10249 getRawId (Ljava/lang/Object;)I ARG 1 entry METHOD method_10250 containsId (Lnet/minecraft/class_2960;)Z diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 45f64d214b..296799b4e6 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -13,10 +13,9 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_18590 maxUses I FIELD field_18591 experience I FIELD field_7473 iconType Lnet/minecraft/class_20$class_21; - FIELD field_7474 structure Ljava/lang/String; - METHOD (ILjava/lang/String;Lnet/minecraft/class_20$class_21;II)V + FIELD field_7474 structure Lnet/minecraft/class_3195; + METHOD (ILnet/minecraft/class_3195;Lnet/minecraft/class_20$class_21;II)V ARG 1 price - ARG 2 structure ARG 3 iconType ARG 4 maxUses ARG 5 experience diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping index 595e070237..2f3af8c14f 100644 --- a/mappings/net/minecraft/village/VillagerData.mapping +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -3,15 +3,11 @@ CLASS net/minecraft/class_3850 net/minecraft/village/VillagerData FIELD field_17049 profession Lnet/minecraft/class_3852; FIELD field_17050 level I FIELD field_18540 LEVEL_BASE_EXPERIENCE [I - METHOD (Lnet/minecraft/class_3854;Lnet/minecraft/class_3852;I)V - ARG 3 level METHOD method_16919 getType ()Lnet/minecraft/class_3854; METHOD method_16920 withLevel (I)Lnet/minecraft/class_3850; ARG 1 level METHOD method_16921 withProfession (Lnet/minecraft/class_3852;)Lnet/minecraft/class_3850; METHOD method_16922 withType (Lnet/minecraft/class_3854;)Lnet/minecraft/class_3850; - METHOD method_16923 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; - ARG 1 ops METHOD method_16924 getProfession ()Lnet/minecraft/class_3852; METHOD method_16925 getLevel ()I METHOD method_19194 getLowerLevelExperience (I)I diff --git a/mappings/net/minecraft/village/VillagerGossips.mapping b/mappings/net/minecraft/village/VillagerGossips.mapping index 6c45e863e0..a190772929 100644 --- a/mappings/net/minecraft/village/VillagerGossips.mapping +++ b/mappings/net/minecraft/village/VillagerGossips.mapping @@ -10,9 +10,8 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 1 type ARG 2 left ARG 3 right - METHOD method_19066 deserialize (Lcom/mojang/datafixers/Dynamic;)V - METHOD method_19067 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops + METHOD method_19066 deserialize (Lcom/mojang/serialization/Dynamic;)V + METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; METHOD method_19070 pickGossips (Ljava/util/Random;I)Ljava/util/Collection; ARG 2 count METHOD method_19071 getReputationFor (Ljava/util/UUID;)Lnet/minecraft/class_4136$class_4137; @@ -39,7 +38,7 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips METHOD method_20655 remove (Lnet/minecraft/class_4139;)V ARG 1 gossipType CLASS class_4138 GossipEntry - FIELD field_18421 target Ljava/util/UUID; + FIELD field_18421 target Lnet/minecraft/class_4844; FIELD field_18422 type Lnet/minecraft/class_4139; FIELD field_18423 value I METHOD (Ljava/util/UUID;Lnet/minecraft/class_4139;I)V @@ -47,6 +46,5 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 2 type ARG 3 value METHOD method_19083 getValue ()I - METHOD method_19084 deserialize (Lcom/mojang/datafixers/Dynamic;)Ljava/util/Optional; - METHOD method_19087 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops + METHOD method_19084 deserialize (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; + METHOD method_19087 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/village/ZombieSiegeManager.mapping b/mappings/net/minecraft/village/ZombieSiegeManager.mapping index fb266aeb9c..e02efe299c 100644 --- a/mappings/net/minecraft/village/ZombieSiegeManager.mapping +++ b/mappings/net/minecraft/village/ZombieSiegeManager.mapping @@ -6,10 +6,6 @@ CLASS net/minecraft/class_1419 net/minecraft/village/ZombieSiegeManager FIELD field_6722 countdown I FIELD field_6723 remaining I FIELD field_6725 spawned Z - METHOD method_6445 spawn (Lnet/minecraft/class_3218;ZZ)I - ARG 1 world - ARG 2 spawnMonsters - ARG 3 spawnAnimals METHOD method_6446 spawn (Lnet/minecraft/class_3218;)Z ARG 1 world METHOD method_6447 trySpawnZombie (Lnet/minecraft/class_3218;)V diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index 112691169c..2380827e79 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion FIELD field_14092 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_14093 world Lnet/minecraft/class_3218; FIELD field_14094 fluidTickScheduler Lnet/minecraft/class_1951; - FIELD field_14096 dimension Lnet/minecraft/class_2869; + FIELD field_14096 dimension Lnet/minecraft/class_2874; FIELD field_14097 levelProperties Lnet/minecraft/class_5217; FIELD field_14098 chunks Ljava/util/List; FIELD field_14099 blockTickScheduler Lnet/minecraft/class_1951; diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 34a93f72f3..4965338c70 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules ARG 2 type METHOD method_20746 get (Lnet/minecraft/class_1928$class_4313;)Lnet/minecraft/class_1928$class_4315; ARG 1 key - METHOD method_20747 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_1928$class_4315;)V + METHOD method_20747 (Lcom/mojang/serialization/DynamicLike;Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_1928$class_4315;)V ARG 1 key ARG 2 rule METHOD method_20748 (Ljava/util/Map$Entry;)Lnet/minecraft/class_1928$class_4315; @@ -38,8 +38,7 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules ARG 1 rule METHOD method_8356 getInt (Lnet/minecraft/class_1928$class_4313;)I ARG 1 rule - METHOD method_8357 load (Lnet/minecraft/class_2487;)V - ARG 1 nbt + METHOD method_8357 load (Lcom/mojang/serialization/DynamicLike;)V METHOD method_8358 toNbt ()Lnet/minecraft/class_2487; METHOD method_8359 register (Ljava/lang/String;Lnet/minecraft/class_1928$class_5198;Lnet/minecraft/class_1928$class_4314;)Lnet/minecraft/class_1928$class_4313; ARG 0 name diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 93ce86ae5f..a9ddf4e3ef 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -62,7 +62,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 1 biome ARG 2 chunkX ARG 3 chunkZ - METHOD method_8662 isClearForSpawn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z + 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 ARG 0 blockView ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/world/WanderingTraderManager.mapping b/mappings/net/minecraft/world/WanderingTraderManager.mapping index 8d4e0a4ad9..588eb72c91 100644 --- a/mappings/net/minecraft/world/WanderingTraderManager.mapping +++ b/mappings/net/minecraft/world/WanderingTraderManager.mapping @@ -1,17 +1,10 @@ CLASS net/minecraft/class_3990 net/minecraft/world/WanderingTraderManager FIELD field_17726 random Ljava/util/Random; - FIELD field_17727 world Lnet/minecraft/class_3218; FIELD field_17728 spawnTimer I FIELD field_17729 spawnDelay I FIELD field_17730 spawnChance I - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_5268;)V - ARG 1 world - METHOD method_18015 tick ()V METHOD method_18016 spawnLlama (Lnet/minecraft/class_3989;I)V ARG 1 wanderingTrader ARG 2 range - METHOD method_18017 getNearbySpawnPos (Lnet/minecraft/class_2338;I)Lnet/minecraft/class_2338; - ARG 1 pos - ARG 2 range - METHOD method_23279 wontSuffocateAt (Lnet/minecraft/class_2338;)Z - ARG 1 pos + METHOD method_18017 getNearbySpawnPos (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_2338; + METHOD method_23279 wontSuffocateAt (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index d2fcd48a23..a58adb8e2b 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9238 unusedIncrement I FIELD field_9241 pendingBlockEntities Ljava/util/List; FIELD field_9246 tickingBlockEntities Ljava/util/List; - FIELD field_9247 dimension Lnet/minecraft/class_2869; + FIELD field_9247 dimension Lnet/minecraft/class_2874; FIELD field_9249 iteratingTickingBlockEntities Z FIELD field_9251 thunderGradientPrev F FIELD field_9253 rainGradientPrev F @@ -84,8 +84,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8428 getScoreboard ()Lnet/minecraft/class_269; METHOD method_8430 getRainGradient (F)F METHOD method_8433 getRecipeManager ()Lnet/minecraft/class_1863; - METHOD method_8435 setTimeOfDay (J)V - ARG 1 time METHOD method_8437 createExplosion (Lnet/minecraft/class_1297;DDDFLnet/minecraft/class_1927$class_4179;)Lnet/minecraft/class_1927; ARG 1 entity ARG 2 x @@ -210,8 +208,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8515 isTopSolid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z ARG 1 pos ARG 2 entity - METHOD method_8516 setTime (J)V - ARG 1 time METHOD method_8517 setBlockBreakingInfo (ILnet/minecraft/class_2338;I)V ARG 1 entityId ARG 2 pos @@ -263,4 +259,3 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 13 tag METHOD method_8558 isValid (Lnet/minecraft/class_2338;)Z ARG 0 pos - METHOD method_8560 tickTime ()V diff --git a/mappings/net/minecraft/world/WorldView.mapping b/mappings/net/minecraft/world/WorldView.mapping index efd85f31af..4ec0f57e8f 100644 --- a/mappings/net/minecraft/world/WorldView.mapping +++ b/mappings/net/minecraft/world/WorldView.mapping @@ -54,7 +54,7 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView ARG 3 leastStatus ARG 4 create METHOD method_8594 getAmbientDarkness ()I - METHOD method_8597 getDimension ()Lnet/minecraft/class_2869; + METHOD method_8597 getDimension ()Lnet/minecraft/class_2874; METHOD method_8598 getTopPosition (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 1 heightmap ARG 2 pos diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index f1d021dbe3..d13c7b0c54 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -88,14 +88,12 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8705 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 blockPos - METHOD method_8706 getStructureFeatureConfig (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3037; - ARG 1 structureFeature METHOD method_8707 computeTemperature (Lnet/minecraft/class_2338;)F ARG 1 blockPos METHOD method_8708 addSpawn (Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;)V ARG 1 group ARG 2 spawnEntry - METHOD method_8710 addStructureFeature (Lnet/minecraft/class_2975;)V + METHOD method_8710 addStructureFeature (Lnet/minecraft/class_5312;)V ARG 1 configuredStructureFeature METHOD method_8711 getGrassColorAt (DD)I ARG 1 x diff --git a/mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping b/mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping index ebf3afcb9c..cdb23cc556 100644 --- a/mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping +++ b/mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping @@ -1,17 +1,4 @@ CLASS net/minecraft/class_4761 net/minecraft/world/biome/BiomeParticleConfig - FIELD field_22034 type Lnet/minecraft/class_2400; FIELD field_22035 chance F - FIELD field_22036 velocityXFactory Ljava/util/function/Function; - FIELD field_22037 velocityYFactory Ljava/util/function/Function; - FIELD field_22038 velocityZFactory Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_2400;FLjava/util/function/Function;Ljava/util/function/Function;Ljava/util/function/Function;)V - ARG 1 type - ARG 2 chance - ARG 3 xFactory - ARG 4 yFactory - ARG 5 zFactory - METHOD method_24369 getParticleType ()Lnet/minecraft/class_2400; + METHOD method_24369 getParticleType ()Lnet/minecraft/class_2394; METHOD method_24370 shouldAddParticle (Ljava/util/Random;)Z - METHOD method_24371 generateVelocityX (Ljava/util/Random;)D - METHOD method_24372 generateVelocityY (Ljava/util/Random;)D - METHOD method_24373 generateVelocityZ (Ljava/util/Random;)D diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping index df3616c5e7..36d6393dc8 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping @@ -230,8 +230,6 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures ARG 0 biome METHOD method_17000 addOceanCarvers (Lnet/minecraft/class_1959;)V ARG 0 biome - METHOD method_17001 addDefaultStructures (Lnet/minecraft/class_1959;)V - ARG 0 biome METHOD method_17002 addDefaultLakes (Lnet/minecraft/class_1959;)V ARG 0 biome METHOD method_17003 addDesertLakes (Lnet/minecraft/class_1959;)V @@ -278,8 +276,6 @@ CLASS net/minecraft/class_3864 net/minecraft/world/biome/DefaultBiomeFeatures ARG 0 biome METHOD method_17024 addExtraSavannaTrees (Lnet/minecraft/class_1959;)V ARG 0 biome - METHOD method_20826 addEndCities (Lnet/minecraft/class_1959;)V - ARG 0 biome METHOD method_24382 addNetherOres (Lnet/minecraft/class_1959;)V ARG 0 biome METHOD method_24383 addCrimsonForestVegetation (Lnet/minecraft/class_1959;)V diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 3804162691..601c1f1038 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -1,17 +1,12 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource - FIELD field_20643 biomes Ljava/util/Set; + FIELD field_20643 biomes Ljava/util/List; FIELD field_9390 topMaterials Ljava/util/Set; FIELD field_9391 SPAWN_BIOMES Ljava/util/List; FIELD field_9392 structureFeatures Ljava/util/Map; - METHOD (Ljava/util/Set;)V - ARG 1 biomes METHOD method_27985 create (J)Lnet/minecraft/class_1966; ARG 1 seed METHOD method_8754 hasStructureFeature (Lnet/minecraft/class_3195;)Z ARG 1 feature - METHOD method_8757 getNoiseAt (II)F - ARG 1 x - ARG 2 z METHOD method_8759 getSpawnBiomes ()Ljava/util/List; METHOD method_8761 getTopMaterials ()Ljava/util/Set; METHOD method_8762 locateBiome (IIIILjava/util/List;Ljava/util/Random;)Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping b/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping deleted file mode 100644 index a44c1d76e7..0000000000 --- a/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_1969 net/minecraft/world/biome/source/BiomeSourceType - FIELD field_9398 CHECKERBOARD Lnet/minecraft/class_1969; - FIELD field_9399 THE_END Lnet/minecraft/class_1969; - FIELD field_9401 FIXED Lnet/minecraft/class_1969; - FIELD field_9402 VANILLA_LAYERED Lnet/minecraft/class_1969; - METHOD method_8773 register (Ljava/lang/String;)Lnet/minecraft/class_1969; - ARG 0 id diff --git a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping index 58772f43dd..dbf831d002 100644 --- a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1973 net/minecraft/world/biome/source/CheckerboardBiomeSource FIELD field_9480 gridSize I - FIELD field_9481 biomeArray [Lnet/minecraft/class_1959; - METHOD ([Lnet/minecraft/class_1959;I)V - ARG 1 biomes + FIELD field_9481 biomeArray Ljava/util/List; + METHOD (Ljava/util/List;I)V ARG 2 size diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index 28ee561984..00d4848d66 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -8,9 +8,6 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS METHOD (JLjava/util/List;)V ARG 1 seed ARG 3 biomePoints - METHOD method_27986 fromBiomes (JLjava/util/List;)Lnet/minecraft/class_4766; - ARG 0 seed - ARG 2 biomes METHOD method_27987 (Lnet/minecraft/class_1959;)Ljava/util/stream/Stream; ARG 0 biome METHOD method_27988 (Lnet/minecraft/class_1959;Lnet/minecraft/class_1959$class_4762;)Lcom/mojang/datafixers/util/Pair; diff --git a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping index 4f0b56b2d2..c0e0a27de8 100644 --- a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSource - FIELD field_9830 BIOMES Ljava/util/Set; + FIELD field_9830 BIOMES Ljava/util/List; FIELD field_9831 noise Lnet/minecraft/class_3541; + METHOD method_8757 getNoiseAt (Lnet/minecraft/class_3541;II)F diff --git a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping index 278ba29b66..4524706991 100644 --- a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_2088 net/minecraft/world/biome/source/VanillaLayeredBiomeSource - FIELD field_9677 BIOMES Ljava/util/Set; + FIELD field_9677 BIOMES Ljava/util/List; FIELD field_9680 biomeSampler Lnet/minecraft/class_3642; diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 012607df61..8a80f83151 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -29,8 +29,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12021 getBlockEntityPositions ()Ljava/util/Set; METHOD method_12024 getBlockEntityTagAt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; ARG 1 pos - METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; - ARG 1 carver METHOD method_12026 getList ([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList; ARG 0 lists ARG 1 index diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index 5526ffefc4..a3d40b53bf 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk ARG 4 blockTickScheduler ARG 5 fluidTickScheduler METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568; + METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; METHOD method_12295 getEntities ()Ljava/util/List; METHOD method_12296 getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList; METHOD method_12300 getPackedSectionRelative (Lnet/minecraft/class_2338;)S diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping deleted file mode 100644 index 5230477833..0000000000 --- a/mappings/net/minecraft/world/dimension/Dimension.mapping +++ /dev/null @@ -1,24 +0,0 @@ -CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension - FIELD field_13053 lightLevelToBrightness [F - FIELD field_13055 type Lnet/minecraft/class_2874; - FIELD field_13058 world Lnet/minecraft/class_1937; - FIELD field_13059 MOON_PHASE_TO_SIZE [F - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2874;F)V - ARG 1 world - ARG 2 type - METHOD method_12444 getTopSpawningBlockPosition (JIIZ)Lnet/minecraft/class_2338; - METHOD method_12448 canPlayersSleep ()Z - METHOD method_12450 saveWorldData (Lnet/minecraft/class_5268;)V - METHOD method_12452 getSpawningBlockInChunk (JLnet/minecraft/class_1923;Z)Lnet/minecraft/class_2338; - METHOD method_12454 getMoonPhase (J)I - ARG 1 time - METHOD method_12460 getType ()Lnet/minecraft/class_2874; - METHOD method_12461 update ()V - METHOD method_12462 hasVisibleSky ()Z - METHOD method_12463 createWorldBorder ()Lnet/minecraft/class_2784; - METHOD method_12464 getSkyAngle (JF)F - ARG 1 timeOfDay - ARG 3 tickDelta - METHOD method_12466 getForcedSpawnPoint ()Lnet/minecraft/class_2338; - METHOD method_23759 getBrightness (I)F - ARG 1 lightLevel diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 86bb8c6f92..758142a2ce 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -1,31 +1,9 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_13073 hasSkyLight Z - FIELD field_13074 id I - FIELD field_13075 factory Ljava/util/function/BiFunction; FIELD field_13077 suffix Ljava/lang/String; - FIELD field_13079 saveDir Ljava/lang/String; FIELD field_20658 biomeAccessType Lnet/minecraft/class_4545; - METHOD (ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;ZZZLnet/minecraft/class_4545;)V - ARG 1 dimensionId - ARG 2 suffix - ARG 3 saveDir - ARG 4 factory - ARG 5 hasSkylight - METHOD method_12482 getAll ()Ljava/lang/Iterable; - METHOD method_12483 byId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2874; - ARG 0 identifier - METHOD method_12484 getRawId ()I - METHOD method_12485 getId (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2960; - ARG 0 type - METHOD method_12486 register (Ljava/lang/String;Lnet/minecraft/class_2874;)Lnet/minecraft/class_2874; - ARG 0 id - ARG 1 dimension - METHOD method_12487 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_2869; - METHOD method_12488 getSaveDirectory (Ljava/io/File;)Ljava/io/File; + METHOD method_12488 getSaveDirectory (Lnet/minecraft/class_5321;Ljava/io/File;)Ljava/io/File; ARG 1 root METHOD method_12489 getSuffix ()Ljava/lang/String; - METHOD method_12490 byRawId (I)Lnet/minecraft/class_2874; - ARG 0 id METHOD method_12491 hasSkyLight ()Z - METHOD method_19298 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2874; METHOD method_22415 getBiomeAccessType ()Lnet/minecraft/class_4545; diff --git a/mappings/net/minecraft/world/dimension/OverworldDimension.mapping b/mappings/net/minecraft/world/dimension/OverworldDimension.mapping deleted file mode 100644 index a59a92033d..0000000000 --- a/mappings/net/minecraft/world/dimension/OverworldDimension.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_2878 net/minecraft/world/dimension/OverworldDimension - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2874;)V - ARG 1 world - ARG 2 type diff --git a/mappings/net/minecraft/world/dimension/TheEndDimension.mapping b/mappings/net/minecraft/world/dimension/TheEndDimension.mapping deleted file mode 100644 index 5f208a8f31..0000000000 --- a/mappings/net/minecraft/world/dimension/TheEndDimension.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_2880 net/minecraft/world/dimension/TheEndDimension - FIELD field_13103 SPAWN_POINT Lnet/minecraft/class_2338; - FIELD field_13104 enderDragonFight Lnet/minecraft/class_2881; - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2874;)V - ARG 1 world - ARG 2 type - METHOD method_12513 getEnderDragonFight ()Lnet/minecraft/class_2881; diff --git a/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping b/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping deleted file mode 100644 index 1b0cd93e7b..0000000000 --- a/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_2872 net/minecraft/world/dimension/TheNetherDimension - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2874;)V - ARG 1 world - ARG 2 type diff --git a/mappings/net/minecraft/world/gen/CatSpawner.mapping b/mappings/net/minecraft/world/gen/CatSpawner.mapping index f7740dee5d..81ffc36bcb 100644 --- a/mappings/net/minecraft/world/gen/CatSpawner.mapping +++ b/mappings/net/minecraft/world/gen/CatSpawner.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_4274 net/minecraft/world/gen/CatSpawner METHOD method_20260 spawnInSwampHut (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I ARG 1 world ARG 2 pos - METHOD method_20261 spawn (Lnet/minecraft/class_3218;ZZ)I - ARG 2 spawnMonsters - ARG 3 spawnAnimals METHOD method_20262 spawn (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;)I ARG 1 pos ARG 2 world diff --git a/mappings/net/minecraft/world/gen/PhantomSpawner.mapping b/mappings/net/minecraft/world/gen/PhantomSpawner.mapping index 5b3819253e..6f4834b45e 100644 --- a/mappings/net/minecraft/world/gen/PhantomSpawner.mapping +++ b/mappings/net/minecraft/world/gen/PhantomSpawner.mapping @@ -1,5 +1,2 @@ CLASS net/minecraft/class_2910 net/minecraft/world/gen/PhantomSpawner FIELD field_13244 ticksUntilNextSpawn I - METHOD method_12639 spawn (Lnet/minecraft/class_3218;ZZ)I - ARG 2 spawnMonsters - ARG 3 spawnAnimals diff --git a/mappings/net/minecraft/world/gen/PillagerSpawner.mapping b/mappings/net/minecraft/world/gen/PillagerSpawner.mapping index 351730500e..50c570abb1 100644 --- a/mappings/net/minecraft/world/gen/PillagerSpawner.mapping +++ b/mappings/net/minecraft/world/gen/PillagerSpawner.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_3769 net/minecraft/world/gen/PillagerSpawner FIELD field_16652 ticksUntilNextSpawn I - METHOD method_16574 spawn (Lnet/minecraft/class_3218;ZZ)I - ARG 2 spawnMonsters - ARG 3 spawnAnimals METHOD method_16575 spawnOneEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;Z)Z diff --git a/mappings/net/minecraft/world/gen/ProbabilityConfig.mapping b/mappings/net/minecraft/world/gen/ProbabilityConfig.mapping index 95e0024726..b49a9682b1 100644 --- a/mappings/net/minecraft/world/gen/ProbabilityConfig.mapping +++ b/mappings/net/minecraft/world/gen/ProbabilityConfig.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_3133 net/minecraft/world/gen/ProbabilityConfig FIELD field_13738 probability F METHOD (F)V ARG 1 probability - METHOD method_13674 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3133; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index b04a0c3ca5..5ccea17a58 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -2,13 +2,11 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver FIELD field_13294 CAVE_AIR Lnet/minecraft/class_2680; FIELD field_13296 LAVA Lnet/minecraft/class_3610; FIELD field_13298 carvableFluids Ljava/util/Set; - FIELD field_13299 configDeserializer Ljava/util/function/Function; FIELD field_13301 AIR Lnet/minecraft/class_2680; FIELD field_13302 alwaysCarvableBlocks Ljava/util/Set; FIELD field_13305 WATER Lnet/minecraft/class_3610; FIELD field_16653 heightLimit I - METHOD (Ljava/util/function/Function;I)V - ARG 1 configDeserializer + METHOD (Lcom/mojang/serialization/Codec;I)V ARG 2 heightLimit METHOD method_12702 carve (Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;IIIIILjava/util/BitSet;Lnet/minecraft/class_2920;)Z ARG 1 chunk diff --git a/mappings/net/minecraft/world/gen/carver/NetherCaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/NetherCaveCarver.mapping index 89c4fff533..f0b8027a9a 100644 --- a/mappings/net/minecraft/world/gen/carver/NetherCaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/NetherCaveCarver.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_2934 net/minecraft/world/gen/carver/NetherCaveCarver - METHOD (Ljava/util/function/Function;)V - ARG 1 configDeserializer diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping index db6b279828..e429ffa130 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2918 net/minecraft/world/gen/carver/RavineCarver FIELD field_13275 heightToHorizontalStretchFactor [F - METHOD (Ljava/util/function/Function;)V - ARG 1 configDeserializer METHOD method_12657 carveRavine (Lnet/minecraft/class_2791;Ljava/util/function/Function;JIIIDDDFFFIIDLjava/util/BitSet;)V ARG 1 chunk ARG 2 posToBiome diff --git a/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping index 75918e2988..09af1e39b3 100644 --- a/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_2936 net/minecraft/world/gen/carver/UnderwaterCaveCarver - METHOD (Ljava/util/function/Function;)V - ARG 1 configDeserializer METHOD method_16138 carveAtPoint (Lnet/minecraft/class_2939;Lnet/minecraft/class_2791;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;IIIIIIII)Z ARG 0 carver ARG 1 chunk diff --git a/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping deleted file mode 100644 index 15924b5d61..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2908 net/minecraft/world/gen/chunk/CavesChunkGenerator - FIELD field_16569 noiseFalloff [D - FIELD field_24511 generatorConfig Lnet/minecraft/class_2900; - METHOD (Lnet/minecraft/class_1966;JLnet/minecraft/class_2900;)V - ARG 1 biomeSource - ARG 2 seed - ARG 4 config - METHOD method_16403 buildNoiseFalloff ()[D diff --git a/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorConfig.mapping deleted file mode 100644 index 26851dc357..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorConfig.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2900 net/minecraft/world/gen/chunk/CavesChunkGeneratorConfig diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 7ca988c31b..ceaa355f21 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -3,37 +3,22 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT as well as populating the generated chunks with {@linkplain net.minecraft.world.gen.feature.Feature features} and {@linkplain net.minecraft.entity.Entity entities}. COMMENT Biome placement starts here, however all vanilla and most modded chunk generators delegate this to a {@linkplain net.minecraft.world.biome.source.BiomeSource biome source}. FIELD field_12761 biomeSource Lnet/minecraft/class_1966; - FIELD field_16567 config Lnet/minecraft/class_2888; - METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_2888;)V - ARG 1 biomeSource - ARG 2 config + FIELD field_16567 config Lnet/minecraft/class_5311; METHOD method_12088 populateNoise (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config. ARG 1 world ARG 2 accessor ARG 3 chunk - METHOD method_12097 hasStructure (Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;)Z - ARG 1 biome - ARG 2 feature METHOD method_12098 getBiomeSource ()Lnet/minecraft/class_1966; - METHOD method_12099 spawnEntities (Lnet/minecraft/class_3218;ZZ)V - ARG 1 world - ARG 2 spawnMonsters - ARG 3 spawnAnimals METHOD method_12100 getSpawnHeight ()I METHOD method_12102 generateFeatures (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;)V ARG 1 region ARG 2 accessor - METHOD method_12103 locateStructure (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; - ARG 1 world - ARG 2 id + METHOD method_12103 locateStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; ARG 3 center ARG 4 radius ARG 5 skipExistingChunks METHOD method_12104 getMaxY ()I - METHOD method_12105 getStructureConfig (Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3037; - ARG 1 biome - ARG 2 feature METHOD method_12106 populateBiomes (Lnet/minecraft/class_2791;)V ARG 1 chunk METHOD method_12107 populateEntities (Lnet/minecraft/class_3233;)V @@ -43,7 +28,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 3 access ARG 4 chunk ARG 5 carver - METHOD method_12109 getConfig ()Lnet/minecraft/class_2888; + METHOD method_12109 getConfig ()Lnet/minecraft/class_5311; METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V ARG 1 region ARG 2 chunk @@ -52,13 +37,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 2 accessor ARG 3 group ARG 4 pos - METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5138;Lnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;J)V - ARG 1 accessor - ARG 2 biomeAccess - ARG 3 chunk - ARG 4 generator - ARG 5 manager - ARG 6 seed + METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V METHOD method_16130 addStructureReferences (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V ARG 1 world ARG 2 accessor @@ -68,9 +47,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 2 z ARG 3 heightmapType METHOD method_16398 getSeaLevel ()I - METHOD method_16554 getDecorationBiome (Lnet/minecraft/class_4543;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; - ARG 1 biomeAccess - ARG 2 pos METHOD method_18028 getHeightInGround (IILnet/minecraft/class_2902$class_2903;)I ARG 1 x ARG 2 z @@ -79,12 +55,8 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 x ARG 2 z ARG 3 heightmapType - METHOD method_22404 (Lnet/minecraft/class_4543;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; - ARG 2 pos METHOD method_26261 getColumnSample (II)Lnet/minecraft/class_1922; ARG 1 x ARG 2 z - METHOD method_27367 hasStructure (Lnet/minecraft/class_3195;)Z - ARG 1 feature METHOD method_27997 create (J)Lnet/minecraft/class_2794; ARG 1 seed diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorConfig.mapping deleted file mode 100644 index df60059375..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorConfig.mapping +++ /dev/null @@ -1,45 +0,0 @@ -CLASS net/minecraft/class_2888 net/minecraft/world/gen/chunk/ChunkGeneratorConfig - FIELD field_13137 templeSeparation I - FIELD field_13139 templeSpacing I - FIELD field_13140 strongholdSpread I - FIELD field_13141 strongholdCount I - FIELD field_13142 strongholdSpacing I - FIELD field_13143 oceanMonumentSeparation I - FIELD field_13144 oceanMonumentSpacing I - FIELD field_13145 villageSeparation I - FIELD field_13146 villageSpacing I - FIELD field_13147 mansionSeparation I - FIELD field_13148 mansionSpacing I - FIELD field_13149 oceanRuinSeparation I - FIELD field_13150 oceanRuinSpacing I - FIELD field_13151 endCitySeparation I - FIELD field_13152 endCitySpacing I - FIELD field_13153 shipwreckSeparation I - FIELD field_13155 shipwreckSpacing I - FIELD field_23987 netherStructureSpacing I - FIELD field_23988 netherStructureSeparation I - FIELD field_23989 netherStructureSeedModifier I - FIELD field_24507 ruinedPortalSpacing I - FIELD field_24508 ruinedPortalSeparation I - METHOD method_12552 getMansionSeparation ()I - METHOD method_12553 getOceanMonumentSpacing ()I - METHOD method_12554 getEndCitySpacing ()I - METHOD method_12555 getOceanRuinSeparation ()I - METHOD method_12556 getOceanMonumentSeparation ()I - METHOD method_12557 getEndCitySeparation ()I - METHOD method_12558 getVillageSpacing ()I - METHOD method_12559 getVillageSeparation ()I - METHOD method_12560 getMansionSpacing ()I - METHOD method_12561 getStrongholdCount ()I - METHOD method_12562 getShipwreckSeparation ()I - METHOD method_12563 getStrongholdSpacing ()I - METHOD method_12564 getOceanRuinSpacing ()I - METHOD method_12565 getStrongholdSpread ()I - METHOD method_12566 getShipwreckSpacing ()I - METHOD method_12567 getTempleSpacing ()I - METHOD method_12568 getTempleSeparation ()I - METHOD method_27193 getNetherStructureSpacing ()I - METHOD method_27194 getRuinedPortalSpacing ()I - METHOD method_27195 getNetherStructureSeparation ()I - METHOD method_27196 getRuinedPortalSeparation ()I - METHOD method_27197 getNetherStructureSeedModifier ()I diff --git a/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping index 74a03ae609..e81a81bb86 100644 --- a/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2891 net/minecraft/world/gen/chunk/DebugChunkGenerator FIELD field_13162 AIR Lnet/minecraft/class_2680; FIELD field_13163 BLOCK_STATES Ljava/util/List; FIELD field_13164 BARRIER Lnet/minecraft/class_2680; - FIELD field_24509 generator Lnet/minecraft/class_2794; + FIELD field_24509 generator Lnet/minecraft/class_2891; METHOD method_12578 getBlockState (II)Lnet/minecraft/class_2680; ARG 0 x ARG 1 z diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping index 22fab86f6d..a1e65926ab 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping @@ -1,21 +1,6 @@ CLASS net/minecraft/class_2897 net/minecraft/world/gen/chunk/FlatChunkGenerator - FIELD field_13183 biome Lnet/minecraft/class_1959; - FIELD field_13184 phantomSpawner Lnet/minecraft/class_2910; - FIELD field_19180 catSpawner Lnet/minecraft/class_4274; FIELD field_24510 generatorConfig Lnet/minecraft/class_3232; METHOD (Lnet/minecraft/class_3232;)V ARG 1 config - METHOD method_12589 getBiome ()Lnet/minecraft/class_1959; METHOD method_28002 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 0 state - CLASS class_2898 FlatChunkGeneratorBiome - METHOD (Lnet/minecraft/class_2897;Lnet/minecraft/class_3504;Lnet/minecraft/class_1959$class_1963;Lnet/minecraft/class_1959$class_1961;FFFFLnet/minecraft/class_4763;Ljava/lang/String;)V - ARG 2 surfaceBuilder - ARG 3 precipitation - ARG 4 category - ARG 5 depth - ARG 6 scale - ARG 7 temperature - ARG 8 downfall - ARG 9 effects - ARG 10 parent diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index 99638d94d1..ae505f7aaa 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -1,65 +1,20 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig - FIELD field_14061 DESERT_PYRAMID Lnet/minecraft/class_2975; - FIELD field_14062 SHIPWRECK Lnet/minecraft/class_2975; - FIELD field_14063 STRONGHOLD Lnet/minecraft/class_2975; FIELD field_14064 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_14065 NETHER_BRIDGE Lnet/minecraft/class_2975; FIELD field_14066 LAVA_LAKE Lnet/minecraft/class_2975; - FIELD field_14067 SWAMP_HUT Lnet/minecraft/class_2975; - FIELD field_14068 WOODLAND_MANSION Lnet/minecraft/class_2975; - FIELD field_14069 FEATURE_TO_GENERATION_STEP Ljava/util/Map; - FIELD field_14070 IGLOO Lnet/minecraft/class_2975; FIELD field_14071 WATER_LAKE Lnet/minecraft/class_2975; FIELD field_14072 layers Ljava/util/List; FIELD field_14073 STRUCTURE_TO_FEATURES Ljava/util/Map; - FIELD field_14074 structures Ljava/util/Map; - FIELD field_14075 MINESHAFT Lnet/minecraft/class_2975; - FIELD field_14076 OCEAN_MONUMENT Lnet/minecraft/class_2975; FIELD field_14077 hasNoTerrain Z - FIELD field_14078 JUNGLE_TEMPLE Lnet/minecraft/class_2975; - FIELD field_14079 VILLAGE Lnet/minecraft/class_2975; - FIELD field_14080 FEATURE_TO_FEATURE_CONFIG Ljava/util/Map; FIELD field_14081 biome Lnet/minecraft/class_1959; FIELD field_14082 layerBlocks [Lnet/minecraft/class_2680; - FIELD field_14083 groundHeight I - FIELD field_14084 END_CITY Lnet/minecraft/class_2975; - FIELD field_14085 OCEAN_RUIN Lnet/minecraft/class_2975; - FIELD field_19182 PILLAGER_OUTPOST Lnet/minecraft/class_2975; - FIELD field_24017 RUINED_PORTAL Lnet/minecraft/class_2975; - FIELD field_24422 BASTION_REMNANT Lnet/minecraft/class_2975; - FIELD field_24560 config Lnet/minecraft/class_2888; - METHOD (Lnet/minecraft/class_2888;)V + FIELD field_24560 config Lnet/minecraft/class_5311; + METHOD (Lnet/minecraft/class_5311;)V ARG 1 config METHOD method_14309 getDefaultConfig ()Lnet/minecraft/class_3232; - METHOD method_14311 (Ljava/util/HashMap;)V - ARG 0 map METHOD method_14312 getLayerBlocks ()[Lnet/minecraft/class_2680; - METHOD method_14313 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 dynamicOps - METHOD method_14314 addStructure (Ljava/lang/String;)V - ARG 1 id - METHOD method_14315 parseLayerString (Ljava/lang/String;I)Lnet/minecraft/class_3229; - ARG 0 string - ARG 1 startY - METHOD method_14319 fromString (Ljava/lang/String;)Lnet/minecraft/class_3232; - ARG 0 string - METHOD method_14320 hasNoTerrain ()Z - METHOD method_14321 (Ljava/util/HashMap;)V - ARG 0 map - METHOD method_14323 fromDynamic (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3232; - ARG 0 dynamic - METHOD method_14324 setStructureOption (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 3 value + METHOD method_14314 addStructure (Lnet/minecraft/class_3195;)V METHOD method_14325 setBiome (Lnet/minecraft/class_1959;)V METHOD method_14326 getBiome ()Lnet/minecraft/class_1959; METHOD method_14327 getLayers ()Ljava/util/List; - METHOD method_14328 parseLayersString (Ljava/lang/String;)Ljava/util/List; - ARG 0 string - METHOD method_14329 (Ljava/util/HashMap;)V - ARG 0 map METHOD method_14330 updateLayerBlocks ()V - METHOD method_14333 getStructures ()Ljava/util/Map; - METHOD method_14334 parseBlock (Ljava/lang/String;)Lnet/minecraft/class_2248; - METHOD method_20314 removeLayerBlock (I)V - ARG 1 layer - METHOD method_28051 getConfig ()Lnet/minecraft/class_2888; + METHOD method_28051 getConfig ()Lnet/minecraft/class_5311; diff --git a/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator.mapping deleted file mode 100644 index 0d87d60532..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_2914 net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator - FIELD field_24519 generatorConfig Lnet/minecraft/class_5284; - METHOD (Lnet/minecraft/class_1966;JLnet/minecraft/class_5284;)V - ARG 1 biomeSource - ARG 2 seed - ARG 4 config diff --git a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping deleted file mode 100644 index d4722e8a24..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_2912 net/minecraft/world/gen/chunk/OverworldChunkGenerator - FIELD field_13245 phantomSpawner Lnet/minecraft/class_2910; - FIELD field_13254 BIOME_WEIGHT_TABLE [F - FIELD field_16583 depthNoiseSampler Lnet/minecraft/class_3537; - FIELD field_16650 pillagerSpawner Lnet/minecraft/class_3769; - FIELD field_19181 catSpawner Lnet/minecraft/class_4274; - FIELD field_19430 zombieSiegeManager Lnet/minecraft/class_1419; - FIELD field_24518 generatorConfig Lnet/minecraft/class_2906; - METHOD (Lnet/minecraft/class_1966;JLnet/minecraft/class_2906;)V - ARG 1 biomeSource - ARG 2 seed - ARG 4 config - METHOD method_16414 sampleDepthNoise (II)D - ARG 1 x - ARG 2 y - METHOD method_16415 ([F)V - ARG 0 array diff --git a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping deleted file mode 100644 index c80d5ee6c0..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_2906 net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig - FIELD field_24517 old Z - METHOD (Lnet/minecraft/class_2888;Z)V - ARG 1 config - ARG 2 old - METHOD method_28008 isOld ()Z diff --git a/mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping index 053f014877..f006e3be41 100644 --- a/mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping @@ -12,23 +12,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/SurfaceChunkGenerat FIELD field_16580 noiseSizeX I FIELD field_16581 upperInterpolatedNoise Lnet/minecraft/class_3537; FIELD field_16648 AIR Lnet/minecraft/class_2680; - FIELD field_24512 bedrockFloorHeight I - FIELD field_24513 bedrockCeilingHeight I - METHOD (Lnet/minecraft/class_1966;JLnet/minecraft/class_5284;IIIZ)V - ARG 1 biomeSource - ARG 2 seed - ARG 4 config - ARG 5 horizontalNoiseResolution - ARG 6 verticalNoiseResolution - ARG 7 worldHeight - ARG 8 useSimplexNoise - METHOD method_12090 computeNoiseRange (II)[D - ARG 1 x - ARG 2 z - METHOD method_16404 computeNoiseFalloff (DDI)D - ARG 1 depth - ARG 3 scale - ARG 5 y METHOD method_16405 sampleNoiseColumn ([DII)V ARG 1 buffer ARG 2 x @@ -36,9 +19,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/SurfaceChunkGenerat METHOD method_16406 sampleNoiseColumn (II)[D ARG 1 x ARG 2 z - METHOD method_16408 getNoiseSizeY ()I - METHOD method_16409 topInterpolationStart ()D - METHOD method_16410 bottomInterpolationStart ()D METHOD method_16411 sampleNoise (IIIDDDD)D ARG 1 x ARG 2 y @@ -50,16 +30,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/SurfaceChunkGenerat METHOD method_16412 buildBedrock (Lnet/minecraft/class_2791;Ljava/util/Random;)V ARG 1 chunk ARG 2 random - METHOD method_16413 sampleNoiseColumn ([DIIDDDDII)V - ARG 1 buffer - ARG 2 x - ARG 3 z - ARG 4 horizontalScale - ARG 6 verticalScale - ARG 8 horizontalStretch - ARG 10 verticalStretch - ARG 12 topInterpolationFactor - ARG 13 topEndValue METHOD method_16573 ([F)V ARG 0 array METHOD method_26262 getBlockState (DI)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/decorator/BeehiveTreeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/BeehiveTreeDecorator.mapping index aed9b130fe..9ce9c7b8bf 100644 --- a/mappings/net/minecraft/world/gen/decorator/BeehiveTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/BeehiveTreeDecorator.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_4659 net/minecraft/world/gen/decorator/BeehiveTreeDecorator FIELD field_21317 chance F - METHOD (F)V - ARG 1 chance diff --git a/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecoratorConfig.mapping index ad0a5b886b..426d936245 100644 --- a/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecoratorConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_3269 net/minecraft/world/gen/decorator/CarvingMaskDeco METHOD (Lnet/minecraft/class_2893$class_2894;F)V ARG 1 step ARG 2 probability - METHOD method_14419 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3269; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping index b788d62a8a..9460a94c38 100644 --- a/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_3297 net/minecraft/world/gen/decorator/ChanceDecorator FIELD field_14289 chance I METHOD (I)V ARG 1 chance - METHOD method_14479 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3297; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/ChanceRangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/ChanceRangeDecoratorConfig.mapping index 70ab9c48ef..bef294810b 100644 --- a/mappings/net/minecraft/world/gen/decorator/ChanceRangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ChanceRangeDecoratorConfig.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_2990 net/minecraft/world/gen/decorator/ChanceRangeDeco ARG 2 bottomOffset ARG 3 topOffset ARG 4 top - METHOD method_12898 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2990; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping index 5ad1d2b75b..8b74b008ce 100644 --- a/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping @@ -1,11 +1,6 @@ CLASS net/minecraft/class_3243 net/minecraft/world/gen/decorator/ConfiguredDecorator FIELD field_14114 config Lnet/minecraft/class_2998; FIELD field_14115 decorator Lnet/minecraft/class_3284; - METHOD (Lnet/minecraft/class_3284;Lcom/mojang/datafixers/Dynamic;)V - ARG 1 decorator METHOD (Lnet/minecraft/class_3284;Lnet/minecraft/class_2998;)V ARG 1 decorator METHOD method_14358 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2975;)Z - METHOD method_14359 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3243; - ARG 0 dynamic - METHOD method_16641 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/world/gen/decorator/CountChanceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/CountChanceDecoratorConfig.mapping index 4ce85457bd..003aa1f10a 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountChanceDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountChanceDecoratorConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_3271 net/minecraft/world/gen/decorator/CountChanceDeco METHOD (IF)V ARG 1 count ARG 2 chance - METHOD method_14422 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3271; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/CountDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/CountDecoratorConfig.mapping index 20a13f7a08..1bcc8de9fa 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountDecoratorConfig.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_3273 net/minecraft/world/gen/decorator/CountDecoratorC FIELD field_14204 count I METHOD (I)V ARG 1 count - METHOD method_14425 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3273; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/CountDepthDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/CountDepthDecoratorConfig.mapping index 8a8e25dc8a..7a65cbc629 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountDepthDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountDepthDecoratorConfig.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/class_3277 net/minecraft/world/gen/decorator/CountDepthDecor ARG 1 count ARG 2 baseline ARG 3 spread - METHOD method_14429 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3277; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/CountExtraChanceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/CountExtraChanceDecoratorConfig.mapping index 16efffa659..ea91a3bbf1 100644 --- a/mappings/net/minecraft/world/gen/decorator/CountExtraChanceDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CountExtraChanceDecoratorConfig.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/class_3276 net/minecraft/world/gen/decorator/CountExtraChanc ARG 1 count ARG 2 extraChance ARG 3 extraCount - METHOD method_14428 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3276; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping index 93e394785f..af81ffab28 100644 --- a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_3284 net/minecraft/world/gen/decorator/Decorator - FIELD field_14232 configDeserializer Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 configDeserializer METHOD method_14450 register (Ljava/lang/String;Lnet/minecraft/class_3284;)Lnet/minecraft/class_3284; ARG 0 registryName ARG 1 decorator - METHOD method_14451 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2998; METHOD method_14452 getPositions (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2998;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/DecoratorConfig.mapping index 9d169016b6..9f306e1e2f 100644 --- a/mappings/net/minecraft/world/gen/decorator/DecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/DecoratorConfig.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_2998 net/minecraft/world/gen/decorator/DecoratorConfig FIELD field_13436 DEFAULT Lnet/minecraft/class_3113; - METHOD method_16585 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapRangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/HeightmapRangeDecoratorConfig.mapping index fa1c47e6d9..1c62479e6a 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapRangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/HeightmapRangeDecoratorConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_3278 net/minecraft/world/gen/decorator/HeightmapRangeD METHOD (II)V ARG 1 min ARG 2 max - METHOD method_14430 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3278; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/NoiseHeightmapDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/NoiseHeightmapDecoratorConfig.mapping index 8af06da97c..6bd1d05e72 100644 --- a/mappings/net/minecraft/world/gen/decorator/NoiseHeightmapDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/NoiseHeightmapDecoratorConfig.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/class_3003 net/minecraft/world/gen/decorator/NoiseHeightmapD ARG 1 noiseLevel ARG 3 belowNoise ARG 4 aboveNoise - METHOD method_12967 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3003; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/NopeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/NopeDecoratorConfig.mapping index be17b8867f..8a2f9dd4b1 100644 --- a/mappings/net/minecraft/world/gen/decorator/NopeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/NopeDecoratorConfig.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_3113 net/minecraft/world/gen/decorator/NopeDecoratorConfig - METHOD method_13572 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3113; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping index aa01732135..10f3d84b5e 100644 --- a/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/RangeDecoratorConfig.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_2997 net/minecraft/world/gen/decorator/RangeDecoratorC ARG 2 bottomOffset ARG 3 topOffset ARG 4 maximum - METHOD method_12942 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2997; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/TopSolidHeightmapNoiseBiasedDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/TopSolidHeightmapNoiseBiasedDecoratorConfig.mapping index 733615f75c..ada141eae0 100644 --- a/mappings/net/minecraft/world/gen/decorator/TopSolidHeightmapNoiseBiasedDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/TopSolidHeightmapNoiseBiasedDecoratorConfig.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_3275 net/minecraft/world/gen/decorator/TopSolidHeightm ARG 2 noiseFactor ARG 4 noiseOffset ARG 6 heightmap - METHOD method_14427 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3275; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/TreeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/TreeDecorator.mapping index 5bdd7fc9f5..1dbe38b1a4 100644 --- a/mappings/net/minecraft/world/gen/decorator/TreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/TreeDecorator.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_4662 net/minecraft/world/gen/decorator/TreeDecorator COMMENT Tree decorators can add additional blocks to trees, such as vines or beehives. - FIELD field_21319 type Lnet/minecraft/class_4663; - METHOD (Lnet/minecraft/class_4663;)V - ARG 1 type METHOD method_23469 generate (Lnet/minecraft/class_1936;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;)V ARG 1 world ARG 2 random diff --git a/mappings/net/minecraft/world/gen/decorator/TreeDecoratorType.mapping b/mappings/net/minecraft/world/gen/decorator/TreeDecoratorType.mapping index ae7f7ccf58..a8be841f3b 100644 --- a/mappings/net/minecraft/world/gen/decorator/TreeDecoratorType.mapping +++ b/mappings/net/minecraft/world/gen/decorator/TreeDecoratorType.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_4663 net/minecraft/world/gen/decorator/TreeDecoratorType - METHOD method_23473 register (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_4663; diff --git a/mappings/net/minecraft/world/gen/feature/AbstractTempleFeature.mapping b/mappings/net/minecraft/world/gen/feature/AbstractTempleFeature.mapping deleted file mode 100644 index d592ba85c8..0000000000 --- a/mappings/net/minecraft/world/gen/feature/AbstractTempleFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3145 net/minecraft/world/gen/feature/AbstractTempleFeature diff --git a/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig.mapping index 855eada379..a2095ce827 100644 --- a/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BasaltColumnsFeatureConfig.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_5156 net/minecraft/world/gen/feature/BasaltColumnsFeat ARG 2 maxReach ARG 3 minHeight ARG 4 maxHeight - METHOD method_27109 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_5156; CLASS class_5157 Builder FIELD field_23891 minReach I FIELD field_23892 maxReach I diff --git a/mappings/net/minecraft/world/gen/feature/BastionRemnantFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BastionRemnantFeatureConfig.mapping index 070f9a2106..5e3a61c7cb 100644 --- a/mappings/net/minecraft/world/gen/feature/BastionRemnantFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BastionRemnantFeatureConfig.mapping @@ -2,7 +2,5 @@ CLASS net/minecraft/class_5186 net/minecraft/world/gen/feature/BastionRemnantFea FIELD field_24013 possibleConfigs Ljava/util/List; METHOD (Ljava/util/Map;)V ARG 1 startPoolToSize - METHOD method_27224 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_5186; - ARG 0 dynamic METHOD method_27227 getRandom (Ljava/util/Random;)Lnet/minecraft/class_3812; ARG 1 random diff --git a/mappings/net/minecraft/world/gen/feature/BlockPileFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BlockPileFeatureConfig.mapping index ae702912ec..251e46d65f 100644 --- a/mappings/net/minecraft/world/gen/feature/BlockPileFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BlockPileFeatureConfig.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_4634 net/minecraft/world/gen/feature/BlockPileFeatureConfig FIELD field_21229 stateProvider Lnet/minecraft/class_4651; - METHOD method_23406 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4634; diff --git a/mappings/net/minecraft/world/gen/feature/BoulderFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BoulderFeatureConfig.mapping index c049f8fd98..b1d17f8cef 100644 --- a/mappings/net/minecraft/world/gen/feature/BoulderFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BoulderFeatureConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_2951 net/minecraft/world/gen/feature/BoulderFeatureCon METHOD (Lnet/minecraft/class_2680;I)V ARG 1 state ARG 2 startRadius - METHOD method_12814 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2951; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig.mapping index 704717355f..ba9a54ae54 100644 --- a/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BuriedTreasureFeatureConfig.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_2959 net/minecraft/world/gen/feature/BuriedTreasureFea FIELD field_13352 probability F METHOD (F)V ARG 1 probability - METHOD method_12828 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2959; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index cbc20cc96d..59a11f340a 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -2,16 +2,7 @@ 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 field_21589 log Lorg/apache/logging/log4j/Logger; - METHOD (Lnet/minecraft/class_3031;Lcom/mojang/datafixers/Dynamic;)V - ARG 1 feature - METHOD (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)V - ARG 1 feature - ARG 2 config - METHOD method_12861 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2975; - ARG 0 dynamic METHOD method_12862 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z - METHOD method_16584 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops METHOD method_23387 withChance (F)Lnet/minecraft/class_3226; ARG 1 chance METHOD method_23388 createDecoratedFeature (Lnet/minecraft/class_3243;)Lnet/minecraft/class_2975; diff --git a/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping index 785b4134db..bc656f082a 100644 --- a/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_2986 net/minecraft/world/gen/feature/DecoratedFeatureConfig FIELD field_13398 decorator Lnet/minecraft/class_3243; FIELD field_13399 feature Lnet/minecraft/class_2975; - METHOD method_12891 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2986; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/DefaultFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/DefaultFeatureConfig.mapping index ca16eabf96..aa8140b700 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultFeatureConfig.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_3111 net/minecraft/world/gen/feature/DefaultFeatureConfig - METHOD method_13565 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3111; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/DeltaFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/DeltaFeatureConfig.mapping index 5d3c0ee9ff..8e2e0299cb 100644 --- a/mappings/net/minecraft/world/gen/feature/DeltaFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/DeltaFeatureConfig.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_5158 net/minecraft/world/gen/feature/DeltaFeatureConfi ARG 3 minRadius ARG 4 maxRadius ARG 5 maxRim - METHOD method_27114 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_5158; CLASS class_5159 Builder FIELD field_23900 contents Ljava/util/Optional; FIELD field_23901 rim Ljava/util/Optional; diff --git a/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping index c21b9926c4..dbba9c863b 100644 --- a/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_3013 net/minecraft/world/gen/feature/DiskFeatureConfig ARG 2 radius ARG 3 ySize ARG 4 targets - METHOD method_13012 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3013; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/EmeraldOreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/EmeraldOreFeatureConfig.mapping index 2a74d1189d..c49f568f6b 100644 --- a/mappings/net/minecraft/world/gen/feature/EmeraldOreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/EmeraldOreFeatureConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_3154 net/minecraft/world/gen/feature/EmeraldOreFeature METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 target ARG 2 state - METHOD method_13822 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3154; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/EndGatewayFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/EndGatewayFeatureConfig.mapping index d91be9a053..21d8bcd6ed 100644 --- a/mappings/net/minecraft/world/gen/feature/EndGatewayFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndGatewayFeatureConfig.mapping @@ -5,11 +5,7 @@ CLASS net/minecraft/class_3018 net/minecraft/world/gen/feature/EndGatewayFeature ARG 1 exitPos ARG 2 exact METHOD method_13026 isExact ()Z - METHOD method_13027 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3018; - ARG 0 dynamic METHOD method_18030 createConfig ()Lnet/minecraft/class_3018; - METHOD method_18033 (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2338;)Ljava/lang/Object; - ARG 2 pos METHOD method_18034 createConfig (Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_3018; ARG 0 exitPortalPosition ARG 1 exitsAtSpawn diff --git a/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping index 0b4e31116b..197f6091ee 100644 --- a/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping @@ -25,8 +25,4 @@ CLASS net/minecraft/class_3310 net/minecraft/world/gen/feature/EndSpikeFeature METHOD method_13966 getCenterX ()I METHOD method_13967 getCenterZ ()I METHOD method_13968 getBoundingBox ()Lnet/minecraft/class_238; - METHOD method_15889 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3310$class_3181; - ARG 0 dynamic - METHOD method_16597 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops CLASS class_3311 SpikeCache diff --git a/mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping index 67213422ab..feb91506f1 100644 --- a/mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_3666 net/minecraft/world/gen/feature/EndSpikeFeatureCo ARG 1 crystalInvulnerable ARG 2 spikes ARG 3 crystalBeamTarget - METHOD method_15881 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3666; - ARG 0 dynamic METHOD method_15883 isCrystalInvulerable ()Z METHOD method_15884 getPos ()Lnet/minecraft/class_2338; METHOD method_15885 getSpikes ()Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index afe6d136ec..ffdf026841 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -1,32 +1,6 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature - FIELD field_13514 configDeserializer Ljava/util/function/Function; - FIELD field_13515 DESERT_PYRAMID Lnet/minecraft/class_3195; - FIELD field_13520 SWAMP_HUT Lnet/minecraft/class_3197; FIELD field_13526 BONUS_CHEST Lnet/minecraft/class_2953; - FIELD field_13527 IGLOO Lnet/minecraft/class_3195; - FIELD field_13528 WOODLAND_MANSION Lnet/minecraft/class_3195; - FIELD field_13536 OCEAN_RUIN Lnet/minecraft/class_3195; - FIELD field_13538 BURIED_TREASURE Lnet/minecraft/class_3195; - FIELD field_13547 MINESHAFT Lnet/minecraft/class_3195; - FIELD field_13553 END_CITY Lnet/minecraft/class_3195; - FIELD field_13557 STRUCTURES Lcom/google/common/collect/BiMap; - FIELD field_13565 STRONGHOLD Lnet/minecraft/class_3195; - FIELD field_13569 NETHER_BRIDGE Lnet/minecraft/class_3195; - FIELD field_13586 JUNGLE_TEMPLE Lnet/minecraft/class_3195; - FIELD field_13587 VILLAGE Lnet/minecraft/class_3195; - FIELD field_13588 OCEAN_MONUMENT Lnet/minecraft/class_3195; - FIELD field_13589 SHIPWRECK Lnet/minecraft/class_3195; - FIELD field_16654 JIGSAW_STRUCTURES Ljava/util/List; - FIELD field_16655 PILLAGER_OUTPOST Lnet/minecraft/class_3195; FIELD field_21219 FLOWER Lnet/minecraft/class_4624; - FIELD field_22190 NETHER_FOSSIL Lnet/minecraft/class_3195; - FIELD field_23996 RUINED_PORTAL Lnet/minecraft/class_3195; - FIELD field_23997 BASTION_REMNANT Lnet/minecraft/class_3195; - METHOD (Ljava/util/function/Function;)V - ARG 1 configDeserializer - METHOD method_13148 deserializeConfig (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3037; - ARG 1 dynamic - METHOD method_13149 getMonsterSpawns ()Ljava/util/List; METHOD method_13150 register (Ljava/lang/String;Lnet/minecraft/class_3031;)Lnet/minecraft/class_3031; ARG 0 name ARG 1 feature @@ -36,13 +10,10 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature ARG 4 random ARG 5 pos ARG 6 config - METHOD method_13152 (Lcom/google/common/collect/HashBiMap;)V - ARG 0 map METHOD method_13153 setBlockState (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos ARG 3 state - METHOD method_16140 getCreatureSpawns ()Ljava/util/List; METHOD method_23395 isStone (Lnet/minecraft/class_2248;)Z ARG 0 block METHOD method_23396 isDirt (Lnet/minecraft/class_2248;)Z diff --git a/mappings/net/minecraft/world/gen/feature/FeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/FeatureConfig.mapping index 47693ab4cf..773e014580 100644 --- a/mappings/net/minecraft/world/gen/feature/FeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/FeatureConfig.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_3037 net/minecraft/world/gen/feature/FeatureConfig FIELD field_13603 DEFAULT Lnet/minecraft/class_3111; - METHOD method_16587 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/feature/FillLayerFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/FillLayerFeatureConfig.mapping index 86a8dc0ea0..29ac1443bd 100644 --- a/mappings/net/minecraft/world/gen/feature/FillLayerFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/FillLayerFeatureConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_4279 net/minecraft/world/gen/feature/FillLayerFeatureC METHOD (ILnet/minecraft/class_2680;)V ARG 1 height ARG 2 state - METHOD method_20313 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4279; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping index 393ad0f377..67266e10ea 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping @@ -14,4 +14,3 @@ CLASS net/minecraft/class_4780 net/minecraft/world/gen/feature/HugeFungusFeature ARG 3 hatState ARG 4 decorationState ARG 5 planted - METHOD method_24436 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4780; diff --git a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeatureConfig.mapping index c9d8c2cc52..339028a09f 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeatureConfig.mapping @@ -6,4 +6,3 @@ CLASS net/minecraft/class_4635 net/minecraft/world/gen/feature/HugeMushroomFeatu ARG 1 capProvider ARG 2 stemProvider ARG 3 capSize - METHOD method_23407 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4635; diff --git a/mappings/net/minecraft/world/gen/feature/IcePatchFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/IcePatchFeatureConfig.mapping index fc71c04a7e..2bb7490d97 100644 --- a/mappings/net/minecraft/world/gen/feature/IcePatchFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/IcePatchFeatureConfig.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_3034 net/minecraft/world/gen/feature/IcePatchFeatureCo FIELD field_13601 radius I METHOD (I)V ARG 1 radius - METHOD method_13164 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3034; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/JungleFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/feature/JungleFoliagePlacer.mapping index f1c3b8ff55..3b3f5c3280 100644 --- a/mappings/net/minecraft/world/gen/feature/JungleFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/feature/JungleFoliagePlacer.mapping @@ -1,8 +1,2 @@ CLASS net/minecraft/class_5209 net/minecraft/world/gen/feature/JungleFoliagePlacer FIELD field_24166 height I - METHOD (IIIII)V - ARG 1 radius - ARG 2 randomRadius - ARG 3 offset - ARG 4 randomOffset - ARG 5 height diff --git a/mappings/net/minecraft/world/gen/feature/MegaPineFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/feature/MegaPineFoliagePlacer.mapping index 091e2eaaf1..eda45235e0 100644 --- a/mappings/net/minecraft/world/gen/feature/MegaPineFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/feature/MegaPineFoliagePlacer.mapping @@ -1,10 +1,3 @@ CLASS net/minecraft/class_5210 net/minecraft/world/gen/feature/MegaPineFoliagePlacer FIELD field_24167 heightRange I FIELD field_24168 crownHeight I - METHOD (IIIIII)V - ARG 1 radius - ARG 2 randomRadius - ARG 3 offset - ARG 4 randomOffset - ARG 5 heightRange - ARG 6 crownHeight diff --git a/mappings/net/minecraft/world/gen/feature/MineshaftFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/MineshaftFeatureConfig.mapping index 7a04bc89b8..26ea64ba0e 100644 --- a/mappings/net/minecraft/world/gen/feature/MineshaftFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/MineshaftFeatureConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_3101 net/minecraft/world/gen/feature/MineshaftFeatureC METHOD (DLnet/minecraft/class_3098$class_3100;)V ARG 1 probability ARG 3 type - METHOD method_13536 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3101; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeatureConfig.mapping index c3dc89cd78..f54bb8b825 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeatureConfig.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_5160 net/minecraft/world/gen/feature/NetherrackReplace ARG 2 state ARG 3 minReachPos ARG 4 maxReachPos - METHOD method_27119 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_5160; CLASS class_5161 Builder FIELD field_23909 target Lnet/minecraft/class_2680; FIELD field_23910 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/feature/OceanRuinFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/OceanRuinFeatureConfig.mapping index 5b8d8a1e45..25075222d0 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanRuinFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanRuinFeatureConfig.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/class_3114 net/minecraft/world/gen/feature/OceanRuinFeatureC ARG 1 biomeType ARG 2 largeProbability ARG 3 clusterProbability - METHOD method_13573 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3114; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping index 0f1951722b..a28a9b35e7 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_3124 net/minecraft/world/gen/feature/OreFeatureConfig ARG 1 target ARG 2 state ARG 3 size - METHOD method_13634 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3124; - ARG 0 dynamic CLASS class_3125 Target FIELD field_13726 name Ljava/lang/String; FIELD field_13728 nameMap Ljava/util/Map; diff --git a/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping index 26cb1e2b41..6fad2c7d6d 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomBooleanFeatureConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_3137 net/minecraft/world/gen/feature/RandomBooleanFeat METHOD (Lnet/minecraft/class_2975;Lnet/minecraft/class_2975;)V ARG 1 featureTrue ARG 2 featureFalse - METHOD method_13687 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3137; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping index 3ddb082d85..2fd8b3a217 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping @@ -4,7 +4,3 @@ CLASS net/minecraft/class_3141 net/minecraft/world/gen/feature/RandomFeatureConf METHOD (Ljava/util/List;Lnet/minecraft/class_2975;)V ARG 1 features ARG 2 defaultFeature - METHOD method_13709 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3141; - ARG 0 dynamic - METHOD method_16590 (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_3226;)Ljava/lang/Object; - ARG 1 feature diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping index c3f91a9c20..39a8f977fa 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping @@ -4,8 +4,4 @@ CLASS net/minecraft/class_3226 net/minecraft/world/gen/feature/RandomFeatureEntr METHOD (Lnet/minecraft/class_2975;F)V ARG 1 feature ARG 2 chance - METHOD method_14270 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3226; - ARG 0 dynamic METHOD method_14271 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z - METHOD method_16599 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - ARG 1 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping index 219934c7ef..d2e35599d3 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_4638 net/minecraft/world/gen/feature/RandomPatchFeatur ARG 9 canReplace ARG 10 project ARG 11 needsWater - METHOD method_23413 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4638; CLASS class_4639 Builder FIELD field_21248 stateProvider Lnet/minecraft/class_4651; FIELD field_21249 blockPlacer Lnet/minecraft/class_4629; diff --git a/mappings/net/minecraft/world/gen/feature/RandomRandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomRandomFeatureConfig.mapping index 79bb2bdcd9..dddcb55ae2 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomRandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomRandomFeatureConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_3147 net/minecraft/world/gen/feature/RandomRandomFeatu METHOD (Ljava/util/List;I)V ARG 1 features ARG 2 count - METHOD method_13780 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3147; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeatureConfig.mapping index d7b51bbcb3..5051edd856 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeatureConfig.mapping @@ -2,4 +2,3 @@ CLASS net/minecraft/class_5187 net/minecraft/world/gen/feature/RuinedPortalFeatu FIELD field_24014 portalType Lnet/minecraft/class_5183$class_5185; METHOD (Lnet/minecraft/class_5183$class_5185;)V ARG 1 type - METHOD method_27228 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_5187; diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeaturePiece.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeaturePiece.mapping index c13a4a65f1..d562acb093 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeaturePiece.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeaturePiece.mapping @@ -66,10 +66,6 @@ CLASS net/minecraft/class_5189 net/minecraft/world/gen/feature/RuinedPortalFeatu FIELD field_24026 overgrown Z FIELD field_24027 vines Z FIELD field_24028 replaceWithBlackstone Z - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 dynamic - METHOD method_27251 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; - ARG 1 ops CLASS class_5191 VerticalPlacement FIELD field_24035 VERTICAL_PLACEMENTS Ljava/util/Map; FIELD field_24036 id Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/SeaPickleFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SeaPickleFeatureConfig.mapping index 3e7a1317dd..be68d725fa 100644 --- a/mappings/net/minecraft/world/gen/feature/SeaPickleFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SeaPickleFeatureConfig.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_2984 net/minecraft/world/gen/feature/SeaPickleFeatureC FIELD field_13385 count I METHOD (I)V ARG 1 count - METHOD method_12871 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2984; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/SeagrassFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SeagrassFeatureConfig.mapping index 82fa6a8f6a..9e613538bf 100644 --- a/mappings/net/minecraft/world/gen/feature/SeagrassFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SeagrassFeatureConfig.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_3163 net/minecraft/world/gen/feature/SeagrassFeatureCo METHOD (ID)V ARG 1 count ARG 2 tallSeagrassProbability - METHOD method_13884 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3163; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/ShipwreckFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/ShipwreckFeatureConfig.mapping index 0169d34aaf..94adaf4edc 100644 --- a/mappings/net/minecraft/world/gen/feature/ShipwreckFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/ShipwreckFeatureConfig.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_3172 net/minecraft/world/gen/feature/ShipwreckFeatureC FIELD field_13803 isBeached Z METHOD (Z)V ARG 1 isBeached - METHOD method_13928 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3172; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping index e877ef167f..a61dc1292a 100644 --- a/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping @@ -3,21 +3,3 @@ CLASS net/minecraft/class_3175 net/minecraft/world/gen/feature/SimpleBlockFeatur FIELD field_13806 placeUnder Ljava/util/List; FIELD field_13807 toPlace Lnet/minecraft/class_2680; FIELD field_13808 placeOn Ljava/util/List; - METHOD (Lnet/minecraft/class_2680;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V - ARG 1 toPlace - ARG 2 placeOn - ARG 3 placeIn - ARG 4 placeUnder - METHOD (Lnet/minecraft/class_2680;[Lnet/minecraft/class_2680;[Lnet/minecraft/class_2680;[Lnet/minecraft/class_2680;)V - ARG 1 toPlace - ARG 2 placeOn - ARG 3 placeIn - ARG 4 placeUnder - METHOD method_13939 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3175; - ARG 0 dynamic - METHOD method_16592 (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2680;)Ljava/lang/Object; - ARG 1 state - METHOD method_16593 (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2680;)Ljava/lang/Object; - ARG 1 state - METHOD method_16594 (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2680;)Ljava/lang/Object; - ARG 1 state diff --git a/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping index 3b169bb745..f6cbdf20f2 100644 --- a/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SimpleRandomFeatureConfig.mapping @@ -2,7 +2,3 @@ CLASS net/minecraft/class_3179 net/minecraft/world/gen/feature/SimpleRandomFeatu FIELD field_13827 features Ljava/util/List; METHOD (Ljava/util/List;)V ARG 1 features - METHOD method_13957 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3179; - ARG 0 dynamic - METHOD method_16595 (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2975;)Ljava/lang/Object; - ARG 1 feature diff --git a/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping index 221eb72f13..7be7940fb1 100644 --- a/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_2963 net/minecraft/world/gen/feature/SingleStateFeatur FIELD field_13356 state Lnet/minecraft/class_2680; METHOD (Lnet/minecraft/class_2680;)V ARG 1 state - METHOD method_12842 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2963; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping index 25eef9858b..0a7b20067b 100644 --- a/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SpringFeatureConfig.mapping @@ -10,4 +10,3 @@ CLASS net/minecraft/class_4642 net/minecraft/world/gen/feature/SpringFeatureConf ARG 3 rockCount ARG 4 holeCount ARG 5 validBlocks - METHOD method_23440 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4642; diff --git a/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping b/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping index c7b7ec911d..9281a3b576 100644 --- a/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping @@ -1,9 +1,2 @@ CLASS net/minecraft/class_3188 net/minecraft/world/gen/feature/StrongholdFeature - FIELD field_13851 stateStillValid Z - FIELD field_13852 startPositions [Lnet/minecraft/class_1923; - FIELD field_13853 starts Ljava/util/List; - FIELD field_13854 lastSeed J - METHOD method_13985 initialize (Lnet/minecraft/class_2794;J)V - ARG 1 chunkGenerator - METHOD method_13986 invalidateState ()V CLASS class_3189 Start diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index 7047d8157e..eb38fd6ebd 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -1,18 +1,12 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature FIELD field_13879 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_13773 getSpacing (Lnet/minecraft/class_2888;)I - METHOD method_13774 getSeedModifier (Lnet/minecraft/class_2888;)I - ARG 1 chunkGeneratorConfig - METHOD method_13775 getSeparation (Lnet/minecraft/class_2888;)I - METHOD method_14015 locateStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; + METHOD method_13149 getMonsterSpawns ()Ljava/util/List; + METHOD method_14015 locateStructure (Lnet/minecraft/class_4538;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;IZJLnet/minecraft/class_5314;)Lnet/minecraft/class_2338; ARG 5 skipExistingChunks METHOD method_14016 getStructureStartFactory ()Lnet/minecraft/class_3195$class_3774; METHOD method_14019 getName ()Ljava/lang/String; - METHOD method_14021 getRadius ()I - METHOD method_14023 isApproximatelyInsideStructure (Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z - METHOD method_14024 isInsideStructure (Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z - METHOD method_14025 isInsideStructure (Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_3449; - METHOD method_14026 shouldStartAt (Lnet/minecraft/class_4543;Lnet/minecraft/class_2794;JLnet/minecraft/class_2919;IILnet/minecraft/class_1959;Lnet/minecraft/class_1923;)Z + METHOD method_14026 shouldStartAt (Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;JLnet/minecraft/class_2919;IILnet/minecraft/class_1959;Lnet/minecraft/class_1923;Lnet/minecraft/class_3037;)Z + METHOD method_16140 getCreatureSpawns ()Ljava/util/List; CLASS class_3774 StructureStartFactory METHOD create (Lnet/minecraft/class_3195;IILnet/minecraft/class_3341;IJ)Lnet/minecraft/class_3449; ARG 1 feature diff --git a/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping index f2ad1750ef..40bb55ead3 100644 --- a/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping @@ -3,10 +3,7 @@ CLASS net/minecraft/class_3812 net/minecraft/world/gen/feature/StructurePoolFeat COMMENT {@link net.minecraft.structure.pool.StructurePoolBasedGenerator#addPieces(net.minecraft.util.Identifier, int, net.minecraft.structure.pool.StructurePoolBasedGenerator.PieceFactory, net.minecraft.world.gen.chunk.ChunkGenerator, net.minecraft.structure.StructureManager, net.minecraft.util.math.BlockPos, java.util.List, java.util.Random, boolean, boolean)}. FIELD field_16860 size I FIELD field_16861 startPool Lnet/minecraft/class_2960; - METHOD (Ljava/lang/String;I)V - ARG 1 startPool + METHOD (Lnet/minecraft/class_2960;I)V ARG 2 size - METHOD method_16752 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3812; - ARG 0 dynamic METHOD method_27222 getSize ()I - METHOD method_27223 getStartPool ()Ljava/lang/String; + METHOD method_27223 getStartPool ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping index 3548ccf66d..71c2348e20 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping @@ -14,8 +14,6 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig ARG 2 leavesProvider ARG 3 foliagePlacer ARG 9 heightmapType - METHOD method_23444 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4643; - ARG 0 configDeserializer METHOD method_23916 ignoreFluidCheck ()V METHOD method_27373 setTreeDecorators (Ljava/util/List;)Lnet/minecraft/class_4643; CLASS class_4644 Builder diff --git a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping index 91ae720413..d2d6571159 100644 --- a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping +++ b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_5201 net/minecraft/world/gen/feature/size/FeatureSize - FIELD field_24145 type Lnet/minecraft/class_5202; FIELD field_24146 minClippedHeight Ljava/util/OptionalInt; - METHOD (Lnet/minecraft/class_5202;Ljava/util/OptionalInt;)V - ARG 1 type - ARG 2 minClippedHeight METHOD method_27377 getMinClippedHeight ()Ljava/util/OptionalInt; - METHOD method_27380 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; - ARG 1 ops diff --git a/mappings/net/minecraft/world/gen/feature/size/FeatureSizeType.mapping b/mappings/net/minecraft/world/gen/feature/size/FeatureSizeType.mapping index a8f3511407..c6e84ae8be 100644 --- a/mappings/net/minecraft/world/gen/feature/size/FeatureSizeType.mapping +++ b/mappings/net/minecraft/world/gen/feature/size/FeatureSizeType.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_5202 net/minecraft/world/gen/feature/size/FeatureSizeType - FIELD field_24149 deserializer Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 deserializer - METHOD method_27382 register (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_5202; + METHOD method_27382 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5202; ARG 0 id - ARG 1 deserializer diff --git a/mappings/net/minecraft/world/gen/feature/size/ThreeLayersFeatureSize.mapping b/mappings/net/minecraft/world/gen/feature/size/ThreeLayersFeatureSize.mapping index c0a0cb5a33..9cbe47918f 100644 --- a/mappings/net/minecraft/world/gen/feature/size/ThreeLayersFeatureSize.mapping +++ b/mappings/net/minecraft/world/gen/feature/size/ThreeLayersFeatureSize.mapping @@ -4,10 +4,3 @@ CLASS net/minecraft/class_5203 net/minecraft/world/gen/feature/size/ThreeLayersF FIELD field_24152 lowerSize I FIELD field_24153 middleSize I FIELD field_24154 upperSize I - METHOD (IIIIILjava/util/OptionalInt;)V - ARG 1 limit - ARG 2 upperLimit - ARG 3 lowerSize - ARG 4 middleSize - ARG 5 upperSize - ARG 6 minClippedHeight diff --git a/mappings/net/minecraft/world/gen/foliage/AcaciaFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/AcaciaFoliagePlacer.mapping index 2013a53a28..41bb97b913 100644 --- a/mappings/net/minecraft/world/gen/foliage/AcaciaFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/AcaciaFoliagePlacer.mapping @@ -1,8 +1 @@ CLASS net/minecraft/class_4645 net/minecraft/world/gen/foliage/AcaciaFoliagePlacer - METHOD (IIII)V - ARG 1 radius - ARG 2 randomRadius - ARG 3 offset - ARG 4 randomOffset - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 data diff --git a/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping index d63810b394..d5fd64d4a8 100644 --- a/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/BlobFoliagePlacer.mapping @@ -1,10 +1,2 @@ CLASS net/minecraft/class_4646 net/minecraft/world/gen/foliage/BlobFoliagePlacer FIELD field_23752 height I - METHOD (IIIII)V - ARG 1 radius - ARG 2 randomRadius - ARG 3 offset - ARG 4 randomOffset - ARG 5 height - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 data diff --git a/mappings/net/minecraft/world/gen/foliage/DarkOakFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/DarkOakFoliagePlacer.mapping index 35e35b10fe..f4eb0307fa 100644 --- a/mappings/net/minecraft/world/gen/foliage/DarkOakFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/DarkOakFoliagePlacer.mapping @@ -1,6 +1 @@ CLASS net/minecraft/class_5206 net/minecraft/world/gen/foliage/DarkOakFoliagePlacer - METHOD (IIII)V - ARG 1 radius - ARG 2 randomRadius - ARG 3 offset - ARG 4 randomOffset diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping index 26a9a8e03d..ab173db8b4 100644 --- a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping @@ -1,15 +1,13 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer FIELD field_21296 radius I FIELD field_21297 randomRadius I - FIELD field_21298 type Lnet/minecraft/class_4648; FIELD field_23753 offset I FIELD field_23754 randomOffset I - METHOD (IIIILnet/minecraft/class_4648;)V + METHOD (IIII)V ARG 1 radius ARG 2 randomRadius ARG 3 offset ARG 4 randomOffset - ARG 5 type METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;IILjava/util/Set;I)V COMMENT This is the main method used to generate foliage. ARG 1 world diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacerType.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacerType.mapping index 28737c45aa..2b3c888d3c 100644 --- a/mappings/net/minecraft/world/gen/foliage/FoliagePlacerType.mapping +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacerType.mapping @@ -1,9 +1 @@ CLASS net/minecraft/class_4648 net/minecraft/world/gen/foliage/FoliagePlacerType - FIELD field_21303 deserializer Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 deserializer - METHOD method_23453 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4647; - ARG 1 dynamic - METHOD method_23454 register (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_4648; - ARG 0 id - ARG 1 deserializer diff --git a/mappings/net/minecraft/world/gen/foliage/PineFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/PineFoliagePlacer.mapping index 84f527f076..551929c8ee 100644 --- a/mappings/net/minecraft/world/gen/foliage/PineFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/PineFoliagePlacer.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_4649 net/minecraft/world/gen/foliage/PineFoliagePlacer FIELD field_23755 height I FIELD field_23756 randomHeight I - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 data diff --git a/mappings/net/minecraft/world/gen/foliage/SpruceFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/SpruceFoliagePlacer.mapping index e23b99183a..5124af8f2e 100644 --- a/mappings/net/minecraft/world/gen/foliage/SpruceFoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/SpruceFoliagePlacer.mapping @@ -1,10 +1,3 @@ CLASS net/minecraft/class_4650 net/minecraft/world/gen/foliage/SpruceFoliagePlacer FIELD field_23757 trunkHeight I FIELD field_23758 randomTrunkHeight I - METHOD (IIIIII)V - ARG 1 radius - ARG 2 randomRadius - ARG 3 offset - ARG 4 randomOffset - ARG 5 trunkHeight - ARG 6 randomTrunkHeight diff --git a/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping b/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping index b0c9e80c00..032e48f343 100644 --- a/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping +++ b/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_4629 net/minecraft/world/gen/placer/BlockPlacer - FIELD field_21222 type Lnet/minecraft/class_4630; - METHOD (Lnet/minecraft/class_4630;)V - ARG 1 type diff --git a/mappings/net/minecraft/world/gen/placer/BlockPlacerType.mapping b/mappings/net/minecraft/world/gen/placer/BlockPlacerType.mapping index d6e50918b3..31aef8ca46 100644 --- a/mappings/net/minecraft/world/gen/placer/BlockPlacerType.mapping +++ b/mappings/net/minecraft/world/gen/placer/BlockPlacerType.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_4630 net/minecraft/world/gen/placer/BlockPlacerType - FIELD field_21226 deserializer Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 deserializer - METHOD method_23404 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4629; - ARG 1 dynamic - METHOD method_23405 register (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_4630; + METHOD method_23405 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_4630; ARG 0 id - ARG 1 deserializer diff --git a/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping b/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping index 00afb0acfd..934adb6621 100644 --- a/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping +++ b/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping @@ -1,8 +1,3 @@ CLASS net/minecraft/class_4631 net/minecraft/world/gen/placer/ColumnPlacer FIELD field_21227 minSize I FIELD field_21228 extraSize I - METHOD (II)V - ARG 1 minSize - ARG 2 extraSize - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 dynamic diff --git a/mappings/net/minecraft/world/gen/placer/DoublePlantPlacer.mapping b/mappings/net/minecraft/world/gen/placer/DoublePlantPlacer.mapping index 949f75deff..cef3af220e 100644 --- a/mappings/net/minecraft/world/gen/placer/DoublePlantPlacer.mapping +++ b/mappings/net/minecraft/world/gen/placer/DoublePlantPlacer.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_4632 net/minecraft/world/gen/placer/DoublePlantPlacer - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 dynamic diff --git a/mappings/net/minecraft/world/gen/placer/SimpleBlockPlacer.mapping b/mappings/net/minecraft/world/gen/placer/SimpleBlockPlacer.mapping index ca67c04f50..4784c0367a 100644 --- a/mappings/net/minecraft/world/gen/placer/SimpleBlockPlacer.mapping +++ b/mappings/net/minecraft/world/gen/placer/SimpleBlockPlacer.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_4633 net/minecraft/world/gen/placer/SimpleBlockPlacer - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 dynamic diff --git a/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping index df5bb97074..75cf686712 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_4651 net/minecraft/world/gen/stateprovider/BlockStateProvider - FIELD field_21304 stateProvider Lnet/minecraft/class_4652; - METHOD (Lnet/minecraft/class_4652;)V - ARG 1 stateProvider METHOD method_23455 getBlockState (Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 random ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/stateprovider/BlockStateProviderType.mapping b/mappings/net/minecraft/world/gen/stateprovider/BlockStateProviderType.mapping index 3f3b3dce07..9033f1cc1c 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/BlockStateProviderType.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/BlockStateProviderType.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_4652 net/minecraft/world/gen/stateprovider/BlockStateProviderType - FIELD field_21309 configDeserializer Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 configDeserializer - METHOD method_23456 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4651; - ARG 1 dynamic - METHOD method_23457 register (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_4652; + METHOD method_23457 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_4652; ARG 0 id - ARG 1 configDeserializer diff --git a/mappings/net/minecraft/world/gen/stateprovider/ForestFlowerBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/ForestFlowerBlockStateProvider.mapping index 77c0463d6e..91cde95690 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/ForestFlowerBlockStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/ForestFlowerBlockStateProvider.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_4653 net/minecraft/world/gen/stateprovider/ForestFlowerBlockStateProvider FIELD field_21310 flowers [Lnet/minecraft/class_2680; - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 configDeserializer diff --git a/mappings/net/minecraft/world/gen/stateprovider/PillarBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/PillarBlockStateProvider.mapping index 4cf63df163..1df57ce350 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/PillarBlockStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/PillarBlockStateProvider.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_4655 net/minecraft/world/gen/stateprovider/PillarBlockStateProvider FIELD field_21313 block Lnet/minecraft/class_2248; - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 configDeserializer - METHOD (Lnet/minecraft/class_2248;)V - ARG 1 block diff --git a/mappings/net/minecraft/world/gen/stateprovider/PlainsFlowerBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/PlainsFlowerBlockStateProvider.mapping index 3bd843c3e7..27ead38488 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/PlainsFlowerBlockStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/PlainsFlowerBlockStateProvider.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_4654 net/minecraft/world/gen/stateprovider/PlainsFlowerBlockStateProvider FIELD field_21311 tulips [Lnet/minecraft/class_2680; FIELD field_21312 flowers [Lnet/minecraft/class_2680; - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 configDeserializer diff --git a/mappings/net/minecraft/world/gen/stateprovider/SimpleBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/SimpleBlockStateProvider.mapping index ed83da3b4e..6e46d8c7e5 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/SimpleBlockStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/SimpleBlockStateProvider.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_4656 net/minecraft/world/gen/stateprovider/SimpleBlockStateProvider FIELD field_21314 state Lnet/minecraft/class_2680; - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 configDeserializer - METHOD (Lnet/minecraft/class_2680;)V - ARG 1 state diff --git a/mappings/net/minecraft/world/gen/stateprovider/WeightedBlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/WeightedBlockStateProvider.mapping index 705624f109..b4c1ffa25a 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/WeightedBlockStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/WeightedBlockStateProvider.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_4657 net/minecraft/world/gen/stateprovider/WeightedBlockStateProvider FIELD field_21315 states Lnet/minecraft/class_4131; - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 configDeserializer METHOD (Lnet/minecraft/class_4131;)V ARG 1 states METHOD method_23458 addState (Lnet/minecraft/class_2680;I)Lnet/minecraft/class_4657; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index e1c31828c8..0426339d85 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_3523 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_15671 END_CONFIG Lnet/minecraft/class_3527; FIELD field_15672 BADLANDS_CONFIG Lnet/minecraft/class_3527; FIELD field_15673 GRAVEL_CONFIG Lnet/minecraft/class_3527; - FIELD field_15674 factory Ljava/util/function/Function; FIELD field_15675 WHITE_TERRACOTTA Lnet/minecraft/class_2680; FIELD field_15676 AIR_CONFIG Lnet/minecraft/class_3527; FIELD field_15677 GRASS_CONFIG Lnet/minecraft/class_3527; @@ -39,8 +38,6 @@ CLASS net/minecraft/class_3523 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_23927 BLACKSTONE Lnet/minecraft/class_2680; FIELD field_23928 BASALT Lnet/minecraft/class_2680; FIELD field_23929 MAGMA_BLOCK Lnet/minecraft/class_2680; - METHOD (Ljava/util/function/Function;)V - ARG 1 factory METHOD method_15305 generate (Ljava/util/Random;Lnet/minecraft/class_2791;Lnet/minecraft/class_1959;IIIDLnet/minecraft/class_2680;Lnet/minecraft/class_2680;IJLnet/minecraft/class_3531;)V ARG 1 random ARG 2 chunk diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/TernarySurfaceConfig.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/TernarySurfaceConfig.mapping index 930bdcce06..b497652ec6 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/TernarySurfaceConfig.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/TernarySurfaceConfig.mapping @@ -7,5 +7,3 @@ CLASS net/minecraft/class_3527 net/minecraft/world/gen/surfacebuilder/TernarySur ARG 2 underMaterial ARG 3 underwaterMaterial METHOD method_15330 getUnderwaterMaterial ()Lnet/minecraft/class_2680; - METHOD method_15331 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3527; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/trunk/ForkingTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/ForkingTrunkPlacer.mapping index 18d68cc0bc..5cca8c3f11 100644 --- a/mappings/net/minecraft/world/gen/trunk/ForkingTrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/ForkingTrunkPlacer.mapping @@ -1,7 +1 @@ CLASS net/minecraft/class_5139 net/minecraft/world/gen/trunk/ForkingTrunkPlacer - METHOD (III)V - ARG 1 baseHeight - ARG 2 firstRandomHeight - ARG 3 secondRandomHeight - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 data diff --git a/mappings/net/minecraft/world/gen/trunk/StraightTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/StraightTrunkPlacer.mapping index 01b96986af..ee50b38d8f 100644 --- a/mappings/net/minecraft/world/gen/trunk/StraightTrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/StraightTrunkPlacer.mapping @@ -1,7 +1 @@ CLASS net/minecraft/class_5140 net/minecraft/world/gen/trunk/StraightTrunkPlacer - METHOD (III)V - ARG 1 baseHeight - ARG 2 firstRandomHeight - ARG 3 secondRandomHeight - METHOD (Lcom/mojang/datafixers/Dynamic;)V - ARG 1 data diff --git a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping index 84d75d97e8..97444cd003 100644 --- a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping @@ -1,20 +1,16 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer - FIELD field_23759 type Lnet/minecraft/class_5142; FIELD field_23760 baseHeight I FIELD field_23761 firstRandomHeight I FIELD field_23762 secondRandomHeight I - METHOD (IIILnet/minecraft/class_5142;)V + METHOD (III)V ARG 1 baseHeight ARG 2 firstRandomHeight ARG 3 secondRandomHeight - ARG 4 type METHOD method_26991 generate (Lnet/minecraft/class_3747;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_4643;)Ljava/util/List; COMMENT Generates the trunk blocks and return a list of tree nodes to place foliage around ARG 1 world ARG 2 random ARG 3 trunkHeight ARG 4 pos - METHOD method_26992 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; - ARG 1 ops METHOD method_26993 getHeight (Ljava/util/Random;)I ARG 1 random diff --git a/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping b/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping index 5e39bbc1b9..619b17393f 100644 --- a/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping +++ b/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_5142 net/minecraft/world/gen/trunk/TrunkPlacerType - FIELD field_23765 deserializer Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 deserializer - METHOD method_26994 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_5141; - ARG 1 data - METHOD method_26995 register (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_5142; + METHOD method_26995 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5142; ARG 0 id - ARG 1 deserializer diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 2949187746..9a4df541fa 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -1,48 +1,30 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_151 spawnX I - FIELD field_154 gameRules Lnet/minecraft/class_1928; FIELD field_155 disabledDataPacks Ljava/util/Set; FIELD field_156 customBossEvents Lnet/minecraft/class_2487; FIELD field_157 difficultyLocked Z FIELD field_158 version I - FIELD field_159 hardcore Z - FIELD field_162 versionName Ljava/lang/String; - FIELD field_165 lastPlayed J FIELD field_167 spawnY I FIELD field_168 thundering Z - FIELD field_169 levelName Ljava/lang/String; FIELD field_170 playerData Lnet/minecraft/class_2487; FIELD field_171 enabledDataPacks Ljava/util/Set; FIELD field_172 playerDataLoaded Z FIELD field_173 thunderTime I - FIELD field_174 difficulty Lnet/minecraft/class_1267; FIELD field_176 clearWeatherTime I FIELD field_17736 wanderingTraderSpawnDelay I FIELD field_17737 wanderingTraderSpawnChance I FIELD field_17738 wanderingTraderId Ljava/util/UUID; - FIELD field_177 commandsAllowed Z - FIELD field_179 gameMode Lnet/minecraft/class_1934; - FIELD field_181 sizeOnDisk J FIELD field_182 spawnZ I - FIELD field_183 versionId I FIELD field_184 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_185 initialized Z FIELD field_189 time J FIELD field_190 raining Z FIELD field_191 scheduledEvents Lnet/minecraft/class_236; FIELD field_192 rainTime I - FIELD field_193 worldData Ljava/util/Map; - FIELD field_194 versionSnapshot Z FIELD field_196 dataVersion I FIELD field_198 timeOfDay J FIELD field_21837 serverBrands Ljava/util/Set; FIELD field_21838 modded Z - FIELD field_23089 generatorOptions Lnet/minecraft/class_5285; - METHOD (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;)V - ARG 1 tag - ARG 2 dataFixer - ARG 3 dataVersion - ARG 4 playerData METHOD method_158 updateProperties (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V ARG 1 levelTag ARG 2 playerTag diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 5ce5288379..0b5b90ff4e 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_236 getBackupsDirectory ()Ljava/nio/file/Path; METHOD method_240 isLevelNameValid (Ljava/lang/String;)Z ARG 1 name - METHOD method_26998 readLevelProperties (Ljava/io/File;)Lnet/minecraft/class_5219; + METHOD method_26998 readLevelProperties (Ljava/io/File;Ljava/util/function/BiFunction;)Ljava/lang/Object; METHOD method_26999 create (Ljava/nio/file/Path;)Lnet/minecraft/class_32; ARG 0 path METHOD method_27002 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index e557ed27f1..7988378188 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -1,25 +1,9 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary FIELD field_205 name Ljava/lang/String; - FIELD field_206 commandsAllowed Z - FIELD field_207 hardcore Z - FIELD field_208 generatorType Lnet/minecraft/class_5285; + FIELD field_208 generatorType Lcom/mojang/serialization/Lifecycle; FIELD field_209 requiresConversion Z - FIELD field_210 getSizeOnDisk J - FIELD field_211 lastPlayed J - FIELD field_212 displayName Ljava/lang/String; - FIELD field_213 gameMode Lnet/minecraft/class_1934; - FIELD field_214 versionName Ljava/lang/String; - FIELD field_215 versionId I - FIELD field_216 snapshot Z FIELD field_23772 locked Z FIELD field_23773 file Ljava/io/File; - METHOD (Lnet/minecraft/class_5219;Ljava/lang/String;Ljava/lang/String;JZZLjava/io/File;)V - ARG 2 name - ARG 3 displayName - ARG 4 size - ARG 6 requiresConversion - ARG 7 locked - ARG 8 file METHOD method_247 getGameMode ()Lnet/minecraft/class_1934; METHOD method_248 getName ()Ljava/lang/String; METHOD method_249 getLastPlayed ()J diff --git a/mappings/net/minecraft/world/poi/PointOfInterest.mapping b/mappings/net/minecraft/world/poi/PointOfInterest.mapping index ca76bced92..0b385d1494 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterest.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterest.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_4156 net/minecraft/world/poi/PointOfInterest FIELD field_18493 type Lnet/minecraft/class_4158; FIELD field_18494 freeTickets I FIELD field_18495 updateListener Ljava/lang/Runnable; - METHOD (Lcom/mojang/datafixers/Dynamic;Ljava/lang/Runnable;)V - ARG 1 dynamic - ARG 2 updateListener METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;ILjava/lang/Runnable;)V ARG 1 pos ARG 2 type diff --git a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping index fe3df69a70..a6f15524a9 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet FIELD field_19226 valid Z METHOD (Ljava/lang/Runnable;)V ARG 1 updateListener - METHOD (Ljava/lang/Runnable;Lcom/mojang/datafixers/Dynamic;)V - ARG 1 updateListener METHOD method_19145 remove (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_19146 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index 8273046ec7..900c3e3e09 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -2,19 +2,12 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase FIELD field_18691 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_18692 loadedElements Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_18693 unsavedElements Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; - FIELD field_18694 deserializer Ljava/util/function/BiFunction; FIELD field_18695 factory Ljava/util/function/Function; FIELD field_19228 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_19229 dataFixType Lnet/minecraft/class_4284; FIELD field_21505 worker Lnet/minecraft/class_4698; - FIELD field_23749 serializer Lnet/minecraft/class_5128; - METHOD (Ljava/io/File;Lnet/minecraft/class_5128;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Z)V + METHOD (Ljava/io/File;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Z)V ARG 1 directory - ARG 2 serializer - ARG 3 deserializer - ARG 4 factory - ARG 5 dataFixer - ARG 6 dataFixType METHOD method_19288 onUpdate (J)V ARG 1 pos METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V @@ -30,11 +23,10 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 pos METHOD method_19295 getOrCreate (J)Ljava/lang/Object; ARG 1 pos - METHOD method_20368 update (Lnet/minecraft/class_1923;Lcom/mojang/datafixers/types/DynamicOps;Ljava/lang/Object;)V + METHOD method_20368 update (Lnet/minecraft/class_1923;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)V ARG 1 pos - ARG 2 ops ARG 3 data - METHOD method_20369 getDataVersion (Lcom/mojang/datafixers/Dynamic;)I + METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I METHOD method_20370 save (Lnet/minecraft/class_1923;)V METHOD method_20621 loadNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos diff --git a/mappings/net/minecraft/world/storage/StorageSerializer.mapping b/mappings/net/minecraft/world/storage/StorageSerializer.mapping deleted file mode 100644 index f3b12bf251..0000000000 --- a/mappings/net/minecraft/world/storage/StorageSerializer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_5128 net/minecraft/world/storage/StorageSerializer - METHOD serialize (Ljava/lang/Object;Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; - ARG 1 object - ARG 2 ops diff --git a/mappings/net/minecraft/world/timer/Timer.mapping b/mappings/net/minecraft/world/timer/Timer.mapping index e75a0771ce..071a2101df 100644 --- a/mappings/net/minecraft/world/timer/Timer.mapping +++ b/mappings/net/minecraft/world/timer/Timer.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_236 net/minecraft/world/timer/Timer FIELD field_1315 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_233;)V ARG 1 timerCallbackSerializer - METHOD method_979 fromTag (Lnet/minecraft/class_2499;)V - ARG 1 tag METHOD method_980 serialize (Lnet/minecraft/class_236$class_237;)Lnet/minecraft/class_2487; ARG 1 event METHOD method_982 toTag ()Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 9a8771cba7..11eb9d940d 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5766 upgradedChunkCount I FIELD field_5767 updateThread Ljava/lang/Thread; FIELD field_5768 totalChunkCount I - METHOD method_17830 getChunkPositions (Lnet/minecraft/class_2874;)Ljava/util/List; + METHOD method_17830 getChunkPositions (Lnet/minecraft/class_5321;)Ljava/util/List; METHOD method_5393 getProgress (Lnet/minecraft/class_2874;)F METHOD method_5394 getStatus ()Lnet/minecraft/class_2561; METHOD method_5397 getTotalChunkCount ()I