diff --git a/build.gradle b/build.gradle index 4b8ec931ed..5092043e22 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "21w38a" +def minecraft_version = "21w39a" def ENV = System.getenv() // Fetch build number from Github Actions @@ -96,6 +96,9 @@ def unpickedJar = file("${minecraft_version}-intermediary-unpicked.jar") def namedJar = file("${minecraft_version}-named.jar") def versionFile = new File(cacheFilesMinecraft, "${minecraft_version}.json") def clientJar = new File(cacheFilesMinecraft, "${minecraft_version}-client.jar") +// The vanilla server bootstrap jar (Contains the real server jar) +def serverBootstrapJar = new File(cacheFilesMinecraft, "${minecraft_version}-serverboostrap.jar") +// The real server jar, expected from the bootstrap def serverJar = new File(cacheFilesMinecraft, "${minecraft_version}-server.jar") def libraries = new File(cacheFilesMinecraft, "libraries") def libs = new File("build/libs/") @@ -186,11 +189,11 @@ task downloadMcJars(dependsOn: downloadWantedVersionManifest) { group = setupGroup inputs.files versionFile - outputs.files(clientJar, serverJar) + outputs.files(clientJar, serverBootstrapJar) outputs.upToDateWhen { def version = new JsonSlurper().parseText(FileUtils.readFileToString(versionFile)) - return clientJar.exists() && serverJar.exists() && validateChecksum(clientJar, version.downloads.client.sha1) && validateChecksum(serverJar, version.downloads.server.sha1) + return clientJar.exists() && serverBootstrapJar.exists() && validateChecksum(clientJar, version.downloads.client.sha1) && validateChecksum(serverBootstrapJar, version.downloads.server.sha1) } doLast { @@ -211,7 +214,7 @@ task downloadMcJars(dependsOn: downloadWantedVersionManifest) { download { src new URL(version.downloads.server.url) - dest serverJar + dest serverBootstrapJar overwrite false } } @@ -245,22 +248,42 @@ task downloadIntermediaryV2(type: Download) { } } -task mergeJars(dependsOn: downloadMcJars) { +import java.util.zip.ZipFile + +// Extracts the real server jar from the boostrap jar +task extractServerJar(dependsOn: downloadMcJars) { group = setupGroup - inputs.files downloadMcJars.outputs.files.files + inputs.file serverBootstrapJar + outputs.file serverJar + + doLast { + new ZipFile(serverBootstrapJar as File).withCloseable { zip -> + def entry = zip.getEntry("META-INF/versions/${minecraft_version}/server-${minecraft_version}.jar") + + if (!entry) { + throw new RuntimeException("Failed to find server jar entry: ") + } + + zip.getInputStream(entry).withCloseable { is -> + serverJar.bytes = is.readAllBytes() + } + } + } +} + +task mergeJars(dependsOn: extractServerJar) { + group = setupGroup + inputs.files (serverJar, clientJar) outputs.file(mergedFile) doLast { logger.lifecycle(":merging jars") - def client = inputs.files.files.find { it.name.endsWith("-client.jar") } - def server = inputs.files.files.find { it.name.endsWith("-server.jar") } - def merged = mergedFile - if (merged.exists()) { + if (mergedFile.exists()) { return } - def jarMerger = new JarMerger(client, server, merged) + def jarMerger = new JarMerger(serverJar, clientJar, mergedFile) jarMerger.merge() jarMerger.close() } diff --git a/mappings/net/minecraft/SaveVersion.mapping b/mappings/net/minecraft/SaveVersion.mapping index 7660a30951..71ad044373 100644 --- a/mappings/net/minecraft/SaveVersion.mapping +++ b/mappings/net/minecraft/SaveVersion.mapping @@ -11,8 +11,6 @@ CLASS net/minecraft/class_6595 net/minecraft/SaveVersion ARG 1 id ARG 2 series METHOD method_38490 isNotMainSeries ()Z - METHOD method_38491 hasSameSeries (Lnet/minecraft/class_6595;)Z - ARG 1 other METHOD method_38492 getSeries ()Ljava/lang/String; COMMENT {@return the series of this version} COMMENT @@ -25,8 +23,3 @@ CLASS net/minecraft/class_6595 net/minecraft/SaveVersion ARG 1 other METHOD method_38494 getId ()I COMMENT {@return the integer data version of this save version} - METHOD method_38495 hasIncompatibleWorldHeight ()Z - COMMENT {@return if this save version has the new -64 to 319 world height limit} - COMMENT - COMMENT

This corresponds to world versions {@code 2693} to {@code 2706}, or - COMMENT game versions 21w06a to 21w14a. diff --git a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping index 51b73cc39b..fa71f3be87 100644 --- a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping @@ -1,24 +1,11 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/NetherTravelCriterion FIELD field_9717 ID Lnet/minecraft/class_2960; - METHOD method_22486 (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;Lnet/minecraft/class_2108$class_2110;)Z - ARG 2 conditions METHOD method_9080 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;)V - ARG 1 player - ARG 2 enteredPos CLASS class_2110 Conditions - FIELD field_9721 enteredPos Lnet/minecraft/class_2090; - FIELD field_9722 exitedPos Lnet/minecraft/class_2090; FIELD field_9723 distance Lnet/minecraft/class_2025; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2025;)V - ARG 1 player - ARG 2 enteredPos + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2025;)V ARG 3 exitedPos ARG 4 distance METHOD method_9085 distance (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2108$class_2110; ARG 0 distance - METHOD method_9086 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;DDD)Z - ARG 1 world - ARG 2 enteredPos - ARG 3 exitedPosX - ARG 5 exitedPosY - ARG 7 exitedPosZ + METHOD method_9086 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z diff --git a/mappings/net/minecraft/block/GrassBlock.mapping b/mappings/net/minecraft/block/GrassBlock.mapping index 600789e04c..bf9842d3b0 100644 --- a/mappings/net/minecraft/block/GrassBlock.mapping +++ b/mappings/net/minecraft/block/GrassBlock.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_2372 net/minecraft/block/GrassBlock - METHOD method_31647 getFlowerState (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2975;)Lnet/minecraft/class_2680; - ARG 0 random - ARG 1 pos - ARG 2 flowerFeature diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index 22e4c82761..a9185da38e 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud ARG 1 offset METHOD method_1977 selectSlot (I)V ARG 1 slot - METHOD method_1978 render (Lnet/minecraft/class_4587;F)V - ARG 1 matrices METHOD method_1979 render (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_1980 isOpen ()Z diff --git a/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping index f7c5966f69..bca8767f64 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/class_540 net/minecraft/client/gui/hud/spectator/TeamTelepor FIELD field_3274 scoreboardEntries Ljava/util/List; FIELD field_3275 team Lnet/minecraft/class_268; FIELD field_3276 skinId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_540;Lnet/minecraft/class_268;)V - ARG 2 team diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping index c3a37e2cbc..33ddef63e0 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen - FIELD field_2900 drawStatusEffects Z - METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_4587;IILjava/lang/Iterable;Z)V ARG 1 matrices ARG 2 x ARG 3 height ARG 4 statusEffects - METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_4587;IILjava/lang/Iterable;Z)V ARG 1 matrices ARG 2 x ARG 3 height @@ -15,6 +14,5 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInv ARG 2 x ARG 3 height ARG 4 statusEffects - METHOD method_2476 applyStatusEffectOffset ()V - METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_4587;)V + METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_4587;II)V ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index b1bba36f06..7a693a0a7f 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -52,8 +52,6 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul ARG 2 value CLASS class_5240 AbstractRuleWidget FIELD field_24311 description Ljava/util/List; - METHOD (Lnet/minecraft/class_5235;Ljava/util/List;)V - ARG 2 description CLASS class_5241 RuleListWidget METHOD (Lnet/minecraft/class_5235;Lnet/minecraft/class_1928;)V ARG 2 gameRules diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 76746ff987..f0e29bbbbf 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid FIELD field_26608 SNAPSHOT_FIRST_LINE Lnet/minecraft/class_2561; FIELD field_26609 SNAPSHOT_SECOND_LINE Lnet/minecraft/class_2561; FIELD field_26610 LOCKED_TEXT Lnet/minecraft/class_2561; - FIELD field_28857 INCOMPATIBLE_WORLDHEIGHT_TEXT Lnet/minecraft/class_2561; FIELD field_3237 parent Lnet/minecraft/class_526; FIELD field_3238 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_3239 levels Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping index 862e224111..d0d0f75355 100644 --- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping @@ -4,15 +4,14 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipCom FIELD field_28360 occupancy I METHOD (Lnet/minecraft/class_5631;)V ARG 1 data - METHOD method_33286 drawOutline (IIIILnet/minecraft/class_4587;ILnet/minecraft/class_1060;)V + METHOD method_33286 drawOutline (IIIILnet/minecraft/class_4587;I)V ARG 1 x ARG 2 y ARG 3 columns ARG 4 rows ARG 5 matrices ARG 6 z - ARG 7 textureManager - METHOD method_33287 drawSlot (IIIZLnet/minecraft/class_327;Lnet/minecraft/class_4587;Lnet/minecraft/class_918;ILnet/minecraft/class_1060;)V + METHOD method_33287 drawSlot (IIIZLnet/minecraft/class_327;Lnet/minecraft/class_4587;Lnet/minecraft/class_918;I)V ARG 1 x ARG 2 y ARG 3 index @@ -21,14 +20,11 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipCom ARG 6 matrices ARG 7 itemRenderer ARG 8 z - ARG 9 textureManager - METHOD method_33288 draw (Lnet/minecraft/class_4587;IIILnet/minecraft/class_1060;Lnet/minecraft/class_5682$class_5771;)V + METHOD method_33288 draw (Lnet/minecraft/class_4587;IIILnet/minecraft/class_5682$class_5771;)V ARG 1 matrices ARG 2 x ARG 3 y ARG 4 z - ARG 5 textureManager - ARG 6 sprite METHOD method_33289 getColumns ()I METHOD method_33290 getRows ()I CLASS class_5771 Sprite diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping index 5def11932c..0637ec1be3 100644 --- a/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping @@ -10,11 +10,10 @@ CLASS net/minecraft/class_5684 net/minecraft/client/gui/tooltip/TooltipComponent ARG 1 textRenderer ARG 2 x ARG 3 y - METHOD method_32666 drawItems (Lnet/minecraft/class_327;IILnet/minecraft/class_4587;Lnet/minecraft/class_918;ILnet/minecraft/class_1060;)V + METHOD method_32666 drawItems (Lnet/minecraft/class_327;IILnet/minecraft/class_4587;Lnet/minecraft/class_918;I)V ARG 1 textRenderer ARG 2 x ARG 3 y ARG 4 matrices ARG 5 itemRenderer ARG 6 z - ARG 7 textureManager diff --git a/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping b/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping index fd2d736644..279e9157f7 100644 --- a/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping +++ b/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_5520 net/minecraft/client/network/SocialInteractionsMa FIELD field_26866 hiddenPlayers Ljava/util/Set; FIELD field_26912 socialInteractionsService Lcom/mojang/authlib/minecraft/UserApiService; FIELD field_26927 playerNameByUuid Ljava/util/Map; - METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/UserApiService;)V - ARG 1 client METHOD method_31336 getHiddenPlayers ()Ljava/util/Set; METHOD method_31337 setPlayerOnline (Lnet/minecraft/class_640;)V ARG 1 player diff --git a/mappings/net/minecraft/client/realms/FileDownload.mapping b/mappings/net/minecraft/client/realms/FileDownload.mapping index 140a9d7326..f9cb18b705 100644 --- a/mappings/net/minecraft/client/realms/FileDownload.mapping +++ b/mappings/net/minecraft/client/realms/FileDownload.mapping @@ -31,8 +31,6 @@ CLASS net/minecraft/class_4333 net/minecraft/client/realms/FileDownload ARG 0 file CLASS class_4334 DownloadCountingOutputStream FIELD field_19539 listener Ljava/awt/event/ActionListener; - METHOD (Lnet/minecraft/class_4333;Ljava/io/OutputStream;)V - ARG 2 out METHOD afterWrite (I)V ARG 1 n METHOD method_20969 setListener (Ljava/awt/event/ActionListener;)V diff --git a/mappings/net/minecraft/client/realms/Ping.mapping b/mappings/net/minecraft/client/realms/Ping.mapping index 2361c1e1cf..76d01e394a 100644 --- a/mappings/net/minecraft/client/realms/Ping.mapping +++ b/mappings/net/minecraft/client/realms/Ping.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/class_4339 net/minecraft/client/realms/Ping METHOD method_20981 pingAllRegions ()Ljava/util/List; METHOD method_20982 ping (Ljava/lang/String;)I ARG 0 host - METHOD method_20983 close (Ljava/net/Socket;)V - ARG 0 socket METHOD method_20984 ping ([Lnet/minecraft/class_4339$class_4340;)Ljava/util/List; ARG 0 regions METHOD method_20985 now ()J diff --git a/mappings/net/minecraft/client/search/SuffixArray.mapping b/mappings/net/minecraft/client/search/SuffixArray.mapping index 0c3342f768..9a71c88877 100644 --- a/mappings/net/minecraft/client/search/SuffixArray.mapping +++ b/mappings/net/minecraft/client/search/SuffixArray.mapping @@ -43,10 +43,3 @@ CLASS net/minecraft/class_1128 net/minecraft/client/search/SuffixArray METHOD method_4808 getDebugString (I)Ljava/lang/String; ARG 1 suffixIndex METHOD method_4809 printArray ()V - CLASS 1 - METHOD compare (II)I - ARG 1 i - ARG 2 j - METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I - ARG 1 i - ARG 2 j diff --git a/mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping index a230c6ec99..393dd81429 100644 --- a/mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1371 net/minecraft/entity/ai/goal/AttackGoal - FIELD field_6538 world Lnet/minecraft/class_1922; FIELD field_6539 target Lnet/minecraft/class_1309; FIELD field_6540 cooldown I FIELD field_6541 mob Lnet/minecraft/class_1308; diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index de62ed5c7b..a3f88e39c1 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -103,9 +103,6 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity CLASS class_1442 PandaMateGoal FIELD field_6783 nextAskPlayerForBambooAge I FIELD field_6784 panda Lnet/minecraft/class_1440; - METHOD (Lnet/minecraft/class_1440;Lnet/minecraft/class_1440;D)V - ARG 2 panda - ARG 3 chance METHOD method_6561 isBambooClose ()Z CLASS class_1443 Gene FIELD field_6785 id I diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 20824c0dd7..9a86684c21 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -72,6 +72,4 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 1 rabbit CLASS class_5197 RabbitJumpControl FIELD field_24090 rabbit Lnet/minecraft/class_1463; - METHOD (Lnet/minecraft/class_1463;Lnet/minecraft/class_1463;)V - ARG 2 rabbit METHOD method_27312 isActive ()Z diff --git a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping index fd1597969d..71d5e8b227 100644 --- a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping +++ b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping @@ -20,6 +20,3 @@ CLASS net/minecraft/class_1796 net/minecraft/entity/player/ItemCooldownManager CLASS class_1797 Entry FIELD field_8027 endTick I FIELD field_8028 startTick I - METHOD (Lnet/minecraft/class_1796;II)V - ARG 2 startTick - ARG 3 endTick diff --git a/mappings/net/minecraft/inventory/DoubleInventory.mapping b/mappings/net/minecraft/inventory/DoubleInventory.mapping index 852729af72..f3018140b0 100644 --- a/mappings/net/minecraft/inventory/DoubleInventory.mapping +++ b/mappings/net/minecraft/inventory/DoubleInventory.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_1258 net/minecraft/inventory/DoubleInventory FIELD field_5769 first Lnet/minecraft/class_1263; FIELD field_5771 second Lnet/minecraft/class_1263; - METHOD (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;)V - ARG 1 first - ARG 2 second METHOD method_5405 isPart (Lnet/minecraft/class_1263;)Z ARG 1 inventory diff --git a/mappings/net/minecraft/inventory/SimpleInventory.mapping b/mappings/net/minecraft/inventory/SimpleInventory.mapping index 527ad856e6..bb8c6a109f 100644 --- a/mappings/net/minecraft/inventory/SimpleInventory.mapping +++ b/mappings/net/minecraft/inventory/SimpleInventory.mapping @@ -28,7 +28,6 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory METHOD method_27070 canInsert (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_5488 removeListener (Lnet/minecraft/class_1265;)V - ARG 1 listener METHOD method_5489 addListener (Lnet/minecraft/class_1265;)V ARG 1 listener METHOD method_5491 addStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/nbt/visitor/NbtOrderedStringFormatter.mapping b/mappings/net/minecraft/nbt/visitor/NbtOrderedStringFormatter.mapping index 915a1119d3..cebbc0a561 100644 --- a/mappings/net/minecraft/nbt/visitor/NbtOrderedStringFormatter.mapping +++ b/mappings/net/minecraft/nbt/visitor/NbtOrderedStringFormatter.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_5625 net/minecraft/nbt/visitor/NbtOrderedStringFormatt FIELD field_27827 pathParts Ljava/util/List; FIELD field_27828 result Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/util/List;)V - ARG 1 prefix ARG 2 indentationLevel ARG 3 pathParts METHOD method_32280 joinPath ()Ljava/lang/String; diff --git a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping index 4aa057334d..72b0ddf503 100644 --- a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping +++ b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping @@ -14,7 +14,6 @@ CLASS net/minecraft/class_5628 net/minecraft/nbt/visitor/NbtTextFormatter FIELD field_27841 indentationLevel I FIELD field_27842 result Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;I)V - ARG 1 prefix ARG 2 indentationLevel METHOD method_32304 escapeName (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 name diff --git a/mappings/net/minecraft/server/chase/ChaseServer.mapping b/mappings/net/minecraft/server/chase/ChaseServer.mapping index 1529ba61eb..9bba7fb941 100644 --- a/mappings/net/minecraft/server/chase/ChaseServer.mapping +++ b/mappings/net/minecraft/server/chase/ChaseServer.mapping @@ -16,4 +16,3 @@ CLASS net/minecraft/class_6632 net/minecraft/server/chase/ChaseServer METHOD method_38766 stop ()V METHOD method_38767 runSender ()V METHOD method_38768 runAcceptor ()V - METHOD method_38769 getTeleportMessage ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index 71f498d308..54403ef78b 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -105,7 +105,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 3 targetLevel ARG 4 levelSetter CLASS class_3897 PlayersWatchingChunkProvider - METHOD method_17210 getPlayersWatchingChunk (Lnet/minecraft/class_1923;Z)Ljava/util/stream/Stream; + METHOD method_17210 getPlayersWatchingChunk (Lnet/minecraft/class_1923;Z)Ljava/util/List; ARG 1 chunkPos ARG 2 onlyOnWatchDistanceEdge CLASS class_5830 MultithreadAction diff --git a/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping b/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping index e0406a5e71..ab91c2b723 100644 --- a/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping +++ b/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_3210 net/minecraft/server/world/PlayerChunkWatchingMan ARG 5 player METHOD method_14082 isWatchDisabled (Lnet/minecraft/class_3222;)Z ARG 1 player - METHOD method_14083 getPlayersWatchingChunk (J)Ljava/util/stream/Stream; + METHOD method_14083 getPlayersWatchingChunk (J)Ljava/util/Set; METHOD method_14084 remove (JLnet/minecraft/class_3222;)V ARG 3 player METHOD method_14085 add (JLnet/minecraft/class_3222;Z)V diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 5caf26bb07..5f012397a7 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -115,7 +115,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 2 packet METHOD method_18722 doesNotGenerateChunks (Lnet/minecraft/class_3222;)Z ARG 1 player - METHOD method_18724 isTooFarFromPlayersToSpawnMobs (Lnet/minecraft/class_1923;)Z METHOD method_18727 tickEntityMovement ()V COMMENT Ticks and updates the tracked status of each tracker. COMMENT diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6110.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6110.mapping deleted file mode 100644 index 0a730d2d1f..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6110.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6110 net/minecraft/unused/packageinfo/PackageInfo6110 diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index afc9767cee..dfe2ad172d 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler FIELD field_34923 INSTANCE Lnet/minecraft/class_6611; METHOD method_37980 stop ()Ljava/nio/file/Path; - METHOD method_37981 start (Lnet/minecraft/class_6505$class_6506;)Z - ARG 1 instanceType METHOD method_37981 start (Lnet/minecraft/class_6506;)Z ARG 1 instanceType METHOD method_37984 isProfiling ()Z diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 12f534dacb..c1c2c73ff5 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -36,7 +36,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_18795 SCHEDULE Lnet/minecraft/class_2378; FIELD field_18796 ACTIVITY Lnet/minecraft/class_2378; FIELD field_21445 BLOCK_STATE_PROVIDER_TYPE Lnet/minecraft/class_2378; - FIELD field_21446 BLOCK_PLACER_TYPE Lnet/minecraft/class_2378; FIELD field_21447 FOLIAGE_PLACER_TYPE Lnet/minecraft/class_2378; FIELD field_21448 TREE_DECORATOR_TYPE Lnet/minecraft/class_2378; FIELD field_23398 POS_RULE_TEST Lnet/minecraft/class_2378; @@ -93,7 +92,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_25113 DECORATOR_KEY Lnet/minecraft/class_5321; FIELD field_25114 BIOME_KEY Lnet/minecraft/class_5321; FIELD field_25115 BLOCK_STATE_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25116 BLOCK_PLACER_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25117 FOLIAGE_PLACER_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25118 TRUNK_PLACER_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25293 LOOT_POOL_ENTRY_TYPE Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/util/thread/TaskQueue.mapping b/mappings/net/minecraft/util/thread/TaskQueue.mapping index 02e3f2ea0d..17d0a78d06 100644 --- a/mappings/net/minecraft/util/thread/TaskQueue.mapping +++ b/mappings/net/minecraft/util/thread/TaskQueue.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_3847 net/minecraft/util/thread/TaskQueue METHOD method_16911 isEmpty ()Z METHOD method_34706 getSize ()I CLASS class_3848 Prioritized - FIELD field_17044 queues Ljava/util/List; METHOD (I)V ARG 1 priorityCount CLASS class_3849 Simple diff --git a/mappings/net/minecraft/world/StructureWorldAccess.mapping b/mappings/net/minecraft/world/StructureWorldAccess.mapping index ea341085bf..11d5264ca8 100644 --- a/mappings/net/minecraft/world/StructureWorldAccess.mapping +++ b/mappings/net/minecraft/world/StructureWorldAccess.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5281 net/minecraft/world/StructureWorldAccess - METHOD method_30275 getStructures (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)Ljava/util/stream/Stream; + METHOD method_30275 getStructures (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)Ljava/util/List; ARG 1 pos ARG 2 feature METHOD method_37368 isValidForSetBlock (Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping index 6da51cfe04..489193d404 100644 --- a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping +++ b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping @@ -84,7 +84,6 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD comp_104 max ()J METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_38119 getMin ()F METHOD method_38120 of (F)Lnet/minecraft/class_6544$class_6546; ARG 0 point METHOD method_38121 of (FF)Lnet/minecraft/class_6544$class_6546; @@ -103,7 +102,6 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD method_38124 (Ljava/lang/Float;Ljava/lang/Float;)Lcom/mojang/serialization/DataResult; ARG 0 min ARG 1 max - METHOD method_38125 getMax ()F METHOD method_38126 getDistance (J)J ARG 1 noise METHOD method_38127 combine (Lnet/minecraft/class_6544$class_6546;)Lnet/minecraft/class_6544$class_6546; @@ -141,8 +139,6 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD method_38149 createNodeComparator (IZ)Ljava/util/Comparator; ARG 0 currentParameter ARG 1 abs - METHOD method_38150 (IZLnet/minecraft/class_6544$class_6548$class_6550;)D - ARG 2 node METHOD method_38151 get (Lnet/minecraft/class_6544$class_6553;Lnet/minecraft/class_6544$class_6545;)Ljava/lang/Object; ARG 1 point ARG 2 distanceFunction diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index 8ed679a173..c5a0b9ea6c 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -15,12 +15,10 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk ARG 4 blockTickScheduler ARG 5 fluidTickScheduler ARG 6 world - METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; + METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class__6643; ARG 1 carver METHOD method_12295 getEntities ()Ljava/util/List; METHOD method_12296 getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList; - METHOD method_12297 (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; - ARG 0 carver METHOD method_12300 getPackedSectionRelative (Lnet/minecraft/class_2338;)S ARG 0 pos METHOD method_12302 addEntity (Lnet/minecraft/class_2487;)V @@ -28,9 +26,8 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk METHOD method_12304 addLightSource (SI)V ARG 1 chunkSliceRel ARG 2 sectionY - METHOD method_12307 setCarvingMask (Lnet/minecraft/class_2893$class_2894;Ljava/util/BitSet;)V + METHOD method_12307 setCarvingMask (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class__6643;)V ARG 1 carver - ARG 2 mask METHOD method_12308 setStatus (Lnet/minecraft/class_2806;)V ARG 1 status METHOD method_12309 getBlockEntities ()Ljava/util/Map; @@ -47,5 +44,5 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk METHOD method_12316 getBlockEntityNbts ()Ljava/util/Map; METHOD method_17032 setLightingProvider (Lnet/minecraft/class_3568;)V ARG 1 lightingProvider - METHOD method_28510 getOrCreateCarvingMask (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; + METHOD method_28510 getOrCreateCarvingMask (Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class__6643; ARG 1 carver diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index a67c4160cc..8e7007c8ae 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -4,18 +4,11 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_5285;)V ARG 1 world ARG 2 options - METHOD method_26971 (Lnet/minecraft/class_3195;Lnet/minecraft/class_4076;)Lnet/minecraft/class_3449; - ARG 2 pos - METHOD method_26972 (Lnet/minecraft/class_3449;)Z - ARG 0 structureStart METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;JLnet/minecraft/class_2810;)V ARG 1 pos ARG 2 feature ARG 3 reference ARG 5 holder - METHOD method_26974 getStructuresWithChildren (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)Ljava/util/stream/Stream; - ARG 1 pos - ARG 2 feature METHOD method_26975 getStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_2810;)Lnet/minecraft/class_3449; ARG 1 pos ARG 2 feature @@ -26,13 +19,7 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 3 structureStart ARG 4 holder METHOD method_27834 shouldGenerateStructures ()Z - METHOD method_28386 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3443;)Z - ARG 1 piece - METHOD method_28388 getStructureAt (Lnet/minecraft/class_2338;ZLnet/minecraft/class_3195;)Lnet/minecraft/class_3449; + METHOD method_28388 getStructureAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; ARG 1 pos - ARG 2 matchChildren - ARG 3 feature - METHOD method_28389 (ZLnet/minecraft/class_2338;Lnet/minecraft/class_3449;)Z - ARG 2 structureStart METHOD method_29951 forRegion (Lnet/minecraft/class_3233;)Lnet/minecraft/class_5138; ARG 1 region diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index e5da4853e5..483c830666 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -9,14 +9,13 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver FIELD field_24831 codec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 configCodec - METHOD method_12702 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Ljava/util/BitSet;)Z + METHOD method_12702 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Lnet/minecraft/class__6643;)Z ARG 1 context ARG 2 config ARG 3 chunk ARG 4 posToBiome ARG 5 random ARG 7 pos - ARG 8 carvingMask METHOD method_12704 register (Ljava/lang/String;Lnet/minecraft/class_2939;)Lnet/minecraft/class_2939; ARG 0 name ARG 1 carver @@ -33,17 +32,11 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_12710 getBranchFactor ()I - METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_6350;Lorg/apache/commons/lang3/mutable/MutableBoolean;)Z + METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class__6643;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_6350;Lorg/apache/commons/lang3/mutable/MutableBoolean;)Z ARG 1 context ARG 2 config ARG 3 chunk ARG 4 posToBiome - ARG 5 carvingMask - ARG 6 random - ARG 7 pos - ARG 8 downPos - ARG 9 sampler - ARG 10 foundSurface METHOD method_28614 configure (Lnet/minecraft/class_5871;)Lnet/minecraft/class_2922; ARG 1 config METHOD method_28616 getCodec ()Lcom/mojang/serialization/Codec; @@ -54,27 +47,10 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 5 branchIndex ARG 6 branchCount ARG 7 baseWidth - METHOD method_33977 isRegionUncarvable (Lnet/minecraft/class_2791;IIIIII)Z - ARG 1 chunk - ARG 2 minX - ARG 3 maxX - ARG 4 minY - ARG 5 maxY - ARG 6 minZ - ARG 7 maxZ - METHOD method_33978 carveRegion (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDDDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)Z + METHOD method_33978 carveRegion (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_6350;DDDDDLnet/minecraft/class__6643;Lnet/minecraft/class_2939$class_5874;)Z ARG 1 context ARG 2 config ARG 4 posToBiome - ARG 5 seed - ARG 7 sampler - ARG 8 x - ARG 10 y - ARG 12 z - ARG 14 horizontalScale - ARG 16 verticalScale - ARG 18 carvingMask - ARG 19 skipPredicate METHOD method_33980 isDebug (Lnet/minecraft/class_5871;)Z ARG 0 config METHOD method_36417 getDebugState (Lnet/minecraft/class_5871;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping index 4f080ebb94..2a311a1a54 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping @@ -1,18 +1,10 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver - METHOD method_12674 carveCave (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDFDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V + METHOD method_12674 carveCave (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_6350;DDDFDLnet/minecraft/class__6643;Lnet/minecraft/class_2939$class_5874;)V ARG 1 context ARG 2 config ARG 3 chunk ARG 4 posToBiome - ARG 5 seed - ARG 8 x - ARG 10 y - ARG 12 z - ARG 14 yaw - ARG 15 yawPitchRatio - ARG 17 carvingMask - ARG 18 skipPredicate - METHOD method_12675 carveTunnels (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDDDFFFIIDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V + METHOD method_12675 carveTunnels (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDDDFFFIIDLnet/minecraft/class__6643;Lnet/minecraft/class_2939$class_5874;)V ARG 1 context ARG 2 config ARG 3 chunk @@ -29,7 +21,6 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver ARG 21 branchStartIndex ARG 22 branchCount ARG 23 yawPitchRatio - ARG 25 carvingMask ARG 26 skipPredicate METHOD method_16576 getTunnelSystemWidth (Ljava/util/Random;)F ARG 1 random diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping index de18d7e0d8..f22e0a190c 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping @@ -7,13 +7,12 @@ CLASS net/minecraft/class_2922 net/minecraft/world/gen/carver/ConfiguredCarver METHOD (Lnet/minecraft/class_2939;Lnet/minecraft/class_5871;)V ARG 1 carver ARG 2 config - METHOD method_12668 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Ljava/util/BitSet;)Z + METHOD method_12668 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Lnet/minecraft/class__6643;)Z ARG 1 context ARG 2 chunk ARG 3 posToBiome ARG 4 random ARG 6 pos - ARG 7 carvingMask METHOD method_12669 shouldCarve (Ljava/util/Random;)Z ARG 1 random METHOD method_30378 getConfig ()Lnet/minecraft/class_5871; diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping index 8e2646598d..d4155d13d1 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping @@ -1,12 +1,11 @@ CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver - FIELD field_29052 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_33960 getVerticalScale (Lnet/minecraft/class_5869;Ljava/util/Random;DFF)D ARG 1 config ARG 2 random ARG 3 pitch ARG 5 branchCount ARG 6 branchIndex - METHOD method_33961 carveRavine (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDFFFIIDLjava/util/BitSet;)V + METHOD method_33961 carveRavine (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDFFFIIDLnet/minecraft/class__6643;)V ARG 1 context ARG 2 config ARG 3 chunk @@ -21,7 +20,6 @@ CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver ARG 17 branchStartIndex ARG 18 branchCount ARG 19 yawPitchRatio - ARG 21 carvingMask METHOD method_33964 isPositionExcluded (Lnet/minecraft/class_5873;[FDDDI)Z ARG 1 context ARG 2 horizontalStretchFactors diff --git a/mappings/net/minecraft/world/gen/carver/UnderwaterCanyonCarver.mapping b/mappings/net/minecraft/world/gen/carver/UnderwaterCanyonCarver.mapping deleted file mode 100644 index e4a951e340..0000000000 --- a/mappings/net/minecraft/world/gen/carver/UnderwaterCanyonCarver.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6330 net/minecraft/world/gen/carver/UnderwaterCanyonCarver diff --git a/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping deleted file mode 100644 index e70ab2f819..0000000000 --- a/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_6331 net/minecraft/world/gen/carver/UnderwaterCaveCarver - METHOD method_36215 carve (Lnet/minecraft/class_2939;Lnet/minecraft/class_2791;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_6350;)Z - ARG 0 carver - ARG 1 chunk - ARG 2 random - ARG 3 pos - ARG 4 downPos - ARG 5 sampler diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index e732a39cd9..a1f1fb6775 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -66,7 +66,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti ARG 0 structuresConfig ARG 1 defaultBlock ARG 2 defaultFluid - METHOD method_30643 createSurfaceSettings (Lnet/minecraft/class_5311;Z)Lnet/minecraft/class_5284; + METHOD method_30643 createSurfaceSettings (Lnet/minecraft/class_5311;ZZ)Lnet/minecraft/class_5284; ARG 0 structuresConfig ARG 1 amplified METHOD method_30644 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)Lnet/minecraft/class_5284; diff --git a/mappings/net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig.mapping deleted file mode 100644 index 8555fc04cb..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_6618 net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig - FIELD comp_121 allowed Ljava/util/List; - FIELD comp_122 disallowed Ljava/util/List; - FIELD comp_123 offset Lnet/minecraft/class_2338; - FIELD field_34935 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_121 allowed ()Ljava/util/List; - METHOD comp_122 disallowed ()Ljava/util/List; - METHOD comp_123 offset ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping b/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping index 73eae380e9..2f9112ca7a 100644 --- a/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping +++ b/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_5444 net/minecraft/world/gen/decorator/DecoratorContex METHOD (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;)V ARG 1 world ARG 2 generator - METHOD method_30459 getOrCreateCarvingMask (Lnet/minecraft/class_1923;Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; + METHOD method_30459 getOrCreateCarvingMask (Lnet/minecraft/class_1923;Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class__6643; ARG 1 chunkPos ARG 2 carver METHOD method_30460 getTopY (Lnet/minecraft/class_2902$class_2903;II)I diff --git a/mappings/net/minecraft/world/gen/decorator/Spread32AboveDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/Spread32AboveDecorator.mapping deleted file mode 100644 index 0749778dfc..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/Spread32AboveDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3245 net/minecraft/world/gen/decorator/Spread32AboveDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping deleted file mode 100644 index 6d4cf123f7..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5448 net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping index 15895dc201..e412fc5314 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping @@ -44,10 +44,7 @@ CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeature FIELD field_26158 HEIGHTMAP Lnet/minecraft/class_3243; FIELD field_26159 TOP_SOLID_HEIGHTMAP Lnet/minecraft/class_3243; FIELD field_26160 HEIGHTMAP_WORLD_SURFACE Lnet/minecraft/class_3243; - FIELD field_26161 HEIGHTMAP_SPREAD_DOUBLE Lnet/minecraft/class_3243; - FIELD field_26164 SPREAD_32_ABOVE Lnet/minecraft/class_3243; FIELD field_26165 SQUARE_HEIGHTMAP Lnet/minecraft/class_3243; - FIELD field_26166 SQUARE_HEIGHTMAP_SPREAD_DOUBLE Lnet/minecraft/class_3243; FIELD field_26167 SQUARE_TOP_SOLID_HEIGHTMAP Lnet/minecraft/class_3243; FIELD field_28956 BOTTOM_TO_TOP Lnet/minecraft/class_2997; FIELD field_28957 BOTTOM_TO_TOP_OFFSET_10 Lnet/minecraft/class_2997; diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 647dad67f7..4986acbe6a 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -130,7 +130,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_28439 addAncientDebris (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder - METHOD method_30578 addMonsters (Lnet/minecraft/class_5483$class_5496;III)V + METHOD method_30578 addMonsters (Lnet/minecraft/class_5483$class_5496;IIIZ)V ARG 0 builder ARG 1 zombieWeight ARG 2 zombieVillagerWeight diff --git a/mappings/net/minecraft/world/gen/feature/DefaultFlowerFeature.mapping b/mappings/net/minecraft/world/gen/feature/DefaultFlowerFeature.mapping deleted file mode 100644 index 1bdd732805..0000000000 --- a/mappings/net/minecraft/world/gen/feature/DefaultFlowerFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3001 net/minecraft/world/gen/feature/DefaultFlowerFeature diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index f190dd08fc..75033936d7 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature FIELD field_13526 BONUS_CHEST Lnet/minecraft/class_2953; FIELD field_13567 SEAGRASS Lnet/minecraft/class_3168; - FIELD field_21219 FLOWER Lnet/minecraft/class_4624; + FIELD field_21219 FLOWER Lnet/minecraft/class_3031; FIELD field_24837 codec Lcom/mojang/serialization/Codec; - FIELD field_26361 NO_BONEMEAL_FLOWER Lnet/minecraft/class_4624; + FIELD field_26361 NO_BONEMEAL_FLOWER Lnet/minecraft/class_3031; METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 configCodec METHOD method_13150 register (Ljava/lang/String;Lnet/minecraft/class_3031;)Lnet/minecraft/class_3031; diff --git a/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping b/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping deleted file mode 100644 index 5f5f8ade7d..0000000000 --- a/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_4624 net/minecraft/world/gen/feature/FlowerFeature - METHOD method_13175 getFlowerState (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Lnet/minecraft/class_2680; - ARG 1 random - ARG 2 pos - ARG 3 config - METHOD method_23369 isPosValid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z - ARG 1 world - ARG 2 pos - ARG 3 config - METHOD method_23370 getFlowerAmount (Lnet/minecraft/class_3037;)I - ARG 1 config - METHOD method_23371 getPos (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Lnet/minecraft/class_2338; - ARG 1 random - ARG 2 pos - ARG 3 config diff --git a/mappings/net/minecraft/world/gen/feature/GrowingPlantFeature.mapping b/mappings/net/minecraft/world/gen/feature/GrowingPlantFeature.mapping deleted file mode 100644 index 45656259cd..0000000000 --- a/mappings/net/minecraft/world/gen/feature/GrowingPlantFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5920 net/minecraft/world/gen/feature/GrowingPlantFeature diff --git a/mappings/net/minecraft/world/gen/feature/GrowingPlantFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/GrowingPlantFeatureConfig.mapping deleted file mode 100644 index 92bafd524d..0000000000 --- a/mappings/net/minecraft/world/gen/feature/GrowingPlantFeatureConfig.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_5924 net/minecraft/world/gen/feature/GrowingPlantFeatureConfig - FIELD field_29259 CODEC Lcom/mojang/serialization/Codec; - FIELD field_29260 heightDistribution Lnet/minecraft/class_6005; - FIELD field_29261 direction Lnet/minecraft/class_2350; - FIELD field_29262 bodyProvider Lnet/minecraft/class_4651; - FIELD field_29263 headProvider Lnet/minecraft/class_4651; - FIELD field_29264 allowWater Z - METHOD (Lnet/minecraft/class_6005;Lnet/minecraft/class_2350;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Z)V - ARG 1 heightDistribution - ARG 2 direction - ARG 3 bodyProvider - ARG 4 headProvider - ARG 5 allowWater - METHOD method_34324 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping index 156cb08647..c1ceeb9525 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomPatchFeatureConfig.mapping @@ -1,70 +1,6 @@ CLASS net/minecraft/class_4638 net/minecraft/world/gen/feature/RandomPatchFeatureConfig - FIELD field_21237 stateProvider Lnet/minecraft/class_4651; - FIELD field_21238 blockPlacer Lnet/minecraft/class_4629; - FIELD field_21239 whitelist Ljava/util/Set; - FIELD field_21240 blacklist Ljava/util/Set; - FIELD field_21241 tries I - FIELD field_21242 spreadX I - FIELD field_21243 spreadY I - FIELD field_21244 spreadZ I - FIELD field_21245 canReplace Z - FIELD field_21246 project Z - FIELD field_21247 needsWater Z + FIELD comp_149 tries I FIELD field_24902 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4629;Ljava/util/List;Ljava/util/List;IIIIZZZ)V - ARG 1 stateProvider - ARG 2 blockPlacer - ARG 3 whitelist + METHOD (IIILjava/util/Set;Ljava/util/Set;ZLjava/util/function/Supplier;)V ARG 4 blacklist - ARG 5 tries - ARG 6 spreadX - ARG 7 spreadY - ARG 8 spreadZ - ARG 9 canReplace - ARG 10 project - ARG 11 needsWater - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4629;Ljava/util/Set;Ljava/util/Set;IIIIZZZ)V - ARG 1 stateProvider - ARG 2 blockPlacer - ARG 3 whitelist - ARG 4 blacklist - ARG 5 tries - ARG 6 spreadX - ARG 7 spreadY - ARG 8 spreadZ - ARG 9 canReplace - ARG 10 project - ARG 11 needsWater - METHOD method_28756 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - CLASS class_4639 Builder - FIELD field_21248 stateProvider Lnet/minecraft/class_4651; - FIELD field_21249 blockPlacer Lnet/minecraft/class_4629; - FIELD field_21250 whitelist Ljava/util/Set; - FIELD field_21251 blacklist Ljava/util/Set; - FIELD field_21252 tries I - FIELD field_21253 spreadX I - FIELD field_21254 spreadY I - FIELD field_21255 spreadZ I - FIELD field_21256 canReplace Z - FIELD field_21257 project Z - FIELD field_21258 needsWater Z - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4629;)V - ARG 1 stateProvider - ARG 2 blockPlacer - METHOD method_23416 canReplace ()Lnet/minecraft/class_4638$class_4639; - METHOD method_23417 tries (I)Lnet/minecraft/class_4638$class_4639; - ARG 1 tries - METHOD method_23418 whitelist (Ljava/util/Set;)Lnet/minecraft/class_4638$class_4639; - ARG 1 whitelist - METHOD method_23419 cannotProject ()Lnet/minecraft/class_4638$class_4639; - METHOD method_23420 spreadX (I)Lnet/minecraft/class_4638$class_4639; - ARG 1 spreadX - METHOD method_23421 blacklist (Ljava/util/Set;)Lnet/minecraft/class_4638$class_4639; - ARG 1 blacklist - METHOD method_23422 needsWater ()Lnet/minecraft/class_4638$class_4639; - METHOD method_23423 spreadY (I)Lnet/minecraft/class_4638$class_4639; - ARG 1 spreadY - METHOD method_23424 build ()Lnet/minecraft/class_4638; - METHOD method_23425 spreadZ (I)Lnet/minecraft/class_4638$class_4639; - ARG 1 spreadZ + METHOD comp_149 tries ()I diff --git a/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping index 3b6858a5c2..80733d7e24 100644 --- a/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping @@ -1,15 +1,6 @@ CLASS net/minecraft/class_3175 net/minecraft/world/gen/feature/SimpleBlockFeatureConfig - FIELD field_13805 placeIn Ljava/util/List; - FIELD field_13806 placeUnder Ljava/util/List; - FIELD field_13807 toPlace Lnet/minecraft/class_4651; - FIELD field_13808 placeOn Ljava/util/List; + FIELD comp_156 toPlace Lnet/minecraft/class_4651; FIELD field_24909 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_4651;)V ARG 1 toPlace - METHOD (Lnet/minecraft/class_4651;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V - ARG 1 toPlace - ARG 2 placeOn - ARG 3 placeIn - ARG 4 placeUnder - METHOD method_28784 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance + METHOD comp_156 toPlace ()Lnet/minecraft/class_4651; diff --git a/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping b/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping deleted file mode 100644 index 019a02ea70..0000000000 --- a/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_4629 net/minecraft/world/gen/placer/BlockPlacer - FIELD field_24865 TYPE_CODEC Lcom/mojang/serialization/Codec; - METHOD method_23403 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)V - ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 random - METHOD method_28673 getType ()Lnet/minecraft/class_4630; diff --git a/mappings/net/minecraft/world/gen/placer/BlockPlacerType.mapping b/mappings/net/minecraft/world/gen/placer/BlockPlacerType.mapping deleted file mode 100644 index e67b48566c..0000000000 --- a/mappings/net/minecraft/world/gen/placer/BlockPlacerType.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_4630 net/minecraft/world/gen/placer/BlockPlacerType - FIELD field_24866 codec Lcom/mojang/serialization/Codec; - METHOD (Lcom/mojang/serialization/Codec;)V - ARG 1 codec - METHOD method_23405 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_4630; - ARG 0 id - ARG 1 codec - METHOD method_28674 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping b/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping deleted file mode 100644 index e1e102a181..0000000000 --- a/mappings/net/minecraft/world/gen/placer/ColumnPlacer.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_4631 net/minecraft/world/gen/placer/ColumnPlacer - FIELD field_24867 CODEC Lcom/mojang/serialization/Codec; - FIELD field_33515 size Lnet/minecraft/class_6017; - METHOD (Lnet/minecraft/class_6017;)V - ARG 1 size - METHOD method_28676 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/placer/DoublePlantPlacer.mapping b/mappings/net/minecraft/world/gen/placer/DoublePlantPlacer.mapping deleted file mode 100644 index a29f81260a..0000000000 --- a/mappings/net/minecraft/world/gen/placer/DoublePlantPlacer.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4632 net/minecraft/world/gen/placer/DoublePlantPlacer - FIELD field_24868 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24869 INSTANCE Lnet/minecraft/class_4632; diff --git a/mappings/net/minecraft/world/gen/placer/SimpleBlockPlacer.mapping b/mappings/net/minecraft/world/gen/placer/SimpleBlockPlacer.mapping deleted file mode 100644 index 2ae80d74e1..0000000000 --- a/mappings/net/minecraft/world/gen/placer/SimpleBlockPlacer.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4633 net/minecraft/world/gen/placer/SimpleBlockPlacer - FIELD field_24870 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24871 INSTANCE Lnet/minecraft/class_4633; diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 73e778a9e3..1483db0a68 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -29,11 +29,6 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_27430 createDetails ()Lnet/minecraft/class_2561; METHOD method_29586 getVersionInfo ()Lnet/minecraft/class_5315; METHOD method_33405 getConversionWarning ()Lnet/minecraft/class_34$class_5781; - METHOD method_33783 hasIncompatibleWorldHeight ()Z - COMMENT Returns whether the level is from a version after the world height was changed to -64 to 320. - COMMENT - COMMENT

This corresponds to world versions {@code 2693} to {@code 2706}, or - COMMENT game versions 21w06a to 21w14a. METHOD method_33784 isUnavailable ()Z METHOD method_35505 getLevelInfo ()Lnet/minecraft/class_1940; METHOD method_38496 isVersionAvailable ()Z