diff --git a/build.gradle b/build.gradle index d34d568864..d79d78f81d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.15.2" +def minecraft_version = "20w06a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index d8efef3f20..b40a9b3982 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChangedCriterion FIELD field_9625 ID Lnet/minecraft/class_2960; - METHOD method_8950 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;)V - ARG 1 player - ARG 2 inventory + METHOD method_8950 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;)V CLASS class_2068 Conditions FIELD field_9629 occupied Lnet/minecraft/class_2096$class_2100; FIELD field_9630 full Lnet/minecraft/class_2096$class_2100; @@ -15,7 +13,6 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan ARG 4 items METHOD method_8957 items ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068; ARG 0 items - METHOD method_8958 matches (Lnet/minecraft/class_1661;)Z - ARG 1 inventory + METHOD method_8958 matches (Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;III)Z METHOD method_8959 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; ARG 0 items diff --git a/mappings/net/minecraft/block/FireBlock.mapping b/mappings/net/minecraft/block/FireBlock.mapping index 9ef1e4b29b..0e5071c33c 100644 --- a/mappings/net/minecraft/block/FireBlock.mapping +++ b/mappings/net/minecraft/block/FireBlock.mapping @@ -26,8 +26,6 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock ARG 2 pos METHOD method_10194 getBurnChance (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)I ARG 2 pos - METHOD method_10195 isFlammable (Lnet/minecraft/class_2680;)Z - ARG 1 blockState METHOD method_10196 trySpreadingFire (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILjava/util/Random;I)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/TorchBlock.mapping b/mappings/net/minecraft/block/TorchBlock.mapping index 3bd48e5233..7e7d64f695 100644 --- a/mappings/net/minecraft/block/TorchBlock.mapping +++ b/mappings/net/minecraft/block/TorchBlock.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_2527 net/minecraft/block/TorchBlock FIELD field_11618 BOUNDING_SHAPE Lnet/minecraft/class_265; - METHOD (Lnet/minecraft/class_2248$class_2251;)V + METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2394;)V ARG 1 settings diff --git a/mappings/net/minecraft/block/WallBlock.mapping b/mappings/net/minecraft/block/WallBlock.mapping index df704fdb20..e9e3f580bf 100644 --- a/mappings/net/minecraft/block/WallBlock.mapping +++ b/mappings/net/minecraft/block/WallBlock.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2544 net/minecraft/block/WallBlock - FIELD field_11716 UP_COLLISION_SHAPES [Lnet/minecraft/class_265; FIELD field_11717 UP Lnet/minecraft/class_2746; - FIELD field_11718 UP_OUTLINE_SHAPES [Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings METHOD method_16704 shouldConnectTo (Lnet/minecraft/class_2680;ZLnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/block/WallTorchBlock.mapping b/mappings/net/minecraft/block/WallTorchBlock.mapping index d12285a420..39c0789581 100644 --- a/mappings/net/minecraft/block/WallTorchBlock.mapping +++ b/mappings/net/minecraft/block/WallTorchBlock.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2555 net/minecraft/block/WallTorchBlock FIELD field_11731 FACING Lnet/minecraft/class_2753; FIELD field_11732 BOUNDING_SHAPES Ljava/util/Map; - METHOD (Lnet/minecraft/class_2248$class_2251;)V + METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2394;)V ARG 1 settings METHOD method_10841 getBoundingShape (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; ARG 0 state diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 0fa460b9ac..9a1c5743fe 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn FIELD field_11982 BOTTOM_SLOTS [I FIELD field_11983 SIDE_SLOTS [I FIELD field_11984 inventory Lnet/minecraft/class_2371; - FIELD field_11986 recipesUsed Ljava/util/Map; + FIELD field_11986 recipesUsed Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; FIELD field_11987 TOP_SLOTS [I FIELD field_11988 cookTimeTotal I FIELD field_11989 cookTime I diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping index 01668c30cd..b1d80404df 100644 --- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping @@ -30,8 +30,6 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity METHOD method_11507 getRenderOffsetZ (F)F ARG 1 tickDelta METHOD method_11508 getSavedWorldTime ()J - METHOD method_11509 getApproximateHeadBox (Ljava/util/List;)Lnet/minecraft/class_238; - ARG 1 boxes METHOD method_11511 getRenderOffsetY (F)F ARG 1 tickDelta METHOD method_11512 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/class_4770.mapping b/mappings/net/minecraft/class_4770.mapping new file mode 100644 index 0000000000..7acbcfa029 --- /dev/null +++ b/mappings/net/minecraft/class_4770.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4770 + METHOD method_10195 isFlammable (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 02a55d1719..3746f80166 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient - FIELD field_16240 profiler Lnet/minecraft/class_3689; + FIELD field_16240 profiler Lnet/minecraft/class_3695; FIELD field_16762 game Lnet/minecraft/class_3799; FIELD field_1686 windowProvider Lnet/minecraft/class_3682; FIELD field_1687 world Lnet/minecraft/class_638; @@ -107,7 +107,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1488 getTickDelta ()F METHOD method_1489 getHeldItemRenderer ()Lnet/minecraft/class_759; METHOD method_1490 stop ()V - METHOD method_1492 drawProfilerResults ()V + METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_3696;)V METHOD method_1493 isPaused ()Z METHOD method_1494 setCrashReport (Lnet/minecraft/class_128;)V METHOD method_1495 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; diff --git a/mappings/net/minecraft/client/gl/JsonGlProgram.mapping b/mappings/net/minecraft/client/gl/JsonGlProgram.mapping index daf5a1ca01..2a23858b0a 100644 --- a/mappings/net/minecraft/client/gl/JsonGlProgram.mapping +++ b/mappings/net/minecraft/client/gl/JsonGlProgram.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonGlProgram FIELD field_1510 uniformByName Ljava/util/Map; FIELD field_1511 uniformStateDirty Z FIELD field_1512 activeProgram Lnet/minecraft/class_280; - FIELD field_1513 useCullFace Z FIELD field_1514 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_1515 uniformData Ljava/util/List; FIELD field_1516 samplerBinds Ljava/util/Map; diff --git a/mappings/net/minecraft/client/particle/WaterSuspendParticle.mapping b/mappings/net/minecraft/client/particle/WaterSuspendParticle.mapping index 3d79f748e1..ade817e840 100644 --- a/mappings/net/minecraft/client/particle/WaterSuspendParticle.mapping +++ b/mappings/net/minecraft/client/particle/WaterSuspendParticle.mapping @@ -3,5 +3,3 @@ CLASS net/minecraft/class_723 net/minecraft/client/particle/WaterSuspendParticle ARG 2 x ARG 4 y ARG 6 z - CLASS class_724 UnderwaterFactory - FIELD field_17879 spriteProvider Lnet/minecraft/class_4002; diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index 7c7a28ce72..5a11b8e275 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -62,8 +62,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase ARG 1 culling CLASS class_4672 DepthTest FIELD field_21391 func I - METHOD (I)V - ARG 1 func CLASS class_4673 DiffuseLighting METHOD (Z)V ARG 1 guiLighting diff --git a/mappings/net/minecraft/client/render/RenderTickCounter.mapping b/mappings/net/minecraft/client/render/RenderTickCounter.mapping index 6772f62db5..148b08a7ba 100644 --- a/mappings/net/minecraft/client/render/RenderTickCounter.mapping +++ b/mappings/net/minecraft/client/render/RenderTickCounter.mapping @@ -3,9 +3,8 @@ 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 - FIELD field_1972 ticksThisFrame I METHOD (FJ)V ARG 1 tps ARG 2 timeMillis - METHOD method_1658 beginRenderTick (J)V + METHOD method_1658 beginRenderTick (J)I ARG 1 timeMillis diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index 91dd65ee11..9b1636cf1c 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers FIELD field_21700 ENTITY_SOLID Lnet/minecraft/class_1921; FIELD field_21701 ENTITY_CUTOUT Lnet/minecraft/class_1921; - FIELD field_21702 ENTITY_TRANSLUCENT Lnet/minecraft/class_1921; FIELD field_21703 ENTITY_TRANSLUCENT_CULL Lnet/minecraft/class_1921; FIELD field_21704 SHULKER_BOXES_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_21705 BEDS_ATLAS_TEXTURE Lnet/minecraft/class_2960; @@ -42,5 +41,4 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers METHOD method_24072 getChest ()Lnet/minecraft/class_1921; METHOD method_24073 getEntitySolid ()Lnet/minecraft/class_1921; METHOD method_24074 getEntityCutout ()Lnet/minecraft/class_1921; - METHOD method_24075 getEntityTranslucent ()Lnet/minecraft/class_1921; METHOD method_24076 getEntityTranslucentCull ()Lnet/minecraft/class_1921; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 472181ce61..32df5dce15 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3730 ticksUntilCaveAmbientSound I FIELD field_3733 scoreboard Lnet/minecraft/class_269; - METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_1940;Lnet/minecraft/class_2874;ILnet/minecraft/class_3695;Lnet/minecraft/class_761;)V + METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_1940;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;)V ARG 2 levelInfo ARG 4 chunkLoadDistance METHOD method_18107 addPlayer (ILnet/minecraft/class_742;)V @@ -48,8 +48,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_23784 reloadColor ()V METHOD method_23785 getCloudsColor (F)Lnet/minecraft/class_243; ARG 1 tickDelta - METHOD method_23786 getFogColor (F)Lnet/minecraft/class_243; - ARG 1 tickDelta METHOD method_23788 getSkyDarknessHeight ()D METHOD method_23789 getLightningTicksLeft ()I METHOD method_2932 addParticle (DDDDDLnet/minecraft/class_2394;)V diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index f1622168fd..2582a4b855 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -6,10 +6,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2066$class_2068; METHOD method_10422 requireEnteringFluid (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039; METHOD method_10423 conditionsFromItemPredicates ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068; - ARG 1 items METHOD method_10425 saveRecipe (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V METHOD method_10426 conditionsFromItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; METHOD method_10427 saveRecipeAdvancement (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V METHOD method_17585 generateCookingRecipes (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_3957;I)V - ARG 2 recipeType - ARG 4 cookTime diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index a6575bf8fb..f651baa3da 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -380,8 +380,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 pos ARG 2 state METHOD method_5713 checkWaterState ()Z - METHOD method_5714 burn (I)V - ARG 1 time METHOD method_5715 isSneaking ()Z METHOD method_5716 updateKilledAdvancementCriterion (Lnet/minecraft/class_1297;ILnet/minecraft/class_1282;)V ARG 1 killer diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 24203e322a..f5e9d87fbf 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -343,8 +343,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 2 count METHOD method_6104 swingHand (Lnet/minecraft/class_1268;)V ARG 1 hand - METHOD method_6105 damageArmor (F)V - ARG 1 amount + METHOD method_6105 damageArmor (Lnet/minecraft/class_1282;F)V METHOD method_6106 getJumpVelocity ()F METHOD method_6107 getSoundVolume ()F METHOD method_6108 updatePostDeath ()V diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping index 718cdb4a5a..9aa7485ec3 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping @@ -3,11 +3,9 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector FIELD field_18411 goalsByControl Ljava/util/Map; FIELD field_6461 goals Ljava/util/Set; FIELD field_6462 disabledControls Ljava/util/EnumSet; - FIELD field_6463 profiler Lnet/minecraft/class_3695; + FIELD field_6463 profiler Ljava/util/function/Supplier; FIELD field_6464 timeInterval I FIELD field_6466 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Lnet/minecraft/class_3695;)V - ARG 1 profiler METHOD method_19048 getRunningGoals ()Ljava/util/stream/Stream; METHOD method_6273 enableControl (Lnet/minecraft/class_1352$class_4134;)V ARG 1 control diff --git a/mappings/net/minecraft/entity/ai/goal/SitGoal.mapping b/mappings/net/minecraft/entity/ai/goal/SitGoal.mapping index a9e2a168ea..a17d4ebb9a 100644 --- a/mappings/net/minecraft/entity/ai/goal/SitGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/SitGoal.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_1386 net/minecraft/entity/ai/goal/SitGoal FIELD field_6597 tameable Lnet/minecraft/class_1321; - FIELD field_6598 enabledWithOwner Z METHOD (Lnet/minecraft/class_1321;)V ARG 1 tameable - METHOD method_6311 setEnabledWithOwner (Z)V - ARG 1 enabledWithOwner diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping index 2f534dab23..814b86b042 100644 --- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity FIELD field_6320 OWNER_UUID Lnet/minecraft/class_2940; - FIELD field_6321 sitGoal Lnet/minecraft/class_1386; FIELD field_6322 TAMEABLE_FLAGS Lnet/minecraft/class_2940; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type @@ -15,7 +14,6 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity METHOD method_6174 setOwnerUuid (Ljava/util/UUID;)V ARG 1 uuid METHOD method_6175 onTamedChanged ()V - METHOD method_6176 getSitGoal ()Lnet/minecraft/class_1386; METHOD method_6177 getOwner ()Lnet/minecraft/class_1309; METHOD method_6178 canAttackWithOwner (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 target diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 184ee27f52..dc49e6d09c 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -25,8 +25,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory METHOD method_7373 scrollInHotbar (D)V ARG 1 scrollAmount METHOD method_7374 addPickBlock (Lnet/minecraft/class_1799;)V - METHOD method_7375 damageArmor (F)V - ARG 1 armor + METHOD method_7375 damageArmor (Lnet/minecraft/class_1282;F)V METHOD method_7376 getEmptySlot ()I METHOD method_7377 clone (Lnet/minecraft/class_1661;)V ARG 1 other diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping index fe0369fdea..59c5ce1ffe 100644 --- a/mappings/net/minecraft/item/ArmorMaterials.mapping +++ b/mappings/net/minecraft/item/ArmorMaterials.mapping @@ -8,11 +8,10 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials FIELD field_7893 protectionAmounts [I FIELD field_7894 toughness F FIELD field_7896 enchantability I - METHOD (Ljava/lang/String;ILjava/lang/String;I[IILnet/minecraft/class_3414;FLjava/util/function/Supplier;)V + METHOD (Ljava/lang/String;ILjava/lang/String;I[IILnet/minecraft/class_3414;FFLjava/util/function/Supplier;)V ARG 3 name ARG 4 durabilityMultiplier ARG 5 protectionAmounts ARG 6 enchantability ARG 7 equipSound ARG 8 toughness - ARG 9 ingredientSupplier diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 52381155ce..8429c9cbc3 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_16205 metricsData Lnet/minecraft/class_3517; FIELD field_16257 serverThread Ljava/lang/Thread; - FIELD field_16258 profiler Lnet/minecraft/class_3689; + FIELD field_16258 profiler Lnet/minecraft/class_3695; FIELD field_17200 workerExecutor Ljava/util/concurrent/Executor; FIELD field_17439 worldGenerationProgressListenerFactory Lnet/minecraft/class_3950; FIELD field_17601 serverId Ljava/lang/String; @@ -80,7 +80,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 0 args METHOD method_15876 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_16043 isStopping ()Z - METHOD method_16044 getProfiler ()Lnet/minecraft/class_3689; + METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695; METHOD method_17191 getWorkerExecutor ()Ljava/util/concurrent/Executor; METHOD method_17819 setServerId (Ljava/lang/String;)V ARG 1 serverId diff --git a/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping b/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping index ec3c07e872..4fe99f43d0 100644 --- a/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping +++ b/mappings/net/minecraft/server/world/SecondaryServerWorld.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_3202 net/minecraft/server/world/SecondaryServerWorld - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_2874;Lnet/minecraft/class_3695;Lnet/minecraft/class_3949;)V + METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V ARG 1 world ARG 2 server ARG 3 workerExecutor ARG 4 worldSaveHandler ARG 5 dimensionType - ARG 6 profiler - ARG 7 worldGenerationProgressListener diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index f33c1831b7..b1d76b7021 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -19,14 +19,12 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_18263 wanderingTraderManager Lnet/minecraft/class_3990; FIELD field_18264 ticking Z FIELD field_18811 raidManager Lnet/minecraft/class_3767; - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_2874;Lnet/minecraft/class_3695;Lnet/minecraft/class_3949;)V + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V ARG 1 server ARG 2 workerExecutor ARG 3 worldSaveHandler ARG 4 properties ARG 5 dimensionType - ARG 6 profiler - ARG 7 worldGenerationProgressListener METHOD method_14166 spawnParticles (Lnet/minecraft/class_3222;Lnet/minecraft/class_2394;ZDDDIDDDD)Z ARG 1 viewer ARG 2 particle diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index 138fe5204e..eb6b7fc3f7 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -3,6 +3,14 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier FIELD field_13353 namespace Ljava/lang/String; FIELD field_13354 COMMAND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13355 path Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 id + COMMENT A string of the form :, for example minecraft:iron_ingot. + COMMENT The string will be split (on the :) into an identifier with the specified path and namespace. + COMMENT Prefer using the constructor {@link net.minecraft.util.Identifier + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 namespace + ARG 2 path METHOD ([Ljava/lang/String;)V ARG 1 id METHOD method_12829 tryParse (Ljava/lang/String;)Lnet/minecraft/class_2960; @@ -29,12 +37,4 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier ARG 0 path METHOD method_20209 isNamespaceValid (Ljava/lang/String;)Z ARG 0 namespace - METHOD (Ljava/lang/String;Ljava/lang/String;)V - ARG 1 namespace - ARG 2 path - METHOD (Ljava/lang/String;)V - ARG 1 id - COMMENT A string of the form :, for example minecraft:iron_ingot. - COMMENT The string will be split (on the :) into an identifier with the specified path and namespace. - COMMENT Prefer using the constructor {@link net.minecraft.util.Identifier#Identifier(java.lang.String, java.lang.String)} that takes the namespace and path as individual parameters to avoid mistakes. CLASS class_2961 Serializer diff --git a/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping b/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping deleted file mode 100644 index 7a3a88eb44..0000000000 --- a/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/class_3689 net/minecraft/util/profiler/DisableableProfiler - FIELD field_16269 tickSupplier Ljava/util/function/IntSupplier; - FIELD field_16270 controller Lnet/minecraft/class_3689$class_3691; - FIELD field_19286 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Ljava/util/function/IntSupplier;)V - ARG 1 tickSupplier - METHOD method_16055 getController ()Lnet/minecraft/class_3689$class_3690; - CLASS class_3690 Controller - METHOD method_16057 isEnabled ()Z - METHOD method_16058 disable ()Lnet/minecraft/class_3696; - METHOD method_16059 getResults ()Lnet/minecraft/class_3696; - METHOD method_16060 enable ()V - CLASS class_3691 ControllerImpl - FIELD field_16272 profiler Lnet/minecraft/class_3693; diff --git a/mappings/net/minecraft/util/profiler/ProfileLocationInfo.mapping b/mappings/net/minecraft/util/profiler/ProfileLocationInfo.mapping index 09182dc1fe..008ae144d3 100644 --- a/mappings/net/minecraft/util/profiler/ProfileLocationInfo.mapping +++ b/mappings/net/minecraft/util/profiler/ProfileLocationInfo.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4748 net/minecraft/util/profiler/ProfileLocationInfo - COMMENT Profiling information on a specific profiler location. METHOD method_24272 getTotalTime ()J COMMENT Returns the total time spent visiting the profiler location. METHOD method_24273 getVisitCount ()J diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index 2fd8c31cd7..ef7d997f72 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -11,10 +11,6 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem FIELD field_20345 checkTimeout Z FIELD field_21818 locationInfos Ljava/util/Map; FIELD field_21819 currentInfo Lnet/minecraft/class_3533$class_4746; - METHOD (JLjava/util/function/IntSupplier;Z)V - ARG 1 startTime - ARG 3 tickGetter - ARG 4 checkTimeout METHOD method_24246 getCurrentInfo ()Lnet/minecraft/class_3533$class_4746; CLASS class_4746 LocatedInfo FIELD field_21820 time J diff --git a/mappings/net/minecraft/util/shape/VoxelSet.mapping b/mappings/net/minecraft/util/shape/VoxelSet.mapping index f8e157c584..06b9c6e1e0 100644 --- a/mappings/net/minecraft/util/shape/VoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/VoxelSet.mapping @@ -7,9 +7,6 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet ARG 1 xSize ARG 2 ySize ARG 3 zSize - METHOD method_1043 getBeginningAxisCoord (Lnet/minecraft/class_2350$class_2351;II)I - ARG 2 begin - ARG 3 end METHOD method_1044 inBoundsAndContains (III)Z ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index f3859e7b06..d9f160bc62 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -11,9 +11,6 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 1 start ARG 2 end ARG 3 pos - METHOD method_1093 getBeginningCoord (Lnet/minecraft/class_2350$class_2351;DD)D - ARG 2 from - ARG 4 to METHOD method_1095 contains (DDD)Z ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 378629885c..f712999aa7 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World - FIELD field_16316 profiler Lnet/minecraft/class_3695; + FIELD field_16316 profiler Ljava/util/function/Supplier; FIELD field_17086 thread Ljava/lang/Thread; FIELD field_18139 unloadedBlockEntities Ljava/util/List; FIELD field_20639 biomeAccess Lnet/minecraft/class_4543; @@ -22,11 +22,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9251 thunderGradientPrev F FIELD field_9253 rainGradientPrev F FIELD field_9256 lcgBlockSeed I - METHOD (Lnet/minecraft/class_31;Lnet/minecraft/class_2874;Ljava/util/function/BiFunction;Lnet/minecraft/class_3695;Z)V + METHOD (Lnet/minecraft/class_31;Lnet/minecraft/class_2874;Ljava/util/function/BiFunction;Ljava/util/function/Supplier;Z)V ARG 1 levelProperties ARG 2 dimensionType ARG 3 chunkManagerProvider - ARG 4 profiler ARG 5 isClient METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16109 checkBlockRerender (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V @@ -189,7 +188,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8513 setDefaultSpawnClient ()V METHOD method_8514 getTagManager ()Lnet/minecraft/class_3505; METHOD method_8515 isTopSolid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z - ARG 1 pos ARG 2 entity METHOD method_8516 setTime (J)V ARG 1 time diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 21a4ef2c78..fbbe037f60 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -18,9 +18,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_9337 structureFeatures Ljava/util/Map; FIELD field_9338 downfall F FIELD field_9339 temperature F - FIELD field_9340 waterFogColor I FIELD field_9341 scale F - FIELD field_9342 waterColor I FIELD field_9343 depth F METHOD (Lnet/minecraft/class_1959$class_1960;)V ARG 1 settings @@ -102,21 +100,15 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_9344 depth Ljava/lang/Float; FIELD field_9345 category Lnet/minecraft/class_1959$class_1961; FIELD field_9346 precipitation Lnet/minecraft/class_1959$class_1963; - FIELD field_9347 waterColor Ljava/lang/Integer; FIELD field_9348 scale Ljava/lang/Float; FIELD field_9349 temperature Ljava/lang/Float; - FIELD field_9350 waterFogColor Ljava/lang/Integer; FIELD field_9351 downfall Ljava/lang/Float; FIELD field_9352 parent Ljava/lang/String; FIELD field_9353 surfaceBuilder Lnet/minecraft/class_3504; METHOD method_8727 downfall (F)Lnet/minecraft/class_1959$class_1960; ARG 1 downfall - METHOD method_8728 waterFogColor (I)Lnet/minecraft/class_1959$class_1960; - ARG 1 waterFogColor METHOD method_8731 surfaceBuilder (Lnet/minecraft/class_3504;)Lnet/minecraft/class_1959$class_1960; ARG 1 surfaceBuilder - METHOD method_8733 waterColor (I)Lnet/minecraft/class_1959$class_1960; - ARG 1 waterColor METHOD method_8735 precipitation (Lnet/minecraft/class_1959$class_1963;)Lnet/minecraft/class_1959$class_1960; METHOD method_8737 configureSurfaceBuilder (Lnet/minecraft/class_3523;Lnet/minecraft/class_3531;)Lnet/minecraft/class_1959$class_1960; ARG 1 surfaceBuilder diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping index 549d74cabb..f420b297e4 100644 --- a/mappings/net/minecraft/world/dimension/Dimension.mapping +++ b/mappings/net/minecraft/world/dimension/Dimension.mapping @@ -14,8 +14,7 @@ CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension ARG 1 x ARG 2 z ARG 3 checkMobSpawnValidity - METHOD method_12445 getFogColor (FF)Lnet/minecraft/class_243; - ARG 1 skyAngle + METHOD method_12445 getFogColor (IF)Lnet/minecraft/class_243; ARG 2 tickDelta METHOD method_12446 getBackgroundColor (FF)[F ARG 1 skyAngle diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping index b69e0c206c..d7a2e3f0eb 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3520 net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder - FIELD field_15658 NETHERRACK Lnet/minecraft/class_2680; FIELD field_15659 GRAVEL Lnet/minecraft/class_2680; FIELD field_15660 CAVE_AIR Lnet/minecraft/class_2680; FIELD field_15661 seed J