From 2565f0b45b6f38ab17bcecdd84235e3ab3eb4dee Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 18 Sep 2019 16:17:05 +0100 Subject: [PATCH] 19w38a --- build.gradle | 2 +- .../blaze3d/platform/GlStateManager.mapping | 30 ++-------- .../blaze3d/systems/RenderSystem.mapping | 37 +----------- .../advancement/AdvancementFrame.mapping | 2 +- .../criterion/BredAnimalsCriterion.mapping | 16 ----- .../criterion/BrewedPotionCriterion.mapping | 11 ---- .../ChangedDimensionCriterion.mapping | 15 ----- .../ChanneledLightningCriterion.mapping | 10 ---- .../ConstructBeaconCriterion.mapping | 11 ---- .../criterion/ConsumeItemCriterion.mapping | 11 ---- .../CuredZombieVillagerCriterion.mapping | 15 ----- .../criterion/EffectsChangedCriterion.mapping | 10 ---- .../criterion/EnchantedItemCriterion.mapping | 13 ----- .../criterion/EnterBlockCriterion.mapping | 15 +---- .../EntityHurtPlayerCriterion.mapping | 21 ------- .../criterion/FilledBucketCriterion.mapping | 13 ----- .../FishingRodHookedCriterion.mapping | 13 ----- .../InventoryChangedCriterion.mapping | 11 ---- .../ItemDurabilityChangedCriterion.mapping | 14 ----- .../KilledByCrossbowCriterion.mapping | 13 ----- .../criterion/LevitationCriterion.mapping | 15 ----- .../LocationArrivalCriterion.mapping | 15 ----- .../criterion/NetherTravelCriterion.mapping | 17 ------ .../criterion/OnKilledCriterion.mapping | 14 ----- .../criterion/PlacedBlockCriterion.mapping | 19 +----- .../PlayerHurtEntityCriterion.mapping | 20 ------- .../criterion/RecipeUnlockedCriterion.mapping | 9 --- .../criterion/ShotCrossbowCriterion.mapping | 8 --- .../criterion/SummonedEntityCriterion.mapping | 9 --- .../criterion/TameAnimalCriterion.mapping | 10 ---- .../criterion/TickCriterion.mapping | 8 --- .../criterion/UsedEnderEyeCriterion.mapping | 8 --- .../criterion/UsedTotemCriterion.mapping | 9 --- .../criterion/VillagerTradeCriterion.mapping | 10 ---- .../block/AbstractPressurePlateBlock.mapping | 2 - mappings/net/minecraft/block/Block.mapping | 3 - .../minecraft/block/BlockRenderLayer.mapping | 3 - .../net/minecraft/block/LeavesBlock.mapping | 3 - mappings/net/minecraft/class_4458.mapping | 6 -- mappings/net/minecraft/class_4538.mapping | 3 - mappings/net/minecraft/class_4558.mapping | 1 + mappings/net/minecraft/class_4565.mapping | 1 + mappings/net/minecraft/class_4567.mapping | 1 + mappings/net/minecraft/class_4568.mapping | 1 + ...otCondition.mapping => class_4570.mapping} | 10 ++-- mappings/net/minecraft/class_4571.mapping | 1 + mappings/net/minecraft/class_4576.mapping | 1 + mappings/net/minecraft/class_4580.mapping | 1 + .../minecraft/client/MinecraftClient.mapping | 9 --- .../net/minecraft/client/gl/GlBuffer.mapping | 3 +- .../client/gl/GlBufferRenderer.mapping | 4 -- .../gui/screen/ingame/LoomScreen.mapping | 6 -- .../net/minecraft/client/model/Cuboid.mapping | 37 ------------ .../net/minecraft/client/model/Model.mapping | 3 - .../minecraft/client/model/ModelPart.mapping | 34 ++--------- .../net/minecraft/client/model/Quad.mapping | 9 --- .../net/minecraft/client/model/Vertex.mapping | 21 ------- .../client/network/PlayerListEntry.mapping | 2 - .../client/render/BackgroundRenderer.mapping | 19 +----- .../client/render/BufferBuilder.mapping | 4 -- .../render/ChunkRenderDispatcher.mapping | 8 +-- .../client/render/GameRenderer.mapping | 23 -------- .../client/render/GuiLighting.mapping | 5 -- .../client/render/Tessellator.mapping | 1 - .../client/render/VertexFormatElement.mapping | 3 +- .../client/render/VertexFormats.mapping | 1 - .../client/render/WorldRenderer.mapping | 58 ++----------------- .../entity/BannerBlockEntityRenderer.mapping | 2 - .../entity/BedBlockEntityRenderer.mapping | 1 - .../entity/BellBlockEntityRenderer.mapping | 1 - .../render/block/entity/BellModel.mapping | 1 - .../BlockEntityRenderDispatcher.mapping | 15 +---- .../block/entity/BlockEntityRenderer.mapping | 4 +- .../entity/ChestBlockEntityRenderer.mapping | 2 - .../entity/ConduitBlockEntityRenderer.mapping | 16 ----- .../entity/LecternBlockEntityRenderer.mapping | 1 - .../chunk/BlockLayeredBufferBuilder.mapping | 5 +- .../client/render/chunk/ChunkBatcher.mapping | 34 +---------- .../render/chunk/ChunkRenderData.mapping | 24 -------- .../render/chunk/ChunkRenderTask.mapping | 34 ----------- .../render/chunk/ChunkRenderWorker.mapping | 11 ---- .../client/render/chunk/ChunkRenderer.mapping | 52 ----------------- .../render/chunk/ChunkRendererFactory.mapping | 4 -- .../render/chunk/ChunkRendererList.mapping | 16 ----- .../debug/ChunkLoadingDebugRenderer.mapping | 2 - .../client/render/debug/DebugRenderer.mapping | 33 ----------- .../debug/GameTestDebugRenderer.mapping | 7 --- .../PointOfInterestDebugRenderer.mapping | 1 - .../debug/RaidCenterDebugRenderer.mapping | 4 -- .../entity/LivingEntityRenderer.mapping | 4 -- .../model/BannerBlockEntityModel.mapping | 7 --- .../entity/model/BedEntityModel.mapping | 7 --- .../render/entity/model/BookModel.mapping | 14 +---- .../entity/model/ChestEntityModel.mapping | 6 -- .../model/LargeChestEntityModel.mapping | 1 - .../render/model/BakedQuadFactory.mapping | 1 + .../client/render/model/ModelLoader.mapping | 10 ---- .../render/model/json/ModelElement.mapping | 5 +- .../render/model/json/ModelRotation.mapping | 2 +- .../render/model/json/Transformation.mapping | 3 +- .../client/texture/ImageFilter.mapping | 2 - .../client/texture/NativeImage.mapping | 4 +- .../client/texture/PlayerSkinProvider.mapping | 1 - .../client/texture/PlayerSkinTexture.mapping | 7 +-- .../texture/SkinRemappingImageFilter.mapping | 1 - .../client/texture/TextureCache.mapping | 1 - .../client/util/DebugNameGenerator.mapping | 6 -- .../client/util/GlAllocationUtils.mapping | 3 - .../client/util/math/Vector3f.mapping | 14 ----- .../arguments/ColorArgumentType.mapping | 1 + .../net/minecraft/entity/LivingEntity.mapping | 2 +- .../ai/pathing/BirdPathNodeMaker.mapping | 6 -- .../ai/pathing/LandPathNodeMaker.mapping | 2 - .../entity/ai/pathing/PathNode.mapping | 1 - .../entity/ai/pathing/PathNodeType.mapping | 2 - .../net/minecraft/entity/boss/BossBar.mapping | 2 +- .../entity/effect/StatusEffectType.mapping | 2 +- .../minecraft/entity/mob/MobEntity.mapping | 4 -- .../minecraft/entity/mob/PatrolEntity.mapping | 2 +- .../entity/mob/PillagerEntity.mapping | 1 - mappings/net/minecraft/fluid/Fluid.mapping | 1 - .../net/minecraft/fluid/FluidState.mapping | 1 - .../listener/ClientPlayPacketListener.mapping | 2 - .../predicate/entity/EntityPredicate.mapping | 3 +- .../entity/LocationPredicate.mapping | 2 +- .../minecraft/recipe/RecipeManager.mapping | 4 -- .../net/minecraft/scoreboard/Team.mapping | 1 + .../server/command/ScheduleCommand.mapping | 4 +- .../server/command/TeamCommand.mapping | 1 + .../server/command/TestCommand.mapping | 1 + .../server/world/ChunkHolder.mapping | 2 - .../server/world/ServerChunkManager.mapping | 4 -- .../world/ServerLightingProvider.mapping | 4 -- .../world/ThreadedAnvilChunkStorage.mapping | 2 - mappings/net/minecraft/test/TestUtil.mapping | 1 + mappings/net/minecraft/text/Style.mapping | 1 + mappings/net/minecraft/text/Text.mapping | 2 + .../net/minecraft/util/Formatting.mapping | 27 --------- .../net/minecraft/util/math/BlockBox.mapping | 1 - .../minecraft/util/math/Quaternion.mapping | 20 +++---- .../net/minecraft/util/math/Vec3d.mapping | 1 - .../net/minecraft/world/BlockView.mapping | 1 - .../net/minecraft/world/ChunkRegion.mapping | 2 - .../net/minecraft/world/CollisionView.mapping | 5 -- mappings/net/minecraft/world/IWorld.mapping | 3 - mappings/net/minecraft/world/World.mapping | 6 -- .../chunk/light/ChunkLightProvider.mapping | 2 - .../chunk/light/ChunkLightingView.mapping | 4 -- .../chunk/light/LightingProvider.mapping | 3 - .../world/chunk/light/SkyLightStorage.mapping | 4 -- .../loot/ConditionConsumerBuilder.mapping | 2 +- .../minecraft/world/loot/LootManager.mapping | 9 +-- .../net/minecraft/world/loot/LootPool.mapping | 10 +--- .../minecraft/world/loot/LootSupplier.mapping | 6 +- .../world/loot/LootTableReporter.mapping | 3 - .../AlternativeLootCondition.mapping | 8 +-- .../BlockStatePropertyLootCondition.mapping | 25 +------- ...amageSourcePropertiesLootCondition.mapping | 2 +- .../EntityPropertiesLootCondition.mapping | 4 +- .../condition/InvertedLootCondition.mapping | 6 +- .../KilledByPlayerLootCondition.mapping | 2 +- .../LocationCheckLootCondition.mapping | 4 +- .../loot/condition/LootConditions.mapping | 6 +- .../condition/MatchToolLootCondition.mapping | 2 +- .../RandomChanceLootCondition.mapping | 2 +- ...ndomChanceWithLootingLootCondition.mapping | 2 +- .../SurvivesExplosionLootCondition.mapping | 2 +- .../condition/TableBonusLootCondition.mapping | 2 +- .../world/loot/context/LootContext.mapping | 10 +--- .../loot/context/ParameterConsumer.mapping | 6 +- .../world/loot/entry/CombinedEntry.mapping | 6 +- .../world/loot/entry/DynamicEntry.mapping | 4 +- .../world/loot/entry/EmptyEntry.mapping | 2 +- .../world/loot/entry/ItemEntry.mapping | 4 +- .../world/loot/entry/LeafEntry.mapping | 6 +- .../world/loot/entry/LootEntry.mapping | 14 ++--- .../world/loot/entry/LootTableEntry.mapping | 4 +- .../world/loot/entry/TagEntry.mapping | 4 +- .../function/ApplyBonusLootFunction.mapping | 10 ++-- .../function/ConditionalLootFunction.mapping | 8 +-- .../function/CopyNameLootFunction.mapping | 4 +- .../loot/function/CopyNbtLootFunction.mapping | 2 +- .../loot/function/CopyStateFunction.mapping | 2 +- .../EnchantRandomlyLootFunction.mapping | 4 +- .../EnchantWithLevelsLootFunction.mapping | 2 +- .../ExplorationMapLootFunction.mapping | 2 +- .../ExplosionDecayLootFunction.mapping | 2 +- .../FillPlayerHeadLootFunction.mapping | 2 +- .../function/FurnaceSmeltLootFunction.mapping | 2 +- .../function/LimitCountLootFunction.mapping | 4 +- .../LootingEnchantLootFunction.mapping | 2 +- .../SetAttributesLootFunction.mapping | 2 +- .../function/SetContentsLootFunction.mapping | 2 +- .../function/SetCountLootFunction.mapping | 4 +- .../function/SetDamageLootFunction.mapping | 4 +- .../function/SetLootTableLootFunction.mapping | 2 +- .../loot/function/SetLoreLootFunction.mapping | 2 +- .../loot/function/SetNameLootFunction.mapping | 2 +- .../loot/function/SetNbtLootFunction.mapping | 4 +- .../SetStewEffectLootFunction.mapping | 2 +- .../net/minecraft/world/timer/Timer.mapping | 7 +-- 201 files changed, 166 insertions(+), 1318 deletions(-) delete mode 100644 mappings/net/minecraft/class_4458.mapping create mode 100644 mappings/net/minecraft/class_4558.mapping create mode 100644 mappings/net/minecraft/class_4565.mapping create mode 100644 mappings/net/minecraft/class_4567.mapping create mode 100644 mappings/net/minecraft/class_4568.mapping rename mappings/net/minecraft/{world/loot/condition/LootCondition.mapping => class_4570.mapping} (60%) create mode 100644 mappings/net/minecraft/class_4571.mapping create mode 100644 mappings/net/minecraft/class_4576.mapping create mode 100644 mappings/net/minecraft/class_4580.mapping delete mode 100644 mappings/net/minecraft/client/gl/GlBufferRenderer.mapping delete mode 100644 mappings/net/minecraft/client/model/Cuboid.mapping delete mode 100644 mappings/net/minecraft/client/model/Quad.mapping delete mode 100644 mappings/net/minecraft/client/model/Vertex.mapping delete mode 100644 mappings/net/minecraft/client/render/block/entity/BellModel.mapping delete mode 100644 mappings/net/minecraft/client/render/chunk/ChunkRenderData.mapping delete mode 100644 mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping delete mode 100644 mappings/net/minecraft/client/render/chunk/ChunkRenderWorker.mapping delete mode 100644 mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/chunk/ChunkRendererFactory.mapping delete mode 100644 mappings/net/minecraft/client/render/chunk/ChunkRendererList.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/model/BannerBlockEntityModel.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/model/ChestEntityModel.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/model/LargeChestEntityModel.mapping delete mode 100644 mappings/net/minecraft/client/texture/ImageFilter.mapping delete mode 100644 mappings/net/minecraft/client/texture/SkinRemappingImageFilter.mapping delete mode 100644 mappings/net/minecraft/client/util/DebugNameGenerator.mapping diff --git a/build.gradle b/build.gradle index 9ccc5cda24..221e8fa8ec 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "19w37a" +def minecraft_version = "19w38a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index cc040f4c94..de2ee24ec8 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -60,9 +60,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5122 units F FIELD field_5123 capFill Lnet/minecraft/class_4493$class_1018; FIELD field_5124 factor F - CLASS class_1032 RenderMode - METHOD method_4472 begin ()V - METHOD method_4473 end ()V CLASS class_1034 StencilSubState FIELD field_5148 func I CLASS class_1035 StencilState @@ -117,11 +114,8 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21912 disableTexture ()V METHOD method_21913 enableClientState (I)V METHOD method_21914 getTexLevelParameter ()I - METHOD method_21915 begin (I)V METHOD method_21916 enableNormalize ()V - METHOD method_21917 callList (I)V METHOD method_21918 disableNormalize ()V - METHOD method_21919 genLists (I)I METHOD method_21920 enableRescaleNormal ()V METHOD method_21921 getString (I)Ljava/lang/String; METHOD method_21922 disableRescaleNormal ()V @@ -130,8 +124,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21926 pushMatrix ()V METHOD method_21928 popMatrix ()V METHOD method_21930 clearCurrentColor ()V - METHOD method_21932 end ()V - METHOD method_21933 endList ()V METHOD method_21934 getError ()I METHOD method_21935 pushLightingAttributes ()V METHOD method_21936 clearDepth (D)V @@ -161,11 +153,8 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21952 copyTexSubImage2D (IIIIIIII)V METHOD method_21953 texSubImage2D (IIIIIIIIJ)V METHOD method_21954 texImage2D (IIIIIIIILjava/nio/IntBuffer;)V - METHOD method_21955 readPixels (IIIIIIJ)V METHOD method_21956 readPixels (IIIIIILjava/nio/ByteBuffer;)V METHOD method_21957 getTexImage (IIIIJ)V - METHOD method_21958 texCoordPointer (IIILjava/nio/ByteBuffer;)V - METHOD method_21959 normalPointer (IILjava/nio/ByteBuffer;)V METHOD method_21960 light (IILjava/nio/FloatBuffer;)V METHOD method_21961 shaderSource (ILjava/lang/CharSequence;)V METHOD method_21962 bufferData (ILjava/nio/ByteBuffer;I)V @@ -173,8 +162,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21964 uniform1 (ILjava/nio/IntBuffer;)V METHOD method_21965 clear (IZ)V METHOD method_21966 uniformMatrix2 (IZLjava/nio/FloatBuffer;)V - METHOD method_21967 beginRenderMode (Lnet/minecraft/class_4493$class_1032;)V - ARG 0 renderMode METHOD method_21968 enableTexGen (Lnet/minecraft/class_4493$class_1036;)V METHOD method_21969 texGenMode (Lnet/minecraft/class_4493$class_1036;I)V METHOD method_21970 texGenParam (Lnet/minecraft/class_4493$class_1036;ILjava/nio/FloatBuffer;)V @@ -188,7 +175,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21976 pushTextureAttributes ()V METHOD method_21977 translated (DDD)V METHOD method_21978 fogStart (F)V - METHOD method_21979 texCoord2f (FF)V METHOD method_21980 scalef (FFF)V METHOD method_21981 rotatef (FFFF)V METHOD method_21982 disableLight (I)V @@ -199,14 +185,11 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21985 texParameter (IIF)V METHOD method_21986 texParameter (III)V METHOD method_21987 renderbufferStorage (IIII)V - METHOD method_21988 vertexPointer (IIILjava/nio/ByteBuffer;)V METHOD method_21989 texEnv (IILjava/nio/FloatBuffer;)V METHOD method_21990 getUniformLocation (ILjava/lang/CharSequence;)I METHOD method_21991 uniform1 (ILjava/nio/FloatBuffer;)V METHOD method_21992 uniform2 (ILjava/nio/IntBuffer;)V METHOD method_21993 uniformMatrix3 (IZLjava/nio/FloatBuffer;)V - METHOD method_21994 endRenderMode (Lnet/minecraft/class_4493$class_1032;)V - ARG 0 renderMode METHOD method_21995 disableTexGen (Lnet/minecraft/class_4493$class_1036;)V METHOD method_21997 popAttributes ()V METHOD method_21998 fogEnd (F)V @@ -217,7 +200,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_22002 getProgram (II)I METHOD method_22003 getTexLevelParameter (III)I METHOD method_22004 framebufferRenderbuffer (IIII)V - METHOD method_22005 colorPointer (IIILjava/nio/ByteBuffer;)V METHOD method_22006 getAttribLocation (ILjava/lang/CharSequence;)I METHOD method_22007 uniform2 (ILjava/nio/FloatBuffer;)V METHOD method_22008 uniform3 (ILjava/nio/IntBuffer;)V @@ -226,7 +208,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager ARG 0 coord METHOD method_22012 disableAlphaTest ()V METHOD method_22013 lineWidth (F)V - METHOD method_22014 vertex3f (FFF)V METHOD method_22015 blendEquation (I)V METHOD method_22016 attachShader (II)V METHOD method_22017 stencilFunc (III)V @@ -239,25 +220,24 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_22024 stencilOp (III)V METHOD method_22025 viewport (IIII)V METHOD method_22026 uniform4 (ILjava/nio/FloatBuffer;)V - METHOD method_22027 getInteger (ILjava/nio/IntBuffer;)V METHOD method_22028 enableLighting ()V METHOD method_22029 deleteShader (I)V METHOD method_22030 uniform1 (II)V - METHOD method_22031 normalPointer (III)V - METHOD method_22032 texCoordPointer (IIII)V + METHOD method_22031 normalPointer (IIJ)V + METHOD method_22032 texCoordPointer (IIIJ)V METHOD method_22033 fog (ILjava/nio/FloatBuffer;)V METHOD method_22034 disableLighting ()V METHOD method_22035 createShader (I)I METHOD method_22036 bindBuffers (II)V METHOD method_22037 drawArrays (III)V - METHOD method_22038 vertexPointer (IIII)V + METHOD method_22038 vertexPointer (IIIJ)V METHOD method_22039 getMatrix (ILjava/nio/FloatBuffer;)V METHOD method_22040 enableColorMaterial ()V METHOD method_22041 compileShader (I)V METHOD method_22042 bindFramebuffer (II)V ARG 0 target ARG 1 framebuffer - METHOD method_22043 colorPointer (IIII)V + METHOD method_22043 colorPointer (IIIJ)V METHOD method_22044 disableColorMaterial ()V METHOD method_22045 useProgram (I)V METHOD method_22046 bindRenderbuffer (II)V @@ -275,10 +255,8 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_22058 polygonMode (II)V METHOD method_22059 tearDownSolidRenderingTextureCombine ()V METHOD method_22060 deleteFramebuffers (I)V - METHOD method_22061 deleteLists (II)V METHOD method_22062 createProgram ()I METHOD method_22063 checkFramebufferStatus (I)I - METHOD method_22064 newList (II)V METHOD method_22065 genBuffers ()I METHOD method_22067 pixelStore (II)V METHOD method_22068 genFramebuffers ()I diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index 8a2766839d..581979f0ba 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -1,4 +1,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem + CLASS class_4564 + METHOD method_4472 begin ()V + METHOD method_4473 end ()V METHOD alphaFunc (IF)V ARG 0 func ARG 1 ref @@ -30,24 +33,10 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 0 func METHOD depthMask (Z)V ARG 0 mask - METHOD drawArrays (III)V - ARG 0 mode - ARG 1 first - ARG 2 count - METHOD light (IILjava/nio/FloatBuffer;)V - ARG 0 light - ARG 1 pname - ARG 2 params - METHOD lightModel (ILjava/nio/FloatBuffer;)V - ARG 0 pname - ARG 1 params METHOD normal3f (FFF)V ARG 0 nx ARG 1 ny ARG 2 nz - METHOD pixelStore (II)V - ARG 0 pname - ARG 1 param METHOD polygonOffset (FF)V ARG 0 factor ARG 1 units @@ -58,23 +47,3 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 3 z METHOD setupSolidRenderingTextureCombine (I)V ARG 0 color - METHOD texImage2D (IIIIIIIILjava/nio/IntBuffer;)V - ARG 0 target - ARG 1 level - ARG 2 internalFormat - ARG 3 width - ARG 4 height - ARG 5 border - ARG 6 format - ARG 7 type - ARG 8 pixels - METHOD texSubImage2D (IIIIIIIIJ)V - ARG 0 target - ARG 1 level - ARG 2 xOffset - ARG 3 yOffset - ARG 4 width - ARG 5 height - ARG 6 format - ARG 7 type - ARG 8 pixels diff --git a/mappings/net/minecraft/advancement/AdvancementFrame.mapping b/mappings/net/minecraft/advancement/AdvancementFrame.mapping index 6b90aa9039..afb26599f1 100644 --- a/mappings/net/minecraft/advancement/AdvancementFrame.mapping +++ b/mappings/net/minecraft/advancement/AdvancementFrame.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_189 net/minecraft/advancement/AdvancementFrame FIELD field_1251 id Ljava/lang/String; FIELD field_1252 texV I FIELD field_1255 titleFormat Lnet/minecraft/class_124; - METHOD (Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/class_124;)V + METHOD (Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/class_618;)V ARG 3 id ARG 4 texV ARG 5 titleFormat diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index 76de1f9c80..65b0f3ba91 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -1,16 +1,4 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCriterion - CLASS class_197 Handler - FIELD field_1273 conditions Ljava/util/Set; - FIELD field_1274 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_856 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_857 isEmpty ()Z - METHOD method_858 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;)V - ARG 1 parent1 - ARG 2 parent2 - ARG 3 child - METHOD method_859 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_198 Conditions FIELD field_1275 child Lnet/minecraft/class_2048; FIELD field_1276 parent Lnet/minecraft/class_2048; @@ -26,8 +14,4 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri ARG 2 parent ARG 3 partner FIELD field_1271 ID Lnet/minecraft/class_2960; - FIELD field_1272 handlers Ljava/util/Map; METHOD method_855 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;)V - ARG 1 player - ARG 2 parent1 - ARG 3 parent2 diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index 7ede7a05f7..635746a1ac 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -1,18 +1,7 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionCriterion - CLASS class_1997 Handler - FIELD field_9490 conditions Ljava/util/Set; - FIELD field_9491 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8786 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8787 isEmpty ()Z - METHOD method_8788 removeCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8789 handle (Lnet/minecraft/class_1842;)V CLASS class_1998 Conditions FIELD field_9492 potion Lnet/minecraft/class_1842; METHOD method_8790 matches (Lnet/minecraft/class_1842;)Z METHOD method_8791 any ()Lnet/minecraft/class_1996$class_1998; FIELD field_9488 ID Lnet/minecraft/class_2960; - FIELD field_9489 handlers Ljava/util/Map; METHOD method_8784 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1842;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index 429c33568c..bd91f9df12 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimensionCriterion - CLASS class_2000 Handler - FIELD field_9495 conditions Ljava/util/Set; - FIELD field_9496 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8795 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8796 isEmpty ()Z - METHOD method_8797 handle (Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)V - ARG 1 from - ARG 2 to - METHOD method_8798 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2001 Conditions FIELD field_9497 from Lnet/minecraft/class_2874; FIELD field_9498 to Lnet/minecraft/class_2874; @@ -21,8 +10,4 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens ARG 1 from ARG 2 to FIELD field_9493 ID Lnet/minecraft/class_2960; - FIELD field_9494 handlers Ljava/util/Map; METHOD method_8794 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)V - ARG 1 player - ARG 2 from - ARG 3 to diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index ed1449c489..62f04deb25 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLightningCriterion - CLASS class_2003 Handler - FIELD field_9501 conditions Ljava/util/Set; - FIELD field_9502 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8804 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8805 isEmpty ()Z - METHOD method_8806 handle (Lnet/minecraft/class_3222;Ljava/util/Collection;)V - METHOD method_8807 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2004 Conditions FIELD field_9503 victims [Lnet/minecraft/class_2048; METHOD ([Lnet/minecraft/class_2048;)V @@ -16,5 +7,4 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh METHOD method_8809 create ([Lnet/minecraft/class_2048;)Lnet/minecraft/class_2002$class_2004; ARG 0 victims FIELD field_9499 ID Lnet/minecraft/class_2960; - FIELD field_9500 handlers Ljava/util/Map; METHOD method_8803 handle (Lnet/minecraft/class_3222;Ljava/util/Collection;)V diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index d4457c7223..6678544688 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -1,18 +1,7 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeaconCriterion - CLASS class_2007 Handler - FIELD field_9506 conditions Ljava/util/Set; - FIELD field_9507 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8813 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8814 handle (Lnet/minecraft/class_2580;)V - METHOD method_8815 isEmpty ()Z - METHOD method_8816 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2008 Conditions FIELD field_9508 level Lnet/minecraft/class_2096$class_2100; METHOD method_8817 matches (Lnet/minecraft/class_2580;)Z METHOD method_8818 level (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2006$class_2008; FIELD field_9504 ID Lnet/minecraft/class_2960; - FIELD field_9505 handlers Ljava/util/Map; METHOD method_8812 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2580;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index 30c2e2f544..e9c42cb10b 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCriterion - CLASS class_2011 Handler - FIELD field_9511 conditions Ljava/util/Set; - FIELD field_9512 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8822 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8823 isEmpty ()Z - METHOD method_8824 handle (Lnet/minecraft/class_1799;)V - METHOD method_8825 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2012 Conditions FIELD field_9513 item Lnet/minecraft/class_2073; METHOD (Lnet/minecraft/class_2073;)V @@ -18,6 +9,4 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr METHOD method_8828 item (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2010$class_2012; ARG 0 item FIELD field_9509 ID Lnet/minecraft/class_2960; - FIELD field_9510 handlers Ljava/util/Map; METHOD method_8821 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index b2bafafc9b..124f64b93e 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -1,16 +1,4 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVillagerCriterion - CLASS class_2015 Handler - FIELD field_9516 conditions Ljava/util/Set; - FIELD field_9517 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8832 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8833 isEmpty ()Z - METHOD method_8834 removeCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8835 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1642;Lnet/minecraft/class_1646;)V - ARG 1 player - ARG 2 zombie - ARG 3 villager CLASS class_2016 Conditions FIELD field_9518 zombie Lnet/minecraft/class_2048; FIELD field_9519 villager Lnet/minecraft/class_2048; @@ -23,7 +11,4 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi ARG 2 zombie ARG 3 villager FIELD field_9514 ID Lnet/minecraft/class_2960; - FIELD field_9515 handlers Ljava/util/Map; METHOD method_8831 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1642;Lnet/minecraft/class_1646;)V - ARG 1 player - ARG 2 zombie diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 90b557f2fb..12a7666c12 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChangedCriterion - CLASS class_2028 Handler - FIELD field_9560 conditions Ljava/util/Set; - FIELD field_9561 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8864 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8865 isEmpty ()Z - METHOD method_8866 removeCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8867 handle (Lnet/minecraft/class_3222;)V CLASS class_2029 Conditions FIELD field_9562 effects Lnet/minecraft/class_2102; METHOD (Lnet/minecraft/class_2102;)V @@ -16,5 +7,4 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange METHOD method_8869 create (Lnet/minecraft/class_2102;)Lnet/minecraft/class_2027$class_2029; ARG 0 effects FIELD field_9558 ID Lnet/minecraft/class_2960; - FIELD field_9559 handlers Ljava/util/Map; METHOD method_8863 handle (Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 3d518f494e..643d2f0ac1 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -1,14 +1,4 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItemCriterion - CLASS class_2031 Handler - FIELD field_9565 conditions Ljava/util/Set; - FIELD field_9566 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8873 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8874 isEmpty ()Z - METHOD method_8875 handle (Lnet/minecraft/class_1799;I)V - ARG 1 level - METHOD method_8876 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2032 Conditions FIELD field_9567 item Lnet/minecraft/class_2073; FIELD field_9568 levels Lnet/minecraft/class_2096$class_2100; @@ -19,7 +9,4 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem ARG 1 stack ARG 2 level FIELD field_9563 ID Lnet/minecraft/class_2960; - FIELD field_9564 handlers Ljava/util/Map; METHOD method_8870 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V - ARG 1 player - ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index 9c7d31b9d3..970a074a5b 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -1,22 +1,9 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCriterion - CLASS class_2038 Handler - FIELD field_9574 conditions Ljava/util/Set; - FIELD field_9575 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8886 addConditon (Lnet/minecraft/class_179$class_180;)V - METHOD method_8887 isEmpty ()Z - METHOD method_8888 handle (Lnet/minecraft/class_2680;)V - ARG 1 state - METHOD method_8889 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2039 Conditions FIELD field_9576 block Lnet/minecraft/class_2248; - FIELD field_9577 state Ljava/util/Map; - METHOD (Lnet/minecraft/class_2248;Ljava/util/Map;)V - ARG 2 state + FIELD field_9577 state Lnet/minecraft/class_4559; METHOD method_8890 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039; METHOD method_8891 matches (Lnet/minecraft/class_2680;)Z ARG 1 state FIELD field_9572 ID Lnet/minecraft/class_2960; - FIELD field_9573 handlers Ljava/util/Map; METHOD method_8885 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index e30f0244e7..e74474c710 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -1,18 +1,4 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPlayerCriterion - CLASS class_2045 Handler - FIELD field_9591 conditions Ljava/util/Set; - FIELD field_9592 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8903 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8904 isEmpty ()Z - METHOD method_8905 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)V - ARG 1 player - ARG 2 source - ARG 3 dealt - ARG 4 taken - ARG 5 blocked - METHOD method_8906 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2046 Conditions FIELD field_9593 damage Lnet/minecraft/class_2019; METHOD (Lnet/minecraft/class_2019;)V @@ -25,10 +11,3 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla ARG 5 blocked METHOD method_8908 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_2044$class_2046; FIELD field_9589 ID Lnet/minecraft/class_2960; - FIELD field_9590 handlers Ljava/util/Map; - METHOD method_8901 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)V - ARG 1 player - ARG 2 source - ARG 3 dealt - ARG 4 taken - ARG 5 blocked diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index a8bf7a1587..fdda586f39 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -1,14 +1,4 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketCriterion - CLASS class_2055 Handler - FIELD field_9614 conditions Ljava/util/Set; - FIELD field_9615 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8933 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8934 isEmpty ()Z - METHOD method_8935 handle (Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_8936 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2056 Conditions FIELD field_9616 item Lnet/minecraft/class_2073; METHOD (Lnet/minecraft/class_2073;)V @@ -18,7 +8,4 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC METHOD method_8938 matches (Lnet/minecraft/class_1799;)Z ARG 1 stack FIELD field_9612 ID Lnet/minecraft/class_2960; - FIELD field_9613 handlers Ljava/util/Map; METHOD method_8932 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V - ARG 1 player - ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index 518233b1d2..d639256587 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -1,16 +1,4 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHookedCriterion - CLASS class_2059 Handler - FIELD field_9619 conditions Ljava/util/Set; - FIELD field_9620 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8942 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1536;Ljava/util/Collection;)V - ARG 1 player - ARG 2 rodStack - ARG 3 entity - METHOD method_8943 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8944 isEmpty ()Z - METHOD method_8945 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2060 Conditions FIELD field_9621 rod Lnet/minecraft/class_2073; FIELD field_9622 bobber Lnet/minecraft/class_2048; @@ -28,5 +16,4 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo ARG 1 bobber ARG 2 item FIELD field_9617 ID Lnet/minecraft/class_2960; - FIELD field_9618 handlers Ljava/util/Map; METHOD method_8939 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1536;Ljava/util/Collection;)V diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index bb5e7b4fd7..a0bc20a2c5 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChangedCriterion - CLASS class_2067 Handler - FIELD field_9627 conditions Ljava/util/Set; - FIELD field_9628 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8953 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8954 isEmpty ()Z - METHOD method_8955 removeCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8956 handle (Lnet/minecraft/class_1661;)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; @@ -21,6 +12,4 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan METHOD method_8959 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; ARG 0 items FIELD field_9625 ID Lnet/minecraft/class_2960; - FIELD field_9626 handlers Ljava/util/Map; METHOD method_8950 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 6256271df6..a1015d1518 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion - CLASS class_2070 Handler - FIELD field_9635 conditions Ljava/util/Set; - FIELD field_9636 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8963 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8964 isEmpty ()Z - METHOD method_8965 handle (Lnet/minecraft/class_1799;I)V - ARG 1 stack - ARG 2 durability - METHOD method_8966 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2071 Conditions FIELD field_9637 item Lnet/minecraft/class_2073; FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100; @@ -22,7 +11,4 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit ARG 1 item ARG 2 durability FIELD field_9633 ID Lnet/minecraft/class_2960; - FIELD field_9634 handlers Ljava/util/Map; METHOD method_8960 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V - ARG 1 player - ARG 2 item diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index 0e44750362..953a0a9bf8 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCrossbowCriterion - CLASS class_2077 Handler - FIELD field_9657 conditions Ljava/util/Set; - FIELD field_9658 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8982 add (Lnet/minecraft/class_179$class_180;)V - METHOD method_8983 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;I)V - ARG 1 player - ARG 2 victims - METHOD method_8984 isEmpty ()Z - METHOD method_8985 remove (Lnet/minecraft/class_179$class_180;)V CLASS class_2078 Conditions FIELD field_9659 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100; FIELD field_9660 victims [Lnet/minecraft/class_2048; @@ -21,6 +10,4 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross ARG 1 player ARG 2 victims FIELD field_9655 ID Lnet/minecraft/class_2960; - FIELD field_9656 handlers Ljava/util/Map; METHOD method_8980 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;I)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index daf2e09a8a..88561e8147 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -1,16 +1,4 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCriterion - CLASS class_2086 Handler - FIELD field_9673 conditions Ljava/util/Set; - FIELD field_9674 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_9009 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9010 isEmpty ()Z - METHOD method_9011 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)V - ARG 1 coord - ARG 2 distance - ARG 3 duration - METHOD method_9012 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2087 Conditions FIELD field_9675 distance Lnet/minecraft/class_2025; FIELD field_9676 duration Lnet/minecraft/class_2096$class_2100; @@ -23,7 +11,4 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri ARG 2 distance ARG 3 duration FIELD field_9671 ID Lnet/minecraft/class_2960; - FIELD field_9672 handlers Ljava/util/Map; METHOD method_9008 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)V - ARG 1 player - ARG 2 coord diff --git a/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping index 0f423f359a..ccd38a958a 100644 --- a/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping @@ -1,17 +1,4 @@ CLASS net/minecraft/class_2092 net/minecraft/advancement/criterion/LocationArrivalCriterion - CLASS class_2093 Handler - FIELD field_9696 conditions Ljava/util/Set; - FIELD field_9697 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_9028 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9029 isEmpty ()Z - METHOD method_9030 removeCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9031 handle (Lnet/minecraft/class_3218;DDD)V - ARG 1 world - ARG 2 x - ARG 4 y - ARG 6 z CLASS class_2094 Conditions FIELD field_9698 location Lnet/minecraft/class_2090; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2090;)V @@ -26,6 +13,4 @@ CLASS net/minecraft/class_2092 net/minecraft/advancement/criterion/LocationArriv METHOD method_9034 create (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2092$class_2094; ARG 0 location FIELD field_9694 id Lnet/minecraft/class_2960; - FIELD field_9695 handlers Ljava/util/Map; METHOD method_9027 handle (Lnet/minecraft/class_3222;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping index a804b7d977..4875e54f3d 100644 --- a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping @@ -1,18 +1,4 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/NetherTravelCriterion - CLASS class_2109 Handler - FIELD field_9719 conditions Ljava/util/Set; - FIELD field_9720 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_9081 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9082 isEmpty ()Z - METHOD method_9083 removeCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9084 handle (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;DDD)V - ARG 1 world - ARG 2 entered - ARG 3 exitedX - ARG 5 exitedY - ARG 7 exitedZ CLASS class_2110 Conditions FIELD field_9721 entered Lnet/minecraft/class_2090; FIELD field_9722 exited Lnet/minecraft/class_2090; @@ -30,7 +16,4 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/NetherTravelC ARG 5 exitedY ARG 7 exitedZ FIELD field_9717 ID Lnet/minecraft/class_2960; - FIELD field_9718 handlers Ljava/util/Map; METHOD method_9080 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;)V - ARG 1 player - ARG 2 entered diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index 2c829b29c9..d61c415335 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCriterion - CLASS class_2082 Handler - FIELD field_9665 conditions Ljava/util/Set; - FIELD field_9666 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_8993 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_8994 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V - ARG 1 player - ARG 3 killingBlow - METHOD method_8995 isEmpty ()Z - METHOD method_8996 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2083 Conditions FIELD field_9667 killingBlow Lnet/minecraft/class_2022; FIELD field_9668 entity Lnet/minecraft/class_2048; @@ -24,7 +13,4 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 3 killingBlow METHOD method_9001 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; FIELD field_9661 id Lnet/minecraft/class_2960; - FIELD field_9662 handlers Ljava/util/Map; METHOD method_8990 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V - ARG 1 player - ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping index e68513b7ff..934c02de52 100644 --- a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping @@ -1,24 +1,10 @@ CLASS net/minecraft/class_2111 net/minecraft/advancement/criterion/PlacedBlockCriterion - CLASS class_2112 Handler - FIELD field_9726 conditions Ljava/util/Set; - FIELD field_9727 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_9090 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9091 isEmpty ()Z - METHOD method_9092 handle (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V - ARG 1 pos - ARG 2 world - ARG 3 item - ARG 4 stack - METHOD method_9093 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2113 Conditions FIELD field_9728 block Lnet/minecraft/class_2248; FIELD field_9729 location Lnet/minecraft/class_2090; - FIELD field_9730 state Ljava/util/Map; + FIELD field_9730 state Lnet/minecraft/class_4559; FIELD field_9731 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2248;Ljava/util/Map;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V - ARG 2 state + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V ARG 3 location ARG 4 item METHOD method_9094 matches (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)Z @@ -29,7 +15,6 @@ CLASS net/minecraft/class_2111 net/minecraft/advancement/criterion/PlacedBlockCr METHOD method_9095 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2111$class_2113; ARG 0 block FIELD field_9724 ID Lnet/minecraft/class_2960; - FIELD field_9725 handlers Ljava/util/Map; METHOD method_9087 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 blockPos diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index e48d3006fc..ba3782c1f0 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -1,18 +1,4 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEntityCriterion - CLASS class_2116 Handler - FIELD field_9734 conditions Ljava/util/Set; - FIELD field_9735 manager Lnet/minecraft/class_2985; - METHOD (Lnet/minecraft/class_2985;)V - ARG 1 manager - METHOD method_9099 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9100 isEmpty ()Z - METHOD method_9101 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;FFZ)V - ARG 1 player - ARG 3 source - ARG 4 dealt - ARG 5 taken - ARG 6 blocked - METHOD method_9102 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2117 Conditions FIELD field_9736 damage Lnet/minecraft/class_2019; FIELD field_9737 entity Lnet/minecraft/class_2048; @@ -27,10 +13,4 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt ARG 5 taken ARG 6 blocked FIELD field_9732 ID Lnet/minecraft/class_2960; - FIELD field_9733 handlers Ljava/util/Map; METHOD method_9097 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;FFZ)V - ARG 1 player - ARG 3 source - ARG 4 dealt - ARG 5 taken - ARG 6 blocked diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index 69d8520eeb..e9be1f4bfc 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -1,15 +1,6 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlockedCriterion - CLASS class_2120 Handler - FIELD field_9740 conditions Ljava/util/Set; - FIELD field_9741 manager Lnet/minecraft/class_2985; - METHOD method_9108 handle (Lnet/minecraft/class_1860;)V - METHOD method_9109 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9110 isEmpty ()Z - METHOD method_9111 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2121 Conditions FIELD field_9742 recipe Lnet/minecraft/class_2960; METHOD method_9112 matches (Lnet/minecraft/class_1860;)Z FIELD field_9738 ID Lnet/minecraft/class_2960; - FIELD field_9739 handlers Ljava/util/Map; METHOD method_9107 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index 22ce758690..5bde032ec2 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -1,15 +1,7 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowCriterion - CLASS class_2124 Handler - FIELD field_9745 conditions Ljava/util/Set; - FIELD field_9746 tracker Lnet/minecraft/class_2985; - METHOD method_9116 add (Lnet/minecraft/class_179$class_180;)V - METHOD method_9117 isEmpty ()Z - METHOD method_9118 trigger (Lnet/minecraft/class_1799;)V - METHOD method_9119 remove (Lnet/minecraft/class_179$class_180;)V CLASS class_2125 Conditions FIELD field_9747 item Lnet/minecraft/class_2073; METHOD method_9120 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2123$class_2125; METHOD method_9121 matches (Lnet/minecraft/class_1799;)Z FIELD field_9743 ID Lnet/minecraft/class_2960; - FIELD field_9744 handlers Ljava/util/Map; METHOD method_9115 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index 3ea9fb3fa0..f12857c110 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -1,16 +1,7 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntityCriterion - CLASS class_2129 Handler - FIELD field_9750 conditions Ljava/util/Set; - FIELD field_9751 manager Lnet/minecraft/class_2985; - METHOD method_9125 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9126 isEmpty ()Z - METHOD method_9127 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V - METHOD method_9128 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2130 Conditions FIELD field_9752 entity Lnet/minecraft/class_2048; METHOD method_9129 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2128$class_2130; METHOD method_9130 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z FIELD field_9748 ID Lnet/minecraft/class_2960; - FIELD field_9749 handlers Ljava/util/Map; METHOD method_9124 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 07446e216c..d5eac162ed 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -1,18 +1,8 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCriterion - CLASS class_2132 Handler - FIELD field_9755 Conditions Ljava/util/Set; - FIELD field_9756 manager Lnet/minecraft/class_2985; - METHOD method_9134 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9135 isEmpty ()Z - METHOD method_9136 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)V - ARG 1 entity - METHOD method_9137 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2133 Conditions FIELD field_9757 entity Lnet/minecraft/class_2048; METHOD method_16114 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2131$class_2133; METHOD method_9138 any ()Lnet/minecraft/class_2131$class_2133; METHOD method_9139 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)Z FIELD field_9753 ID Lnet/minecraft/class_2960; - FIELD field_9754 handlers Ljava/util/Map; METHOD method_9132 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index 6483be72f7..ab9cedf966 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -1,12 +1,4 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion - CLASS class_2136 Handler - FIELD field_9760 conditions Ljava/util/Set; - FIELD field_9761 manager Lnet/minecraft/class_2985; - METHOD method_9142 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9143 isEmpty ()Z - METHOD method_9144 removeCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9145 handle ()V CLASS class_2137 Conditions FIELD field_9758 ID Lnet/minecraft/class_2960; - FIELD field_9759 handlers Ljava/util/Map; METHOD method_9141 handle (Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index f467100600..a48c34377e 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -1,15 +1,7 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeCriterion - CLASS class_2144 Handler - FIELD field_9770 conditions Ljava/util/Set; - FIELD field_9771 manager Lnet/minecraft/class_2985; - METHOD method_9158 handle (D)V - METHOD method_9159 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9160 isEmpty ()Z - METHOD method_9161 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2145 Conditions FIELD field_9772 distance Lnet/minecraft/class_2096$class_2099; METHOD method_9162 matches (D)Z FIELD field_9768 id Lnet/minecraft/class_2960; - FIELD field_9769 handlers Ljava/util/Map; METHOD method_9157 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;)V ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index d66b949af8..cd43e1f152 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -1,16 +1,7 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCriterion - CLASS class_2149 Handler - FIELD field_9775 conditions Ljava/util/Set; - FIELD field_9776 manager Lnet/minecraft/class_2985; - METHOD method_9166 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9167 isEmpty ()Z - METHOD method_9168 handle (Lnet/minecraft/class_1799;)V - METHOD method_9169 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2150 Conditions FIELD field_9777 item Lnet/minecraft/class_2073; METHOD method_9170 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2148$class_2150; METHOD method_9171 matches (Lnet/minecraft/class_1799;)Z FIELD field_9773 ID Lnet/minecraft/class_2960; - FIELD field_9774 handlers Ljava/util/Map; METHOD method_9165 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V - ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index 1bb7ff56a9..320faf4b1a 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -1,18 +1,8 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTradeCriterion - CLASS class_2141 Handler - FIELD field_9764 conditions Ljava/util/Set; - FIELD field_9765 manager Lnet/minecraft/class_2985; - METHOD method_9149 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_3988;Lnet/minecraft/class_1799;)V - ARG 1 villager - METHOD method_9150 addCondition (Lnet/minecraft/class_179$class_180;)V - METHOD method_9151 isEmpty ()Z - METHOD method_9152 removeCondition (Lnet/minecraft/class_179$class_180;)V CLASS class_2142 Conditions FIELD field_9766 villager Lnet/minecraft/class_2073; FIELD field_9767 item Lnet/minecraft/class_2048; METHOD method_9153 any ()Lnet/minecraft/class_2140$class_2142; METHOD method_9154 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_3988;Lnet/minecraft/class_1799;)Z FIELD field_9762 ID Lnet/minecraft/class_2960; - FIELD field_9763 handlers Ljava/util/Map; METHOD method_9146 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_3988;Lnet/minecraft/class_1799;)V - ARG 1 player diff --git a/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping b/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping index c314192ceb..d56281669c 100644 --- a/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_2231 net/minecraft/block/AbstractPressurePlateBlock FIELD field_9943 DEFAULT_SHAPE Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings - METHOD canPlaceAt (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z - ARG 2 world METHOD method_9432 setRedstoneOutput (Lnet/minecraft/class_2680;I)Lnet/minecraft/class_2680; ARG 1 state ARG 2 rsOut diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 8fab8531d9..4ea98b779e 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -23,7 +23,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block FIELD field_10669 hardness F FIELD field_10670 dynamicBounds Z METHOD (Lnet/minecraft/class_3614;Lnet/minecraft/class_3620;)V - ARG 1 material ARG 2 materialColor METHOD method_16228 dropsLike (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248$class_2251; ARG 1 source @@ -255,7 +254,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 view ARG 3 pos ARG 4 ePos - METHOD method_9551 getRenderLayer ()Lnet/minecraft/class_1921; METHOD method_9552 shouldPostProcess (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 state ARG 2 view @@ -410,7 +408,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 state ARG 2 rotation METHOD method_9601 isOpaque (Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_9602 getMapColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3620; ARG 1 state ARG 2 view diff --git a/mappings/net/minecraft/block/BlockRenderLayer.mapping b/mappings/net/minecraft/block/BlockRenderLayer.mapping index e9daee12ca..cd60bc0d7b 100644 --- a/mappings/net/minecraft/block/BlockRenderLayer.mapping +++ b/mappings/net/minecraft/block/BlockRenderLayer.mapping @@ -1,5 +1,2 @@ CLASS net/minecraft/class_1921 net/minecraft/block/BlockRenderLayer FIELD field_9175 CUTOUT_MIPPED Lnet/minecraft/class_1921; - FIELD field_9177 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name diff --git a/mappings/net/minecraft/block/LeavesBlock.mapping b/mappings/net/minecraft/block/LeavesBlock.mapping index 7477b8a76f..d80e1923ec 100644 --- a/mappings/net/minecraft/block/LeavesBlock.mapping +++ b/mappings/net/minecraft/block/LeavesBlock.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2397 net/minecraft/block/LeavesBlock - FIELD field_11198 fancy Z FIELD field_11199 DISTANCE Lnet/minecraft/class_2758; FIELD field_11200 PERSISTENT Lnet/minecraft/class_2746; METHOD (Lnet/minecraft/class_2248$class_2251;)V @@ -8,7 +7,5 @@ CLASS net/minecraft/class_2397 net/minecraft/block/LeavesBlock ARG 0 state ARG 1 world ARG 2 pos - METHOD method_10301 setRenderingMode (Z)V - ARG 0 fancy METHOD method_10302 getDistanceFromLog (Lnet/minecraft/class_2680;)I ARG 0 state diff --git a/mappings/net/minecraft/class_4458.mapping b/mappings/net/minecraft/class_4458.mapping deleted file mode 100644 index 6742f09817..0000000000 --- a/mappings/net/minecraft/class_4458.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_4458 - FIELD field_20288 speed F - FIELD field_20289 completionRange I - METHOD (FI)V - ARG 1 speed - ARG 2 completionRange diff --git a/mappings/net/minecraft/class_4538.mapping b/mappings/net/minecraft/class_4538.mapping index 63609e2233..041a840627 100644 --- a/mappings/net/minecraft/class_4538.mapping +++ b/mappings/net/minecraft/class_4538.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_4538 - METHOD method_22338 (II)Lnet/minecraft/class_1922; - ARG 1 chunkX - ARG 2 chunkZ METHOD method_22339 getLightLevel (Lnet/minecraft/class_2338;)I ARG 1 pos METHOD method_22340 isChunkLoaded (Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/class_4558.mapping b/mappings/net/minecraft/class_4558.mapping new file mode 100644 index 0000000000..3e9b12eba7 --- /dev/null +++ b/mappings/net/minecraft/class_4558.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4558 diff --git a/mappings/net/minecraft/class_4565.mapping b/mappings/net/minecraft/class_4565.mapping new file mode 100644 index 0000000000..6f39fc9198 --- /dev/null +++ b/mappings/net/minecraft/class_4565.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4565 diff --git a/mappings/net/minecraft/class_4567.mapping b/mappings/net/minecraft/class_4567.mapping new file mode 100644 index 0000000000..f8260b808e --- /dev/null +++ b/mappings/net/minecraft/class_4567.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4567 diff --git a/mappings/net/minecraft/class_4568.mapping b/mappings/net/minecraft/class_4568.mapping new file mode 100644 index 0000000000..ec67f680a7 --- /dev/null +++ b/mappings/net/minecraft/class_4568.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4568 diff --git a/mappings/net/minecraft/world/loot/condition/LootCondition.mapping b/mappings/net/minecraft/class_4570.mapping similarity index 60% rename from mappings/net/minecraft/world/loot/condition/LootCondition.mapping rename to mappings/net/minecraft/class_4570.mapping index 2470a2f502..b5e8d76a81 100644 --- a/mappings/net/minecraft/world/loot/condition/LootCondition.mapping +++ b/mappings/net/minecraft/class_4570.mapping @@ -1,7 +1,7 @@ -CLASS net/minecraft/class_209 net/minecraft/world/loot/condition/LootCondition +CLASS net/minecraft/class_4570 CLASS class_210 Builder - METHOD method_16780 invert ()Lnet/minecraft/class_209$class_210; - METHOD method_893 withCondition (Lnet/minecraft/class_209$class_210;)Lnet/minecraft/class_186$class_187; + METHOD method_16780 invert ()Lnet/minecraft/class_4570$class_210; + METHOD method_893 withCondition (Lnet/minecraft/class_4570$class_210;)Lnet/minecraft/class_186$class_187; ARG 1 condition CLASS class_211 Factory FIELD field_1284 id Lnet/minecraft/class_2960; @@ -10,11 +10,11 @@ CLASS net/minecraft/class_209 net/minecraft/world/loot/condition/LootCondition ARG 1 id ARG 2 clazz METHOD method_894 getId ()Lnet/minecraft/class_2960; - METHOD method_895 toJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_209;Lcom/google/gson/JsonSerializationContext;)V + METHOD method_895 toJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4570;Lcom/google/gson/JsonSerializationContext;)V ARG 1 json ARG 2 condition ARG 3 context - METHOD method_896 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_209; + METHOD method_896 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_4570; ARG 1 json ARG 2 context METHOD method_897 getConditionClass ()Ljava/lang/Class; diff --git a/mappings/net/minecraft/class_4571.mapping b/mappings/net/minecraft/class_4571.mapping new file mode 100644 index 0000000000..ea752a3af4 --- /dev/null +++ b/mappings/net/minecraft/class_4571.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4571 diff --git a/mappings/net/minecraft/class_4576.mapping b/mappings/net/minecraft/class_4576.mapping new file mode 100644 index 0000000000..cc7d7fd478 --- /dev/null +++ b/mappings/net/minecraft/class_4576.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4576 diff --git a/mappings/net/minecraft/class_4580.mapping b/mappings/net/minecraft/class_4580.mapping new file mode 100644 index 0000000000..e50241d1b3 --- /dev/null +++ b/mappings/net/minecraft/class_4580.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4580 diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 63cd96c670..dc9f82bada 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1688 metricsData Lnet/minecraft/class_3517; FIELD field_1689 framebuffer Lnet/minecraft/class_276; FIELD field_1690 options Lnet/minecraft/class_315; - FIELD field_1691 crashed Z FIELD field_1692 targetedEntity Lnet/minecraft/class_1297; FIELD field_1693 is64Bit Z FIELD field_1694 sessionPropertyMap Lcom/mojang/authlib/properties/PropertyMap; @@ -21,11 +20,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1703 IS_SYSTEM_MAC Z FIELD field_1704 window Lnet/minecraft/class_1041; FIELD field_1705 inGameHud Lnet/minecraft/class_329; - FIELD field_1706 autoConnectServerIp Ljava/lang/String; FIELD field_1707 skinProvider Lnet/minecraft/class_1071; FIELD field_1708 fontManager Lnet/minecraft/class_378; FIELD field_1709 debugRenderer Lnet/minecraft/class_863; - FIELD field_1710 autoConnectServerPort I FIELD field_1711 gameVersion Ljava/lang/String; FIELD field_1712 nextDebugInfoUpdateTime J FIELD field_1713 particleManager Lnet/minecraft/class_702; @@ -39,7 +36,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1722 resourcePackCreator Lnet/minecraft/class_1066; FIELD field_1723 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_1724 player Lnet/minecraft/class_746; - FIELD field_1725 windowSettings Lnet/minecraft/class_543; FIELD field_1726 session Lnet/minecraft/class_320; FIELD field_1727 soundManager Lnet/minecraft/class_1144; FIELD field_1728 renderTickCounter Lnet/minecraft/class_317; @@ -67,8 +63,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1750 lastMetricsSampleTime J FIELD field_1751 blockColorMap Lnet/minecraft/class_324; FIELD field_1752 itemUseCooldown I - FIELD field_1753 assetDirectory Ljava/io/File; - FIELD field_1754 cachedMaxTextureSize I FIELD field_1755 currentScreen Lnet/minecraft/class_437; FIELD field_1756 blockRenderManager Lnet/minecraft/class_776; FIELD field_1757 resourcePackDir Ljava/io/File; @@ -118,7 +112,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;)Lnet/minecraft/class_1799; ARG 1 stack ARG 2 blockEntity - METHOD method_1503 init ()V METHOD method_1504 setCameraEntity (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_1505 getBlockColorMap ()Lnet/minecraft/class_324; @@ -183,13 +176,11 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1574 tick ()V METHOD method_1576 getServer ()Lnet/minecraft/class_1132; METHOD method_1577 getTutorialManager ()Lnet/minecraft/class_1156; - METHOD method_1580 getMaxTextureSize ()I METHOD method_1582 getSkinProvider ()Lnet/minecraft/class_1071; METHOD method_1583 doItemUse ()V METHOD method_1584 setCurrentServerEntry (Lnet/minecraft/class_642;)V METHOD method_1586 getLevelStorage ()Lnet/minecraft/class_32; METHOD method_1587 populateCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; - ARG 1 report METHOD method_1588 isAmbientOcclusionEnabled ()Z METHOD method_1589 isConnectedToRealms ()Z METHOD method_1590 handleBlockBreaking (Z)V diff --git a/mappings/net/minecraft/client/gl/GlBuffer.mapping b/mappings/net/minecraft/client/gl/GlBuffer.mapping index f8037befbc..210f705f37 100644 --- a/mappings/net/minecraft/client/gl/GlBuffer.mapping +++ b/mappings/net/minecraft/client/gl/GlBuffer.mapping @@ -6,8 +6,7 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/GlBuffer ARG 1 format METHOD method_1351 draw (I)V ARG 1 mode - METHOD method_1352 set (Ljava/nio/ByteBuffer;)V - ARG 1 buffer + METHOD method_1352 set (Lnet/minecraft/class_287;)V METHOD method_1353 bind ()V METHOD method_1354 unbind ()V METHOD method_1355 delete ()V diff --git a/mappings/net/minecraft/client/gl/GlBufferRenderer.mapping b/mappings/net/minecraft/client/gl/GlBufferRenderer.mapping deleted file mode 100644 index d326a7d240..0000000000 --- a/mappings/net/minecraft/client/gl/GlBufferRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_294 net/minecraft/client/gl/GlBufferRenderer - FIELD field_1604 glBuffer Lnet/minecraft/class_291; - METHOD method_1372 setGlBuffer (Lnet/minecraft/class_291;)V - ARG 1 glBuffer diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index 8fab8c41e2..039b1b52d6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -1,21 +1,15 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_2954 dye Lnet/minecraft/class_1799; FIELD field_2955 banner Lnet/minecraft/class_1799; - FIELD field_2956 PATTERN_BUTTON_FOREGROUND_COLOR Lnet/minecraft/class_1767; - FIELD field_2957 output Lnet/minecraft/class_2960; FIELD field_2958 scrollbarClicked Z - FIELD field_2959 PATTERN_BUTTON_COLORS Ljava/util/List; FIELD field_2961 hasTooManyPatterns Z FIELD field_2962 canApplySpecialPattern Z FIELD field_2963 PATTERN_BUTTON_ROW_COUNT I - FIELD field_2964 PATTERN_BUTTON_BACKGROUND_COLOR Lnet/minecraft/class_1767; FIELD field_2965 canApplyDyePattern Z FIELD field_2966 TEXTURE Lnet/minecraft/class_2960; FIELD field_2967 pattern Lnet/minecraft/class_1799; FIELD field_2968 scrollPosition F - FIELD field_2969 lastCachedPatternButtonTextureId I FIELD field_2970 firstPatternButtonId I - FIELD field_2972 patternButtonTextureIds [Lnet/minecraft/class_2960; METHOD method_17576 onInventoryChanged ()V METHOD mouseClicked (DDI)Z ARG 1 mouseX diff --git a/mappings/net/minecraft/client/model/Cuboid.mapping b/mappings/net/minecraft/client/model/Cuboid.mapping deleted file mode 100644 index 4ed135503f..0000000000 --- a/mappings/net/minecraft/client/model/Cuboid.mapping +++ /dev/null @@ -1,37 +0,0 @@ -CLASS net/minecraft/class_628 net/minecraft/client/model/Cuboid - FIELD field_3643 zMin F - FIELD field_3644 yMin F - FIELD field_3645 xMin F - FIELD field_3646 zMax F - FIELD field_3647 yMax F - FIELD field_3648 xMax F - FIELD field_3649 polygons [Lnet/minecraft/class_593; - FIELD field_3650 name Ljava/lang/String; - FIELD field_3651 vertices [Lnet/minecraft/class_618; - METHOD (Lnet/minecraft/class_630;IIFFFIIIF)V - ARG 1 parent - ARG 2 textureOffsetU - ARG 3 textureOffsetV - ARG 4 xMin - ARG 5 yMin - ARG 6 zMin - ARG 7 xSize - ARG 8 ySize - ARG 9 zSize - ARG 10 scale - METHOD (Lnet/minecraft/class_630;IIFFFIIIFZ)V - ARG 1 parent - ARG 2 textureOffsetU - ARG 3 textureOffsetV - ARG 4 xMin - ARG 5 yMin - ARG 6 zMin - ARG 7 xSize - ARG 8 ySize - ARG 9 zSize - ARG 10 scale - ARG 11 flip - METHOD method_2842 setName (Ljava/lang/String;)Lnet/minecraft/class_628; - ARG 1 name - METHOD method_2843 render (Lnet/minecraft/class_287;F)V - ARG 2 scale diff --git a/mappings/net/minecraft/client/model/Model.mapping b/mappings/net/minecraft/client/model/Model.mapping index fbae67d05d..fa24e70df6 100644 --- a/mappings/net/minecraft/client/model/Model.mapping +++ b/mappings/net/minecraft/client/model/Model.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_3879 net/minecraft/client/model/Model - FIELD field_17137 cuboidList Ljava/util/List; FIELD field_17138 textureWidth I FIELD field_17139 textureHeight I - METHOD method_17101 getRandomCuboid (Ljava/util/Random;)Lnet/minecraft/class_630; - ARG 1 rand diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 7288b8c597..e6b569c1b0 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -5,43 +5,30 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart FIELD field_3657 rotationPointX F FIELD field_3658 textureHeight F FIELD field_3659 textureWidth F - FIELD field_3660 compiled Z + FIELD field_3660 compiled Ljava/nio/ByteBuffer; FIELD field_3661 children Ljava/util/List; - FIELD field_3662 name Ljava/lang/String; FIELD field_3663 cuboids Ljava/util/List; FIELD field_3665 visible Z FIELD field_3666 mirror Z - FIELD field_3667 renderList I - FIELD field_3669 z F FIELD field_3670 textureOffsetV I - FIELD field_3671 y F FIELD field_3672 textureOffsetU I - FIELD field_3673 x F FIELD field_3674 roll F FIELD field_3675 yaw F METHOD (Lnet/minecraft/class_3879;II)V ARG 1 owner ARG 2 textureOffsetU ARG 3 textureOffsetV - METHOD (Lnet/minecraft/class_3879;Ljava/lang/String;)V - ARG 1 owner - ARG 2 name METHOD method_17138 copyRotation (Lnet/minecraft/class_630;)V - METHOD method_17578 removeChild (Lnet/minecraft/class_630;)V - METHOD method_2844 addCuboid (FFFIII)Lnet/minecraft/class_630; + METHOD method_2844 addCuboid (FFFFFF)Lnet/minecraft/class_630; ARG 1 xMin ARG 2 yMin ARG 3 zMin - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize METHOD method_2845 addChild (Lnet/minecraft/class_630;)V METHOD method_2846 render (F)V ARG 1 scale METHOD method_2847 applyTransform (F)V ARG 1 scale METHOD method_2848 addCuboid (Ljava/lang/String;FFFIIIFII)Lnet/minecraft/class_630; - ARG 1 suffix ARG 2 xMin ARG 3 yMin ARG 4 zMin @@ -50,13 +37,10 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 7 zSize ARG 9 textureOffsetU ARG 10 textureOffsetV - METHOD method_2849 addCuboid (FFFIIIFZ)V + METHOD method_2849 addCuboid (FFFFFFFZ)V ARG 1 xMin ARG 2 yMin ARG 3 zMin - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize METHOD method_2850 setTextureOffset (II)Lnet/minecraft/class_630; ARG 1 u ARG 2 v @@ -64,24 +48,16 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 1 x ARG 2 y ARG 3 z - METHOD method_2852 (F)V - ARG 1 scale METHOD method_2853 setTextureSize (II)Lnet/minecraft/class_630; ARG 1 width ARG 2 height - METHOD method_2854 addCuboid (FFFIIIZ)Lnet/minecraft/class_630; + METHOD method_2854 addCuboid (FFFFFFZ)Lnet/minecraft/class_630; ARG 1 xMin ARG 2 yMin ARG 3 zMin - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize METHOD method_2855 compile (F)V ARG 1 scale - METHOD method_2856 addCuboid (FFFIIIF)V + METHOD method_2856 addCuboid (FFFFFFF)V ARG 1 xMin ARG 2 yMin ARG 3 zMin - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize diff --git a/mappings/net/minecraft/client/model/Quad.mapping b/mappings/net/minecraft/client/model/Quad.mapping deleted file mode 100644 index e43ccb25b2..0000000000 --- a/mappings/net/minecraft/client/model/Quad.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_593 net/minecraft/client/model/Quad - FIELD field_3500 vertexCount I - FIELD field_3501 flipNormals Z - FIELD field_3502 vertices [Lnet/minecraft/class_618; - METHOD ([Lnet/minecraft/class_618;IIIIFF)V - ARG 1 vertices - METHOD method_2825 render (Lnet/minecraft/class_287;F)V - ARG 2 scale - METHOD method_2826 flip ()V diff --git a/mappings/net/minecraft/client/model/Vertex.mapping b/mappings/net/minecraft/client/model/Vertex.mapping deleted file mode 100644 index 4f79bb3d35..0000000000 --- a/mappings/net/minecraft/client/model/Vertex.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_618 net/minecraft/client/model/Vertex - FIELD field_3603 v F - FIELD field_3604 u F - FIELD field_3605 pos Lnet/minecraft/class_243; - METHOD (FFFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 u - ARG 5 v - METHOD (Lnet/minecraft/class_243;FF)V - ARG 1 pos - ARG 2 u - ARG 3 v - METHOD (Lnet/minecraft/class_618;FF)V - ARG 1 vertex - ARG 2 u - ARG 3 v - METHOD method_2837 remap (FF)Lnet/minecraft/class_618; - ARG 1 u - ARG 2 v diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index ef9b1ac854..71dcb42ea8 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry FIELD field_3743 displayName Lnet/minecraft/class_2561; FIELD field_3744 gameMode Lnet/minecraft/class_1934; FIELD field_3745 model Ljava/lang/String; - METHOD (Lcom/mojang/authlib/GameProfile;)V - ARG 1 profile METHOD (Lnet/minecraft/class_2703$class_2705;)V ARG 1 playerListPacketEntry METHOD method_2955 getScoreboardTeam ()Lnet/minecraft/class_268; diff --git a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping index 30c88e4bec..8834b60911 100644 --- a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping +++ b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping @@ -1,27 +1,12 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer - FIELD field_4030 bufferRed F FIELD field_4031 waterFogColor I FIELD field_4032 blue F FIELD field_4033 green F FIELD field_4034 red F - FIELD field_4035 gameRenderer Lnet/minecraft/class_757; FIELD field_4036 blackColorBuffer Ljava/nio/FloatBuffer; - FIELD field_4037 client Lnet/minecraft/class_310; FIELD field_4038 colorBuffer Ljava/nio/FloatBuffer; - FIELD field_4039 bufferBlue F - FIELD field_4040 bufferGreen F FIELD field_4041 nextWaterFogColor I FIELD field_4042 lastWaterFogColorUpdateTime J - METHOD (Lnet/minecraft/class_757;)V - ARG 1 gameRenderer - METHOD method_3208 updateColorNotInWater (Lnet/minecraft/class_4184;Lnet/minecraft/class_1937;F)V - ARG 2 world - ARG 3 tickDelta - METHOD method_3209 getColorAsBuffer ()Ljava/nio/FloatBuffer; - METHOD method_3210 renderBackground (Lnet/minecraft/class_4184;F)V - ARG 1 camera - ARG 2 tickDelta - METHOD method_3211 applyFog (Lnet/minecraft/class_4184;I)V + METHOD method_3210 renderBackground (Lnet/minecraft/class_4184;FLnet/minecraft/class_1937;IF)V + METHOD method_3211 applyFog (Lnet/minecraft/class_4184;IFZ)V METHOD method_3212 setFogBlack (Z)V - ARG 1 fogBlack - METHOD method_3213 updateColorInWater (Lnet/minecraft/class_4184;Lnet/minecraft/class_4538;)V diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index a70c13a5f6..cb9a666e1f 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder FIELD field_1558 currentElement Lnet/minecraft/class_296; FIELD field_1559 colorDisabled Z FIELD field_1560 bufInt Ljava/nio/IntBuffer; - FIELD field_1561 bufShort Ljava/nio/ShortBuffer; FIELD field_1562 offsetZ D FIELD field_1563 offsetY D FIELD field_1564 offsetX D @@ -96,8 +95,6 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder ARG 1 red ARG 2 green ARG 3 blue - METHOD method_1337 getVertexCount ()I - METHOD method_1338 getDrawMode ()I METHOD method_1339 brightness (IIII)V METHOD method_1340 setColor (IIII)V ARG 1 colorIndex @@ -108,7 +105,6 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder ARG 1 cameraX ARG 2 cameraY ARG 3 cameraZ - METHOD method_1342 getByteBuffer ()Ljava/nio/ByteBuffer; METHOD method_1343 clear ()V METHOD method_1344 next ()V METHOD method_16005 roundBufferSize (I)I diff --git a/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping b/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping index aa112f0c4a..d670fbbb56 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping @@ -3,18 +3,12 @@ CLASS net/minecraft/class_769 net/minecraft/client/render/ChunkRenderDispatcher FIELD field_4147 sizeZ I FIELD field_4148 sizeX I FIELD field_4149 sizeY I - FIELD field_4150 renderers [Lnet/minecraft/class_851; FIELD field_4151 world Lnet/minecraft/class_1937; - METHOD (Lnet/minecraft/class_1937;ILnet/minecraft/class_761;Lnet/minecraft/class_850;)V - ARG 1 world - ARG 3 renderer METHOD method_16040 scheduleChunkRender (IIIZ)V ARG 1 x ARG 2 y ARG 3 z - METHOD method_3323 getChunkRenderer (Lnet/minecraft/class_2338;)Lnet/minecraft/class_851; - ARG 1 pos - METHOD method_3324 createChunks (Lnet/minecraft/class_850;)V + METHOD method_3324 createChunks (Lnet/minecraft/class_846;)V METHOD method_3326 getChunkIndex (III)I METHOD method_3327 delete ()V METHOD method_3330 updateCameraPosition (DD)V diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 9a5cde1ed0..1a11d0ea90 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_18765 camera Lnet/minecraft/class_4184; - FIELD field_3990 backgroundRenderer Lnet/minecraft/class_758; FIELD field_3992 renderHand Z FIELD field_3993 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_3994 random Ljava/util/Random; @@ -12,10 +11,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4003 floatingItemHeight F FIELD field_4006 floatingItem Lnet/minecraft/class_1799; FIELD field_4007 floatingItemTimeLeft I - FIELD field_4008 SNOW_LOC Lnet/minecraft/class_2960; FIELD field_4009 blockOutlineEnabled Z FIELD field_4010 SHADER_COUNT I - FIELD field_4011 RAIN_LOC Lnet/minecraft/class_2960; FIELD field_4012 firstPersonRenderer Lnet/minecraft/class_759; FIELD field_4013 shadersEnabled Z FIELD field_4015 client Lnet/minecraft/class_310; @@ -35,7 +32,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V METHOD method_3168 loadShader (Lnet/minecraft/class_2960;)V METHOD method_3169 onResized (II)V - METHOD method_3170 renderWeather (F)V METHOD method_3171 renderFloatingItem (IIF)V ARG 1 scaledWidth ARG 2 scaledHeight @@ -44,14 +40,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 camera ARG 2 tickDelta METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F - ARG 1 entity - ARG 2 tickDelta METHOD method_3175 isShaderEnabled ()Z METHOD method_3176 updateWorldIcon ()V - METHOD method_3177 renderRain ()V - METHOD method_3178 renderCenter (FJ)V - ARG 1 tickDelta - ARG 2 limitTime METHOD method_3179 renderFloatingText (Lnet/minecraft/class_327;Ljava/lang/String;FFFIFFZ)V ARG 0 textRenderer ARG 1 text @@ -62,15 +52,11 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 6 yaw ARG 7 pitch ARG 8 translucent - METHOD method_3180 enableLightmap ()V METHOD method_3182 tick ()V METHOD method_3183 getShader ()Lnet/minecraft/class_279; METHOD method_3184 toggleShadersEnabled ()V - METHOD method_3185 applyCameraTransformations (F)V - ARG 1 tickDelta METHOD method_3186 bobView (F)V ARG 1 tickDelta - METHOD method_3187 disableLightmap ()V METHOD method_3188 renderWorld (FJ)V ARG 1 tickDelta ARG 2 limitTime @@ -91,16 +77,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3198 bobViewWhenHurt (F)V ARG 1 tickDelta METHOD method_3199 updateMovementFovMultiplier ()V - METHOD method_3201 setFogBlack (Z)V - ARG 1 fogBlack METHOD method_3202 shouldRenderBlockOutline ()Z METHOD method_3203 reset ()V METHOD method_3204 getClient ()Lnet/minecraft/class_310; - METHOD method_3206 renderAboveClouds (Lnet/minecraft/class_4184;Lnet/minecraft/class_761;FDDD)V - ARG 1 camera - ARG 2 worldRenderer - ARG 3 tickDelta - ARG 4 cameraX - ARG 6 cameraY - ARG 8 cameraZ METHOD method_3207 disableShader ()V diff --git a/mappings/net/minecraft/client/render/GuiLighting.mapping b/mappings/net/minecraft/client/render/GuiLighting.mapping index 508068d4e3..09ab93fd62 100644 --- a/mappings/net/minecraft/client/render/GuiLighting.mapping +++ b/mappings/net/minecraft/client/render/GuiLighting.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/GuiLighting - FIELD field_1675 buffer Ljava/nio/FloatBuffer; - FIELD field_1676 oppositeLight Lnet/minecraft/class_1160; - FIELD field_1677 towardLight Lnet/minecraft/class_1160; METHOD method_1450 disable ()V - METHOD method_1451 singletonBuffer (FFFF)Ljava/nio/FloatBuffer; METHOD method_1452 enable ()V METHOD method_1453 enableForItems ()V - METHOD method_15980 createNormalVector (FFF)Lnet/minecraft/class_1160; diff --git a/mappings/net/minecraft/client/render/Tessellator.mapping b/mappings/net/minecraft/client/render/Tessellator.mapping index 4f37528184..2efbaaa1ef 100644 --- a/mappings/net/minecraft/client/render/Tessellator.mapping +++ b/mappings/net/minecraft/client/render/Tessellator.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_289 net/minecraft/client/render/Tessellator - FIELD field_1572 renderer Lnet/minecraft/class_286; FIELD field_1573 INSTANCE Lnet/minecraft/class_289; FIELD field_1574 buffer Lnet/minecraft/class_287; METHOD (I)V diff --git a/mappings/net/minecraft/client/render/VertexFormatElement.mapping b/mappings/net/minecraft/client/render/VertexFormatElement.mapping index 5aab8070e6..ce33fd2a28 100644 --- a/mappings/net/minecraft/client/render/VertexFormatElement.mapping +++ b/mappings/net/minecraft/client/render/VertexFormatElement.mapping @@ -16,8 +16,7 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement CLASS class_298 Type FIELD field_1630 name Ljava/lang/String; FIELD field_1632 COLOR Lnet/minecraft/class_296$class_298; - FIELD field_1634 MATRIX Lnet/minecraft/class_296$class_298; - METHOD (Ljava/lang/String;ILjava/lang/String;)V + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_296$class_298$class_4575;Ljava/util/function/IntConsumer;)V ARG 3 name METHOD method_1392 getName ()Ljava/lang/String; FIELD field_1612 count I diff --git a/mappings/net/minecraft/client/render/VertexFormats.mapping b/mappings/net/minecraft/client/render/VertexFormats.mapping index ccab3803cc..d295eee389 100644 --- a/mappings/net/minecraft/client/render/VertexFormats.mapping +++ b/mappings/net/minecraft/client/render/VertexFormats.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_290 net/minecraft/client/render/VertexFormats FIELD field_1579 NORMAL_ELEMENT Lnet/minecraft/class_296; FIELD field_1580 POSITION_UV_NORMAL_2 Lnet/minecraft/class_293; FIELD field_1581 COLOR_ELEMENT Lnet/minecraft/class_296; - FIELD field_1582 POSITION_COLOR_UV_LMAP Lnet/minecraft/class_293; FIELD field_1583 LMAP_ELEMENT Lnet/minecraft/class_296; FIELD field_1584 POSITION_UV_COLOR_LMAP Lnet/minecraft/class_293; FIELD field_1585 POSITION_UV Lnet/minecraft/class_293; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index bb36043bd3..0f8ad70f69 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer CLASS class_762 ChunkInfo - FIELD field_4124 renderer Lnet/minecraft/class_851; - METHOD (Lnet/minecraft/class_761;Lnet/minecraft/class_851;Lnet/minecraft/class_2350;I)V + METHOD (Lnet/minecraft/class_761;Lnet/minecraft/class_846$b;Lnet/minecraft/class_2350;I)V ARG 1 renderer FIELD field_4055 blockEntities Ljava/util/Set; FIELD field_4056 forcedFrustum Lnet/minecraft/class_857; @@ -12,14 +11,13 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4061 END_SKY_TEX Lnet/minecraft/class_2960; FIELD field_4062 renderDistance I FIELD field_4064 lastCameraYaw D - FIELD field_4068 destroyStages [Lnet/minecraft/class_1058; + FIELD field_4068 destroyStages Ljava/util/List; FIELD field_4069 lastCameraX D FIELD field_4070 lastCameraChunkUpdateZ D FIELD field_4071 FORCEFIELD_TEX Lnet/minecraft/class_2960; FIELD field_4073 ticks I FIELD field_4075 chunkRenderers Ljava/util/Set; FIELD field_4077 terrainUpdateNecessary Z - FIELD field_4078 chunkRendererFactory Lnet/minecraft/class_850; FIELD field_4081 lastCameraY D FIELD field_4083 lastTranslucentSortX D FIELD field_4084 cameraChunkX I @@ -29,12 +27,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4089 regularEntityCount I FIELD field_4090 entityOutlinesUpdateNecessary Z FIELD field_4091 forcedFrustumPosition Lnet/minecraft/class_1161; - FIELD field_4092 chunkRendererList Lnet/minecraft/class_752; + FIELD field_4092 chunkRendererList Lnet/minecraft/class_758; FIELD field_4094 cloudsBuffer Lnet/minecraft/class_291; FIELD field_4095 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_4096 lastCameraZ D FIELD field_4098 MOON_PHASES_TEX Lnet/minecraft/class_2960; - FIELD field_4099 starsDisplayList I FIELD field_4101 entityOutlinesFramebuffer Lnet/minecraft/class_276; FIELD field_4103 lastTranslucentSortY D FIELD field_4104 lastCameraChunkUpdateX D @@ -47,14 +44,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4111 SUN_TEX Lnet/minecraft/class_2960; FIELD field_4112 chunkRenderDispatcher Lnet/minecraft/class_769; FIELD field_4113 starsBuffer Lnet/minecraft/class_291; - FIELD field_4114 cloudsDisplayList I FIELD field_4115 lastCameraPitch D FIELD field_4118 lastTranslucentSortZ D FIELD field_4119 playingSongs Ljava/util/Map; FIELD field_4120 lastCameraChunkUpdateY D FIELD field_4121 cameraChunkZ I - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client METHOD method_16037 scheduleSectionRender (Lnet/minecraft/class_2338;Z)V ARG 1 pos METHOD method_18145 scheduleBlockRenders (III)V @@ -70,19 +64,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 6 maxZ METHOD method_3239 renderClouds (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)V ARG 8 color - METHOD method_3240 drawDebugShapeOutline (Lnet/minecraft/class_265;DDDFFFF)V - ARG 0 shape - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 red - ARG 8 green - ARG 9 blue - ARG 10 alpha - METHOD method_3241 getAdjacentChunkRenderer (Lnet/minecraft/class_2338;Lnet/minecraft/class_851;Lnet/minecraft/class_2350;)Lnet/minecraft/class_851; - ARG 1 pos - ARG 2 chunkRenderer - ARG 3 direction METHOD method_3242 onResized (II)V METHOD method_3243 renderWorldBorder (Lnet/minecraft/class_4184;F)V ARG 2 delta @@ -97,27 +78,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 3 playing METHOD method_3249 loadDestroyStageTextures ()V METHOD method_3250 renderEndSky ()V - METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4184;)I - ARG 1 layer + METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4184;Lnet/minecraft/class_765;)V METHOD method_3252 tick ()V - METHOD method_3253 buildBox (Lnet/minecraft/class_287;DDDDDDFFFF)V - ARG 0 builder - ARG 1 minX - ARG 3 minY - ARG 5 minZ - ARG 7 maxX - ARG 9 maxY - ARG 11 maxZ - ARG 13 red - ARG 14 green - ARG 15 blue - ARG 16 alpha METHOD method_3254 drawEntityOutlinesFramebuffer ()V METHOD method_3255 renderStars (Lnet/minecraft/class_287;)V ARG 1 buffer - METHOD method_3256 renderPartiallyBrokenBlocks (Lnet/minecraft/class_289;Lnet/minecraft/class_287;Lnet/minecraft/class_4184;)V - ARG 1 tesselator - ARG 2 builder METHOD method_3257 renderSky (F)V ARG 1 tickDelta METHOD method_3258 buildBoxOutline (Lnet/minecraft/class_287;DDDDDDFFFF)V @@ -134,12 +99,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 16 alpha METHOD method_3259 renderClouds (FDDD)V ARG 1 tickDelta - METHOD method_3260 drawBoxOutline (Lnet/minecraft/class_238;FFFF)V - ARG 0 box - ARG 1 red - ARG 2 green - ARG 3 blue - ARG 4 alpha METHOD method_3262 drawBoxOutline (DDDDDDFFFF)V ARG 0 minX ARG 2 minY @@ -151,17 +110,13 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 13 green ARG 14 blue ARG 15 alpha - METHOD method_3263 enableBlockOverlayRendering ()V METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; ARG 1 canSpawnOnMinimal METHOD method_3269 updateChunks (J)V ARG 1 limitTime METHOD method_3270 canDrawEntityOutlines ()Z - METHOD method_3271 renderEntities (Lnet/minecraft/class_4184;Lnet/minecraft/class_856;F)V - ARG 3 tickDelta METHOD method_3272 getEntitiesDebugString ()Ljava/lang/String; METHOD method_3273 setUpTerrain (Lnet/minecraft/class_4184;Lnet/minecraft/class_856;IZ)V - METHOD method_3274 disableBlockOverlayRendering ()V METHOD method_3276 addParticle (Lnet/minecraft/class_2394;DDDDDD)V ARG 1 parameters ARG 2 x @@ -188,8 +143,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 3 flipX METHOD method_3285 getOpenChunkFaces (Lnet/minecraft/class_2338;)Ljava/util/Set; ARG 1 pos - METHOD method_3287 renderLayer (Lnet/minecraft/class_1921;)V - ARG 1 layer METHOD method_3288 spawnParticle (Lnet/minecraft/class_2394;ZZDDDDDD)Lnet/minecraft/class_703; ARG 1 parameters ARG 2 alwaysSpawn @@ -214,9 +167,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 10 alpha METHOD method_3292 scheduleTerrainUpdate ()V METHOD method_3293 renderStars ()V - METHOD method_3294 drawHighlightedBlockOutline (Lnet/minecraft/class_4184;Lnet/minecraft/class_239;I)V - ARG 2 hit - ARG 3 renderPass METHOD method_3295 scheduleChunkRender (IIIZ)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index 4d682e0acb..49fcd21bcd 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlockEntityRenderer - FIELD field_4339 model Lnet/minecraft/class_550; - METHOD method_3547 getTextureId (Lnet/minecraft/class_2573;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping index d950d66f0f..1908afa189 100644 --- a/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_825 net/minecraft/client/render/block/entity/BedBlockEntityRenderer - FIELD field_4355 model Lnet/minecraft/class_552; FIELD field_4356 TEXTURES [Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/block/entity/BellBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BellBlockEntityRenderer.mapping index e8a15a94c8..28ed77a5ca 100644 --- a/mappings/net/minecraft/client/render/block/entity/BellBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BellBlockEntityRenderer.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_3880 net/minecraft/client/render/block/entity/BellBlockEntityRenderer FIELD field_17145 BELL_BODY_TEXTURE Lnet/minecraft/class_2960; - FIELD field_17146 model Lnet/minecraft/class_3878; diff --git a/mappings/net/minecraft/client/render/block/entity/BellModel.mapping b/mappings/net/minecraft/client/render/block/entity/BellModel.mapping deleted file mode 100644 index c080874c75..0000000000 --- a/mappings/net/minecraft/client/render/block/entity/BellModel.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3878 net/minecraft/client/render/block/entity/BellModel diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index bf106c94ec..d62966a7ec 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -9,24 +9,15 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti FIELD field_4347 textureManager Lnet/minecraft/class_1060; FIELD field_4348 world Lnet/minecraft/class_1937; FIELD field_4350 hitResult Lnet/minecraft/class_239; - METHOD method_3548 renderEntity (Lnet/minecraft/class_2586;DDDF)V + METHOD method_3548 renderEntity (Lnet/minecraft/class_2586;FLnet/minecraft/class_1921;Lnet/minecraft/class_287;)V ARG 1 blockEntity - ARG 2 xOffset - ARG 4 yOffset - ARG 6 zOffset - ARG 8 tickDelta METHOD method_3549 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_1060;Lnet/minecraft/class_327;Lnet/minecraft/class_4184;Lnet/minecraft/class_239;)V METHOD method_3550 get (Ljava/lang/Class;)Lnet/minecraft/class_827; METHOD method_3551 setWorld (Lnet/minecraft/class_1937;)V METHOD method_3552 renderEntity (Lnet/minecraft/class_2586;)V METHOD method_3553 get (Lnet/minecraft/class_2586;)Lnet/minecraft/class_827; - METHOD method_3554 renderEntity (Lnet/minecraft/class_2586;DDDFIZ)V - ARG 2 xOffset - ARG 4 yOffset - ARG 6 zOffset - ARG 8 tickDelta - ARG 9 blockBreakStage - METHOD method_3555 render (Lnet/minecraft/class_2586;FI)V + METHOD method_3554 renderEntity (Lnet/minecraft/class_2586;Ljava/lang/Runnable;)V + METHOD method_3555 render (Lnet/minecraft/class_2586;FILnet/minecraft/class_1921;Lnet/minecraft/class_287;)V ARG 2 tickDelta ARG 3 blockBreakStage METHOD method_3556 getFontRenderer ()Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping index 60911298f9..d2ba672ef4 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_827 net/minecraft/client/render/block/entity/BlockEntityRenderer FIELD field_4367 renderManager Lnet/minecraft/class_824; - FIELD field_4368 DESTROY_STAGE_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_4368 DESTROY_STAGE_TEXTURES Ljava/util/List; METHOD method_3564 getFontRenderer ()Lnet/minecraft/class_327; METHOD method_3565 getWorld ()Lnet/minecraft/class_1937; METHOD method_3566 bindTexture (Lnet/minecraft/class_2960;)V METHOD method_3567 renderName (Lnet/minecraft/class_2586;Ljava/lang/String;DDDI)V METHOD method_3568 setRenderManager (Lnet/minecraft/class_824;)V - METHOD method_3569 render (Lnet/minecraft/class_2586;DDDFI)V + METHOD method_3569 render (Lnet/minecraft/class_2586;DDDFILnet/minecraft/class_1921;)V ARG 1 entity ARG 2 xOffset ARG 4 yOffset diff --git a/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping index 2f3ab41fa1..88a45fb78f 100644 --- a/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_826 net/minecraft/client/render/block/entity/ChestBlockEntityRenderer FIELD field_4357 TRAPPED_TEX Lnet/minecraft/class_2960; - FIELD field_4358 modelDoubleChest Lnet/minecraft/class_556; FIELD field_4359 NORMAL_DOUBLE_TEX Lnet/minecraft/class_2960; FIELD field_4360 TRAPPED_DOUBLE_TEX Lnet/minecraft/class_2960; - FIELD field_4361 modelSingleChest Lnet/minecraft/class_556; FIELD field_4362 CHRISTMAS_DOUBLE_TEX Lnet/minecraft/class_2960; FIELD field_4363 CHRISTMAS_TEX Lnet/minecraft/class_2960; FIELD field_4364 NORMAL_TEX Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping index 50fdd40fc3..cf97f6198b 100644 --- a/mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping @@ -1,22 +1,6 @@ CLASS net/minecraft/class_829 net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer - CLASS class_830 CageModel - FIELD field_4381 cuboid Lnet/minecraft/class_630; - METHOD method_17140 render (FFFFFF)V - CLASS class_831 EyeModel - FIELD field_4382 cuboid Lnet/minecraft/class_630; - METHOD method_17141 render (FFFFFF)V - CLASS class_832 BaseModel - FIELD field_4383 cuboid Lnet/minecraft/class_630; - METHOD method_17142 render (FFFFFF)V - CLASS class_833 WindModel - FIELD field_4386 cuboids [Lnet/minecraft/class_630; - METHOD method_17143 render (FFFFFF)V FIELD field_4371 WIND_VERTICAL_TEX Lnet/minecraft/class_2960; - FIELD field_4372 baseModel Lnet/minecraft/class_829$class_832; FIELD field_4373 WIND_TEX Lnet/minecraft/class_2960; - FIELD field_4374 windModel Lnet/minecraft/class_829$class_833; - FIELD field_4375 cageModel Lnet/minecraft/class_829$class_830; - FIELD field_4376 eyeModel Lnet/minecraft/class_829$class_831; FIELD field_4377 BASE_TEX Lnet/minecraft/class_2960; FIELD field_4378 CAGE_TEX Lnet/minecraft/class_2960; FIELD field_4379 OPEN_EYE_TEX Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/block/entity/LecternBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/LecternBlockEntityRenderer.mapping index 5ec66a6b4b..d743084923 100644 --- a/mappings/net/minecraft/client/render/block/entity/LecternBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/LecternBlockEntityRenderer.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_3942 net/minecraft/client/render/block/entity/LecternBlockEntityRenderer - FIELD field_17427 BOOK_TEXTURE Lnet/minecraft/class_2960; FIELD field_17428 book Lnet/minecraft/class_557; diff --git a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping b/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping index 314a06c676..344dc20592 100644 --- a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_750 net/minecraft/client/render/chunk/BlockLayeredBufferBuilder - FIELD field_3951 layerBuilders [Lnet/minecraft/class_287; + FIELD field_3951 layerBuilders Ljava/util/Map; METHOD method_3154 get (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; - ARG 1 layer - METHOD method_3155 get (I)Lnet/minecraft/class_287; - ARG 1 index diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping index 5630e3afd7..ad532ebfeb 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping @@ -1,46 +1,14 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBatcher - CLASS class_847 ChunkUploadTask - FIELD field_4446 task Lcom/google/common/util/concurrent/ListenableFutureTask; - FIELD field_4447 priority D - METHOD (Lnet/minecraft/class_846;Lcom/google/common/util/concurrent/ListenableFutureTask;D)V - ARG 1 task - ARG 2 priority FIELD field_18766 cameraPosition Lnet/minecraft/class_243; FIELD field_4435 pendingChunks Ljava/util/concurrent/PriorityBlockingQueue; - FIELD field_4436 THREAD_FACTORY Ljava/util/concurrent/ThreadFactory; - FIELD field_4437 displayListBufferRenderer Lnet/minecraft/class_286; - FIELD field_4438 availableBuffers Ljava/util/concurrent/BlockingQueue; - FIELD field_4439 clientThreadWorker Lnet/minecraft/class_845; - FIELD field_4440 workerThreads Ljava/util/List; - FIELD field_4441 vboBufferRenderer Lnet/minecraft/class_294; - FIELD field_4442 bufferCount I FIELD field_4443 pendingUploads Ljava/util/Queue; - FIELD field_4444 workers Ljava/util/List; FIELD field_4445 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_19419 setCameraPosition (Lnet/minecraft/class_243;)V ARG 1 cameraPosition METHOD method_19420 getCameraPosition ()Lnet/minecraft/class_243; METHOD method_3619 stop ()V - METHOD method_3620 resortTransparency (Lnet/minecraft/class_851;)Z - ARG 1 renderer - METHOD method_3621 uploadVbo (Lnet/minecraft/class_287;Lnet/minecraft/class_291;)V - ARG 1 bufferBuilder - ARG 2 glBuffer METHOD method_3622 getDebugString ()Ljava/lang/String; - METHOD method_3624 rebuild (Lnet/minecraft/class_851;)Z - ARG 1 renderer - METHOD method_3625 addAvailableBuffer (Lnet/minecraft/class_750;)V - METHOD method_3626 getNextAvailableBuffer ()Lnet/minecraft/class_750; - METHOD method_3627 rebuildSync (Lnet/minecraft/class_851;)Z - ARG 1 renderer - METHOD method_3629 getNextChunkRenderDataTask ()Lnet/minecraft/class_842; METHOD method_3630 isEmpty ()Z - METHOD method_3631 runTasksSync (J)Z - ARG 1 endTime METHOD method_3632 reset ()V METHOD method_3633 clear ()V - METHOD method_3635 upload (Lnet/minecraft/class_1921;Lnet/minecraft/class_287;Lnet/minecraft/class_851;Lnet/minecraft/class_849;D)Lcom/google/common/util/concurrent/ListenableFuture; - ARG 1 layer - ARG 2 bufferBuilder - ARG 3 chunkRenderer - ARG 4 chunkRenderData + METHOD method_3635 upload (Lnet/minecraft/class_287;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderData.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderData.mapping deleted file mode 100644 index 58e70d0ddf..0000000000 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderData.mapping +++ /dev/null @@ -1,24 +0,0 @@ -CLASS net/minecraft/class_849 net/minecraft/client/render/chunk/ChunkRenderData - FIELD field_4450 nonEmpty [Z - FIELD field_4451 EMPTY Lnet/minecraft/class_849; - FIELD field_4452 initialized [Z - FIELD field_4453 bufferState Lnet/minecraft/class_287$class_288; - FIELD field_4454 empty Z - FIELD field_4455 occlusionGraph Lnet/minecraft/class_854; - FIELD field_4456 blockEntities Ljava/util/List; - METHOD method_3640 setOcclusionGraph (Lnet/minecraft/class_854;)V - ARG 1 occlusionGraph - METHOD method_3641 isEmpty (Lnet/minecraft/class_1921;)Z - ARG 1 layer - METHOD method_3642 getBlockEntities ()Ljava/util/List; - METHOD method_3643 setNonEmpty (Lnet/minecraft/class_1921;)V - ARG 1 layer - METHOD method_3644 getBufferState ()Lnet/minecraft/class_287$class_288; - METHOD method_3645 isEmpty ()Z - METHOD method_3646 addBlockEntity (Lnet/minecraft/class_2586;)V - METHOD method_3647 markBufferInitialized (Lnet/minecraft/class_1921;)V - ARG 1 layer - METHOD method_3648 setBufferState (Lnet/minecraft/class_287$class_288;)V - METHOD method_3649 isBufferInitialized (Lnet/minecraft/class_1921;)Z - ARG 1 layer - METHOD method_3650 isVisibleThrough (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping deleted file mode 100644 index 40fd7328f5..0000000000 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping +++ /dev/null @@ -1,34 +0,0 @@ -CLASS net/minecraft/class_842 net/minecraft/client/render/chunk/ChunkRenderTask - CLASS class_843 Stage - CLASS class_844 Mode - FIELD field_4410 cancelled Z - FIELD field_4411 completionActions Ljava/util/List; - FIELD field_4412 lock Ljava/util/concurrent/locks/ReentrantLock; - FIELD field_4413 stage Lnet/minecraft/class_842$class_843; - FIELD field_4414 region Lnet/minecraft/class_853; - FIELD field_4415 bufferBuilder Lnet/minecraft/class_750; - FIELD field_4416 mode Lnet/minecraft/class_842$class_844; - FIELD field_4417 renderData Lnet/minecraft/class_849; - FIELD field_4418 chunkRenderer Lnet/minecraft/class_851; - FIELD field_4419 squaredCameraDistance D - METHOD (Lnet/minecraft/class_851;Lnet/minecraft/class_842$class_844;DLnet/minecraft/class_853;)V - ARG 1 chunkRenderer - ARG 2 mode - ARG 3 squaredCameraDistance - ARG 5 region - METHOD method_3595 isCancelled ()Z - METHOD method_3596 cancel ()V - METHOD method_3597 addCompletionAction (Ljava/lang/Runnable;)V - ARG 1 action - METHOD method_3598 setRenderData (Lnet/minecraft/class_849;)V - ARG 1 renderData - METHOD method_3599 getStage ()Lnet/minecraft/class_842$class_843; - METHOD method_3600 getBufferBuilders ()Lnet/minecraft/class_750; - METHOD method_3602 getSquaredCameraDistance ()D - METHOD method_3603 setBufferBuilders (Lnet/minecraft/class_750;)V - METHOD method_3604 getMode ()Lnet/minecraft/class_842$class_844; - METHOD method_3605 getLock ()Ljava/util/concurrent/locks/ReentrantLock; - METHOD method_3606 takeRegion ()Lnet/minecraft/class_853; - METHOD method_3607 setStage (Lnet/minecraft/class_842$class_843;)V - METHOD method_3608 getChunkRenderer ()Lnet/minecraft/class_851; - METHOD method_3609 getRenderData ()Lnet/minecraft/class_849; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderWorker.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderWorker.mapping deleted file mode 100644 index f140a3070f..0000000000 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderWorker.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_845 net/minecraft/client/render/chunk/ChunkRenderWorker - FIELD field_4428 bufferBuilders Lnet/minecraft/class_750; - FIELD field_4429 running Z - FIELD field_4430 batcher Lnet/minecraft/class_846; - FIELD field_4431 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Lnet/minecraft/class_846;Lnet/minecraft/class_750;)V - ARG 1 batcher - METHOD method_3610 freeRenderTask (Lnet/minecraft/class_750;)V - METHOD method_3611 stop ()V - METHOD method_3613 getBufferBuilders ()Lnet/minecraft/class_750; - METHOD method_3615 runTask (Lnet/minecraft/class_842;)V diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping deleted file mode 100644 index fd65e72602..0000000000 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping +++ /dev/null @@ -1,52 +0,0 @@ -CLASS net/minecraft/class_851 net/minecraft/client/render/chunk/ChunkRenderer - FIELD field_4457 blockEntities Ljava/util/Set; - FIELD field_4458 boundingBox Lnet/minecraft/class_238; - FIELD field_4459 data Lnet/minecraft/class_849; - FIELD field_4460 chunkUpdateCount I - FIELD field_4461 task Lnet/minecraft/class_842; - FIELD field_4462 buffers [Lnet/minecraft/class_291; - FIELD field_4463 rebuildOnClientThread Z - FIELD field_4464 rebuildScheduled Z - FIELD field_4466 renderer Lnet/minecraft/class_761; - FIELD field_4467 origin Lnet/minecraft/class_2338$class_2339; - FIELD field_4468 lock Ljava/util/concurrent/locks/ReentrantLock; - FIELD field_4469 world Lnet/minecraft/class_1937; - FIELD field_4470 dataLock Ljava/util/concurrent/locks/ReentrantLock; - FIELD field_4472 neighborPositions [Lnet/minecraft/class_2338$class_2339; - METHOD method_3651 isChunkNonEmpty (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;)Z - ARG 0 pos - ARG 1 world - METHOD method_3652 rebuildChunk (FFFLnet/minecraft/class_842;)V - ARG 1 cameraX - ARG 2 cameraY - ARG 3 cameraZ - ARG 4 task - METHOD method_3653 setOrigin (III)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_3654 scheduleRebuild (Z)V - ARG 1 rebuildOnClientThread - METHOD method_3655 beginBufferBuilding (Lnet/minecraft/class_287;Lnet/minecraft/class_2338;)V - METHOD method_3656 getGlBuffer (I)Lnet/minecraft/class_291; - ARG 1 layer - METHOD method_3657 resortTransparency (FFFLnet/minecraft/class_842;)V - METHOD method_3659 delete ()V - METHOD method_3661 shouldRebuildOnClientThread ()Z - METHOD method_3662 unscheduleRebuild ()V - METHOD method_3663 cancel ()V - METHOD method_3665 setData (Lnet/minecraft/class_849;)V - ARG 1 data - METHOD method_3666 endBufferBuilding (Lnet/minecraft/class_1921;FFFLnet/minecraft/class_287;Lnet/minecraft/class_849;)V - METHOD method_3667 getLock ()Ljava/util/concurrent/locks/ReentrantLock; - METHOD method_3668 getSquaredCameraDistance ()D - METHOD method_3669 startResortTransparency ()Lnet/minecraft/class_842; - METHOD method_3670 getOrigin ()Lnet/minecraft/class_2338; - METHOD method_3672 shouldRebuild ()Z - METHOD method_3673 shouldBuild ()Z - METHOD method_3674 startRebuild ()Lnet/minecraft/class_842; - METHOD method_3675 clear ()V - METHOD method_3676 getNeighborPosition (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338; - ARG 1 direction - METHOD method_3677 getData ()Lnet/minecraft/class_849; - METHOD method_3678 getWorld ()Lnet/minecraft/class_1937; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRendererFactory.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererFactory.mapping deleted file mode 100644 index 5997832b02..0000000000 --- a/mappings/net/minecraft/client/render/chunk/ChunkRendererFactory.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_850 net/minecraft/client/render/chunk/ChunkRendererFactory - METHOD create (Lnet/minecraft/class_1937;Lnet/minecraft/class_761;)Lnet/minecraft/class_851; - ARG 1 world - ARG 2 worldRenderer diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRendererList.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererList.mapping deleted file mode 100644 index 1c398109f3..0000000000 --- a/mappings/net/minecraft/client/render/chunk/ChunkRendererList.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_752 net/minecraft/client/render/chunk/ChunkRendererList - FIELD field_3953 cameraY D - FIELD field_3954 cameraX D - FIELD field_3955 chunkRenderers Ljava/util/List; - FIELD field_3956 isCameraPositionSet Z - FIELD field_3957 cameraZ D - METHOD method_3157 translateToOrigin (Lnet/minecraft/class_851;)V - ARG 1 renderer - METHOD method_3158 setCameraPosition (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_3159 add (Lnet/minecraft/class_851;Lnet/minecraft/class_1921;)V - ARG 2 layer - METHOD method_3160 render (Lnet/minecraft/class_1921;)V - ARG 1 layer diff --git a/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping index 872ff42442..9e9d4b407a 100644 --- a/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_860 net/minecraft/client/render/debug/ChunkLoadingDebugRenderer - CLASS class_861 ServerData FIELD field_4509 client Lnet/minecraft/class_310; FIELD field_4510 lastUpdateTime D - FIELD field_4512 serverData Lnet/minecraft/class_860$class_861; diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index 2344b0fce4..68bbf12d3c 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer CLASS class_864 Renderer METHOD method_20414 clear ()V - METHOD method_3715 render (J)V - ARG 1 limitTime FIELD field_18777 pointsOfInterestDebugRenderer Lnet/minecraft/class_4207; FIELD field_18778 goalSelectorDebugRenderer Lnet/minecraft/class_4205; FIELD field_19325 raidCenterDebugRenderer Lnet/minecraft/class_4304; @@ -22,36 +20,5 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer FIELD field_4539 structureDebugRenderer Lnet/minecraft/class_870; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_19429 drawFloatingText (Ljava/lang/String;DDDIF)V - ARG 0 string - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 color - ARG 8 size METHOD method_20413 reset ()V - METHOD method_3709 render (J)V - ARG 1 limitTime - METHOD method_3711 drawBlockFloatingText (Ljava/lang/String;IIII)V - ARG 0 string - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 color - METHOD method_3712 drawFloatingText (Ljava/lang/String;DDDIFZFZ)V - ARG 0 string - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 color - ARG 8 size - ARG 9 centered - ARG 10 boldness - ARG 11 noDepthTest METHOD method_3713 toggleShowChunkBorder ()Z - METHOD method_3714 drawFloatingText (Ljava/lang/String;DDDI)V - ARG 0 string - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 color diff --git a/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping index 7c0484d9e5..7dc3812bb9 100644 --- a/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping @@ -7,16 +7,9 @@ CLASS net/minecraft/class_4503 net/minecraft/client/render/debug/GameTestDebugRe ARG 1 color ARG 2 message ARG 3 removalTime - METHOD method_22125 getRed ()F - METHOD method_22126 getGreen ()F - METHOD method_22127 getBlue ()F - METHOD method_22128 getAlpha ()F FIELD field_20520 markers Ljava/util/Map; METHOD method_22123 addMarker (Lnet/minecraft/class_2338;ILjava/lang/String;I)V ARG 1 pos ARG 2 color ARG 3 message ARG 4 duration - METHOD method_22124 renderMarker (Lnet/minecraft/class_2338;Lnet/minecraft/class_4503$class_4504;)V - ARG 1 pos - ARG 2 marker diff --git a/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping index 76562c58c9..1c1ad123fa 100644 --- a/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping @@ -2,4 +2,3 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/PointOfInterest FIELD field_18787 pointsOfInterest Ljava/util/Map; METHOD method_19432 addPointOfInterest (Lnet/minecraft/class_4207$class_4232;)V METHOD method_19434 removePointOfInterest (Lnet/minecraft/class_2338;)V - METHOD method_19706 getCamera ()Lnet/minecraft/class_4184; diff --git a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping index c100ab7ab2..bf4fa40d65 100644 --- a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping @@ -3,9 +3,5 @@ CLASS net/minecraft/class_4304 net/minecraft/client/render/debug/RaidCenterDebug FIELD field_19327 raidCenters Ljava/util/Collection; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_20559 draw (Lnet/minecraft/class_2338;)V - METHOD method_20560 showText (Ljava/lang/String;Lnet/minecraft/class_2338;I)V METHOD method_20561 setRaidCenters (Ljava/util/Collection;)V ARG 1 centers - METHOD method_20562 drawRaidCenters ()V - METHOD method_20563 getCamera ()Lnet/minecraft/class_4184; diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index 77b18a592b..744bd32ed5 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -2,11 +2,8 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen FIELD field_4737 model Lnet/minecraft/class_583; FIELD field_4738 features Ljava/util/List; FIELD field_4739 disableOutlineRender Z - FIELD field_4740 colorOverlayBuffer Ljava/nio/FloatBuffer; FIELD field_4741 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_4742 colorOverlayTexture Lnet/minecraft/class_1043; METHOD method_4039 getLyingAngle (Lnet/minecraft/class_1309;)F - METHOD method_4040 disableOverlayColor ()V METHOD method_4042 scale (Lnet/minecraft/class_1309;F)V ARG 1 entity ARG 2 tickDelta @@ -18,7 +15,6 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen ARG 2 tickDelta METHOD method_4046 addFeature (Lnet/minecraft/class_3887;)Z METHOD method_4047 applyOverlayColor (Lnet/minecraft/class_1309;FZ)Z - ARG 1 entity ARG 2 tickDelta ARG 3 hasHurtOverlay METHOD method_4050 afterOutlineRender ()V diff --git a/mappings/net/minecraft/client/render/entity/model/BannerBlockEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BannerBlockEntityModel.mapping deleted file mode 100644 index 5bad2a5dbf..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/BannerBlockEntityModel.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_550 net/minecraft/client/render/entity/model/BannerBlockEntityModel - FIELD field_3309 banner Lnet/minecraft/class_630; - FIELD field_3310 horizontalStick Lnet/minecraft/class_630; - FIELD field_3311 verticalStick Lnet/minecraft/class_630; - METHOD method_2791 getVerticalStick ()Lnet/minecraft/class_630; - METHOD method_2792 getBanner ()Lnet/minecraft/class_630; - METHOD method_2793 render ()V diff --git a/mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping deleted file mode 100644 index 20f3d32150..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_552 net/minecraft/client/render/entity/model/BedEntityModel - FIELD field_3316 part1 Lnet/minecraft/class_630; - FIELD field_3317 legs [Lnet/minecraft/class_630; - FIELD field_3318 part2 Lnet/minecraft/class_630; - METHOD method_2794 render ()V - METHOD method_2795 setVisible (Z)V - ARG 1 visible diff --git a/mappings/net/minecraft/client/render/entity/model/BookModel.mapping b/mappings/net/minecraft/client/render/entity/model/BookModel.mapping index ac5590f565..d4a83e7bc2 100644 --- a/mappings/net/minecraft/client/render/entity/model/BookModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BookModel.mapping @@ -6,15 +6,5 @@ CLASS net/minecraft/class_557 net/minecraft/client/render/entity/model/BookModel FIELD field_3337 leftBlock Lnet/minecraft/class_630; FIELD field_3338 rightCover Lnet/minecraft/class_630; FIELD field_3339 rightPage Lnet/minecraft/class_630; - METHOD method_17072 render (FFFFFF)V - ARG 1 ticks - ARG 2 leftPageAngle - ARG 3 rightPageAngle - ARG 4 pageTurningSpeed - ARG 6 scale - METHOD method_17073 setPageAngles (FFFFFF)V - ARG 1 ticks - ARG 2 leftPageAngle - ARG 3 rightPageAngle - ARG 4 pageTurningSpeed - ARG 6 scale + METHOD method_17072 render (Lnet/minecraft/class_287;FIILnet/minecraft/class_1058;)V + METHOD method_17073 setPageAngles (FFFF)V diff --git a/mappings/net/minecraft/client/render/entity/model/ChestEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ChestEntityModel.mapping deleted file mode 100644 index 5aa438a722..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/ChestEntityModel.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_556 net/minecraft/client/render/entity/model/ChestEntityModel - FIELD field_3330 lid Lnet/minecraft/class_630; - FIELD field_3331 hatch Lnet/minecraft/class_630; - FIELD field_3332 base Lnet/minecraft/class_630; - METHOD method_2798 getLid ()Lnet/minecraft/class_630; - METHOD method_2799 render ()V diff --git a/mappings/net/minecraft/client/render/entity/model/LargeChestEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/LargeChestEntityModel.mapping deleted file mode 100644 index 0d30c940b1..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/LargeChestEntityModel.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_577 net/minecraft/client/render/entity/model/LargeChestEntityModel diff --git a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping index e1b934386e..36599a156d 100644 --- a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping +++ b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory METHOD method_3454 uvLock (Lnet/minecraft/class_787;Lnet/minecraft/class_2350;Lnet/minecraft/class_1086;)Lnet/minecraft/class_787; METHOD method_3468 bake (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;Lnet/minecraft/class_789;Z)Lnet/minecraft/class_777; + METHOD method_3468 (Lnet/minecraft/class_593;Lnet/minecraft/class_593;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;Lnet/minecraft/class_789;Z)Lnet/minecraft/class_777; ARG 1 from ARG 2 to ARG 3 face diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index 7ddb387acb..6785c376b1 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -1,31 +1,23 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader CLASS class_1089 ModelLoaderException FIELD field_17907 spriteAtlasData Lnet/minecraft/class_1059$class_4007; - FIELD field_5369 DESTROY_STAGE_6 Lnet/minecraft/class_2960; FIELD field_5370 FIRE_1 Lnet/minecraft/class_2960; FIELD field_5371 MISSING_DEFINITION Ljava/lang/String; FIELD field_5372 KEY_VALUE_SPLITTER Lcom/google/common/base/Splitter; FIELD field_5373 COMMA_SPLITTER Lcom/google/common/base/Splitter; FIELD field_5374 MISSING Lnet/minecraft/class_1091; - FIELD field_5375 DESTROY_STAGE_2 Lnet/minecraft/class_2960; FIELD field_5376 unbakedModels Ljava/util/Map; - FIELD field_5377 DESTROY_STAGE_0 Lnet/minecraft/class_2960; FIELD field_5378 DEFAULT_TEXTURES Ljava/util/Set; FIELD field_5379 resourceManager Lnet/minecraft/class_3300; FIELD field_5380 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5381 LAVA_FLOW Lnet/minecraft/class_2960; - FIELD field_5382 DESTROY_STAGE_9 Lnet/minecraft/class_2960; FIELD field_5383 STATIC_DEFINITIONS Ljava/util/Map; FIELD field_5384 ITEM_MODEL_GENERATOR Lnet/minecraft/class_801; - FIELD field_5385 DESTROY_STAGE_1 Lnet/minecraft/class_2960; - FIELD field_5386 DESTROY_STAGE_5 Lnet/minecraft/class_2960; FIELD field_5387 bakedModels Ljava/util/Map; FIELD field_5388 WATER_OVERLAY Lnet/minecraft/class_2960; FIELD field_5389 BLOCK_ENTITY_MARKER Lnet/minecraft/class_793; FIELD field_5390 modelsToLoad Ljava/util/Set; FIELD field_5391 WATER_FLOW Lnet/minecraft/class_2960; - FIELD field_5392 DESTROY_STAGE_8 Lnet/minecraft/class_2960; - FIELD field_5393 DESTROY_STAGE_4 Lnet/minecraft/class_2960; FIELD field_5394 modelsToBake Ljava/util/Map; FIELD field_5395 ITEM_FRAME_STATE_FACTORY Lnet/minecraft/class_2689; FIELD field_5396 BUILTIN_MODEL_DEFINITIONS Ljava/util/Map; @@ -33,9 +25,7 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader FIELD field_5398 bakedModelCache Ljava/util/Map; FIELD field_5399 variantMapDeserializationContext Lnet/minecraft/class_790$class_791; FIELD field_5400 GENERATION_MARKER Lnet/minecraft/class_793; - FIELD field_5401 DESTROY_STAGE_7 Lnet/minecraft/class_2960; FIELD field_5402 spriteAtlas Lnet/minecraft/class_1059; - FIELD field_5403 DESTROY_STAGE_3 Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_1059;Lnet/minecraft/class_324;Lnet/minecraft/class_3695;)V ARG 2 spriteAtlas METHOD method_15878 bake (Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087; diff --git a/mappings/net/minecraft/client/render/model/json/ModelElement.mapping b/mappings/net/minecraft/client/render/model/json/ModelElement.mapping index 3bf244c5a5..de6a7ee862 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelElement.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelElement.mapping @@ -6,16 +6,19 @@ CLASS net/minecraft/class_785 net/minecraft/client/render/model/json/ModelElemen ARG 1 context ARG 2 object METHOD method_3405 deserializeTo (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1160; + METHOD method_3405 (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_593; ARG 1 object METHOD method_3406 (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_785; ARG 1 element ARG 2 type ARG 3 context METHOD method_3407 deserializeFrom (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1160; + METHOD method_3407 (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_593; ARG 1 object METHOD method_3408 getDirection (Ljava/lang/String;)Lnet/minecraft/class_2350; ARG 1 name METHOD method_3409 deserializeVec3f (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_1160; + METHOD method_3409 (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_593; ARG 1 object ARG 2 name METHOD method_3410 deserializeRotation (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_789; @@ -30,7 +33,7 @@ CLASS net/minecraft/class_785 net/minecraft/client/render/model/json/ModelElemen FIELD field_4230 faces Ljava/util/Map; FIELD field_4231 to Lnet/minecraft/class_1160; FIELD field_4232 rotation Lnet/minecraft/class_789; - METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Ljava/util/Map;Lnet/minecraft/class_789;Z)V + METHOD (Lnet/minecraft/class_593;Lnet/minecraft/class_593;Ljava/util/Map;Lnet/minecraft/class_789;Z)V ARG 1 from ARG 2 to ARG 3 faces diff --git a/mappings/net/minecraft/client/render/model/json/ModelRotation.mapping b/mappings/net/minecraft/client/render/model/json/ModelRotation.mapping index 52347c7d42..a4ac17900b 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelRotation.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelRotation.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_789 net/minecraft/client/render/model/json/ModelRotati FIELD field_4237 angle F FIELD field_4238 rescale Z FIELD field_4239 axis Lnet/minecraft/class_2350$class_2351; - METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_2350$class_2351;FZ)V + METHOD (Lnet/minecraft/class_593;Lnet/minecraft/class_2350$class_2351;FZ)V ARG 1 origin ARG 2 axis ARG 3 angle diff --git a/mappings/net/minecraft/client/render/model/json/Transformation.mapping b/mappings/net/minecraft/client/render/model/json/Transformation.mapping index a8bb6d8178..baf45636cd 100644 --- a/mappings/net/minecraft/client/render/model/json/Transformation.mapping +++ b/mappings/net/minecraft/client/render/model/json/Transformation.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_804 net/minecraft/client/render/model/json/Transformat ARG 2 unused ARG 3 context METHOD method_3493 parseVector3f (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_1160;)Lnet/minecraft/class_1160; + METHOD method_3493 (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_593;)Lnet/minecraft/class_593; ARG 1 json ARG 2 key ARG 3 default_ @@ -15,7 +16,7 @@ CLASS net/minecraft/class_804 net/minecraft/client/render/model/json/Transformat FIELD field_4285 scale Lnet/minecraft/class_1160; FIELD field_4286 translation Lnet/minecraft/class_1160; FIELD field_4287 rotation Lnet/minecraft/class_1160; - METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V + METHOD (Lnet/minecraft/class_593;Lnet/minecraft/class_593;Lnet/minecraft/class_593;)V ARG 1 rotation ARG 2 translation ARG 3 scale diff --git a/mappings/net/minecraft/client/texture/ImageFilter.mapping b/mappings/net/minecraft/client/texture/ImageFilter.mapping deleted file mode 100644 index 9f095cc453..0000000000 --- a/mappings/net/minecraft/client/texture/ImageFilter.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_760 net/minecraft/client/texture/ImageFilter - METHOD method_3237 filterImage (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011; diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 288cbaa2ad..bb8b2adb8b 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -112,7 +112,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4311 getPixelOpacity (II)B ARG 1 x ARG 2 y - METHOD method_4312 upload (IIIIIIIZ)V + METHOD method_4312 upload (IIIIIIIZZ)V ARG 1 level ARG 2 xOffset ARG 3 yOffset @@ -143,7 +143,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4318 getFormat ()Lnet/minecraft/class_1011$class_1012; METHOD method_4319 mirrorVertically ()V METHOD method_4320 checkAllocated ()V - METHOD method_4321 upload (IIIIIIIZZZ)V + METHOD method_4321 upload (IIIIIIIZZZZ)V ARG 1 level ARG 2 xOffset ARG 3 yOffset diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index 67ad2e0ca6..39c5160cf5 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider FIELD field_5304 textureManager Lnet/minecraft/class_1060; FIELD field_5305 skinCacheDir Ljava/io/File; FIELD field_5306 skinCache Lcom/google/common/cache/LoadingCache; - FIELD field_5307 EXECUTOR_SERVICE Ljava/util/concurrent/ExecutorService; FIELD field_5308 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_4651 loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_1071$class_1072;)Lnet/minecraft/class_2960; ARG 1 profileTexture diff --git a/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping b/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping index f719d8ae9c..c2f680a8c2 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping @@ -1,13 +1,8 @@ CLASS net/minecraft/class_1046 net/minecraft/client/texture/PlayerSkinTexture FIELD field_5210 cacheFile Ljava/io/File; - FIELD field_5211 filter Lnet/minecraft/class_760; FIELD field_5212 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_5213 downloadThread Ljava/lang/Thread; FIELD field_5214 url Ljava/lang/String; - FIELD field_5216 DOWNLOAD_THREAD_COUNTER Ljava/util/concurrent/atomic/AtomicInteger; - METHOD (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/class_2960;Lnet/minecraft/class_760;)V + METHOD (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/class_2960;ZLjava/lang/Runnable;)V ARG 1 cacheFile ARG 2 url ARG 3 fallbackSkin - ARG 4 filter - METHOD method_4532 startTextureDownload ()V diff --git a/mappings/net/minecraft/client/texture/SkinRemappingImageFilter.mapping b/mappings/net/minecraft/client/texture/SkinRemappingImageFilter.mapping deleted file mode 100644 index c52c75f3cf..0000000000 --- a/mappings/net/minecraft/client/texture/SkinRemappingImageFilter.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_764 net/minecraft/client/texture/SkinRemappingImageFilter diff --git a/mappings/net/minecraft/client/texture/TextureCache.mapping b/mappings/net/minecraft/client/texture/TextureCache.mapping index e5c15a77f3..6d6c386470 100644 --- a/mappings/net/minecraft/client/texture/TextureCache.mapping +++ b/mappings/net/minecraft/client/texture/TextureCache.mapping @@ -14,5 +14,4 @@ CLASS net/minecraft/class_770 net/minecraft/client/texture/TextureCache FIELD field_4161 lastRequestTimeMillis J FIELD field_4152 DEFAULT_SHIELD Lnet/minecraft/class_2960; FIELD field_4153 DEFAULT_BANNER Lnet/minecraft/class_2960; - FIELD field_4154 BANNER Lnet/minecraft/class_770$class_771; FIELD field_4155 SHIELD Lnet/minecraft/class_770$class_771; diff --git a/mappings/net/minecraft/client/util/DebugNameGenerator.mapping b/mappings/net/minecraft/client/util/DebugNameGenerator.mapping deleted file mode 100644 index d05d8cd734..0000000000 --- a/mappings/net/minecraft/client/util/DebugNameGenerator.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_4240 net/minecraft/client/util/DebugNameGenerator - FIELD field_18962 ADJECTIVES [Ljava/lang/String; - FIELD field_18963 NOUNS [Ljava/lang/String; - METHOD method_19779 getRandom (Ljava/util/Random;[Ljava/lang/String;)Ljava/lang/String; - METHOD method_19780 getDebugName (Ljava/util/UUID;)Ljava/lang/String; - METHOD method_19781 createRandomForUUID (Ljava/util/UUID;)Ljava/util/Random; diff --git a/mappings/net/minecraft/client/util/GlAllocationUtils.mapping b/mappings/net/minecraft/client/util/GlAllocationUtils.mapping index a193bd0044..882f877e27 100644 --- a/mappings/net/minecraft/client/util/GlAllocationUtils.mapping +++ b/mappings/net/minecraft/client/util/GlAllocationUtils.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_311 net/minecraft/client/util/GlAllocationUtils - METHOD method_1593 genLists (I)I - METHOD method_1594 deleteLists (II)V - METHOD method_1595 deleteSingletonList (I)V METHOD method_1596 allocateByteBuffer (I)Ljava/nio/ByteBuffer; ARG 0 size METHOD method_1597 allocateFloatBuffer (I)Ljava/nio/FloatBuffer; diff --git a/mappings/net/minecraft/client/util/math/Vector3f.mapping b/mappings/net/minecraft/client/util/math/Vector3f.mapping index d9730d164e..cea29330a6 100644 --- a/mappings/net/minecraft/client/util/math/Vector3f.mapping +++ b/mappings/net/minecraft/client/util/math/Vector3f.mapping @@ -1,28 +1,14 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f FIELD field_5658 components [F - METHOD (FFF)V - ARG 1 x - ARG 2 y - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o METHOD method_16004 clampFloat (FFF)F - ARG 0 v - ARG 1 min - ARG 2 max METHOD method_4942 scale (F)V METHOD method_4943 getX ()F METHOD method_4944 subtract (Lnet/minecraft/class_1160;)V METHOD method_4945 getY ()F METHOD method_4946 clamp (FF)V - ARG 1 min METHOD method_4947 getZ ()F METHOD method_4948 add (FFF)V - ARG 1 x - ARG 2 y METHOD method_4949 set (FFF)V - ARG 1 x - ARG 2 y - ARG 3 z METHOD method_4950 dot (Lnet/minecraft/class_1160;)F METHOD method_4951 cross (Lnet/minecraft/class_1160;)V METHOD method_4952 reciprocal ()V diff --git a/mappings/net/minecraft/command/arguments/ColorArgumentType.mapping b/mappings/net/minecraft/command/arguments/ColorArgumentType.mapping index 2af72500b4..2e13eeccf1 100644 --- a/mappings/net/minecraft/command/arguments/ColorArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ColorArgumentType.mapping @@ -6,5 +6,6 @@ CLASS net/minecraft/class_2177 net/minecraft/command/arguments/ColorArgumentType ARG 2 builder METHOD method_9276 color ()Lnet/minecraft/class_2177; METHOD method_9277 getColor (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_124; + METHOD method_9277 (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_618; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index f616eef8b0..b87e83e2cb 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -215,9 +215,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6037 spawnItemParticles (Lnet/minecraft/class_1799;I)V ARG 1 stack ARG 2 count - METHOD method_6039 isBlocking ()Z METHOD method_6038 onDismounted (Lnet/minecraft/class_1297;)V ARG 1 vehicle + METHOD method_6039 isBlocking ()Z METHOD method_6040 consumeItem ()V METHOD method_6041 getFallSound (I)Lnet/minecraft/class_3414; ARG 1 distance diff --git a/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping index 1621032669..890fbb5956 100644 --- a/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping @@ -1,7 +1 @@ CLASS net/minecraft/class_6 net/minecraft/entity/ai/pathing/BirdPathNodeMaker - METHOD getPathNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; - ARG 6 sizeX - ARG 7 sizeY - ARG 8 sizeZ - ARG 9 canOpenDoors - ARG 10 canEnterOpenDoors diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index 7b9a2b453d..2dee78ea1a 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker FIELD field_63 waterPathNodeTypeWeight F - METHOD getNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; - ARG 1 world METHOD method_20536 isValidDiagonalSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z ARG 1 node ARG 2 successor1 diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping index f252b25f82..3f21ef77a4 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping @@ -18,7 +18,6 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode ARG 3 z METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_21652 getPos ()Lnet/minecraft/class_2338; METHOD method_21653 getManhattanDistance (Lnet/minecraft/class_9;)F ARG 1 node METHOD method_21654 getManhattanDistance (Lnet/minecraft/class_2338;)F diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping index 13e848ba23..14eabbffb7 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_7 net/minecraft/entity/ai/pathing/PathNodeType FIELD field_13 defaultPenalty F - METHOD (F)V - ARG 1 defaultPenalty METHOD method_11 getDefaultPenalty ()F diff --git a/mappings/net/minecraft/entity/boss/BossBar.mapping b/mappings/net/minecraft/entity/boss/BossBar.mapping index fd62259542..0d2eeab484 100644 --- a/mappings/net/minecraft/entity/boss/BossBar.mapping +++ b/mappings/net/minecraft/entity/boss/BossBar.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1259 net/minecraft/entity/boss/BossBar CLASS class_1260 Color FIELD field_5781 name Ljava/lang/String; FIELD field_5787 format Lnet/minecraft/class_124; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_124;)V + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_618;)V ARG 3 name ARG 4 format METHOD method_5421 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectType.mapping b/mappings/net/minecraft/entity/effect/StatusEffectType.mapping index c6a1d92e4a..e7bb68cb88 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectType.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectType.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4081 net/minecraft/entity/effect/StatusEffectType FIELD field_18274 formatting Lnet/minecraft/class_124; - METHOD (Ljava/lang/String;ILnet/minecraft/class_124;)V + METHOD (Ljava/lang/String;ILnet/minecraft/class_618;)V ARG 3 format METHOD method_18793 getFormatting ()Lnet/minecraft/class_124; diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 944850263a..fc239ca4c2 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -27,10 +27,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6207 moveControl Lnet/minecraft/class_1335; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type - METHOD e (FF)F - ARG 1 yaw - METHOD isWalkTargetCompleted (Lnet/minecraft/class_2338;)Z - ARG 1 pos METHOD method_17326 cannotDespawn ()Z METHOD method_18407 isInWalkTargetRange (Lnet/minecraft/class_2338;)Z ARG 1 pos diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping index 4920f34832..5a65950cbd 100644 --- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_3732 net/minecraft/entity/mob/PatrolEntity ARG 1 actor ARG 2 leaderSpeed ARG 4 fellowSpeed - METHOD method_16222 wander ()V + METHOD method_16222 wander ()Z FIELD field_16477 patrolling Z FIELD field_16478 patrolTarget Lnet/minecraft/class_2338; FIELD field_16479 patrolLeader Z diff --git a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping index f36ad6b32d..6e1ad09555 100644 --- a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1604 net/minecraft/entity/mob/PillagerEntity FIELD field_7334 CHARGING Lnet/minecraft/class_2940; FIELD field_7335 inventory Lnet/minecraft/class_1277; - METHOD method_16473 getInventory ()Lnet/minecraft/class_1277; METHOD method_19168 getProjectileVelocity (Lnet/minecraft/class_243;F)Lnet/minecraft/class_1160; METHOD method_7108 isCharging ()Z diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 2a3bf451dc..07cbe15f5d 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -19,7 +19,6 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_15783 getStateFactory ()Lnet/minecraft/class_2689; METHOD method_15784 getBlastResistance ()F METHOD method_15785 getDefaultState ()Lnet/minecraft/class_3610; - METHOD method_15786 getRenderLayer ()Lnet/minecraft/class_1921; METHOD method_15787 getParticle ()Lnet/minecraft/class_2394; METHOD method_15788 getHeight (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F METHOD method_15789 getTickRate (Lnet/minecraft/class_4538;)I diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 0d1f415d29..071abd90af 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_15759 getBlockState ()Lnet/minecraft/class_2680; METHOD method_15760 getBlastResistance ()F METHOD method_15761 getLevel ()I - METHOD method_15762 getRenderLayer ()Lnet/minecraft/class_1921; METHOD method_15763 getHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F METHOD method_15765 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3610; ARG 0 dynamic diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index ca054bfb44..ae10b13802 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -177,7 +177,5 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_20320 onChunkRenderDistanceCenter (Lnet/minecraft/class_4282;)V ARG 1 packet - METHOD method_21707 onBlockAction (Lnet/minecraft/class_4463;)V - ARG 1 packet METHOD method_21707 handlePlayerActionResponse (Lnet/minecraft/class_4463;)V ARG 1 packet diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 7611d739c0..3a30cbe600 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_9599 ANY Lnet/minecraft/class_2048; FIELD field_9600 nbt Lnet/minecraft/class_2105; FIELD field_9601 distance Lnet/minecraft/class_2025; - METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Ljava/lang/String;Lnet/minecraft/class_2960;)V ARG 1 type ARG 2 distance ARG 3 location @@ -41,7 +41,6 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 7 equipment METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 1 world - ARG 2 pos METHOD method_8910 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2048; ARG 0 element METHOD method_8911 serializeAll ([Lnet/minecraft/class_2048;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index fa4103ccdc..825b75b129 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_9685 ANY Lnet/minecraft/class_2090; FIELD field_9686 dimension Lnet/minecraft/class_2874; FIELD field_9687 feature Lnet/minecraft/class_3195; - METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;Lnet/minecraft/class_2874;)V + METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;Lnet/minecraft/class_2874;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index f4eeb24baa..cc6551193a 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager FIELD field_9023 recipes Ljava/util/Map; FIELD field_9024 errored Z FIELD field_9027 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD apply (Ljava/util/Map;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)V - ARG 1 preparedObject - ARG 2 resourceManager - ARG 3 profiler METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map; ARG 1 type METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1860; diff --git a/mappings/net/minecraft/scoreboard/Team.mapping b/mappings/net/minecraft/scoreboard/Team.mapping index a6b2a2dd67..34d33fd0db 100644 --- a/mappings/net/minecraft/scoreboard/Team.mapping +++ b/mappings/net/minecraft/scoreboard/Team.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_268 net/minecraft/scoreboard/Team METHOD method_1139 setSuffix (Lnet/minecraft/class_2561;)V METHOD method_1140 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_1141 setColor (Lnet/minecraft/class_124;)V + METHOD method_1141 (Lnet/minecraft/class_618;)V ARG 1 color METHOD method_1142 modifyText (Lnet/minecraft/class_270;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; METHOD method_1143 setShowFriendlyInvisibles (Z)V diff --git a/mappings/net/minecraft/server/command/ScheduleCommand.mapping b/mappings/net/minecraft/server/command/ScheduleCommand.mapping index 7d1e2160da..9ec85414ca 100644 --- a/mappings/net/minecraft/server/command/ScheduleCommand.mapping +++ b/mappings/net/minecraft/server/command/ScheduleCommand.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_3112 net/minecraft/server/command/ScheduleCommand FIELD field_13706 SAME_TICK_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - METHOD method_13566 execute (Lnet/minecraft/class_2168;Lcom/mojang/datafixers/util/Either;I)I - ARG 0 source - ARG 1 function + METHOD method_13566 execute (Lnet/minecraft/class_2168;Lcom/mojang/datafixers/util/Either;IZ)I ARG 2 time METHOD method_13567 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher diff --git a/mappings/net/minecraft/server/command/TeamCommand.mapping b/mappings/net/minecraft/server/command/TeamCommand.mapping index e01ba34a0a..ccdf32a195 100644 --- a/mappings/net/minecraft/server/command/TeamCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamCommand.mapping @@ -50,6 +50,7 @@ CLASS net/minecraft/class_3142 net/minecraft/server/command/TeamCommand ARG 1 team ARG 2 prefix METHOD method_13745 executeModifyColor (Lnet/minecraft/class_2168;Lnet/minecraft/class_268;Lnet/minecraft/class_124;)I + METHOD method_13745 (Lnet/minecraft/class_2168;Lnet/minecraft/class_268;Lnet/minecraft/class_618;)I ARG 0 source ARG 1 team ARG 2 color diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 2ae373fc9e..c46e0d7883 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 1 pos ARG 2 tests METHOD method_22275 sendMessage (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_124;)V + METHOD method_22275 (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_618;)V ARG 0 world ARG 1 message ARG 2 formatting diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index f8032bd16f..2e83ca4f37 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -48,7 +48,6 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 1 targetStatus ARG 2 chunkStorage METHOD method_13994 getPos ()Lnet/minecraft/class_1923; - METHOD method_13995 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_14000 getFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_14002 markForBlockUpdate (III)V ARG 1 x @@ -72,7 +71,6 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 2 y METHOD method_15890 setLevel (I)V ARG 1 level - METHOD method_16141 getCompletedStatus ()Lnet/minecraft/class_2806; METHOD method_16143 updateFuture (Ljava/util/concurrent/CompletableFuture;)V ARG 1 newChunkFuture METHOD method_16144 getWorldChunk ()Lnet/minecraft/class_2818; diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 371707a304..af9372e8c2 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -35,8 +35,6 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_14151 getLoadedChunkCount ()I METHOD method_14161 tickChunks ()V METHOD method_16155 tick ()Z - METHOD method_17294 getDebugString (Lnet/minecraft/class_1923;)Ljava/lang/String; - ARG 1 pos METHOD method_17297 addTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V METHOD method_17298 save (Z)V ARG 1 flush @@ -62,5 +60,3 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_20585 (JLjava/util/function/Function;)Z ARG 1 pos METHOD method_20587 initChunkCaches ()V - METHOD onLightUpdate (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)V - ARG 2 pos diff --git a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping index 324d82631c..7496143466 100644 --- a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping +++ b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping @@ -10,10 +10,6 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider ARG 2 chunkStorage ARG 4 processor ARG 5 actor - METHOD a (Lnet/minecraft/class_2338;I)V - ARG 1 pos - METHOD enableLight (Lnet/minecraft/class_1923;Z)V - ARG 1 pos METHOD method_14277 runTasks ()V METHOD method_17303 tick ()V METHOD method_17304 setTaskBatchSize (I)V diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index fc5c0af66e..439d98b8fc 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -63,8 +63,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 pos ARG 3 level ARG 4 holder - METHOD method_17218 getDebugString (Lnet/minecraft/class_1923;)Ljava/lang/String; - ARG 1 pos METHOD method_17220 createChunkRegionFuture (Lnet/minecraft/class_1923;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; ARG 1 centerChunk ARG 2 margin diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping index c776546f06..8c5699ec99 100644 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ b/mappings/net/minecraft/test/TestUtil.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil METHOD method_22213 clearDebugMarkers (Lnet/minecraft/class_3218;)V ARG 0 world METHOD method_22214 sendMessage (Lnet/minecraft/class_3218;Lnet/minecraft/class_124;Ljava/lang/String;)V + METHOD method_22214 (Lnet/minecraft/class_3218;Lnet/minecraft/class_618;Ljava/lang/String;)V ARG 0 world ARG 1 formatting ARG 2 message diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index d51f51bbb9..9fcfe24efc 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style ARG 1 insertion METHOD method_10976 deepCopy ()Lnet/minecraft/class_2583; METHOD method_10977 setColor (Lnet/minecraft/class_124;)Lnet/minecraft/class_2583; + METHOD method_10977 (Lnet/minecraft/class_618;)Lnet/minecraft/class_2583; ARG 1 color METHOD method_10978 setItalic (Ljava/lang/Boolean;)Lnet/minecraft/class_2583; ARG 1 italic diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index f221aee756..ea8d880742 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -35,9 +35,11 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text ARG 1 text METHOD method_10853 deepCopy ()Lnet/minecraft/class_2561; METHOD method_10854 formatted (Lnet/minecraft/class_124;)Lnet/minecraft/class_2561; + METHOD method_10854 (Lnet/minecraft/class_618;)Lnet/minecraft/class_2561; ARG 1 formatting METHOD method_10855 getSiblings ()Ljava/util/List; METHOD method_10856 formatted ([Lnet/minecraft/class_124;)Lnet/minecraft/class_2561; + METHOD method_10856 ([Lnet/minecraft/class_618;)Lnet/minecraft/class_2561; ARG 1 formatting METHOD method_10857 copyWithoutChildren (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 text diff --git a/mappings/net/minecraft/util/Formatting.mapping b/mappings/net/minecraft/util/Formatting.mapping index 2602906762..7db5b9ae33 100644 --- a/mappings/net/minecraft/util/Formatting.mapping +++ b/mappings/net/minecraft/util/Formatting.mapping @@ -7,43 +7,16 @@ CLASS net/minecraft/class_124 net/minecraft/util/Formatting FIELD field_1069 stringValue Ljava/lang/String; FIELD field_1071 colorIndex I FIELD field_1081 modifier Z - METHOD (Ljava/lang/String;ILjava/lang/String;CILjava/lang/Integer;)V - ARG 3 name - ARG 4 code - ARG 5 colorIndex - ARG 6 colorValue - METHOD (Ljava/lang/String;ILjava/lang/String;CZ)V - ARG 3 name - ARG 4 code - ARG 5 modifier - METHOD (Ljava/lang/String;ILjava/lang/String;CZILjava/lang/Integer;)V - ARG 3 name - ARG 4 code - ARG 5 modifier - ARG 6 colorIndex - ARG 7 colorValue - METHOD method_531 (Lnet/minecraft/class_124;)Ljava/lang/String; - ARG 0 f METHOD method_532 getColorValue ()Ljava/lang/Integer; METHOD method_533 byName (Ljava/lang/String;)Lnet/minecraft/class_124; - ARG 0 name METHOD method_534 byColorIndex (I)Lnet/minecraft/class_124; - ARG 0 colorIndex METHOD method_535 sanitize (Ljava/lang/String;)Ljava/lang/String; - ARG 0 name METHOD method_536 getColorIndex ()I METHOD method_537 getName ()Ljava/lang/String; METHOD method_538 getFormatAtEnd (Ljava/lang/String;)Ljava/lang/String; - ARG 0 string METHOD method_539 strip (Ljava/lang/String;)Ljava/lang/String; - ARG 0 string METHOD method_540 getNames (ZZ)Ljava/util/Collection; - ARG 0 colors - ARG 1 modifiers - METHOD method_541 (Lnet/minecraft/class_124;)Lnet/minecraft/class_124; - ARG 0 f METHOD method_542 isModifier ()Z METHOD method_543 isColor ()Z METHOD method_544 byCode (C)Lnet/minecraft/class_124; - ARG 0 code METHOD method_545 affectsGlyphWidth ()Z diff --git a/mappings/net/minecraft/util/math/BlockBox.mapping b/mappings/net/minecraft/util/math/BlockBox.mapping index 350c5cb120..7d432ddd77 100644 --- a/mappings/net/minecraft/util/math/BlockBox.mapping +++ b/mappings/net/minecraft/util/math/BlockBox.mapping @@ -67,4 +67,3 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox ARG 1 x ARG 2 y ARG 3 z - METHOD method_19635 getCenter ()Lnet/minecraft/class_2382; diff --git a/mappings/net/minecraft/util/math/Quaternion.mapping b/mappings/net/minecraft/util/math/Quaternion.mapping index 7e688a8203..957ed9af82 100644 --- a/mappings/net/minecraft/util/math/Quaternion.mapping +++ b/mappings/net/minecraft/util/math/Quaternion.mapping @@ -1,5 +1,4 @@ -CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion - FIELD field_5656 components [F +CLASS net/minecraft/class_628 net/minecraft/util/math/Quaternion METHOD (FFFF)V ARG 1 x ARG 2 y @@ -10,22 +9,17 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion ARG 2 y ARG 3 z ARG 4 w - METHOD (Lnet/minecraft/class_1158;)V - ARG 1 other - METHOD (Lnet/minecraft/class_1160;FZ)V + METHOD (Lnet/minecraft/class_593;FZ)V ARG 1 axis ARG 2 angle ARG 3 degrees + METHOD (Lnet/minecraft/class_628;)V + ARG 1 other METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_16002 sin (F)F + METHOD method_16002 (F)F ARG 0 value - METHOD method_16003 cos (F)F + METHOD method_16003 (F)F ARG 0 value - METHOD method_4921 getX ()F - METHOD method_4922 getY ()F - METHOD method_4923 getZ ()F - METHOD method_4924 getW ()F - METHOD method_4925 copyFrom (Lnet/minecraft/class_1158;)V + METHOD method_4925 (Lnet/minecraft/class_628;)V ARG 1 other - METHOD method_4926 reverse ()V diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index ccfa8fa42b..1aff2eba85 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -49,4 +49,3 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d ARG 5 multZ METHOD method_18806 multiply (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 mult - METHOD method_19637 negate ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping index dbb404f5c6..23d49415f6 100644 --- a/mappings/net/minecraft/world/BlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_1922 net/minecraft/world/BlockView METHOD method_17744 rayTrace (Lnet/minecraft/class_3959;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Ljava/lang/Object; ARG 1 context ARG 2 blockRaytracer - ARG 3 missProvider METHOD method_17745 rayTraceBlock (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2338;Lnet/minecraft/class_265;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3965; ARG 1 start ARG 2 end diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index 1612fd16fd..d7cdf64a9f 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -16,8 +16,6 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion METHOD (Lnet/minecraft/class_3218;Ljava/util/List;)V ARG 1 world ARG 2 chunks - METHOD getChunk (IILnet/minecraft/class_2806;Z)Lnet/minecraft/class_2791; - ARG 4 create METHOD method_14336 getCenterChunkX ()I METHOD method_14338 markBlockForPostProcessing (Lnet/minecraft/class_2338;)V METHOD method_14339 getCenterChunkZ ()I diff --git a/mappings/net/minecraft/world/CollisionView.mapping b/mappings/net/minecraft/world/CollisionView.mapping index 917c8d2b33..558ed2f534 100644 --- a/mappings/net/minecraft/world/CollisionView.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -20,15 +20,10 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView ARG 1 entity ARG 2 entityBoundingBox ARG 3 otherEntities - METHOD method_8600 getCollisionShapes (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; - ARG 2 box - ARG 3 excluded METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; ARG 1 entity ARG 2 box ARG 3 excluded - METHOD method_8603 (Lnet/minecraft/class_2338;I)I - ARG 2 darkness METHOD method_8606 intersectsEntities (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_8611 intersectsEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_265;)Z diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index 72bc40007f..1dec559c95 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_1936 net/minecraft/world/IWorld - METHOD isChunkLoaded (II)Z - ARG 1 chunkX - ARG 2 chunkZ METHOD method_20290 playLevelEvent (ILnet/minecraft/class_2338;I)V ARG 1 eventId ARG 3 data diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 193a3e6af2..5c31bb3e91 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -29,8 +29,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 3 chunkManagerProvider ARG 4 profiler ARG 5 isClient - METHOD breakBlock (Lnet/minecraft/class_2338;ZLnet/minecraft/class_1297;)Z - ARG 2 drop METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16109 scheduleBlockRender (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V METHOD method_17452 addImportantParticle (Lnet/minecraft/class_2394;ZDDDDDD)V @@ -57,10 +55,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 pos ARG 2 oldBlock ARG 3 newBlock - METHOD method_21729 (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; - ARG 1 entityClass - ARG 2 box - ARG 3 predicate METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V METHOD method_8419 isRaining ()Z METHOD method_8421 sendEntityStatus (Lnet/minecraft/class_1297;B)V diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index 387a24ae55..8e4931af70 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -29,8 +29,6 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide ARG 1 array ARG 2 blockPos METHOD method_15518 hasUpdates ()Z - METHOD method_15520 getSectionDebugString (J)Ljava/lang/String; - ARG 1 pos METHOD method_17529 getChunk (II)Lnet/minecraft/class_1922; ARG 1 chunkX ARG 2 chunkZ diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping index 1cc3376c7e..5202cd3918 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_3562 net/minecraft/world/chunk/light/ChunkLightingView CLASS class_3563 Empty - METHOD getLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; - ARG 1 pos - METHOD getLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; - ARG 1 pos METHOD method_15543 getLightLevel (Lnet/minecraft/class_2338;)I METHOD method_15544 getLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index 91a62baace..758d072c67 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -22,9 +22,6 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider ARG 1 maxUpdateCount ARG 2 doSkylight ARG 3 skipEdgeLightPropagation - METHOD method_15564 getSectionDebugString (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)Ljava/lang/String; - ARG 1 lightType - ARG 2 pos METHOD method_20601 setRetainData (Lnet/minecraft/class_1923;Z)V ARG 1 pos ARG 2 retainData diff --git a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping index 9174e4974b..a4578d1f97 100644 --- a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping @@ -8,10 +8,6 @@ CLASS net/minecraft/class_3569 net/minecraft/world/chunk/light/SkyLightStorage FIELD field_15819 hasSkyLightUpdates Z METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider - METHOD enableLight (JZ)V - ARG 3 enabled - METHOD k (J)V - ARG 1 blockPos METHOD method_15566 isLightEnabled (J)Z ARG 1 sectionPos METHOD method_15567 isAboveMinimumHeight (I)Z diff --git a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping b/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping index cc1360bf5b..f8c418dd7a 100644 --- a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping +++ b/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_192 net/minecraft/world/loot/ConditionConsumerBuilder METHOD method_512 getThis ()Ljava/lang/Object; - METHOD method_840 withCondition (Lnet/minecraft/class_209$class_210;)Ljava/lang/Object; + METHOD method_840 withCondition (Lnet/minecraft/class_4570$class_210;)Ljava/lang/Object; ARG 1 builder diff --git a/mappings/net/minecraft/world/loot/LootManager.mapping b/mappings/net/minecraft/world/loot/LootManager.mapping index 344ff3dce0..b6e70142b9 100644 --- a/mappings/net/minecraft/world/loot/LootManager.mapping +++ b/mappings/net/minecraft/world/loot/LootManager.mapping @@ -7,14 +7,7 @@ CLASS net/minecraft/class_60 net/minecraft/world/loot/LootManager METHOD method_368 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 key ARG 1 value - METHOD method_369 check (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;Ljava/util/function/Function;)V - ARG 0 reporter - ARG 1 id - ARG 2 supplier - ARG 3 supplierGetter + METHOD method_369 check (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V METHOD method_370 getSupplierNames ()Ljava/util/Set; METHOD method_372 toJson (Lnet/minecraft/class_52;)Lcom/google/gson/JsonElement; ARG 0 supplier - METHOD method_373 (Lnet/minecraft/class_58;Lcom/google/common/collect/ImmutableMap;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V - ARG 2 id - ARG 3 supplier diff --git a/mappings/net/minecraft/world/loot/LootPool.mapping b/mappings/net/minecraft/world/loot/LootPool.mapping index 8f65509faf..9c7f2d7424 100644 --- a/mappings/net/minecraft/world/loot/LootPool.mapping +++ b/mappings/net/minecraft/world/loot/LootPool.mapping @@ -21,12 +21,12 @@ CLASS net/minecraft/class_55 net/minecraft/world/loot/LootPool ARG 3 context FIELD field_952 javaFunctions Ljava/util/function/BiFunction; FIELD field_953 entries [Lnet/minecraft/class_79; - FIELD field_954 conditions [Lnet/minecraft/class_209; + FIELD field_954 conditions [Lnet/minecraft/class_4570; FIELD field_955 predicate Ljava/util/function/Predicate; FIELD field_956 functions [Lnet/minecraft/class_117; FIELD field_957 rollsRange Lnet/minecraft/class_59; FIELD field_958 bonusRollsRange Lnet/minecraft/class_61; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;Lnet/minecraft/class_59;Lnet/minecraft/class_61;)V + METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;Lnet/minecraft/class_59;Lnet/minecraft/class_61;)V ARG 1 entries ARG 2 conditions ARG 3 functions @@ -41,8 +41,4 @@ CLASS net/minecraft/class_55 net/minecraft/world/loot/LootPool ARG 1 itemDropper ARG 2 context METHOD method_347 builder ()Lnet/minecraft/class_55$class_56; - METHOD method_349 check (Lnet/minecraft/class_58;Ljava/util/function/Function;Ljava/util/Set;Lnet/minecraft/class_176;)V - ARG 1 reporter - ARG 2 supplierGetter - ARG 3 parentLootTables - ARG 4 contextType + METHOD method_349 check (Lnet/minecraft/class_58;)V diff --git a/mappings/net/minecraft/world/loot/LootSupplier.mapping b/mappings/net/minecraft/world/loot/LootSupplier.mapping index 408449fa96..ac0c65b554 100644 --- a/mappings/net/minecraft/world/loot/LootSupplier.mapping +++ b/mappings/net/minecraft/world/loot/LootSupplier.mapping @@ -44,11 +44,7 @@ CLASS net/minecraft/class_52 net/minecraft/world/loot/LootSupplier METHOD method_329 supplyInventory (Lnet/minecraft/class_1263;Lnet/minecraft/class_47;)V ARG 1 inventory ARG 2 context - METHOD method_330 check (Lnet/minecraft/class_58;Ljava/util/function/Function;Ljava/util/Set;Lnet/minecraft/class_176;)V - ARG 1 reporter - ARG 2 supplierGetter - ARG 3 parentLootTables - ARG 4 contextType + METHOD method_330 check (Lnet/minecraft/class_58;)V METHOD method_331 (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_332 limitedConsumer (Ljava/util/function/Consumer;)Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/world/loot/LootTableReporter.mapping b/mappings/net/minecraft/world/loot/LootTableReporter.mapping index cb2af9dfd1..54c9ae3da5 100644 --- a/mappings/net/minecraft/world/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/world/loot/LootTableReporter.mapping @@ -2,9 +2,6 @@ CLASS net/minecraft/class_58 net/minecraft/world/loot/LootTableReporter FIELD field_964 name Ljava/lang/String; FIELD field_965 messages Lcom/google/common/collect/Multimap; FIELD field_966 nameFactory Ljava/util/function/Supplier; - METHOD (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;)V - ARG 1 messages - ARG 2 nameFactory METHOD method_359 getContext ()Ljava/lang/String; METHOD method_360 report (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping index 916e3b9b37..2afcb50df6 100644 --- a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_186 net/minecraft/world/loot/condition/AlternativeLootCondition CLASS class_187 Builder FIELD field_1248 terms Ljava/util/List; - METHOD ([Lnet/minecraft/class_209$class_210;)V + METHOD ([Lnet/minecraft/class_4570$class_210;)V ARG 1 terms CLASS class_188 Factory - FIELD field_1246 terms [Lnet/minecraft/class_209; + FIELD field_1246 terms [Lnet/minecraft/class_4570; FIELD field_1247 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_209;)V + METHOD ([Lnet/minecraft/class_4570;)V ARG 1 terms - METHOD method_826 builder ([Lnet/minecraft/class_209$class_210;)Lnet/minecraft/class_186$class_187; + METHOD method_826 builder ([Lnet/minecraft/class_4570$class_210;)Lnet/minecraft/class_186$class_187; ARG 0 terms METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping index aea19786fc..7fd3fd2540 100644 --- a/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping @@ -1,34 +1,13 @@ CLASS net/minecraft/class_212 net/minecraft/world/loot/condition/BlockStatePropertyLootCondition CLASS class_213 Builder - FIELD field_1289 availableProperties Ljava/util/Set; FIELD field_1290 block Lnet/minecraft/class_2248; - FIELD field_1291 propertyValues Ljava/util/Map; + FIELD field_1291 propertyValues Lnet/minecraft/class_4559; METHOD (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_907 withBlockStateProperty (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Lnet/minecraft/class_212$class_213; - ARG 1 property - ARG 2 value CLASS class_214 Factory - METHOD method_908 getPropertyValueString (Lnet/minecraft/class_2769;Ljava/lang/Object;)Ljava/lang/String; - ARG 0 property - ARG 1 value - METHOD method_911 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2769;Ljava/lang/Object;)V - ARG 1 property - ARG 2 value FIELD field_1286 block Lnet/minecraft/class_2248; - FIELD field_1287 predicate Ljava/util/function/Predicate; - FIELD field_1288 properties Ljava/util/Map; - METHOD (Lnet/minecraft/class_2248;Ljava/util/Map;)V - ARG 1 block - ARG 2 properties - METHOD method_898 getBlockState (Lnet/minecraft/class_2248;Ljava/util/Map;)Ljava/util/function/Predicate; - ARG 0 block - ARG 1 properties + FIELD field_1288 properties Lnet/minecraft/class_4559; METHOD method_900 builder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_212$class_213; ARG 0 block - METHOD method_905 (Ljava/lang/Object;Lnet/minecraft/class_2769;Lnet/minecraft/class_2680;)Z - ARG 2 blockState - METHOD method_906 (Lnet/minecraft/class_2248;Ljava/lang/Object;Lnet/minecraft/class_2769;Lnet/minecraft/class_2680;)Z - ARG 3 blockState METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping index 97121b720b..db3c406114 100644 --- a/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_190 net/minecraft/world/loot/condition/DamageSourcePro FIELD field_1256 predicate Lnet/minecraft/class_2022; METHOD (Lnet/minecraft/class_2022;)V ARG 1 predicate - METHOD method_837 builder (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_209$class_210; + METHOD method_837 builder (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_4570$class_210; ARG 0 builder METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping index 20e470776e..519ffb85aa 100644 --- a/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping @@ -5,9 +5,9 @@ CLASS net/minecraft/class_215 net/minecraft/world/loot/condition/EntityPropertie METHOD (Lnet/minecraft/class_2048;Lnet/minecraft/class_47$class_50;)V ARG 1 predicate ARG 2 entity - METHOD method_15972 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_209$class_210; + METHOD method_15972 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_4570$class_210; ARG 0 entity - METHOD method_917 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_209$class_210; + METHOD method_917 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_4570$class_210; ARG 0 entity ARG 1 predicateBuilder METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping index 584bef6a72..88b129c8ab 100644 --- a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_207 net/minecraft/world/loot/condition/InvertedLootCondition CLASS class_208 Factory - FIELD field_1283 term Lnet/minecraft/class_209; - METHOD (Lnet/minecraft/class_209;)V + FIELD field_1283 term Lnet/minecraft/class_4570; + METHOD (Lnet/minecraft/class_4570;)V ARG 1 term - METHOD method_889 builder (Lnet/minecraft/class_209$class_210;)Lnet/minecraft/class_209$class_210; + METHOD method_889 builder (Lnet/minecraft/class_4570$class_210;)Lnet/minecraft/class_4570$class_210; ARG 0 term METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping index a7200bd204..468cff2279 100644 --- a/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_221 net/minecraft/world/loot/condition/KilledByPlayerLootCondition CLASS class_222 Factory FIELD field_1297 INSTANCE Lnet/minecraft/class_221; - METHOD method_939 builder ()Lnet/minecraft/class_209$class_210; + METHOD method_939 builder ()Lnet/minecraft/class_4570$class_210; METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping index 8e75ff87d1..76a1c43e47 100644 --- a/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_205 net/minecraft/world/loot/condition/LocationCheckLootCondition CLASS class_206 Factory FIELD field_1282 predicate Lnet/minecraft/class_2090; - METHOD (Lnet/minecraft/class_2090;)V - ARG 1 predicate - METHOD method_884 builder (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_209$class_210; + METHOD method_884 builder (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_4570$class_210; ARG 0 predicateBuilder METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/LootConditions.mapping b/mappings/net/minecraft/world/loot/condition/LootConditions.mapping index 8ce8db5b77..bbba3191e6 100644 --- a/mappings/net/minecraft/world/loot/condition/LootConditions.mapping +++ b/mappings/net/minecraft/world/loot/condition/LootConditions.mapping @@ -12,15 +12,15 @@ CLASS net/minecraft/class_217 net/minecraft/world/loot/condition/LootConditions FIELD field_1295 byClass Ljava/util/Map; METHOD method_921 (Ljava/lang/Object;)Z ARG 0 predicates - METHOD method_922 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_209$class_211; + METHOD method_922 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570$class_211; ARG 0 id - METHOD method_923 getFactory (Lnet/minecraft/class_209;)Lnet/minecraft/class_209$class_211; + METHOD method_923 getFactory (Lnet/minecraft/class_4570;)Lnet/minecraft/class_4570$class_211; ARG 0 condition METHOD method_924 joinAnd ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; ARG 0 predicates METHOD method_925 joinOr ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; ARG 0 predicates - METHOD method_926 register (Lnet/minecraft/class_209$class_211;)V + METHOD method_926 register (Lnet/minecraft/class_4570$class_211;)V ARG 0 condition METHOD method_927 ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z ARG 1 operand diff --git a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping index 42839940cd..608cd8fa3b 100644 --- a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_223 net/minecraft/world/loot/condition/MatchToolLootCo FIELD field_1298 predicate Lnet/minecraft/class_2073; METHOD (Lnet/minecraft/class_2073;)V ARG 1 predicate - METHOD method_945 builder (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_209$class_210; + METHOD method_945 builder (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4570$class_210; ARG 0 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping index 692edc2246..85d9c01e5a 100644 --- a/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_219 net/minecraft/world/loot/condition/RandomChanceLoo FIELD field_1296 chance F METHOD (F)V ARG 1 chance - METHOD method_932 builder (F)Lnet/minecraft/class_209$class_210; + METHOD method_932 builder (F)Lnet/minecraft/class_4570$class_210; ARG 0 chance METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping index 047f334f88..43b6586f4e 100644 --- a/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_225 net/minecraft/world/loot/condition/RandomChanceWit METHOD (FF)V ARG 1 chance ARG 2 lootingMultiplier - METHOD method_953 builder (FF)Lnet/minecraft/class_209$class_210; + METHOD method_953 builder (FF)Lnet/minecraft/class_4570$class_210; ARG 0 chance ARG 1 lootingMultiplier METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping index 47cea66fb1..b4c38f21c8 100644 --- a/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_201 net/minecraft/world/loot/condition/SurvivesExplosionLootCondition CLASS class_202 Factory FIELD field_1280 INSTANCE Lnet/minecraft/class_201; - METHOD method_871 builder ()Lnet/minecraft/class_209$class_210; + METHOD method_871 builder ()Lnet/minecraft/class_4570$class_210; METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping index e795a3c191..2c0d2cd46f 100644 --- a/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_182 net/minecraft/world/loot/condition/TableBonusLootC METHOD (Lnet/minecraft/class_1887;[F)V ARG 1 enchantment ARG 2 chances - METHOD method_800 builder (Lnet/minecraft/class_1887;[F)Lnet/minecraft/class_209$class_210; + METHOD method_800 builder (Lnet/minecraft/class_1887;[F)Lnet/minecraft/class_4570$class_210; ARG 0 enchantment ARG 1 chances METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/world/loot/context/LootContext.mapping b/mappings/net/minecraft/world/loot/context/LootContext.mapping index 4bcf965470..a0d05f7182 100644 --- a/mappings/net/minecraft/world/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/world/loot/context/LootContext.mapping @@ -51,19 +51,12 @@ CLASS net/minecraft/class_47 net/minecraft/world/loot/context/LootContext ARG 0 type METHOD method_315 getIdentifier ()Lnet/minecraft/class_169; FIELD field_923 random Ljava/util/Random; - FIELD field_924 manager Lnet/minecraft/class_60; + FIELD field_924 manager Ljava/util/function/Function; FIELD field_925 parameters Ljava/util/Map; FIELD field_926 luck F FIELD field_927 suppliers Ljava/util/Set; FIELD field_928 world Lnet/minecraft/class_3218; FIELD field_929 drops Ljava/util/Map; - METHOD (Ljava/util/Random;FLnet/minecraft/class_3218;Lnet/minecraft/class_60;Ljava/util/Map;Ljava/util/Map;)V - ARG 1 random - ARG 2 luck - ARG 3 world - ARG 4 manager - ARG 5 parameters - ARG 6 drops METHOD method_294 getRandom ()Ljava/util/Random; METHOD method_295 removeDrop (Lnet/minecraft/class_52;)V ARG 1 supplier @@ -77,5 +70,4 @@ CLASS net/minecraft/class_47 net/minecraft/world/loot/context/LootContext METHOD method_299 getWorld ()Lnet/minecraft/class_3218; METHOD method_300 hasParameter (Lnet/minecraft/class_169;)Z ARG 1 parameter - METHOD method_301 getLootManager ()Lnet/minecraft/class_60; METHOD method_302 getLuck ()F diff --git a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping b/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping index 1f0c1c4086..a2c2287084 100644 --- a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping +++ b/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_46 net/minecraft/world/loot/context/ParameterConsumer - METHOD method_292 check (Lnet/minecraft/class_58;Ljava/util/function/Function;Ljava/util/Set;Lnet/minecraft/class_176;)V - ARG 1 reporter - ARG 2 supplierGetter - ARG 3 parentLootTables - ARG 4 contextType + METHOD method_292 check (Lnet/minecraft/class_58;)V METHOD method_293 getRequiredParameters ()Ljava/util/Set; diff --git a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping index 5d39386935..e662a83cb6 100644 --- a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping @@ -1,17 +1,17 @@ CLASS net/minecraft/class_69 net/minecraft/world/loot/entry/CombinedEntry CLASS class_70 Factory - METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_209;)Lnet/minecraft/class_69; + METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_69; ARG 1 children ARG 2 conditions CLASS class_71 Serializer - METHOD method_398 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_79;[Lnet/minecraft/class_209;)Lnet/minecraft/class_69; + METHOD method_398 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_79;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_69; ARG 1 json ARG 2 context ARG 3 children ARG 4 conditions FIELD field_982 children [Lnet/minecraft/class_79; FIELD field_983 predicate Lnet/minecraft/class_64; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_209;)V + METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_4570;)V ARG 1 children ARG 2 conditions METHOD method_394 combine ([Lnet/minecraft/class_64;)Lnet/minecraft/class_64; diff --git a/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping index b639bae14b..d48f94e896 100644 --- a/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_67 net/minecraft/world/loot/entry/DynamicEntry CLASS class_68 Serializer FIELD field_980 name Lnet/minecraft/class_2960; FIELD field_981 instance Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V ARG 1 name ARG 2 weight ARG 3 quality @@ -10,7 +10,7 @@ CLASS net/minecraft/class_67 net/minecraft/world/loot/entry/DynamicEntry ARG 5 functions METHOD method_390 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86; ARG 0 name - METHOD method_391 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_391 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping index 92fbee8e52..d889e6b956 100644 --- a/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_73 net/minecraft/world/loot/entry/EmptyEntry CLASS class_74 Serializer - METHOD (II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V + METHOD (II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping index 26194be246..d8c1f0666b 100644 --- a/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_77 net/minecraft/world/loot/entry/ItemEntry CLASS class_78 Serializer FIELD field_987 item Lnet/minecraft/class_1792; - METHOD (Lnet/minecraft/class_1792;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_1792;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V ARG 1 item ARG 2 weight ARG 3 quality ARG 4 conditions ARG 5 functions - METHOD method_409 (Lnet/minecraft/class_1935;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_409 (Lnet/minecraft/class_1935;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping index a4eb8026d5..e6af45f51b 100644 --- a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping @@ -14,13 +14,13 @@ CLASS net/minecraft/class_85 net/minecraft/world/loot/entry/LeafEntry ARG 1 factory CLASS class_88 Choice CLASS class_89 Factory - METHOD build (II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD build (II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions CLASS class_90 Serializer - METHOD method_443 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_443 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 entryJson ARG 2 context ARG 3 weight @@ -32,7 +32,7 @@ CLASS net/minecraft/class_85 net/minecraft/world/loot/entry/LeafEntry FIELD field_996 functions [Lnet/minecraft/class_117; FIELD field_997 compiledFunctions Ljava/util/function/BiFunction; FIELD field_998 choice Lnet/minecraft/class_82; - METHOD (II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V + METHOD (II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping index 68e5248f6b..02ce047a29 100644 --- a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_79 net/minecraft/world/loot/entry/LootEntry ARG 1 builder METHOD method_418 getThisBuilder ()Lnet/minecraft/class_79$class_80; METHOD method_419 build ()Lnet/minecraft/class_79; - METHOD method_420 getConditions ()[Lnet/minecraft/class_209; + METHOD method_420 getConditions ()[Lnet/minecraft/class_4570; CLASS class_81 Serializer FIELD field_991 id Lnet/minecraft/class_2960; FIELD field_992 type Ljava/lang/Class; @@ -17,19 +17,15 @@ CLASS net/minecraft/class_79 net/minecraft/world/loot/entry/LootEntry ARG 2 entry ARG 3 context METHOD method_423 getIdentifier ()Lnet/minecraft/class_2960; - METHOD method_424 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_209;)Lnet/minecraft/class_79; + METHOD method_424 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_79; ARG 1 json ARG 2 context ARG 3 conditions METHOD method_425 getType ()Ljava/lang/Class; - FIELD field_988 conditions [Lnet/minecraft/class_209; + FIELD field_988 conditions [Lnet/minecraft/class_4570; FIELD field_989 conditionPredicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_209;)V + METHOD ([Lnet/minecraft/class_4570;)V ARG 1 conditions METHOD method_414 test (Lnet/minecraft/class_47;)Z ARG 1 context - METHOD method_415 check (Lnet/minecraft/class_58;Ljava/util/function/Function;Ljava/util/Set;Lnet/minecraft/class_176;)V - ARG 1 reporter - ARG 2 supplierGetter - ARG 3 parentLootTables - ARG 4 contextType + METHOD method_415 check (Lnet/minecraft/class_58;)V diff --git a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping index 473ff4aada..f9a61c9af2 100644 --- a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_83 net/minecraft/world/loot/entry/LootTableEntry CLASS class_84 Serializer FIELD field_993 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V ARG 1 id ARG 2 weight ARG 3 quality @@ -9,7 +9,7 @@ CLASS net/minecraft/class_83 net/minecraft/world/loot/entry/LootTableEntry ARG 5 functions METHOD method_428 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86; ARG 0 id - METHOD method_430 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_430 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/world/loot/entry/TagEntry.mapping b/mappings/net/minecraft/world/loot/entry/TagEntry.mapping index eb81f9bb5c..c444bdbbf6 100644 --- a/mappings/net/minecraft/world/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/TagEntry.mapping @@ -2,14 +2,14 @@ CLASS net/minecraft/class_91 net/minecraft/world/loot/entry/TagEntry CLASS class_92 Serializer FIELD field_1005 name Lnet/minecraft/class_3494; FIELD field_1006 expand Z - METHOD (Lnet/minecraft/class_3494;ZII[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_3494;ZII[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V ARG 1 name ARG 2 expand ARG 3 weight ARG 4 quality ARG 5 conditions ARG 6 functions - METHOD method_444 (Lnet/minecraft/class_3494;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_444 (Lnet/minecraft/class_3494;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping index 81d3c0b4cc..ea25135a85 100644 --- a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping @@ -39,24 +39,24 @@ CLASS net/minecraft/class_94 net/minecraft/world/loot/function/ApplyBonusLootFun FIELD field_1009 formula Lnet/minecraft/class_94$class_96; FIELD field_1010 FACTORIES Ljava/util/Map; FIELD field_1011 enchantment Lnet/minecraft/class_1887; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_1887;Lnet/minecraft/class_94$class_96;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_1887;Lnet/minecraft/class_94$class_96;)V ARG 1 conditions ARG 2 enchantment ARG 3 formula - METHOD method_453 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_453 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_455 oreDrops (Lnet/minecraft/class_1887;)Lnet/minecraft/class_120$class_121; ARG 0 enchantment METHOD method_456 uniformBonusCount (Lnet/minecraft/class_1887;)Lnet/minecraft/class_120$class_121; ARG 0 enchantment - METHOD method_457 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_457 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 1 conditions - METHOD method_459 (Lnet/minecraft/class_1887;IF[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_459 (Lnet/minecraft/class_1887;IF[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 3 conditions METHOD method_461 uniformBonusCount (Lnet/minecraft/class_1887;I)Lnet/minecraft/class_120$class_121; ARG 0 enchantment ARG 1 bonusMultiplier - METHOD method_462 (Lnet/minecraft/class_1887;I[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_462 (Lnet/minecraft/class_1887;I[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 2 conditions METHOD method_463 binomialWithBonusCount (Lnet/minecraft/class_1887;FI)Lnet/minecraft/class_120$class_121; ARG 0 enchantment diff --git a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping index 876bc5550c..1165edb6b5 100644 --- a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping @@ -2,19 +2,19 @@ CLASS net/minecraft/class_120 net/minecraft/world/loot/function/ConditionalLootF CLASS class_121 Builder FIELD field_1049 conditionList Ljava/util/List; METHOD method_523 getThisBuilder ()Lnet/minecraft/class_120$class_121; - METHOD method_526 getConditions ()[Lnet/minecraft/class_209; + METHOD method_526 getConditions ()[Lnet/minecraft/class_4570; CLASS class_122 Joiner FIELD field_1050 joiner Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V ARG 1 joiner CLASS class_123 Factory - METHOD method_530 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_209;)Lnet/minecraft/class_120; + METHOD method_530 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_120; ARG 1 json ARG 2 context ARG 3 conditions - FIELD field_1047 conditions [Lnet/minecraft/class_209; + FIELD field_1047 conditions [Lnet/minecraft/class_4570; FIELD field_1048 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_209;)V + METHOD ([Lnet/minecraft/class_4570;)V ARG 1 conditions METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 itemStack diff --git a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping index ca31e27213..a9a25cd531 100644 --- a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping @@ -9,10 +9,10 @@ CLASS net/minecraft/class_101 net/minecraft/world/loot/function/CopyNameLootFunc ARG 0 name CLASS class_103 Factory FIELD field_1018 source Lnet/minecraft/class_101$class_102; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_101$class_102;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_101$class_102;)V ARG 1 conditions ARG 2 source METHOD method_473 builder (Lnet/minecraft/class_101$class_102;)Lnet/minecraft/class_120$class_121; ARG 0 source - METHOD method_474 (Lnet/minecraft/class_101$class_102;[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_474 (Lnet/minecraft/class_101$class_102;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 1 conditions diff --git a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping index bea570dede..0a66e46f82 100644 --- a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping @@ -64,7 +64,7 @@ CLASS net/minecraft/class_3837 net/minecraft/world/loot/function/CopyNbtLootFunc FIELD field_17014 operations Ljava/util/List; FIELD field_17015 ENTITY_TAG_GETTER Ljava/util/function/Function; FIELD field_17016 BLOCK_ENTITY_TAG_GETTER Ljava/util/function/Function; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_3837$class_3840;Ljava/util/List;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_3837$class_3840;Ljava/util/List;)V ARG 1 conditions ARG 2 source ARG 3 operations diff --git a/mappings/net/minecraft/world/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyStateFunction.mapping index 3d4a893cd2..085f3c872e 100644 --- a/mappings/net/minecraft/world/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/CopyStateFunction.mapping @@ -5,6 +5,6 @@ CLASS net/minecraft/class_4488 net/minecraft/world/loot/function/CopyStateFuncti CLASS class_4490 Factory FIELD field_20449 block Lnet/minecraft/class_2248; FIELD field_20450 properties Ljava/util/Set; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_2248;Ljava/util/Set;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_2248;Ljava/util/Set;)V ARG 3 properties METHOD method_21892 getBuilder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4488$class_4489; diff --git a/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping index 58f3b07060..764e9ad70c 100644 --- a/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping @@ -2,9 +2,9 @@ CLASS net/minecraft/class_109 net/minecraft/world/loot/function/EnchantRandomlyL CLASS class_110 Factory FIELD field_1030 enchantments Ljava/util/List; FIELD field_1031 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_209;Ljava/util/Collection;)V + METHOD ([Lnet/minecraft/class_4570;Ljava/util/Collection;)V ARG 1 conditions ARG 2 enchantments - METHOD method_488 ([Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_488 ([Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 0 conditions METHOD method_489 builder ()Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping index b6814c5b49..a1ff79666d 100644 --- a/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_106 net/minecraft/world/loot/function/EnchantWithLevel CLASS class_108 Factory FIELD field_1026 range Lnet/minecraft/class_59; FIELD field_1027 treasureEnchantmentsAllowed Z - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_59;Z)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_59;Z)V ARG 1 conditions ARG 2 range ARG 3 treasureEnchantmentsAllowed diff --git a/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping index 8725dea66d..1b2a0a4a41 100644 --- a/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_111 net/minecraft/world/loot/function/ExplorationMapLo FIELD field_1036 decoration Lnet/minecraft/class_20$class_21; FIELD field_1037 zoom B FIELD field_1038 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_209;Ljava/lang/String;Lnet/minecraft/class_20$class_21;BIZ)V + METHOD ([Lnet/minecraft/class_4570;Ljava/lang/String;Lnet/minecraft/class_20$class_21;BIZ)V ARG 1 conditions ARG 2 destination ARG 3 decoration diff --git a/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping index a3f826cbaa..2ca143bcea 100644 --- a/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_104 net/minecraft/world/loot/function/ExplosionDecayLootFunction CLASS class_105 Factory - METHOD ([Lnet/minecraft/class_209;)V + METHOD ([Lnet/minecraft/class_4570;)V ARG 1 conditions METHOD method_478 builder ()Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping index 35c50e7a2b..855d1423f4 100644 --- a/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3668 net/minecraft/world/loot/function/FillPlayerHeadLootFunction CLASS class_3669 Factory FIELD field_16227 entity Lnet/minecraft/class_47$class_50; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_47$class_50;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_47$class_50;)V ARG 1 conditions ARG 2 entity diff --git a/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping b/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping index c0aeeb743a..4182fcd123 100644 --- a/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_165 net/minecraft/world/loot/function/FurnaceSmeltLootFunction CLASS class_166 Factory FIELD field_1159 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_209;)V + METHOD ([Lnet/minecraft/class_4570;)V ARG 1 conditions METHOD method_724 builder ()Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping b/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping index 821dcf41a3..7f32ebb5dc 100644 --- a/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_114 net/minecraft/world/loot/function/LimitCountLootFunction CLASS class_115 Factory FIELD field_1044 limit Lnet/minecraft/class_42; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_42;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_42;)V ARG 1 conditions ARG 2 limit METHOD method_506 builder (Lnet/minecraft/class_42;)Lnet/minecraft/class_120$class_121; ARG 0 limit - METHOD method_508 (Lnet/minecraft/class_42;[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_508 (Lnet/minecraft/class_42;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 1 conditions diff --git a/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping index d5a164caf0..1206845c5f 100644 --- a/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_125 net/minecraft/world/loot/function/LootingEnchantLo CLASS class_127 Factory FIELD field_1082 countRange Lnet/minecraft/class_61; FIELD field_1083 limit I - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_61;I)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_61;I)V ARG 1 conditions ARG 2 countRange ARG 3 limit diff --git a/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping index 41008130e7..8262c62f77 100644 --- a/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping @@ -24,6 +24,6 @@ CLASS net/minecraft/class_137 net/minecraft/world/loot/function/SetAttributesLoo ARG 1 context CLASS class_139 Factory FIELD field_1105 attributes Ljava/util/List; - METHOD ([Lnet/minecraft/class_209;Ljava/util/List;)V + METHOD ([Lnet/minecraft/class_4570;Ljava/util/List;)V ARG 1 conditions ARG 2 attributes diff --git a/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping index a7e40a9205..3a6b331855 100644 --- a/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_134 net/minecraft/world/loot/function/SetContentsLootF ARG 1 entryBuilder CLASS class_136 Factory FIELD field_1103 entries Ljava/util/List; - METHOD ([Lnet/minecraft/class_209;Ljava/util/List;)V + METHOD ([Lnet/minecraft/class_4570;Ljava/util/List;)V ARG 1 conditions ARG 2 entries METHOD method_599 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_79;)V diff --git a/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping index 4fa2d99654..559a131b72 100644 --- a/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_141 net/minecraft/world/loot/function/SetCountLootFunction CLASS class_142 Factory FIELD field_1114 countRange Lnet/minecraft/class_59; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_59;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_59;)V ARG 1 conditions ARG 2 countRange - METHOD method_620 (Lnet/minecraft/class_59;[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_620 (Lnet/minecraft/class_59;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_621 builder (Lnet/minecraft/class_59;)Lnet/minecraft/class_120$class_121; ARG 0 countRange diff --git a/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping index cc6ffeab20..07a61c04a2 100644 --- a/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping @@ -2,10 +2,10 @@ CLASS net/minecraft/class_149 net/minecraft/world/loot/function/SetDamageLootFun CLASS class_150 Factory FIELD field_1120 durabilityRange Lnet/minecraft/class_61; FIELD field_1121 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_61;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_61;)V ARG 1 contents ARG 2 durabilityRange METHOD method_633 builder (Lnet/minecraft/class_61;)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange - METHOD method_634 (Lnet/minecraft/class_61;[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_634 (Lnet/minecraft/class_61;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 1 conditions diff --git a/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping index bdd21c2141..144f2a1185 100644 --- a/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_144 net/minecraft/world/loot/function/SetLootTableLoot CLASS class_145 Factory FIELD field_1116 id Lnet/minecraft/class_2960; FIELD field_1117 seed J - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_2960;J)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_2960;J)V ARG 1 conditions ARG 2 id ARG 3 seed diff --git a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping index 06e8a8f3bb..5ca8f03655 100644 --- a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_3671 net/minecraft/world/loot/function/SetLoreLootFunc FIELD field_16231 lore Ljava/util/List; FIELD field_16232 replace Z FIELD field_16233 entity Lnet/minecraft/class_47$class_50; - METHOD ([Lnet/minecraft/class_209;ZLjava/util/List;Lnet/minecraft/class_47$class_50;)V + METHOD ([Lnet/minecraft/class_4570;ZLjava/util/List;Lnet/minecraft/class_47$class_50;)V ARG 1 conditions ARG 2 replace ARG 3 lore diff --git a/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping index 39f4593dc7..d053ed9f89 100644 --- a/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_3670 net/minecraft/world/loot/function/SetNameLootFunc FIELD field_16228 name Lnet/minecraft/class_2561; FIELD field_16229 entity Lnet/minecraft/class_47$class_50; FIELD field_16230 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;)V ARG 1 conditions ARG 2 name ARG 3 entity diff --git a/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping index fa0708d16f..d4850da5cf 100644 --- a/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_159 net/minecraft/world/loot/function/SetNbtLootFunction CLASS class_160 Builder FIELD field_1138 tag Lnet/minecraft/class_2487; - METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_2487;)V + METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_2487;)V ARG 1 conditions ARG 2 tag - METHOD method_675 (Lnet/minecraft/class_2487;[Lnet/minecraft/class_209;)Lnet/minecraft/class_117; + METHOD method_675 (Lnet/minecraft/class_2487;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_677 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; ARG 0 tag diff --git a/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping index 12298dd8d7..be254e0c5b 100644 --- a/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_152 net/minecraft/world/loot/function/SetStewEffectLoo ARG 2 durationRange CLASS class_154 Factory FIELD field_1122 effects Ljava/util/Map; - METHOD ([Lnet/minecraft/class_209;Ljava/util/Map;)V + METHOD ([Lnet/minecraft/class_4570;Ljava/util/Map;)V ARG 1 conditions ARG 2 effects METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; diff --git a/mappings/net/minecraft/world/timer/Timer.mapping b/mappings/net/minecraft/world/timer/Timer.mapping index 9727dff796..576bf4aa4c 100644 --- a/mappings/net/minecraft/world/timer/Timer.mapping +++ b/mappings/net/minecraft/world/timer/Timer.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_236 net/minecraft/world/timer/Timer ARG 4 name ARG 5 callback FIELD field_1311 eventCounter Lcom/google/common/primitives/UnsignedLong; - FIELD field_1312 eventsByName Ljava/util/Map; + FIELD field_1312 eventsByName Lcom/google/common/collect/Table; FIELD field_1313 events Ljava/util/Queue; FIELD field_1314 callback Lnet/minecraft/class_233; FIELD field_1315 LOGGER Lorg/apache/logging/log4j/Logger; @@ -20,12 +20,7 @@ CLASS net/minecraft/class_236 net/minecraft/world/timer/Timer ARG 1 tag METHOD method_980 serialize (Lnet/minecraft/class_236$class_237;)Lnet/minecraft/class_2487; ARG 1 event - METHOD method_981 addEvent (Ljava/lang/String;JLnet/minecraft/class_234;)Z METHOD method_982 toTag ()Lnet/minecraft/class_2499; - METHOD method_984 replaceEvent (Ljava/lang/String;JLnet/minecraft/class_234;)V - ARG 1 name - ARG 2 triggerTime - ARG 4 callback METHOD method_985 setEvent (Ljava/lang/String;JLnet/minecraft/class_234;)V ARG 1 name ARG 2 triggerTime