diff --git a/build.gradle b/build.gradle index 58e435cd8b..aeea93f1ad 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w42a" +def minecraft_version = "23w43a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/AbstractGlassBlock.mapping b/mappings/net/minecraft/block/AbstractGlassBlock.mapping deleted file mode 100644 index 49b7800252..0000000000 --- a/mappings/net/minecraft/block/AbstractGlassBlock.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4262 net/minecraft/block/AbstractGlassBlock diff --git a/mappings/net/minecraft/block/Degradable.mapping b/mappings/net/minecraft/block/Degradable.mapping index 7c66608830..ee34b05443 100644 --- a/mappings/net/minecraft/block/Degradable.mapping +++ b/mappings/net/minecraft/block/Degradable.mapping @@ -3,16 +3,4 @@ CLASS net/minecraft/class_5547 net/minecraft/block/Degradable METHOD method_31639 getDegradationResult (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 1 state METHOD method_33620 getDegradationChanceMultiplier ()F - METHOD method_33621 tickDegradation (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 random METHOD method_33622 getDegradationLevel ()Ljava/lang/Enum; - METHOD method_33623 tryDegrade (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 random - METHOD method_34726 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 2 statex diff --git a/mappings/net/minecraft/block/GlassBlock.mapping b/mappings/net/minecraft/block/GlassBlock.mapping deleted file mode 100644 index 89a2e25e33..0000000000 --- a/mappings/net/minecraft/block/GlassBlock.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_2368 net/minecraft/block/GlassBlock - FIELD field_46361 CODEC Lcom/mojang/serialization/MapCodec; diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping index 4551691b6b..4aac54230c 100644 --- a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping @@ -12,10 +12,10 @@ CLASS net/minecraft/class_7941 net/minecraft/client/gui/screen/option/TelemetryE ARG 3 width ARG 4 height ARG 5 textRenderer - METHOD method_47635 appendEventInfo (Lnet/minecraft/class_7941$class_7943;Lnet/minecraft/class_7966;)V + METHOD method_47635 appendEventInfo (Lnet/minecraft/class_7941$class_7943;Lnet/minecraft/class_7966;Z)V ARG 1 builder ARG 2 eventType - METHOD method_47636 appendProperties (Lnet/minecraft/class_7966;Lnet/minecraft/class_7941$class_7943;)V + METHOD method_47636 appendProperties (Lnet/minecraft/class_7966;Lnet/minecraft/class_7941$class_7943;Z)V ARG 1 eventType ARG 2 builder METHOD method_47637 setScrollConsumer (Ljava/util/function/DoubleConsumer;)V diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping index 6980143d32..b2e24a2935 100644 --- a/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping @@ -19,13 +19,10 @@ CLASS net/minecraft/class_7944 net/minecraft/client/gui/screen/option/TelemetryI ARG 2 right METHOD method_47648 goBack (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_47649 (Ljava/lang/Boolean;)V - ARG 1 value METHOD method_47650 openFeedbackPage (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_47651 openLogDirectory (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_47653 createOptInButton ()Lnet/minecraft/class_339; METHOD method_48286 (Lnet/minecraft/class_7944;Lnet/minecraft/class_364;)V ARG 1 child METHOD method_52765 openPrivacyStatementPage (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping b/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping index 0880fd1fb1..feca4a6f11 100644 --- a/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping @@ -1,24 +1,11 @@ CLASS net/minecraft/class_4286 net/minecraft/client/gui/widget/CheckboxWidget FIELD field_19230 checked Z - FIELD field_24253 showMessage Z FIELD field_32181 TEXT_COLOR I FIELD field_45348 SELECTED_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; FIELD field_45349 SELECTED_TEXTURE Lnet/minecraft/class_2960; FIELD field_45350 HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; FIELD field_45351 TEXTURE Lnet/minecraft/class_2960; - METHOD (IIIILnet/minecraft/class_2561;Z)V + METHOD (IILnet/minecraft/class_2561;Lnet/minecraft/class_327;ZLnet/minecraft/class_4286$class_8930;)V ARG 1 x ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 message - ARG 6 checked - METHOD (IIIILnet/minecraft/class_2561;ZZ)V - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 message - ARG 6 checked - ARG 7 showMessage METHOD method_20372 isChecked ()Z diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 0e910450b2..ab8de9a24e 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -77,10 +77,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 2 realmsServer METHOD method_25001 isOwnedNotExpired (Lnet/minecraft/class_4877;)Z ARG 1 serverData - METHOD method_31172 (Lnet/minecraft/class_4877;Lnet/minecraft/class_4325$class_4866;)Z - ARG 1 child - METHOD method_31174 removeServer (Lnet/minecraft/class_4877;)V - ARG 1 serverData METHOD method_38503 findServer ()Lnet/minecraft/class_4877; METHOD method_38504 (Lnet/minecraft/class_4877;Z)V ARG 2 confirmed diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 1051e48d40..4f6123eba7 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -90,7 +90,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4024 postProcessor Lnet/minecraft/class_279; FIELD field_4025 viewDistance F FIELD field_4026 mapRenderer Lnet/minecraft/class_330; - FIELD field_4027 ticks I FIELD field_4028 lightmapTextureManager Lnet/minecraft/class_765; FIELD field_4029 floatingItemWidth F FIELD field_42515 renderTypeTextBackgroundProgram Lnet/minecraft/class_5944; diff --git a/mappings/net/minecraft/client/render/RenderTickCounter.mapping b/mappings/net/minecraft/client/render/RenderTickCounter.mapping index 148b08a7ba..bc4ba21612 100644 --- a/mappings/net/minecraft/client/render/RenderTickCounter.mapping +++ b/mappings/net/minecraft/client/render/RenderTickCounter.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_317 net/minecraft/client/render/RenderTickCounter FIELD field_1969 lastFrameDuration F FIELD field_1970 tickDelta F FIELD field_1971 prevTimeMillis J - METHOD (FJ)V + METHOD (FJLit/unimi/dsi/fastutil/floats/FloatUnaryOperator;)V ARG 1 tps ARG 2 timeMillis METHOD method_1658 beginRenderTick (J)I diff --git a/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping index 06ce940853..a18da0b070 100644 --- a/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping @@ -40,6 +40,4 @@ CLASS net/minecraft/class_553 net/minecraft/client/render/entity/model/BatEntity FIELD field_3322 rightWing Lnet/minecraft/class_630; FIELD field_3323 body Lnet/minecraft/class_630; FIELD field_3324 leftWingTip Lnet/minecraft/class_630; - METHOD (Lnet/minecraft/class_630;)V - ARG 1 root METHOD method_31980 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index e2cb31c6c0..75b3549c29 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -21,7 +21,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_37952 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;IILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V ARG 1 networkHandler - ARG 2 properties ARG 3 registryRef ARG 4 dimensionTypeEntry ARG 5 loadDistance diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index 2a64d25b40..97089cb636 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -564,8 +564,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato FIELD field_22838 baseModelId Lnet/minecraft/class_2960; FIELD field_28553 knownModels Ljava/util/Map; FIELD field_28554 family Lnet/minecraft/class_5794; - METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_4944;)V - ARG 2 textures METHOD method_25716 button (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 buttonBlock METHOD method_25717 sign (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; @@ -585,8 +583,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 block METHOD method_25725 stairs (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 block - METHOD method_32230 same ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; - ARG 1 blocks METHOD method_33521 (Lnet/minecraft/class_5794$class_5796;Lnet/minecraft/class_2248;)V ARG 1 variant ARG 2 block diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index dd30cb616f..2662b767cf 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -558,8 +558,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 delta METHOD method_31166 getClientCameraPosVec (F)Lnet/minecraft/class_243; ARG 1 tickDelta - METHOD method_31469 (Lnet/minecraft/class_1297;)Z - ARG 0 entity METHOD method_31471 onSpawnPacket (Lnet/minecraft/class_2604;)V COMMENT Called on the client when the entity receives a spawn packet. COMMENT diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index e2d80c5633..982a86354d 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -150,10 +150,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 1 commandBlockExecutor METHOD method_7259 incrementStat (Lnet/minecraft/class_3445;)V ARG 1 stat - METHOD method_7260 increaseRidingMotionStats (DDD)V - ARG 1 dx - ARG 3 dy - ARG 5 dz METHOD method_7261 getAttackCooldownProgress (F)F ARG 1 baseTime METHOD method_7262 dropShoulderEntities ()V @@ -188,10 +184,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7279 getAttackCooldownProgressPerTick ()F METHOD method_7281 incrementStat (Lnet/minecraft/class_2960;)V ARG 1 stat - METHOD method_7282 increaseTravelMotionStats (DDD)V - ARG 1 dx - ARG 3 dy - ARG 5 dz METHOD method_7283 setMainArm (Lnet/minecraft/class_1306;)V ARG 1 arm METHOD method_7284 disableShield (Z)V diff --git a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping index 4adfd1a3af..9a92928169 100644 --- a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping @@ -6,12 +6,12 @@ CLASS net/minecraft/class_1667 net/minecraft/entity/projectile/ArrowEntity FIELD field_7596 colorSet Z FIELD field_7597 potion Lnet/minecraft/class_1842; FIELD field_7598 effects Ljava/util/Set; - METHOD (Lnet/minecraft/class_1937;DDD)V + METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V ARG 1 world ARG 2 x ARG 4 y ARG 6 z - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V ARG 1 world ARG 2 owner METHOD method_7459 initFromStack (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index 6a6b8c287a..b87673fca6 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -15,13 +15,13 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject FIELD field_7588 inGround Z FIELD field_7589 PIERCE_LEVEL Lnet/minecraft/class_2940; FIELD field_7590 piercedEntities Lit/unimi/dsi/fastutil/ints/IntOpenHashSet; - METHOD (Lnet/minecraft/class_1299;DDDLnet/minecraft/class_1937;)V + METHOD (Lnet/minecraft/class_1299;DDDLnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V ARG 1 type ARG 2 x ARG 4 y ARG 6 z ARG 8 world - METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;)V + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V ARG 1 type ARG 2 owner ARG 3 world diff --git a/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping index 686743bacf..27737a741c 100644 --- a/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_1679 net/minecraft/entity/projectile/SpectralArrowEntity FIELD field_7636 duration I - METHOD (Lnet/minecraft/class_1937;DDD)V + METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V ARG 1 world ARG 2 x ARG 4 y ARG 6 z - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V ARG 1 world ARG 2 owner diff --git a/mappings/net/minecraft/entity/projectile/TridentEntity.mapping b/mappings/net/minecraft/entity/projectile/TridentEntity.mapping index f7c91e1d30..ec279aaddd 100644 --- a/mappings/net/minecraft/entity/projectile/TridentEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/TridentEntity.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1685 net/minecraft/entity/projectile/TridentEntity FIELD field_7647 LOYALTY Lnet/minecraft/class_2940; FIELD field_7648 dealtDamage Z FIELD field_7649 returnTimer I - FIELD field_7650 tridentStack Lnet/minecraft/class_1799; METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V ARG 1 world ARG 2 owner diff --git a/mappings/net/minecraft/item/AxeItem.mapping b/mappings/net/minecraft/item/AxeItem.mapping index de0c02981b..c61f879695 100644 --- a/mappings/net/minecraft/item/AxeItem.mapping +++ b/mappings/net/minecraft/item/AxeItem.mapping @@ -11,5 +11,3 @@ CLASS net/minecraft/class_1743 net/minecraft/item/AxeItem ARG 1 state METHOD method_34717 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; ARG 1 block - METHOD method_34718 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; - ARG 1 block diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping index 719d1fb4a5..7b0eb81666 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3753 net/minecraft/network/packet/c2s/play/UpdateJigsa FIELD field_16566 target Lnet/minecraft/class_2960; FIELD field_23401 pool Lnet/minecraft/class_2960; FIELD field_23402 jointType Lnet/minecraft/class_3751$class_4991; - METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_3751$class_4991;)V + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_3751$class_4991;II)V ARG 1 pos ARG 2 name ARG 3 target diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index c02685a098..f60c47d865 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -21,7 +21,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_17439 worldGenerationProgressListenerFactory Lnet/minecraft/class_3950; FIELD field_17601 serverId Ljava/lang/String; FIELD field_17704 DEMO_LEVEL_INFO Lnet/minecraft/class_1940; - FIELD field_19248 nextTickTimestamp J FIELD field_19249 waitingForNextTick Z FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565; FIELD field_22250 recorder Lnet/minecraft/class_5962; @@ -31,10 +30,8 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_24372 saveProperties Lnet/minecraft/class_5219; FIELD field_25132 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897; - FIELD field_33205 MILLISECONDS_PER_TICK J FIELD field_33210 START_TICKET_CHUNK_RADIUS I FIELD field_33211 MAX_WORLD_BORDER_RADIUS I - FIELD field_33217 PLAYER_SAMPLE_UPDATE_INTERVAL J FIELD field_33219 START_TICKET_CHUNKS I FIELD field_33975 recorderResultConsumer Ljava/util/function/Consumer; FIELD field_33976 recorderDumpConsumer Ljava/util/function/Consumer; @@ -58,7 +55,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4552 keyPair Ljava/security/KeyPair; FIELD field_4554 flightEnabled Z FIELD field_4555 serverPort I - FIELD field_4557 lastTimeReference J FIELD field_4558 scoreboard Lnet/minecraft/class_2995; FIELD field_4560 preventProxyConnections Z FIELD field_4561 stopped Z @@ -66,14 +62,11 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4564 motd Ljava/lang/String; FIELD field_4568 serverGuiTickables Ljava/util/List; FIELD field_4570 enforceWhitelist Z - FIELD field_4571 timeReference J FIELD field_4572 ticks I - FIELD field_4573 lastTickLengths [J FIELD field_4585 serverIp Ljava/lang/String; FIELD field_4587 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_4589 worlds Ljava/util/Map; FIELD field_4591 commandFunctionManager Lnet/minecraft/class_2991; - FIELD field_4592 tickTime F FIELD field_4593 metadata Lnet/minecraft/class_2926; FIELD field_4595 dataPackManager Lnet/minecraft/class_3283; FIELD field_4596 playerIdleTimeout I @@ -88,7 +81,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 5 proxy ARG 6 dataFixer ARG 7 apiServices - ARG 8 worldGenerationProgressListenerFactory METHOD method_16043 isStopping ()Z METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16208 runTasksTillTickEnd ()V @@ -252,7 +244,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 waitForShutdown COMMENT whether to wait for server shutdown, if called outside the server thread METHOD method_3748 tick (Ljava/util/function/BooleanSupplier;)V - ARG 1 shouldKeepTicking METHOD method_3749 getMaxWorldBorderRadius ()I METHOD method_3750 isStopped ()Z METHOD method_3754 isHardcore ()Z @@ -337,7 +328,6 @@ CLASS net/minecraft/server/MinecraftServer COMMENT @see net.minecraft.server.network.ServerLoginNetworkHandler METHOD method_3829 getSpawnRadius (Lnet/minecraft/class_3218;)I ARG 1 world - METHOD method_3830 getTickTime ()F METHOD method_3831 getRunDirectory ()Ljava/io/File; METHOD method_3832 startDebug ()V METHOD method_3834 setMotd (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping index 64234ed0e1..ca94f22846 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_3178 net/minecraft/server/dedicated/DedicatedServerWatchdog FIELD field_13823 server Lnet/minecraft/class_3176; - FIELD field_13824 maxTickTime J FIELD field_13825 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_3176;)V ARG 1 server diff --git a/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping b/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping index cd304337ef..5659fddf00 100644 --- a/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping +++ b/mappings/net/minecraft/server/dedicated/gui/PlayerStatsGui.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_3186 net/minecraft/server/dedicated/gui/PlayerStatsGui FIELD field_16858 timer Ljavax/swing/Timer; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 1 server - METHOD method_13980 average ([J)D - ARG 1 values METHOD method_13982 update ()V METHOD method_13983 (Ljava/awt/event/ActionEvent;)V ARG 1 event diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index bb3f39ea72..497972e74f 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -310,8 +310,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT the classifier that determines the category of any item METHOD method_31418 getLightningRodPos (Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 1 pos - METHOD method_31420 (Lnet/minecraft/class_3695;Lnet/minecraft/class_1297;)V - ARG 2 entity METHOD method_31421 (Lnet/minecraft/class_6880;)Z ARG 0 poiType METHOD method_31423 loadEntities (Ljava/util/stream/Stream;)V diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping index de2245a532..6fcb201757 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -44,20 +44,23 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe METHOD method_45548 (Lnet/minecraft/class_5321;)Ljava/lang/String; ARG 0 key CLASS class_4181 ShapedPoolStructurePiece - FIELD field_18696 piece Lnet/minecraft/class_3790; - FIELD field_18697 pieceShape Lorg/apache/commons/lang3/mutable/MutableObject; - FIELD field_18699 currentSize I + FIELD comp_2017 piece Lnet/minecraft/class_3790; + FIELD comp_2018 pieceShape Lorg/apache/commons/lang3/mutable/MutableObject; + FIELD comp_2019 currentSize I METHOD (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;I)V ARG 1 piece ARG 2 pieceShape ARG 3 currentSize + METHOD comp_2017 piece ()Lnet/minecraft/class_3790; + METHOD comp_2018 pieceShape ()Lorg/apache/commons/lang3/mutable/MutableObject; + METHOD comp_2019 currentSize ()I CLASS class_4182 StructurePoolGenerator FIELD field_18700 maxSize I FIELD field_18702 chunkGenerator Lnet/minecraft/class_2794; FIELD field_18703 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_18704 children Ljava/util/List; FIELD field_18705 random Lnet/minecraft/class_5819; - FIELD field_18706 structurePieces Ljava/util/Deque; + FIELD field_18706 structurePieces Lnet/minecraft/class_8917; FIELD field_25852 registry Lnet/minecraft/class_2378; METHOD (Lnet/minecraft/class_2378;ILnet/minecraft/class_2794;Lnet/minecraft/class_3485;Ljava/util/List;Lnet/minecraft/class_5819;)V ARG 1 registry diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index 729a6f6e42..3aa3c5fbb2 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState ARG 2 rotation ARG 3 world METHOD method_22165 tick ()V - METHOD method_22166 init (Lnet/minecraft/class_2338;I)V + METHOD method_22166 init (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_22167 addListener (Lnet/minecraft/class_4518;)V ARG 1 listener diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 8620c0d458..e18805916b 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -12,10 +12,8 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 2 world METHOD method_22245 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)I ARG 1 posx - METHOD method_22246 clearArea (Lnet/minecraft/class_3341;ILnet/minecraft/class_3218;)V + METHOD method_22246 clearArea (Lnet/minecraft/class_3341;Lnet/minecraft/class_3218;)V ARG 0 area - ARG 1 altitude - ARG 2 world METHOD method_22247 isInStructureBounds (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)Z ARG 0 structureBlockPos ARG 1 pos @@ -27,12 +25,10 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 3 world METHOD method_22249 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 2 structureBlockPos - METHOD method_22250 createStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;ILnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; + METHOD method_22250 createStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; ARG 0 templateName ARG 1 pos ARG 2 rotation - ARG 4 world - ARG 5 interactive METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V ARG 0 testName ARG 1 pos @@ -52,8 +48,7 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 pos ARG 1 radius ARG 2 world - METHOD method_22256 forceLoadNearbyChunks (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V - ARG 0 pos + METHOD method_22256 forceLoadNearbyChunks (Lnet/minecraft/class_3341;Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_22258 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Collection; ARG 0 pos diff --git a/mappings/net/minecraft/test/TeamCityTestCompletionListener.mapping b/mappings/net/minecraft/test/TeamCityTestCompletionListener.mapping deleted file mode 100644 index f12783637b..0000000000 --- a/mappings/net/minecraft/test/TeamCityTestCompletionListener.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_6308 net/minecraft/test/TeamCityTestCompletionListener - FIELD field_33176 LOGGER Lorg/slf4j/Logger; - FIELD field_33177 ESCAPER Lcom/google/common/escape/Escaper; diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index d710148760..718818321e 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -204,9 +204,8 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT {@return the contents of {@code stream} copied to a list and then shuffled} ARG 0 list ARG 1 random - METHOD method_43028 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_5819;)V + METHOD method_43028 shuffle (Ljava/util/List;Lnet/minecraft/class_5819;)V COMMENT Shuffles {@code list}, modifying the passed list in place. - ARG 0 list ARG 1 random METHOD method_43251 shuffle (Ljava/util/stream/IntStream;Lnet/minecraft/class_5819;)Lit/unimi/dsi/fastutil/ints/IntArrayList; COMMENT {@return the contents of {@code stream} copied to a list and then shuffled} diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping index e2d086df9b..c0084f88f5 100644 --- a/mappings/net/minecraft/util/math/Box.mapping +++ b/mappings/net/minecraft/util/math/Box.mapping @@ -24,10 +24,6 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box METHOD (Lnet/minecraft/class_2338;)V COMMENT Creates a box that only contains the given block position. ARG 1 pos - METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V - COMMENT Creates a box of the given positions as corners. - ARG 1 pos1 - ARG 2 pos2 METHOD (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V COMMENT Creates a box of the given positions as corners. ARG 1 pos1