diff --git a/build.gradle b/build.gradle index cfc2a6dd76..800ba4500e 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "21w42a" +def minecraft_version = "21w43a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/com/mojang/blaze3d/platform/GlDebugInfo.mapping b/mappings/com/mojang/blaze3d/platform/GlDebugInfo.mapping index a2f6dcbf2a..bddb9f7f6f 100644 --- a/mappings/com/mojang/blaze3d/platform/GlDebugInfo.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlDebugInfo.mapping @@ -5,7 +5,5 @@ CLASS net/minecraft/class_4494 com/mojang/blaze3d/platform/GlDebugInfo METHOD method_22091 getVersion ()Ljava/lang/String; METHOD method_35611 allocateMemory (I)Ljava/nio/ByteBuffer; ARG 0 size - METHOD method_35612 feedTo (Lnet/minecraft/class_6184;)V - ARG 0 consumer METHOD method_35613 freeMemory (Ljava/nio/Buffer;)V ARG 0 buffer diff --git a/mappings/net/minecraft/class_6756.mapping b/mappings/net/minecraft/class_6756.mapping new file mode 100644 index 0000000000..6839f8ff09 --- /dev/null +++ b/mappings/net/minecraft/class_6756.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_6756 + METHOD method_8677 isTicking (Lnet/minecraft/class_2338;Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/class_6761.mapping b/mappings/net/minecraft/class_6761.mapping new file mode 100644 index 0000000000..4788112f46 --- /dev/null +++ b/mappings/net/minecraft/class_6761.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_6761 + METHOD method_20463 toNbt (JLjava/util/function/Function;)Lnet/minecraft/class_2520; diff --git a/mappings/net/minecraft/class_6762.mapping b/mappings/net/minecraft/class_6762.mapping new file mode 100644 index 0000000000..bb99d5b579 --- /dev/null +++ b/mappings/net/minecraft/class_6762.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_6762 + METHOD method_20825 getTicks ()I + METHOD method_8674 isScheduled (Lnet/minecraft/class_2338;Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index ee39d3e7d4..8ac3409c24 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -137,7 +137,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1772 textRenderer Lnet/minecraft/class_327; FIELD field_1773 gameRenderer Lnet/minecraft/class_757; FIELD field_1774 keyboard Lnet/minecraft/class_309; - FIELD field_1775 snooper Lnet/minecraft/class_1276; FIELD field_17763 splashTextLoader Lnet/minecraft/class_4008; FIELD field_18008 paintingManager Lnet/minecraft/class_4044; FIELD field_18009 COMPLETED_UNIT_FUTURE Ljava/util/concurrent/CompletableFuture; @@ -264,7 +263,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1549 getSpriteAtlas (Lnet/minecraft/class_2960;)Ljava/util/function/Function; ARG 1 id METHOD method_1551 getInstance ()Lnet/minecraft/class_310; - METHOD method_1552 getSnooper ()Lnet/minecraft/class_1276; METHOD method_1554 getBakedModelManager ()Lnet/minecraft/class_1092; METHOD method_1555 hasReducedDebugInfo ()Z METHOD method_1556 (Lnet/minecraft/class_1860;)Lnet/minecraft/class_2960; @@ -275,7 +273,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1560 getCameraEntity ()Lnet/minecraft/class_1297; METHOD method_1561 getEntityRenderDispatcher ()Lnet/minecraft/class_898; METHOD method_1562 getNetworkHandler ()Lnet/minecraft/class_634; - METHOD method_1563 getCurrentAction ()Ljava/lang/String; METHOD method_1565 printCrashReport (Lnet/minecraft/class_128;)V ARG 0 report METHOD method_1566 getToastManager ()Lnet/minecraft/class_374; @@ -478,8 +475,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 4 width ARG 5 height METHOD method_35703 getWorldGenerationProgressTracker ()Lnet/minecraft/class_3953; - METHOD method_35705 addGlInfo (Lnet/minecraft/class_1276;)V - ARG 0 snooper METHOD method_35706 isRealmsEnabled ()Z METHOD method_36561 reloadResources (Z)Ljava/util/concurrent/CompletableFuture; ARG 1 force diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index 44acea2346..da472fe83d 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -3,13 +3,12 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl FIELD field_3232 DIMENSION_COLORS Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_3233 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_3234 updater Lnet/minecraft/class_1257; - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLcom/google/common/collect/ImmutableSet;)V + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_5285;)V ARG 1 callback ARG 2 dataFixer ARG 3 storageSession ARG 4 levelInfo ARG 5 eraseCache - ARG 6 worlds METHOD method_19938 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527; diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 5ba8eb1aa4..f64d32358d 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -57,7 +57,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions COMMENT the chat screen} with the {@code /} already typed. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_SLASH the slash key} by default. FIELD field_1846 incompatibleResourcePacks Ljava/util/List; - FIELD field_1847 snooperEnabled Z FIELD field_1848 autoJump Z FIELD field_1849 keyRight Lnet/minecraft/class_304; COMMENT A key binding for moving right. diff --git a/mappings/net/minecraft/client/option/Option.mapping b/mappings/net/minecraft/client/option/Option.mapping index 47294b1ddc..12dd0f61f7 100644 --- a/mappings/net/minecraft/client/option/Option.mapping +++ b/mappings/net/minecraft/client/option/Option.mapping @@ -23,7 +23,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option FIELD field_19243 DISCRETE_MOUSE_SCROLL Lnet/minecraft/class_4064; FIELD field_1924 AO Lnet/minecraft/class_4064; FIELD field_1925 CHAT_LINKS_PROMPT Lnet/minecraft/class_4064; - FIELD field_1926 SNOOPER Lnet/minecraft/class_4064; FIELD field_1927 VSYNC Lnet/minecraft/class_4064; FIELD field_1930 TOUCHSCREEN Lnet/minecraft/class_4064; FIELD field_1932 FULLSCREEN Lnet/minecraft/class_4064; @@ -171,10 +170,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option METHOD method_18574 (Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; ARG 0 gameOptions ARG 1 option - METHOD method_18575 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V - ARG 0 gameOptions - ARG 1 option - ARG 2 entityShadows METHOD method_18576 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 chatScale @@ -432,17 +427,11 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option ARG 0 gameOptions METHOD method_32586 (Lnet/minecraft/class_315;)Ljava/lang/Boolean; ARG 0 gameOptions - METHOD method_32587 (Lnet/minecraft/class_315;)Ljava/lang/Boolean; - ARG 0 gameOptions - METHOD method_32588 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V - ARG 0 gameOptions - ARG 1 option - ARG 2 backgroundForChatOnly METHOD method_32589 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4066; ARG 0 gameOptions METHOD method_32590 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4065; ARG 0 gameOptions - METHOD method_32591 (Lnet/minecraft/class_315;)Lnet/minecraft/class_1306; + METHOD method_32591 (Lnet/minecraft/class_315;)Ljava/lang/String; ARG 0 gameOptions METHOD method_32592 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4063; ARG 0 gameOptions @@ -454,8 +443,6 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option ARG 0 gameOptions ARG 1 option ARG 2 monochromeLogo - METHOD method_38511 (Lnet/minecraft/class_315;)Ljava/lang/String; - ARG 0 gameOptions METHOD method_38512 (Lnet/minecraft/class_315;)Lnet/minecraft/class_4060; ARG 0 gameOptions METHOD method_38513 (Lnet/minecraft/class_315;)Ljava/lang/Boolean; diff --git a/mappings/net/minecraft/client/util/GlInfoConsumer.mapping b/mappings/net/minecraft/client/util/GlInfoConsumer.mapping deleted file mode 100644 index 085bdbb83e..0000000000 --- a/mappings/net/minecraft/client/util/GlInfoConsumer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_6184 net/minecraft/client/util/GlInfoConsumer - COMMENT A functional interface with a method to set a key-value pair of information. - COMMENT - COMMENT @see net.minecraft.util.snooper.Snooper#addInitialInfo - METHOD setFixedData (Ljava/lang/String;Ljava/lang/Object;)V - COMMENT Sets a value associated to a key. - COMMENT - COMMENT

"Fixed" means immutable or static information; it is not related in any way - COMMENT to data fixers. - ARG 1 key - ARG 2 value diff --git a/mappings/net/minecraft/client/world/DummyClientTickScheduler.mapping b/mappings/net/minecraft/client/world/DummyClientTickScheduler.mapping deleted file mode 100644 index bde677a071..0000000000 --- a/mappings/net/minecraft/client/world/DummyClientTickScheduler.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_1925 net/minecraft/client/world/DummyClientTickScheduler - FIELD field_9182 INSTANCE Lnet/minecraft/class_1925; - METHOD method_8339 get ()Lnet/minecraft/class_1925; diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index 73f7472dbe..e9d6ec4d61 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -2,11 +2,10 @@ CLASS net/minecraft/server/Main FIELD field_24625 LOGGER Lorg/apache/logging/log4j/Logger; METHOD main ([Ljava/lang/String;)V ARG 0 args - METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lcom/google/common/collect/ImmutableSet;)V + METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_5285;)V ARG 0 session ARG 1 dataFixer ARG 2 eraseCache - ARG 4 worlds METHOD method_29734 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;Lnet/minecraft/class_3807;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176; ARG 0 registryTracker ARG 1 session diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index a5c229a440..aec2571987 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -71,7 +71,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4572 ticks I FIELD field_4573 lastTickLengths [J FIELD field_4578 singlePlayerName Ljava/lang/String; - FIELD field_4582 snooper Lnet/minecraft/class_1276; FIELD field_4584 resourcePackHash Ljava/lang/String; FIELD field_4585 serverIp Ljava/lang/String; FIELD field_4587 dataFixer Lcom/mojang/datafixers/DataFixer; @@ -307,7 +306,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3791 setFavicon (Lnet/minecraft/class_2926;)V ARG 1 metadata METHOD method_3793 getUserCache ()Lnet/minecraft/class_3312; - METHOD method_3795 getSnooper ()Lnet/minecraft/class_1276; METHOD method_3796 shouldSpawnAnimals ()Z METHOD method_3798 getOpPermissionLevel ()I METHOD method_3799 isDemo ()Z diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index 586c99da8f..42f75983f2 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_16805 enforceWhitelist Z FIELD field_16806 enableCommandBlock Z FIELD field_16807 allowFlight Z - FIELD field_16808 snooperEnabled Z FIELD field_16809 spawnNpcs Z FIELD field_16811 allowNether Z FIELD field_16812 maxWorldSize I diff --git a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping deleted file mode 100644 index aba0fab930..0000000000 --- a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping +++ /dev/null @@ -1,38 +0,0 @@ -CLASS net/minecraft/class_1949 net/minecraft/server/world/ServerTickScheduler - FIELD field_19338 consumedTickActions Ljava/util/List; - FIELD field_19341 scheduledTickActionsInOrder Ljava/util/Set; - FIELD field_9294 idToName Ljava/util/function/Function; - FIELD field_9296 scheduledTickActions Ljava/util/Set; - FIELD field_9297 invalidObjPredicate Ljava/util/function/Predicate; - FIELD field_9299 currentTickActions Ljava/util/Queue; - FIELD field_9300 tickConsumer Ljava/util/function/Consumer; - FIELD field_9301 world Lnet/minecraft/class_3218; - METHOD (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;Ljava/util/function/Function;Ljava/util/function/Consumer;)V - ARG 1 world - ARG 2 invalidObjPredicate - ARG 3 idToName - ARG 4 tickConsumer - METHOD method_20469 serializeScheduledTicks (Ljava/util/function/Function;Ljava/lang/Iterable;J)Lnet/minecraft/class_2499; - ARG 0 identifierProvider - ARG 1 scheduledTicks - ARG 2 time - METHOD method_20514 addScheduledTick (Lnet/minecraft/class_1954;)V - ARG 1 tick - METHOD method_20596 transferTicksInBounds (Ljava/util/List;Ljava/util/Collection;Lnet/minecraft/class_3341;Z)Ljava/util/List; - ARG 1 dst - ARG 2 src - ARG 3 bounds - ARG 4 move - METHOD method_8666 copyScheduledTicks (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V - ARG 1 box - ARG 2 offset - METHOD method_8669 toNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2499; - METHOD method_8670 tick ()V - METHOD method_8671 getScheduledTicksInChunk (Lnet/minecraft/class_1923;ZZ)Ljava/util/List; - ARG 1 pos - ARG 2 updateState - ARG 3 getStaleTicks - METHOD method_8672 getScheduledTicks (Lnet/minecraft/class_3341;ZZ)Ljava/util/List; - ARG 1 bounds - ARG 2 updateState - ARG 3 getStaleTicks diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index b4d45f27da..6be3323a4f 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_13948 idleTimeout I - FIELD field_13949 blockTickScheduler Lnet/minecraft/class_1949; + FIELD field_13949 blockTickScheduler Lnet/minecraft/class_6757; FIELD field_13950 syncedBlockEventQueue Lit/unimi/dsi/fastutil/objects/ObjectLinkedOpenHashSet; - FIELD field_13951 fluidTickScheduler Lnet/minecraft/class_1949; + FIELD field_13951 fluidTickScheduler Lnet/minecraft/class_6757; FIELD field_13952 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13953 inBlockTick Z FIELD field_13956 portalForcer Lnet/minecraft/class_1946; @@ -50,8 +50,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 13 deltaY ARG 15 deltaZ ARG 17 speed - METHOD method_14171 tickFluid (Lnet/minecraft/class_1954;)V - ARG 1 tick + METHOD method_14171 tickFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;)V METHOD method_14173 getPortalForcer ()Lnet/minecraft/class_1946; METHOD method_14174 processBlockEvent (Lnet/minecraft/class_1919;)Z ARG 1 event @@ -63,8 +62,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_14177 isInBlockTick ()Z METHOD method_14183 getStructureManager ()Lnet/minecraft/class_3485; METHOD method_14188 saveLevel ()V - METHOD method_14189 tickBlock (Lnet/minecraft/class_1954;)V - ARG 1 tick + METHOD method_14189 tickBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V METHOD method_14190 getEntity (Ljava/util/UUID;)Lnet/minecraft/class_1297; ARG 1 uuid METHOD method_14191 sendToPlayerIfNearby (Lnet/minecraft/class_3222;ZDDDLnet/minecraft/class_2596;)Z @@ -222,6 +220,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 vibration METHOD method_32818 (Lnet/minecraft/class_2338;Lnet/minecraft/class_5747;Lnet/minecraft/class_3222;)V ARG 3 player + METHOD method_32819 getLogicalHeight ()I METHOD method_33143 sendSleepingStatus ()V COMMENT Sends sleeping status action bar messages to players in this world. METHOD method_33144 isSleepingEnabled ()Z @@ -233,8 +232,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 pos METHOD method_37116 isChunkLoaded (J)Z ARG 1 chunkPos - METHOD method_37117 isTickingFutureReady (Lnet/minecraft/class_2338;)Z - ARG 1 pos + METHOD method_37117 isTickingFutureReady (J)Z METHOD method_37118 shouldTickEntity (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_8448 updateSleepingPlayers ()V diff --git a/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping b/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping index 83fed149e3..14c176a1f4 100644 --- a/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping +++ b/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping @@ -1,27 +1,2 @@ CLASS net/minecraft/class_4296 net/minecraft/server/world/SimpleTickScheduler FIELD field_19275 scheduledTicks Ljava/util/List; - FIELD field_19276 identifierProvider Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;Ljava/util/List;)V - ARG 1 identifierProvider - ARG 2 scheduledTicks - METHOD (Ljava/util/function/Function;Ljava/util/List;J)V - ARG 1 identifierProvider - ARG 2 scheduledTicks - ARG 3 startTime - METHOD method_20463 toNbt ()Lnet/minecraft/class_2499; - METHOD method_20512 fromNbt (Lnet/minecraft/class_2499;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_4296; - ARG 0 ticks - METHOD method_26368 scheduleTo (Lnet/minecraft/class_1951;)V - ARG 1 scheduler - METHOD method_26369 (Lnet/minecraft/class_1951;Lnet/minecraft/class_4296$class_4989;)V - ARG 1 tick - CLASS class_4989 Tick - FIELD field_23257 pos Lnet/minecraft/class_2338; - FIELD field_23258 delay I - FIELD field_23259 priority Lnet/minecraft/class_1953; - FIELD field_23260 object Ljava/lang/Object; - METHOD (Ljava/lang/Object;Lnet/minecraft/class_2338;ILnet/minecraft/class_1953;)V - ARG 1 object - ARG 2 pos - ARG 3 delay - ARG 4 priority diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 7dde6b7aca..b3943b9602 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -134,8 +134,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_20458 tryUnloadChunk (JLnet/minecraft/class_3193;)V ARG 1 pos ARG 3 holder - METHOD method_20576 enableTickSchedulers (Lnet/minecraft/class_2818;)Ljava/util/concurrent/CompletableFuture; - ARG 1 chunk METHOD method_20605 unloadChunks (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking METHOD method_20617 upgradeChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/util/math/Spline.mapping b/mappings/net/minecraft/util/math/Spline.mapping index a8e888477b..588ac5f73f 100644 --- a/mappings/net/minecraft/util/math/Spline.mapping +++ b/mappings/net/minecraft/util/math/Spline.mapping @@ -1,23 +1,6 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline - FIELD field_34378 locationFunction Lnet/minecraft/class_6501; - FIELD field_34379 locations [F - FIELD field_34380 values Ljava/util/List; - FIELD field_34381 derivatives [F - METHOD (Lnet/minecraft/class_6501;[FLjava/util/List;[F)V - ARG 1 locationFunction - ARG 2 locations - ARG 3 values - ARG 4 derivatives - METHOD method_37914 getLocationFunction ()Lnet/minecraft/class_6501; - METHOD method_37917 getValue (I)Lnet/minecraft/class_6501; - ARG 1 index METHOD method_37918 builder (Lnet/minecraft/class_6501;)Lnet/minecraft/class_6492$class_6493; ARG 0 locationFunction - METHOD method_37919 getListAsString ([F)Ljava/lang/String; - ARG 1 locations - METHOD method_37921 getLocations ()Ljava/util/List; - METHOD method_37922 getDerivative (I)F - ARG 1 index CLASS class_6493 Builder FIELD field_34382 locationFunction Lnet/minecraft/class_6501; FIELD field_34383 locations Lit/unimi/dsi/fastutil/floats/FloatList; @@ -32,17 +15,9 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline ARG 3 derivative METHOD method_37925 add (FLnet/minecraft/class_6492;F)Lnet/minecraft/class_6492$class_6493; ARG 1 location - ARG 2 value - ARG 3 derivative - METHOD method_37926 add (FLnet/minecraft/class_6501;F)Lnet/minecraft/class_6492$class_6493; - ARG 1 location - ARG 2 value - ARG 3 derivative - METHOD method_37927 addSplinePoint (FLnet/minecraft/class_6501;F)Lnet/minecraft/class_6492$class_6493; - ARG 1 location - ARG 2 value ARG 3 derivative CLASS class_6494 FixedFloatFunction - FIELD field_34386 value F + FIELD comp_228 value F METHOD (F)V ARG 1 value + METHOD comp_228 value ()F diff --git a/mappings/net/minecraft/util/profiler/Profiler.mapping b/mappings/net/minecraft/util/profiler/Profiler.mapping index 8fd3bb0b83..1c0fbd01ee 100644 --- a/mappings/net/minecraft/util/profiler/Profiler.mapping +++ b/mappings/net/minecraft/util/profiler/Profiler.mapping @@ -11,14 +11,14 @@ CLASS net/minecraft/class_3695 net/minecraft/util/profiler/Profiler METHOD method_15407 pop ()V METHOD method_16065 startTick ()V METHOD method_16066 endTick ()V - METHOD method_24270 visit (Ljava/lang/String;)V + METHOD method_24270 visit (Ljava/lang/String;I)V COMMENT Increment the visit count for a marker. COMMENT COMMENT

This is useful to keep track of number of calls made to performance- COMMENT wise expensive methods. ARG 1 marker COMMENT a unique marker - METHOD method_24271 visit (Ljava/util/function/Supplier;)V + METHOD method_24271 visit (Ljava/util/function/Supplier;I)V COMMENT Increment the visit count for a marker. COMMENT COMMENT

This is useful to keep track of number of calls made to performance- diff --git a/mappings/net/minecraft/util/snooper/Snooper.mapping b/mappings/net/minecraft/util/snooper/Snooper.mapping deleted file mode 100644 index c9773fb6e9..0000000000 --- a/mappings/net/minecraft/util/snooper/Snooper.mapping +++ /dev/null @@ -1,32 +0,0 @@ -CLASS net/minecraft/class_1276 net/minecraft/util/snooper/Snooper - FIELD field_29957 BASE_URL Ljava/lang/String; - FIELD field_29959 VERSION I - FIELD field_5819 snooperUrl Ljava/net/URL; - FIELD field_5820 active Z - FIELD field_5821 token Ljava/lang/String; - FIELD field_5822 startTime J - FIELD field_5823 timer Ljava/util/Timer; - FIELD field_5824 syncObject Ljava/lang/Object; - FIELD field_5825 initialInfo Ljava/util/Map; - FIELD field_5826 info Ljava/util/Map; - FIELD field_5827 listener Lnet/minecraft/class_1279; - METHOD (Ljava/lang/String;Lnet/minecraft/class_1279;J)V - ARG 1 urlPath - ARG 2 listener - ARG 3 startTime - METHOD method_35022 ([ILjava/lang/String;)V - ARG 2 flag - METHOD method_35024 getInfo ()Ljava/util/Map; - METHOD method_35030 addInfo ()V - METHOD method_35032 addJvmFlags ()V - METHOD method_5479 getToken ()Ljava/lang/String; - METHOD method_5480 addInitialInfo (Ljava/lang/String;Ljava/lang/Object;)V - ARG 1 key - ARG 2 value - METHOD method_5481 addInfo (Ljava/lang/String;Ljava/lang/Object;)V - ARG 1 key - ARG 2 value - METHOD method_5483 isActive ()Z - METHOD method_5484 getStartTime ()J - METHOD method_5485 update ()V - METHOD method_5487 cancel ()V diff --git a/mappings/net/minecraft/util/snooper/SnooperListener.mapping b/mappings/net/minecraft/util/snooper/SnooperListener.mapping deleted file mode 100644 index b76ebb45f4..0000000000 --- a/mappings/net/minecraft/util/snooper/SnooperListener.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1279 net/minecraft/util/snooper/SnooperListener - METHOD method_35033 isSnooperEnabled ()Z - METHOD method_35034 addInitialSnooperInfo (Lnet/minecraft/class_1276;)V - ARG 1 snooper - METHOD method_5495 addSnooperInfo (Lnet/minecraft/class_1276;)V - ARG 1 snooper diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index 12ca315644..76f16c9ec4 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -4,11 +4,11 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion FIELD field_14091 random Ljava/util/Random; 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_14094 fluidTickScheduler Lnet/minecraft/class_3235; 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; + FIELD field_14099 blockTickScheduler Lnet/minecraft/class_3235; FIELD field_20668 biomeAccess Lnet/minecraft/class_4543; FIELD field_23788 lowerCorner Lnet/minecraft/class_1923; FIELD field_23789 upperCorner Lnet/minecraft/class_1923; @@ -26,12 +26,11 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion METHOD (Lnet/minecraft/class_3218;Ljava/util/List;Lnet/minecraft/class_2806;I)V ARG 1 world ARG 2 chunks - ARG 3 status ARG 4 placementRadius - METHOD method_14337 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1951; + METHOD method_14337 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6763; ARG 1 pos METHOD method_14338 markBlockForPostProcessing (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_14340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1951; + METHOD method_14340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6763; ARG 1 pos METHOD method_33561 getCenterPos ()Lnet/minecraft/class_1923; diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index cad131729e..06064abbe8 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -15,8 +15,6 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer METHOD method_12387 readStructureReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/Map; ARG 0 pos ARG 1 nbt - METHOD method_12391 (Lnet/minecraft/class_3611;)Z - ARG 0 fluid METHOD method_12392 readStructureStarts (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Ljava/util/Map; ARG 1 nbt ARG 2 worldSeed @@ -27,8 +25,6 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 poiStorage ARG 2 chunkPos ARG 3 nbt - METHOD method_12396 (Lnet/minecraft/class_2248;)Z - ARG 0 block METHOD method_12410 serialize (Lnet/minecraft/class_3218;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2487; ARG 0 world ARG 1 chunk diff --git a/mappings/net/minecraft/world/ChunkTickScheduler.mapping b/mappings/net/minecraft/world/ChunkTickScheduler.mapping deleted file mode 100644 index 9801a801d8..0000000000 --- a/mappings/net/minecraft/world/ChunkTickScheduler.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS net/minecraft/class_2850 net/minecraft/world/ChunkTickScheduler - FIELD field_12990 scheduledPositions [Lit/unimi/dsi/fastutil/shorts/ShortList; - FIELD field_12991 shouldExclude Ljava/util/function/Predicate; - FIELD field_12993 pos Lnet/minecraft/class_1923; - FIELD field_27230 world Lnet/minecraft/class_5539; - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_1923;Lnet/minecraft/class_2499;Lnet/minecraft/class_5539;)V - ARG 1 shouldExclude - ARG 2 pos - ARG 3 nbtList - ARG 4 world - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_1923;Lnet/minecraft/class_5539;)V - ARG 1 shouldExclude - ARG 2 pos - ARG 3 world - METHOD method_12367 toNbt ()Lnet/minecraft/class_2499; - METHOD method_12368 tick (Lnet/minecraft/class_1951;Ljava/util/function/Function;)V - ARG 1 scheduler - ARG 2 dataMapper diff --git a/mappings/net/minecraft/world/MultiTickScheduler.mapping b/mappings/net/minecraft/world/MultiTickScheduler.mapping index 8bfa7111d0..fcdaa681c9 100644 --- a/mappings/net/minecraft/world/MultiTickScheduler.mapping +++ b/mappings/net/minecraft/world/MultiTickScheduler.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_3235 net/minecraft/world/MultiTickScheduler - FIELD field_14100 mapper Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V ARG 1 mapper diff --git a/mappings/net/minecraft/world/ScheduledTick.mapping b/mappings/net/minecraft/world/ScheduledTick.mapping deleted file mode 100644 index 1b58795392..0000000000 --- a/mappings/net/minecraft/world/ScheduledTick.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_1954 net/minecraft/world/ScheduledTick - FIELD field_9317 object Ljava/lang/Object; - FIELD field_9318 id J - FIELD field_9319 idCounter J - FIELD field_9320 priority Lnet/minecraft/class_1953; - FIELD field_9321 time J - FIELD field_9322 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2338;Ljava/lang/Object;)V - ARG 1 pos - ARG 2 t - METHOD (Lnet/minecraft/class_2338;Ljava/lang/Object;JLnet/minecraft/class_1953;)V - ARG 1 pos - ARG 2 t - ARG 3 time - ARG 5 priority - METHOD method_20597 getComparator ()Ljava/util/Comparator; - METHOD method_8683 getObject ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/TickScheduler.mapping b/mappings/net/minecraft/world/TickScheduler.mapping deleted file mode 100644 index af34ff7973..0000000000 --- a/mappings/net/minecraft/world/TickScheduler.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_1951 net/minecraft/world/TickScheduler - METHOD method_20825 getTicks ()I - METHOD method_8674 isScheduled (Lnet/minecraft/class_2338;Ljava/lang/Object;)Z - ARG 1 pos - ARG 2 object - METHOD method_8675 schedule (Lnet/minecraft/class_2338;Ljava/lang/Object;ILnet/minecraft/class_1953;)V - ARG 1 pos - ARG 2 object - ARG 3 delay - ARG 4 priority - METHOD method_8676 schedule (Lnet/minecraft/class_2338;Ljava/lang/Object;I)V - ARG 1 pos - ARG 2 object - ARG 3 delay - METHOD method_8677 isTicking (Lnet/minecraft/class_2338;Ljava/lang/Object;)Z - ARG 1 pos - ARG 2 object diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index 84d6863618..d45f2a4367 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 1 eventId ARG 2 pos ARG 3 data - METHOD method_32819 getLogicalHeight ()I METHOD method_32887 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)V ARG 1 entity ARG 2 event @@ -25,12 +24,12 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 4 category ARG 5 volume ARG 6 pitch - METHOD method_8397 getBlockTickScheduler ()Lnet/minecraft/class_1951; + METHOD method_8397 getBlockTickScheduler ()Lnet/minecraft/class_6756; METHOD method_8398 getChunkManager ()Lnet/minecraft/class_2802; METHOD method_8401 getLevelProperties ()Lnet/minecraft/class_5217; METHOD method_8404 getLocalDifficulty (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1266; ARG 1 pos - METHOD method_8405 getFluidTickScheduler ()Lnet/minecraft/class_1951; + METHOD method_8405 getFluidTickScheduler ()Lnet/minecraft/class_6756; METHOD method_8406 addParticle (Lnet/minecraft/class_2394;DDDDDD)V ARG 1 parameters ARG 2 x diff --git a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping index 376d84975e..4b94860a31 100644 --- a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping @@ -35,7 +35,6 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator ARG 0 monument METHOD method_30714 createNormalBambooJungle ()Lnet/minecraft/class_1959; METHOD method_30723 createWarmOcean ()Lnet/minecraft/class_1959; - METHOD method_30724 createDeepWarmOcean ()Lnet/minecraft/class_1959; METHOD method_30726 createTheVoid ()Lnet/minecraft/class_1959; METHOD method_30932 getSkyColor (F)I ARG 0 temperature diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index 38af407ace..71e20e497d 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerrainParameters - FIELD field_34524 CONTINENTALNESS Lnet/minecraft/class_6501; - FIELD field_34525 EROSION Lnet/minecraft/class_6501; - FIELD field_34526 WEIRDNESS Lnet/minecraft/class_6501; - FIELD field_34527 NORMALIZED_WEIRDNESS Lnet/minecraft/class_6501; FIELD field_34528 offsetSpline Lnet/minecraft/class_6492; FIELD field_34529 factorSpline Lnet/minecraft/class_6492; FIELD field_34530 peakSpline Lnet/minecraft/class_6492; @@ -34,16 +30,16 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr METHOD method_38221 getPeak (Lnet/minecraft/class_6555$class_6556;)F ARG 1 point CLASS class_6556 NoisePoint - FIELD field_34532 continentalnessNoise F - FIELD field_34533 erosionNoise F - FIELD field_34534 normalizedWeirdness F - FIELD field_34535 weirdnessNoise F + FIELD comp_235 continentalnessNoise F + FIELD comp_236 erosionNoise F + FIELD comp_237 normalizedWeirdness F + FIELD comp_238 weirdnessNoise F METHOD (FFFF)V ARG 1 continentalnessNoise ARG 2 erosionNoise ARG 3 normalizedWeirdness ARG 4 weirdnessNoise - METHOD method_38226 getContinentalnessNoise ()F - METHOD method_38227 getErosionNoise ()F - METHOD method_38228 getNormalizedWeirdness ()F - METHOD method_38229 getWeirdnessNoise ()F + METHOD comp_235 continentalnessNoise ()F + METHOD comp_236 erosionNoise ()F + METHOD comp_237 normalizedWeirdness ()F + METHOD comp_238 weirdnessNoise ()F diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 5fde99810c..9c3be62644 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -10,14 +10,12 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk FIELD field_34543 blockEntities Ljava/util/Map; FIELD field_34544 heightLimitView Lnet/minecraft/class_5539; FIELD field_34545 sectionArray [Lnet/minecraft/class_2826; - FIELD field_34546 blockTickScheduler Lnet/minecraft/class_1951; - FIELD field_34547 fluidTickScheduler Lnet/minecraft/class_1951; FIELD field_34549 lightOn Z FIELD field_34550 inhabitedTime J FIELD field_34551 biome Lnet/minecraft/class_1959; FIELD field_34552 structureStarts Ljava/util/Map; FIELD field_34553 structureReferences Ljava/util/Map; - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_1951;Lnet/minecraft/class_1951;)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_6752;)V ARG 1 pos ARG 2 upgradeData ARG 3 heightLimitView @@ -25,7 +23,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 5 inhabitedTime ARG 7 sectionArrayInitializer ARG 8 blockTickScheduler - ARG 9 fluidTickScheduler METHOD method_12002 addEntity (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_12003 getUpgradeData ()Lnet/minecraft/class_2843; @@ -46,8 +43,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 3 moved METHOD method_12011 getHeightmaps ()Ljava/util/Collection; METHOD method_12012 getPostProcessingLists ()[Lit/unimi/dsi/fastutil/shorts/ShortList; - METHOD method_12013 getBlockTickScheduler ()Lnet/minecraft/class_1951; - METHOD method_12014 getFluidTickScheduler ()Lnet/minecraft/class_1951; + METHOD method_12013 getBlockTickScheduler ()Lnet/minecraft/class_6763; + METHOD method_12014 getFluidTickScheduler ()Lnet/minecraft/class_6763; METHOD method_12016 getStructureStarts ()Ljava/util/Map; METHOD method_12018 getLightSourcesStream ()Ljava/util/stream/Stream; METHOD method_12020 setLightOn (Z)V @@ -90,7 +87,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 ySectionCoord METHOD method_35319 sampleMaxHeightMap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2338; ARG 1 type - METHOD method_38255 getOrCreateChunkNoiseSampler (IIIIIILnet/minecraft/class_5818;Ljava/util/function/Supplier;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6568; + METHOD method_38255 getOrCreateChunkNoiseSampler (IIIIIILnet/minecraft/class_5818;Ljava/util/function/Supplier;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; ARG 1 minimumY ARG 2 height ARG 3 x diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index 3b52ac2c00..be64ab1b1f 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -1,18 +1,16 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk FIELD field_12918 status Lnet/minecraft/class_2806; FIELD field_12919 lightSources Ljava/util/List; - FIELD field_12920 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_12926 carvingMasks Ljava/util/Map; FIELD field_12929 entities Ljava/util/List; FIELD field_17105 lightingProvider Lnet/minecraft/class_3568; - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;Lnet/minecraft/class_6752;)V ARG 1 pos ARG 2 upgradeData ARG 3 world - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;[Lnet/minecraft/class_2826;Lnet/minecraft/class_2850;Lnet/minecraft/class_2850;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;[Lnet/minecraft/class_2826;Lnet/minecraft/class_4296;Lnet/minecraft/class_4296;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;Lnet/minecraft/class_6752;)V ARG 1 pos ARG 2 upgradeData - ARG 4 blockTickScheduler ARG 5 fluidTickScheduler ARG 6 world METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class_6643; @@ -31,10 +29,6 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk METHOD method_12308 setStatus (Lnet/minecraft/class_2806;)V ARG 1 status METHOD method_12309 getBlockEntities ()Ljava/util/Map; - METHOD method_12310 (Lnet/minecraft/class_3611;)Z - ARG 0 fluid - METHOD method_12311 (Lnet/minecraft/class_2248;)Z - ARG 0 block METHOD method_12314 joinBlockPos (SILnet/minecraft/class_1923;)Lnet/minecraft/class_2338; ARG 0 sectionRel ARG 1 sectionY diff --git a/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping b/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping index d87e9f005c..67e1801b2e 100644 --- a/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping @@ -6,7 +6,3 @@ CLASS net/minecraft/class_2821 net/minecraft/world/chunk/ReadOnlyChunk METHOD method_12239 transformHeightmapType (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902$class_2903; ARG 1 type METHOD method_12240 getWrappedChunk ()Lnet/minecraft/class_2818; - METHOD method_12241 (Lnet/minecraft/class_3611;)Z - ARG 0 fluid - METHOD method_12242 (Lnet/minecraft/class_2248;)Z - ARG 0 block diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 36e8554609..e103bf83d7 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -10,11 +10,10 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;)V ARG 1 world ARG 2 pos - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_1951;Lnet/minecraft/class_1951;J[Lnet/minecraft/class_2826;Ljava/util/function/Consumer;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_6755;Lnet/minecraft/class_6755;J[Lnet/minecraft/class_2826;Ljava/util/function/Consumer;Lnet/minecraft/class_6752;)V ARG 1 world ARG 2 pos ARG 3 upgradeData - ARG 4 blockTickScheduler ARG 5 fluidTickScheduler ARG 6 inhabitedTime ARG 8 sectionArrayInitializer @@ -35,8 +34,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 levelTypeProvider METHOD method_12208 createBlockEntity (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; ARG 1 pos - METHOD method_12209 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2248; - ARG 1 pos METHOD method_12214 getBlockEntities ()Ljava/util/Map; METHOD method_12216 addBlockEntity (Lnet/minecraft/class_2586;)V ARG 1 blockEntity @@ -46,15 +43,11 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_12226 setLoadedToWorld (Z)V ARG 1 loaded - METHOD method_12230 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3611; - ARG 1 pos METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; ARG 1 x ARG 2 y ARG 3 z - METHOD method_20471 enableTickSchedulers (Lnet/minecraft/class_3218;)V - ARG 1 world - METHOD method_20530 disableTickSchedulers ()V + METHOD method_20530 disableTickSchedulers (J)V METHOD method_31713 updateAllBlockEntities ()V METHOD method_31715 canTickBlockEntities ()Z METHOD method_31718 wrapTicker (Lnet/minecraft/class_2586;Lnet/minecraft/class_5558;)Lnet/minecraft/class_5562; diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping index 67ed007773..749444f52a 100644 --- a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping +++ b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping @@ -63,7 +63,6 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler COMMENT Interpolates the noise at the top and bottom of the world. ARG 1 noise ARG 3 y - METHOD method_38373 getDepth (D)D METHOD method_38374 shouldPlaceOreVeinBlock (DD)Z ARG 1 firstOrePlacementNoise ARG 3 secondOrePlacementNoise @@ -71,7 +70,7 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler ARG 1 x ARG 3 y ARG 5 z - METHOD method_38376 createTerrainNoisePoint (IIFFF)Lnet/minecraft/class_6576; + METHOD method_38376 createTerrainNoisePoint (IIFFFLnet/minecraft/class_6748;)Lnet/minecraft/class_6576; ARG 1 x ARG 2 z ARG 3 continentalness @@ -81,28 +80,18 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler ARG 1 x ARG 2 y ARG 3 z - METHOD method_38378 sample (IIIDDFFFD)Lnet/minecraft/class_6544$class_6553; - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 noiseX - ARG 6 noiseZ - ARG 8 continentalness - ARG 9 erosion - ARG 10 weirdness - ARG 11 offset METHOD method_38379 createNoiseSamplerFactory (Lnet/minecraft/class_5216;IIID)Lnet/minecraft/class_6568$class_6571; ARG 0 noiseSampler ARG 1 minY ARG 2 maxY ARG 3 alternative ARG 4 scale - METHOD method_38380 sampleNoiseColumn (IIILnet/minecraft/class_6576;)D + METHOD method_38380 sampleNoiseColumn (IIILnet/minecraft/class_6576;Lnet/minecraft/class_6748;)D ARG 1 x ARG 2 y ARG 3 z ARG 4 point - METHOD method_38381 sampleNoiseColumn (IIILnet/minecraft/class_6576;DZZ)D + METHOD method_38381 sampleNoiseColumn (IIILnet/minecraft/class_6576;DZZLnet/minecraft/class_6748;)D ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 88bb41c641..b30fdb93ce 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -19,11 +19,9 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_5311;)V ARG 1 biomeSource ARG 2 structuresConfig - METHOD method_12088 populateNoise (Ljava/util/concurrent/Executor;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + METHOD method_12088 populateNoise (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config. ARG 1 executor - ARG 2 accessor - ARG 3 chunk METHOD method_12098 getBiomeSource ()Lnet/minecraft/class_1966; METHOD method_12100 getSpawnHeight (Lnet/minecraft/class_5539;)I ARG 1 world @@ -104,7 +102,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_33730 getMinimumY ()I METHOD method_38266 canPlaceStrongholdInBiome (Lnet/minecraft/class_1959;)Z ARG 0 biome - METHOD method_38275 populateBiomes (Ljava/util/concurrent/Executor;Lnet/minecraft/class_2378;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; - ARG 2 biomeRegistry + METHOD method_38275 populateBiomes (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 4 chunk METHOD method_38276 getMultiNoiseSampler ()Lnet/minecraft/class_6544$class_6552; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping index 72ede39bd4..33a8839724 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping @@ -9,23 +9,16 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_34603 biomeX I FIELD field_34604 biomeZ I FIELD field_34605 interpolators Ljava/util/List; - FIELD field_34606 noiseX [[D - FIELD field_34607 noiseZ [[D - FIELD field_34608 continentalness [[D - FIELD field_34609 weirdness [[D - FIELD field_34610 erosion [[D - FIELD field_34611 terrainNoisePoint [[Lnet/minecraft/class_6576; FIELD field_34612 terrainNoisePoints Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_34613 aquiferSampler Lnet/minecraft/class_6350; FIELD field_34614 initialNoiseBlockStateSampler Lnet/minecraft/class_6568$class_6569; FIELD field_34615 oreVeinSampler Lnet/minecraft/class_6568$class_6569; - METHOD (IIIIILnet/minecraft/class_5818;IILnet/minecraft/class_6568$class_6572;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;)V + METHOD (IIIIILnet/minecraft/class_5818;IILnet/minecraft/class_6568$class_6572;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V ARG 1 horizontalNoiseResolution ARG 2 verticalNoiseResolution ARG 3 horizontalSize ARG 4 height ARG 5 minimumY - ARG 6 noiseColumnSampler ARG 7 x ARG 8 z ARG 9 columnSampler @@ -38,9 +31,6 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler ARG 2 interpolator METHOD method_38339 sampleEndNoise (I)V ARG 1 x - METHOD method_38340 getNoiseX (II)D - ARG 1 x - ARG 2 z METHOD method_38341 sampleInitialNoiseBlockState (III)Lnet/minecraft/class_2680; ARG 1 x ARG 2 y @@ -53,26 +43,19 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler ARG 1 columnSampler METHOD method_38345 (Lnet/minecraft/class_6568$class_5917;)V ARG 0 interpolator - METHOD method_38346 createMultiNoisePoint (Lnet/minecraft/class_5818;II)Lnet/minecraft/class_6568$class_6570; - ARG 0 noiseColumnSampler + METHOD method_38346 createMultiNoisePoint (II)Lnet/minecraft/class_5818$class_6747; ARG 1 x ARG 2 z - METHOD method_38347 (Lnet/minecraft/class_5818;J)Lnet/minecraft/class_6576; - ARG 1 pos METHOD method_38348 swapBuffers ()V METHOD method_38349 sampleNoiseX (D)V ARG 1 deltaX METHOD method_38350 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator - METHOD method_38351 getNoiseZ (II)D - ARG 1 x - ARG 2 z METHOD method_38352 sampleOreVeins (III)Lnet/minecraft/class_2680; ARG 1 x ARG 2 y ARG 3 z METHOD method_38353 getTerrainNoisePoint (Lnet/minecraft/class_5818;II)Lnet/minecraft/class_6576; - ARG 1 columnSampler ARG 2 x ARG 3 z METHOD method_38354 getAquiferSampler ()Lnet/minecraft/class_6350; @@ -80,18 +63,6 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler ARG 1 deltaZ METHOD method_38356 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator - METHOD method_38357 getContinentalness (II)D - ARG 1 x - ARG 2 z - METHOD method_38358 getWeirdness (II)D - ARG 1 x - ARG 2 z - METHOD method_38359 getErosion (II)D - ARG 1 x - ARG 2 z - METHOD method_38360 getTerrainNoisePoint (II)Lnet/minecraft/class_6576; - ARG 1 x - ARG 2 z METHOD method_38361 getInterpolatedTerrainNoisePoint (II)Lnet/minecraft/class_6576; ARG 1 x ARG 2 z @@ -143,17 +114,6 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler ARG 1 x ARG 2 y ARG 3 z - CLASS class_6570 MultiNoisePoint - FIELD field_34616 terrainNoisePoint Lnet/minecraft/class_6576; - FIELD field_34617 noiseX D - FIELD field_34618 noiseZ D - FIELD field_34619 continentalness D - FIELD field_34620 weirdness D - FIELD field_34621 erosion D - METHOD (Lnet/minecraft/class_5818;II)V - ARG 1 noiseColumnSampler - ARG 2 x - ARG 3 z CLASS class_6571 ValueSamplerFactory METHOD instantiate create (Lnet/minecraft/class_6568;)Lnet/minecraft/class_6568$class_6573; ARG 1 chunkNoiseSampler diff --git a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping index 165e190f5b..0dc51a8cf1 100644 --- a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf FIELD comp_182 islandNoiseOverride Z FIELD comp_183 amplified Z FIELD field_24804 CODEC Lcom/mojang/serialization/Codec; - METHOD (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZ)V + METHOD (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZLnet/minecraft/class_6555;)V ARG 1 minimumY ARG 2 height ARG 3 sampling @@ -36,7 +36,7 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf METHOD comp_183 amplified ()Z METHOD method_28582 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZ)Lnet/minecraft/class_5309; + METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZLnet/minecraft/class_6555;)Lnet/minecraft/class_5309; ARG 0 minimumY ARG 1 height ARG 2 sampling diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 2faac412a8..9f2ac7a1b9 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -27,11 +27,7 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 3 settingsKey METHOD method_28550 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_33754 populateNoise (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;II)Lnet/minecraft/class_2791; - ARG 1 accessor - ARG 2 chunk - ARG 3 startY - ARG 4 noiseSizeY + METHOD method_33754 populateNoise (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;II)Lnet/minecraft/class_2791; METHOD method_38323 (IIILnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 1 y ARG 2 x @@ -42,11 +38,8 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 4 y ARG 5 z METHOD method_38326 (Lnet/minecraft/class_6568;III)Lnet/minecraft/class_6544$class_6553; - ARG 2 x ARG 3 y - ARG 4 z - METHOD method_38327 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V - ARG 1 biomeRegistry + METHOD method_38327 (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V ARG 2 world ARG 3 chunk METHOD method_38329 (III)D diff --git a/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping b/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping index 9618c9702d..bf0ebbbd1b 100644 --- a/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping +++ b/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping @@ -8,6 +8,5 @@ CLASS net/minecraft/class_6574 net/minecraft/world/gen/random/RandomDeriver METHOD method_38995 createRandom (Ljava/lang/String;)Lnet/minecraft/class_5819; ARG 1 string METHOD method_39000 createRandom (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5819; - ARG 1 id METHOD method_39039 addDebugInfo (Ljava/lang/StringBuilder;)V ARG 1 info diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index 571c06124b..9f5980187e 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -64,12 +64,10 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35237 biomeDependentPredicates Ljava/util/List; FIELD field_35238 positionalPredicates Ljava/util/List; FIELD field_35239 contextDependentPredicates Ljava/util/List; - FIELD field_35240 needsCeilingStoneDepth Z FIELD field_35241 heightContext Lnet/minecraft/class_5868; METHOD (Lnet/minecraft/class_6724;Lnet/minecraft/class_5868;)V ARG 1 surfaceBuilder ARG 2 heightContext - METHOD method_39071 needsCeilingStoneDepth ()Z METHOD method_39072 initWorldDependentPredicates (Lnet/minecraft/class_2791;III)V ARG 1 chunk ARG 2 x diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index f3bf57f5a8..e2916980bd 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -13,14 +13,12 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_35286 seaLevel I FIELD field_35287 terracottaBands [Lnet/minecraft/class_2680; FIELD field_35288 terracottaBandsOffsetNoise Lnet/minecraft/class_5216; - FIELD field_35289 icebergAndBadlandsPillarNoise Lnet/minecraft/class_5216; - FIELD field_35290 icebergAndBadlandsPillarRoofNoise Lnet/minecraft/class_5216; FIELD field_35291 noiseSamplers Ljava/util/Map; FIELD field_35292 randomDeriver Lnet/minecraft/class_6574; FIELD field_35293 surfaceNoise Lnet/minecraft/class_5216; METHOD (Lnet/minecraft/class_5818;Lnet/minecraft/class_2378;Lnet/minecraft/class_2680;IJLnet/minecraft/class_2919$class_6675;)V ARG 1 noiseColumnSampler - METHOD method_39102 (IDLnet/minecraft/class_6557;III)V + METHOD method_39102 (IDLnet/minecraft/class_6557;IIILnet/minecraft/class_5539;)V ARG 4 chunk ARG 5 x ARG 6 z @@ -43,11 +41,6 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 5 chunk ARG 6 chunkNoiseSampler ARG 7 surfaceRule - METHOD method_39107 getBlockStateToPlace (Lnet/minecraft/class_6557;ILnet/minecraft/class_2680;D)Lnet/minecraft/class_2680; - ARG 1 chunk - ARG 2 y - ARG 3 state - ARG 4 waterHeight METHOD method_39108 createTerracottaBands (Lnet/minecraft/class_5819;)[Lnet/minecraft/class_2680; ARG 0 random METHOD method_39109 addTerracottaBands (Lnet/minecraft/class_5819;[Lnet/minecraft/class_2680;ILnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index cb115d2ba7..701f810651 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage ARG 1 directory ARG 2 dataFixer ARG 3 dsync - METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;Ljava/util/Optional;)Lnet/minecraft/class_2487; ARG 1 worldKey ARG 2 persistentStateManagerFactory ARG 3 nbt diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 7515fa38ca..cecc36f61d 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_19225 eraseCache Z FIELD field_24083 session Lnet/minecraft/class_32$class_5143; FIELD field_24084 dataFixer Lcom/mojang/datafixers/DataFixer; - FIELD field_25354 worlds Lcom/google/common/collect/ImmutableSet; FIELD field_5755 persistentStateManager Lnet/minecraft/class_26; FIELD field_5756 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5757 UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory; @@ -16,10 +15,9 @@ 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 (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lcom/google/common/collect/ImmutableSet;Z)V + METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5285;Z)V ARG 1 session ARG 2 dataFixer - ARG 3 worlds ARG 4 eraseCache METHOD method_17829 (Ljava/io/File;Ljava/lang/String;)Z ARG 0 directory