From 323e6f8e29e7064360fecb0037e076c5e073dc72 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 3 Feb 2021 19:34:30 +0000 Subject: [PATCH] 21w05a --- build.gradle | 2 +- .../block/AbstractCandleBlock.mapping | 5 +- .../net/minecraft/block/BellBlock.mapping | 5 +- mappings/net/minecraft/block/Block.mapping | 2 - mappings/net/minecraft/block/Blocks.mapping | 2 +- .../net/minecraft/block/CampfireBlock.mapping | 5 +- .../net/minecraft/block/CarpetBlock.mapping | 5 -- .../net/minecraft/block/CopperBlock.mapping | 5 -- .../minecraft/block/CopperSlabBlock.mapping | 5 -- .../minecraft/block/CopperStairsBlock.mapping | 6 --- .../net/minecraft/block/LecternBlock.mapping | 12 +---- .../minecraft/block/LightningRodBlock.mapping | 1 - .../net/minecraft/block/Oxidizable.mapping | 10 ---- .../client/option/GameOptions.mapping | 3 +- .../client/particle/AnimatedParticle.mapping | 4 -- .../client/particle/AscendingParticle.mapping | 6 +-- .../client/particle/BlockDustParticle.mapping | 9 +--- .../client/particle/CloudParticle.mapping | 1 - .../particle/ExplosionSmokeParticle.mapping | 1 - .../client/particle/GlowParticle.mapping | 1 - .../client/particle/Particle.mapping | 1 - .../client/particle/SnowflakeParticle.mapping | 1 - .../client/particle/SpellParticle.mapping | 1 - .../particle/SpriteBillboardParticle.mapping | 1 - .../render/model/json/ModelOverride.mapping | 11 ++--- .../model/json/ModelOverrideList.mapping | 3 -- .../client/tutorial/TutorialManager.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 12 +---- .../item/FluidModificationItem.mapping | 5 +- .../play/PlayerPositionLookS2CPacket.mapping | 2 +- .../net/minecraft/recipe/Ingredient.mapping | 2 - .../minecraft/server/MinecraftServer.mapping | 2 +- .../structure/StructureStart.mapping | 2 +- .../pool/StructurePoolBasedGenerator.mapping | 2 +- mappings/net/minecraft/util/Lazy.mapping | 1 - mappings/net/minecraft/util/math/Box.mapping | 5 +- .../noise/DoublePerlinNoiseSampler.mapping | 9 ++-- .../noise/OctavePerlinNoiseSampler.mapping | 15 ++---- .../noise/OctaveSimplexNoiseSampler.mapping | 9 ++-- .../math/noise/PerlinNoiseSampler.mapping | 6 +-- .../math/noise/SimplexNoiseSampler.mapping | 2 - .../net/minecraft/world/ChunkRegion.mapping | 4 -- .../net/minecraft/world/SpawnHelper.mapping | 5 +- .../net/minecraft/world/WorldView.mapping | 4 -- .../world/chunk/PalettedContainer.mapping | 2 - .../minecraft/world/gen/ChunkRandom.mapping | 8 ---- .../world/gen/StructureAccessor.mapping | 2 - .../world/gen/chunk/ChunkGenerator.mapping | 13 ++---- .../gen/chunk/NoiseChunkGenerator.mapping | 46 ++----------------- .../ConfiguredStructureFeature.mapping | 2 +- .../world/gen/feature/EndCityFeature.mapping | 2 +- .../world/gen/feature/Feature.mapping | 7 +-- .../gen/feature/RuinedPortalFeature.mapping | 2 +- .../gen/feature/StructureFeature.mapping | 4 +- .../world/poi/PointOfInterestSet.mapping | 2 - .../SerializingRegionBasedStorage.mapping | 3 +- 56 files changed, 50 insertions(+), 240 deletions(-) delete mode 100644 mappings/net/minecraft/block/CopperBlock.mapping delete mode 100644 mappings/net/minecraft/block/CopperSlabBlock.mapping delete mode 100644 mappings/net/minecraft/block/CopperStairsBlock.mapping diff --git a/build.gradle b/build.gradle index b0415eb59c..10173502a7 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "21w03a" +def minecraft_version = "21w05a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/AbstractCandleBlock.mapping b/mappings/net/minecraft/block/AbstractCandleBlock.mapping index 9c573e5ab0..fd3280aa40 100644 --- a/mappings/net/minecraft/block/AbstractCandleBlock.mapping +++ b/mappings/net/minecraft/block/AbstractCandleBlock.mapping @@ -13,7 +13,4 @@ CLASS net/minecraft/class_5540 net/minecraft/block/AbstractCandleBlock ARG 3 lit METHOD method_31613 getParticleOffsets (Lnet/minecraft/class_2680;)Ljava/lang/Iterable; ARG 1 state - METHOD method_31614 extinguish (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V - ARG 0 state - ARG 1 world - ARG 2 pos + METHOD method_31614 extinguish (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/block/BellBlock.mapping b/mappings/net/minecraft/block/BellBlock.mapping index 9c81390ec6..03e8779f4d 100644 --- a/mappings/net/minecraft/block/BellBlock.mapping +++ b/mappings/net/minecraft/block/BellBlock.mapping @@ -18,10 +18,7 @@ CLASS net/minecraft/class_3709 net/minecraft/block/BellBlock ARG 0 state METHOD method_16116 getShape (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; ARG 1 state - METHOD method_17026 ring (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 1 world - ARG 2 pos - ARG 3 direction + METHOD method_17026 ring (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z METHOD method_17028 isPointOnBell (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;D)Z ARG 1 state ARG 2 side diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 1bdc43af9a..2c2ee98794 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -125,10 +125,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 pos ARG 3 state METHOD method_9576 onBreak (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)V - ARG 1 world ARG 2 pos ARG 3 state - ARG 4 player METHOD method_9577 dropStack (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index ae5a5fcac3..6f625cd620 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 state METHOD method_26105 (Lnet/minecraft/class_2680;)I ARG 0 state - METHOD method_26106 createLeavesBlock ()Lnet/minecraft/class_2397; + METHOD method_26106 createLeavesBlock (Lnet/minecraft/class_2498;)Lnet/minecraft/class_2397; METHOD method_26107 createLightLevelFromBlockState (I)Ljava/util/function/ToIntFunction; ARG 0 litLevel METHOD method_26108 (ILnet/minecraft/class_2680;)I diff --git a/mappings/net/minecraft/block/CampfireBlock.mapping b/mappings/net/minecraft/block/CampfireBlock.mapping index 768aab60cd..47daf43b21 100644 --- a/mappings/net/minecraft/block/CampfireBlock.mapping +++ b/mappings/net/minecraft/block/CampfireBlock.mapping @@ -24,9 +24,6 @@ CLASS net/minecraft/class_3922 net/minecraft/block/CampfireBlock ARG 1 pos METHOD method_23896 isLitCampfire (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_29288 extinguish (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 0 world - ARG 1 pos - ARG 2 state + METHOD method_29288 extinguish (Lnet/minecraft/class_1297;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V METHOD method_30035 canBeLit (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/CarpetBlock.mapping b/mappings/net/minecraft/block/CarpetBlock.mapping index 7193ad6816..99a0b52fdf 100644 --- a/mappings/net/minecraft/block/CarpetBlock.mapping +++ b/mappings/net/minecraft/block/CarpetBlock.mapping @@ -1,7 +1,2 @@ CLASS net/minecraft/class_2577 net/minecraft/block/CarpetBlock FIELD field_11783 SHAPE Lnet/minecraft/class_265; - FIELD field_11784 color Lnet/minecraft/class_1767; - METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)V - ARG 1 color - ARG 2 settings - METHOD method_10925 getColor ()Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/block/CopperBlock.mapping b/mappings/net/minecraft/block/CopperBlock.mapping deleted file mode 100644 index 5ad5e7e5a8..0000000000 --- a/mappings/net/minecraft/block/CopperBlock.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5548 net/minecraft/block/CopperBlock - FIELD field_27189 oxidationResult Lnet/minecraft/class_2248; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_2248;)V - ARG 1 settings - ARG 2 block diff --git a/mappings/net/minecraft/block/CopperSlabBlock.mapping b/mappings/net/minecraft/block/CopperSlabBlock.mapping deleted file mode 100644 index 6191f0bb91..0000000000 --- a/mappings/net/minecraft/block/CopperSlabBlock.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5549 net/minecraft/block/CopperSlabBlock - FIELD field_27190 oxidationResult Lnet/minecraft/class_2248; - METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_2248;)V - ARG 1 settings - ARG 2 block diff --git a/mappings/net/minecraft/block/CopperStairsBlock.mapping b/mappings/net/minecraft/block/CopperStairsBlock.mapping deleted file mode 100644 index 9845f876f8..0000000000 --- a/mappings/net/minecraft/block/CopperStairsBlock.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_5550 net/minecraft/block/CopperStairsBlock - FIELD field_27191 oxidationResult Lnet/minecraft/class_2248; - METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_2248;)V - ARG 1 state - ARG 2 settings - ARG 3 block diff --git a/mappings/net/minecraft/block/LecternBlock.mapping b/mappings/net/minecraft/block/LecternBlock.mapping index 70249f435c..2ea9c25082 100644 --- a/mappings/net/minecraft/block/LecternBlock.mapping +++ b/mappings/net/minecraft/block/LecternBlock.mapping @@ -19,11 +19,7 @@ CLASS net/minecraft/class_3715 net/minecraft/block/LecternBlock ARG 0 world ARG 1 pos ARG 2 state - METHOD method_17472 putBookIfAbsent (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)Z - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 book + METHOD method_17472 putBookIfAbsent (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)Z METHOD method_17473 setHasBook (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V ARG 0 world ARG 1 pos @@ -33,11 +29,7 @@ CLASS net/minecraft/class_3715 net/minecraft/block/LecternBlock ARG 0 world ARG 1 pos ARG 2 state - METHOD method_17475 putBook (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 book + METHOD method_17475 putBook (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V METHOD method_17476 setPowered (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/LightningRodBlock.mapping b/mappings/net/minecraft/block/LightningRodBlock.mapping index 302422e0d3..a497e5b749 100644 --- a/mappings/net/minecraft/block/LightningRodBlock.mapping +++ b/mappings/net/minecraft/block/LightningRodBlock.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_5554 net/minecraft/block/LightningRodBlock FIELD field_27193 POWERED Lnet/minecraft/class_2746; METHOD method_31648 setPowered (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 state - ARG 2 world ARG 3 pos diff --git a/mappings/net/minecraft/block/Oxidizable.mapping b/mappings/net/minecraft/block/Oxidizable.mapping index 03d2207d98..db49b65a93 100644 --- a/mappings/net/minecraft/block/Oxidizable.mapping +++ b/mappings/net/minecraft/block/Oxidizable.mapping @@ -1,13 +1,3 @@ CLASS net/minecraft/class_5547 net/minecraft/block/Oxidizable - METHOD method_31637 scheduleOxidation (Lnet/minecraft/class_1937;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 block - ARG 3 pos - METHOD method_31638 oxidize (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 state - ARG 3 pos METHOD method_31639 getOxidationResult (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 1 state - METHOD method_31640 getOxidationTime (Ljava/util/Random;)I - ARG 1 random diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 42be78246e..f2b851cded 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -91,7 +91,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_1913 keyLeft Lnet/minecraft/class_304; FIELD field_1914 smoothCameraEnabled Z FIELD field_1915 chatWidth D - FIELD field_1916 soundVolumeLevels Ljava/util/Map; + FIELD field_1916 soundVolumeLevels Lit/unimi/dsi/fastutil/objects/Object2FloatMap; FIELD field_19244 discreteMouseScroll Z FIELD field_20308 rawMouseInput Z FIELD field_21332 sneakToggled Z @@ -123,7 +123,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_1631 togglePlayerModelPart (Lnet/minecraft/class_1664;Z)V ARG 1 part METHOD method_1632 getCloudRenderMode ()Lnet/minecraft/class_4063; - METHOD method_1634 parseFloat (Ljava/lang/String;)F METHOD method_1635 setPlayerModelPart (Lnet/minecraft/class_1664;Z)V ARG 1 part ARG 2 enabled diff --git a/mappings/net/minecraft/client/particle/AnimatedParticle.mapping b/mappings/net/minecraft/client/particle/AnimatedParticle.mapping index 2c38c37b1e..795fd909e3 100644 --- a/mappings/net/minecraft/client/particle/AnimatedParticle.mapping +++ b/mappings/net/minecraft/client/particle/AnimatedParticle.mapping @@ -3,9 +3,7 @@ CLASS net/minecraft/class_708 net/minecraft/client/particle/AnimatedParticle FIELD field_3876 targetColorBlue F FIELD field_3877 targetColorGreen F FIELD field_3878 targetColorRed F - FIELD field_3879 resistance F FIELD field_3880 changesColor Z - FIELD field_3881 upwardsAcceleration F METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_4002;F)V ARG 1 world ARG 2 x @@ -13,8 +11,6 @@ CLASS net/minecraft/class_708 net/minecraft/client/particle/AnimatedParticle ARG 6 z ARG 8 spriteProvider ARG 9 upwardsAcceleration - METHOD method_3091 setResistance (F)V - ARG 1 resistance METHOD method_3092 setTargetColor (I)V ARG 1 rgbHex METHOD method_3093 setColor (I)V diff --git a/mappings/net/minecraft/client/particle/AscendingParticle.mapping b/mappings/net/minecraft/client/particle/AscendingParticle.mapping index 51bf7ae2fa..202bfce3fb 100644 --- a/mappings/net/minecraft/client/particle/AscendingParticle.mapping +++ b/mappings/net/minecraft/client/particle/AscendingParticle.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4794 net/minecraft/client/particle/AscendingParticle - FIELD field_22236 ascendingAcceleration D FIELD field_22237 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_638;DDDFFFDDDFLnet/minecraft/class_4002;FIDZ)V + METHOD (Lnet/minecraft/class_638;DDDFFFDDDFLnet/minecraft/class_4002;FIFZ)V ARG 1 world ARG 2 x ARG 4 y @@ -13,8 +12,5 @@ CLASS net/minecraft/class_4794 net/minecraft/client/particle/AscendingParticle ARG 13 velocityY ARG 15 velocityZ ARG 17 scaleMultiplier - ARG 18 spriteProvider ARG 19 colorMultiplier ARG 20 baseMaxAge - ARG 21 ascendingAcceleration - ARG 23 collidesWithWorld diff --git a/mappings/net/minecraft/client/particle/BlockDustParticle.mapping b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping index 1df2a10781..3b40fbde8d 100644 --- a/mappings/net/minecraft/client/particle/BlockDustParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_727 net/minecraft/client/particle/BlockDustParticle FIELD field_17884 sampleU F FIELD field_17885 sampleV F FIELD field_3891 blockPos Lnet/minecraft/class_2338; - FIELD field_3892 blockState Lnet/minecraft/class_2680; - METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_2680;)V + METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 x ARG 4 y @@ -11,10 +10,4 @@ CLASS net/minecraft/class_727 net/minecraft/client/particle/BlockDustParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - ARG 14 blockState - METHOD method_3106 setBlockPosFromPosition ()Lnet/minecraft/class_727; - METHOD method_3107 updateColor (Lnet/minecraft/class_2338;)V - ARG 1 blockPos - METHOD method_3108 setBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_727; - ARG 1 blockPos CLASS class_728 Factory diff --git a/mappings/net/minecraft/client/particle/CloudParticle.mapping b/mappings/net/minecraft/client/particle/CloudParticle.mapping index 6791ab1ea3..8f00cff041 100644 --- a/mappings/net/minecraft/client/particle/CloudParticle.mapping +++ b/mappings/net/minecraft/client/particle/CloudParticle.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_704 net/minecraft/client/particle/CloudParticle ARG 2 x ARG 4 y ARG 6 z - ARG 14 spriteProvider CLASS class_705 CloudFactory FIELD field_17863 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/particle/ExplosionSmokeParticle.mapping b/mappings/net/minecraft/client/particle/ExplosionSmokeParticle.mapping index fbfd6f377f..54f19ae2cd 100644 --- a/mappings/net/minecraft/client/particle/ExplosionSmokeParticle.mapping +++ b/mappings/net/minecraft/client/particle/ExplosionSmokeParticle.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_673 net/minecraft/client/particle/ExplosionSmokePartic ARG 2 x ARG 4 y ARG 6 z - ARG 14 spriteProvider CLASS class_674 Factory FIELD field_17807 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/particle/GlowParticle.mapping b/mappings/net/minecraft/client/particle/GlowParticle.mapping index 314776bb62..4e014f4afd 100644 --- a/mappings/net/minecraft/client/particle/GlowParticle.mapping +++ b/mappings/net/minecraft/client/particle/GlowParticle.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle ARG 2 x ARG 4 y ARG 6 z - ARG 14 spriteProvider CLASS class_5787 Factory FIELD field_28459 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 53489b57e9..8cf8ed8aa4 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -27,7 +27,6 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle FIELD field_3872 boundingBox Lnet/minecraft/class_238; FIELD field_3874 x D METHOD (Lnet/minecraft/class_638;DDD)V - ARG 1 world ARG 2 x ARG 4 y ARG 6 z diff --git a/mappings/net/minecraft/client/particle/SnowflakeParticle.mapping b/mappings/net/minecraft/client/particle/SnowflakeParticle.mapping index 3b9175776f..0c6a1bd407 100644 --- a/mappings/net/minecraft/client/particle/SnowflakeParticle.mapping +++ b/mappings/net/minecraft/client/particle/SnowflakeParticle.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_5685 net/minecraft/client/particle/SnowflakeParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - ARG 14 spriteProvider CLASS class_5686 Factory FIELD field_28004 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/particle/SpellParticle.mapping b/mappings/net/minecraft/client/particle/SpellParticle.mapping index 4fe2398755..91ef4a4fec 100644 --- a/mappings/net/minecraft/client/particle/SpellParticle.mapping +++ b/mappings/net/minecraft/client/particle/SpellParticle.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_711 net/minecraft/client/particle/SpellParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - ARG 14 spriteProvider CLASS class_712 EntityAmbientFactory FIELD field_17871 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping b/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping index 5a970ba82d..dc7279f52f 100644 --- a/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping +++ b/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping @@ -5,4 +5,3 @@ CLASS net/minecraft/class_4003 net/minecraft/client/particle/SpriteBillboardPart METHOD method_18141 setSprite (Lnet/minecraft/class_1058;)V ARG 1 sprite METHOD method_18142 setSpriteForAge (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping index 21edeb14e1..9a5073ddd0 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping @@ -1,18 +1,13 @@ CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverride FIELD field_4268 modelId Lnet/minecraft/class_2960; - FIELD field_4269 predicateToThresholds Ljava/util/Map; - METHOD (Lnet/minecraft/class_2960;Ljava/util/Map;)V + FIELD field_4269 predicateToThresholds Ljava/util/List; + METHOD (Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 1 modelId - ARG 2 predicateToThresholds METHOD method_3472 getModelId ()Lnet/minecraft/class_2960; - METHOD method_3473 matches (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)Z - ARG 1 stack - ARG 2 world - ARG 3 entity CLASS class_800 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson ARG 2 unused ARG 3 context - METHOD method_3474 deserializeMinPropertyValues (Lcom/google/gson/JsonObject;)Ljava/util/Map; + METHOD method_3474 deserializeMinPropertyValues (Lcom/google/gson/JsonObject;)Ljava/util/List; ARG 1 object diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping index 6d3cb30fb0..ec62da255a 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverrideList - FIELD field_4291 models Ljava/util/List; FIELD field_4292 EMPTY Lnet/minecraft/class_806; - FIELD field_4293 overrides Ljava/util/List; METHOD (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Ljava/util/List;)V ARG 1 modelLoader ARG 2 unbakedModel ARG 3 unbakedModelGetter - ARG 4 overrides METHOD method_3495 apply (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; ARG 1 model ARG 2 stack diff --git a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping index 6b76407e41..8a78e0c304 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1156 net/minecraft/client/tutorial/TutorialManager FIELD field_5645 client Lnet/minecraft/class_310; FIELD field_5646 currentHandler Lnet/minecraft/class_1155; - METHOD (Lnet/minecraft/class_310;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_315;)V ARG 1 client METHOD method_4905 isInSurvival ()Z COMMENT Returns whether the current game mode of the client is {@linkplain net.minecraft.world.GameMode#SURVIVAL survival}. diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index c6ea6ccdfd..a76c9921b6 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -64,7 +64,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6017 fallDistance F FIELD field_6018 netherPortalCooldown I FIELD field_6021 uuid Ljava/util/UUID; - FIELD field_6022 nextFlySoundDistance F FIELD field_6025 NULL_BOX Lnet/minecraft/class_238; FIELD field_6027 CUSTOM_NAME Lnet/minecraft/class_2940; FIELD field_6029 scoreboardTags Ljava/util/Set; @@ -276,11 +275,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 frozenTicks METHOD method_32319 setInPowderSnow (Z)V ARG 1 inPowderSnow - METHOD method_32875 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;)V - ARG 1 entity - ARG 2 event + METHOD method_32875 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)V METHOD method_32876 emitGameEvent (Lnet/minecraft/class_5712;)V - ARG 1 event METHOD method_33189 occludeVibrationSignals ()Z METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V @@ -356,7 +352,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 5 offsetZ METHOD method_5655 isInvulnerable ()Z METHOD method_5657 getPistonBehavior ()Lnet/minecraft/class_3619; - METHOD method_5658 canClimb ()Z METHOD method_5659 isImmuneToExplosion ()Z METHOD method_5660 setSneaking (Z)V ARG 1 sneaking @@ -574,7 +569,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 volume ARG 3 pitch METHOD method_5784 move (Lnet/minecraft/class_1313;Lnet/minecraft/class_243;)V - ARG 1 type ARG 2 movement METHOD method_5785 scheduleVelocityUpdate ()V METHOD method_5786 saveSelfToTag (Lnet/minecraft/class_2487;)Z @@ -599,8 +593,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5800 onStruckByLightning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1538;)V ARG 1 world ARG 2 lightning - METHOD method_5801 playFlySound (F)F - ARG 1 distance + METHOD method_5801 playFlySound ()V METHOD method_5802 getRotationClient ()Lnet/minecraft/class_241; METHOD method_5803 setSilent (Z)V ARG 1 silent @@ -631,7 +624,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5821 hasPassengerDeep (Lnet/minecraft/class_1297;)Z ARG 1 passenger METHOD method_5822 canUsePortals ()Z - METHOD method_5823 afterSpawn ()V METHOD method_5824 getRenderDistanceMultiplier ()D METHOD method_5825 tickInVoid ()V COMMENT Called when the entity is 64 blocks below the world's {@linkplain net.minecraft.world.HeightLimitView#getBottomSectionLimit() minimum Y position}. diff --git a/mappings/net/minecraft/item/FluidModificationItem.mapping b/mappings/net/minecraft/item/FluidModificationItem.mapping index 3ed197d77e..786d54315c 100644 --- a/mappings/net/minecraft/item/FluidModificationItem.mapping +++ b/mappings/net/minecraft/item/FluidModificationItem.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_5633 net/minecraft/item/FluidModificationItem - METHOD method_7728 onEmptied (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 stack - ARG 3 pos + METHOD method_7728 onEmptied (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V METHOD method_7731 placeFluid (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3965;)Z ARG 1 player ARG 2 world diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping index 38185d35c4..68ac19fcc5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit FIELD field_12394 teleportId I FIELD field_12395 x D FIELD field_12396 flags Ljava/util/Set; - METHOD (DDDFFLjava/util/Set;I)V + METHOD (DDDFFLjava/util/Set;IZ)V ARG 1 x ARG 3 y ARG 5 z diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 1f1d759cbe..871f9d8e49 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -22,8 +22,6 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient ARG 0 items METHOD method_8092 ofEntries (Ljava/util/stream/Stream;)Lnet/minecraft/class_1856; ARG 0 entries - METHOD method_8093 test (Lnet/minecraft/class_1799;)Z - ARG 1 stack METHOD method_8094 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1856$class_1857; ARG 0 stack METHOD method_8096 cacheMatchingStacks ()V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 8e767b003d..e4cae21703 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -97,7 +97,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_27727 getStructureManager ()Lnet/minecraft/class_3485; METHOD method_27728 getSaveProperties ()Lnet/minecraft/class_5219; METHOD method_27729 updateMobSpawnOptions ()V - METHOD method_27901 setupSpawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_5268;ZZZ)V + METHOD method_27901 setupSpawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_5268;ZZ)V ARG 0 world ARG 2 bonusChest ARG 3 debugWorld diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index bf82d849a4..331ac5469b 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart ARG 2 random ARG 3 minSeaLevelDistance METHOD method_14979 isInExistingChunk ()Z - METHOD method_16655 init (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;Lnet/minecraft/class_3037;)V + METHOD method_16655 init (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;)V ARG 1 registryManager ARG 2 chunkGenerator ARG 3 manager diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping index 15eee08afc..06442d1abf 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -24,7 +24,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe FIELD field_18704 children Ljava/util/List; FIELD field_18705 random Ljava/util/Random; FIELD field_18706 structurePieces Ljava/util/Deque; - METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IIZ)V + METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IIZLnet/minecraft/class_5539;)V ARG 1 piece ARG 3 minY ARG 4 currentSize diff --git a/mappings/net/minecraft/util/Lazy.mapping b/mappings/net/minecraft/util/Lazy.mapping index c59c5b3772..c22dc9a0af 100644 --- a/mappings/net/minecraft/util/Lazy.mapping +++ b/mappings/net/minecraft/util/Lazy.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3528 net/minecraft/util/Lazy - FIELD field_15718 value Ljava/lang/Object; FIELD field_15719 supplier Ljava/util/function/Supplier; METHOD (Ljava/util/function/Supplier;)V ARG 1 delegate diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping index 4465285dd8..e6abe30bcc 100644 --- a/mappings/net/minecraft/util/math/Box.mapping +++ b/mappings/net/minecraft/util/math/Box.mapping @@ -77,10 +77,7 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 0 mutable METHOD method_29968 from (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; ARG 0 vec3d - METHOD method_30048 of (DDD)Lnet/minecraft/class_238; - ARG 0 x - ARG 2 y - ARG 4 z + METHOD method_30048 of (Lnet/minecraft/class_243;DDD)Lnet/minecraft/class_238; METHOD method_989 offset (DDD)Lnet/minecraft/class_238; ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping index f6ffa6ef57..1b8d7c04da 100644 --- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa FIELD field_24175 amplitude D FIELD field_24176 firstSampler Lnet/minecraft/class_3537; FIELD field_24177 secondSampler Lnet/minecraft/class_3537; - METHOD (Lnet/minecraft/class_2919;ILit/unimi/dsi/fastutil/doubles/DoubleList;)V - ARG 1 random + METHOD (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)V ARG 2 offset ARG 3 octaves METHOD method_27406 sample (DDD)D @@ -12,11 +11,9 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa ARG 5 z METHOD method_27407 createAmplitude (I)D ARG 0 octaves - METHOD method_30846 create (Lnet/minecraft/class_2919;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_5216; - ARG 0 random + METHOD method_30846 create (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_5216; ARG 1 offset ARG 2 octaves - METHOD method_31927 create (Lnet/minecraft/class_2919;I[D)Lnet/minecraft/class_5216; - ARG 0 random + METHOD method_31927 create (Lnet/minecraft/class_5819;I[D)Lnet/minecraft/class_5216; ARG 1 offset ARG 2 octaves diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index 51df9228a7..d636108803 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -3,17 +3,13 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa FIELD field_20659 persistence D FIELD field_20660 lacunarity D FIELD field_26445 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; - METHOD (Lnet/minecraft/class_2919;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 random + METHOD (Lnet/minecraft/class_5819;Lcom/mojang/datafixers/util/Pair;)V ARG 2 offsetAndAmplitudes - METHOD (Lnet/minecraft/class_2919;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V - ARG 1 random + METHOD (Lnet/minecraft/class_5819;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V ARG 2 octaves - METHOD (Lnet/minecraft/class_2919;Ljava/util/List;)V - ARG 1 random + METHOD (Lnet/minecraft/class_5819;Ljava/util/List;)V ARG 2 octaves - METHOD (Lnet/minecraft/class_2919;Ljava/util/stream/IntStream;)V - ARG 1 random + METHOD (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)V ARG 2 octaves METHOD method_15416 sample (DDD)D ARG 1 x @@ -30,8 +26,7 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa ARG 11 useOrigin METHOD method_16668 getOctave (I)Lnet/minecraft/class_3756; ARG 1 octave - METHOD method_30847 create (Lnet/minecraft/class_2919;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_3537; - ARG 0 random + METHOD method_30847 create (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_3537; ARG 1 offset ARG 2 amplitudes METHOD method_30848 calculateAmplitudes (Lit/unimi/dsi/fastutil/ints/IntSortedSet;)Lcom/mojang/datafixers/util/Pair; diff --git a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping index c16050375f..95c8f1657c 100644 --- a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping @@ -2,14 +2,11 @@ CLASS net/minecraft/class_3543 net/minecraft/util/math/noise/OctaveSimplexNoiseS FIELD field_15770 octaveSamplers [Lnet/minecraft/class_3541; FIELD field_20661 persistence D FIELD field_20662 lacunarity D - METHOD (Lnet/minecraft/class_2919;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V - ARG 1 random + METHOD (Lnet/minecraft/class_5819;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V ARG 2 octaves - METHOD (Lnet/minecraft/class_2919;Ljava/util/List;)V - ARG 1 random + METHOD (Lnet/minecraft/class_5819;Ljava/util/List;)V ARG 2 octaves - METHOD (Lnet/minecraft/class_2919;Ljava/util/stream/IntStream;)V - ARG 1 random + METHOD (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)V ARG 2 octaves METHOD method_16451 sample (DDZ)D ARG 1 x diff --git a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping index 74ebdf0672..3039862bf3 100644 --- a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_3756 net/minecraft/util/math/noise/PerlinNoiseSampler FIELD field_16589 originY D FIELD field_16590 permutations [B FIELD field_16591 originX D - METHOD (Ljava/util/Random;)V - ARG 1 random METHOD method_16447 sample (DDDDD)D ARG 1 x ARG 3 y @@ -18,7 +16,7 @@ CLASS net/minecraft/class_3756 net/minecraft/util/math/noise/PerlinNoiseSampler ARG 5 z METHOD method_16449 getGradient (I)I ARG 1 hash - METHOD method_16450 sample (IIIDDDDDD)D + METHOD method_16450 sample (IIIDDDD)D ARG 1 sectionX ARG 2 sectionY ARG 3 sectionZ @@ -26,5 +24,3 @@ CLASS net/minecraft/class_3756 net/minecraft/util/math/noise/PerlinNoiseSampler ARG 6 localY ARG 8 localZ ARG 10 fadeLocalX - ARG 12 fadeLocalY - ARG 14 fadeLocalZ diff --git a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping index e9b742be72..78c999a152 100644 --- a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_3541 net/minecraft/util/math/noise/SimplexNoiseSampler FIELD field_15766 GRADIENTS [[I FIELD field_15767 UNSKEW_FACTOR_2D D FIELD field_15768 SKEW_FACTOR_2D D - METHOD (Ljava/util/Random;)V - ARG 1 random METHOD method_15431 dot ([IDDD)D ARG 0 gArr ARG 1 x diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index 521516d7a0..a09d3ab92c 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion FIELD field_14087 seed J FIELD field_14088 width I - FIELD field_14089 centerChunkZ I - FIELD field_14090 centerChunkX I FIELD field_14091 random Ljava/util/Random; FIELD field_14092 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_14093 world Lnet/minecraft/class_3218; @@ -18,11 +16,9 @@ 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 method_14336 getCenterChunkX ()I METHOD method_14337 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1951; ARG 1 pos METHOD method_14338 markBlockForPostProcessing (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_14339 getCenterChunkZ ()I METHOD method_14340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1951; ARG 1 pos diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 26ae3d21cc..b79b3f5775 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -59,12 +59,9 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 1 world ARG 2 pos ARG 3 entityType - METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_1959;IILjava/util/Random;)V + METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_1959;Lnet/minecraft/class_1923;Ljava/util/Random;)V ARG 0 world ARG 1 biome - ARG 2 chunkX - ARG 3 chunkZ - ARG 4 random METHOD method_8662 isClearForSpawn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_1299;)Z ARG 0 blockView ARG 1 pos diff --git a/mappings/net/minecraft/world/WorldView.mapping b/mappings/net/minecraft/world/WorldView.mapping index dc3aa3775f..14081b03fd 100644 --- a/mappings/net/minecraft/world/WorldView.mapping +++ b/mappings/net/minecraft/world/WorldView.mapping @@ -5,12 +5,8 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView METHOD method_22340 isChunkLoaded (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_22341 isRegionLoaded (IIIIII)Z - ARG 1 minX ARG 2 minY - ARG 3 minZ - ARG 4 maxX ARG 5 maxY - ARG 6 maxZ METHOD method_22342 getChunk (IILnet/minecraft/class_2806;)Lnet/minecraft/class_2791; ARG 1 chunkX ARG 2 chunkZ diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index 1b610a45b5..67cb5c0f3c 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -46,8 +46,6 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 3 dataKey METHOD method_12331 get (I)Ljava/lang/Object; ARG 1 index - METHOD method_12332 (Ljava/lang/Thread;)Ljava/lang/String; - ARG 0 thread METHOD method_12333 (ILjava/lang/Object;)I ARG 0 newSize ARG 1 added diff --git a/mappings/net/minecraft/world/gen/ChunkRandom.mapping b/mappings/net/minecraft/world/gen/ChunkRandom.mapping index 45877b57b8..3efb1f1057 100644 --- a/mappings/net/minecraft/world/gen/ChunkRandom.mapping +++ b/mappings/net/minecraft/world/gen/ChunkRandom.mapping @@ -9,14 +9,6 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom COMMENT chunk coordinates.

ARG 1 chunkX ARG 2 chunkZ - METHOD method_12660 consume (I)V - COMMENT Skips the provided number of calls to the randomizer. - COMMENT - COMMENT

The skips give the effect of "scrambling" the randomizer but the output is still - COMMENT linearly dependent. Note that since multiple calls to a linear congruential generator is - COMMENT equivalent to another linear congruence, this method could be optimized to combine - COMMENT the calls into one.

- ARG 1 count METHOD method_12661 setPopulationSeed (JII)J COMMENT Seeds the randomizer to create population features such as decorators and animals. COMMENT diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index e705d6637b..44b30f6efe 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -25,8 +25,6 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 2 feature ARG 3 structureStart ARG 4 holder - METHOD method_26977 (Ljava/lang/Long;)Lnet/minecraft/class_4076; - ARG 0 pos METHOD method_27834 shouldGenerateStructures ()Z METHOD method_28386 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3443;)Z ARG 1 piece diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 4092cdf96e..01563114f7 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -65,7 +65,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 4 pos METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V COMMENT Determines which structures should start in the given chunk and creates their starting points. - ARG 3 chunk ARG 5 worldSeed METHOD method_16130 addStructureReferences (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Finds all structures that the given chunk intersects, and adds references to their starting chunks to it. @@ -73,20 +72,20 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 world ARG 2 accessor ARG 3 chunk - METHOD method_16397 getHeight (IILnet/minecraft/class_2902$class_2903;)I + METHOD method_16397 getHeight (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;)I ARG 1 x ARG 2 z ARG 3 heightmapType METHOD method_16398 getSeaLevel ()I - METHOD method_18028 getHeightInGround (IILnet/minecraft/class_2902$class_2903;)I + METHOD method_18028 getHeightInGround (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;)I ARG 1 x ARG 2 z ARG 3 heightmapType - METHOD method_20402 getHeightOnGround (IILnet/minecraft/class_2902$class_2903;)I + METHOD method_20402 getHeightOnGround (IILnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_5539;)I ARG 1 x ARG 2 z ARG 3 heightmapType - METHOD method_26261 getColumnSample (II)Lnet/minecraft/class_4966; + METHOD method_26261 getColumnSample (IILnet/minecraft/class_5539;)Lnet/minecraft/class_4966; ARG 1 x ARG 2 z METHOD method_27997 withSeed (J)Lnet/minecraft/class_2794; @@ -94,9 +93,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_28506 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_28507 isStrongholdStartingChunk (Lnet/minecraft/class_1923;)Z ARG 1 pos - METHOD method_28508 setStructureStart (Lnet/minecraft/class_5312;Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_1959;)V + METHOD method_28508 setStructureStart (Lnet/minecraft/class_5312;Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;JLnet/minecraft/class_1959;)V ARG 4 chunk ARG 6 worldSeed - ARG 8 chunkPos - ARG 9 biome METHOD method_28509 generateStrongholdPositions ()V diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 407189553d..50428b647e 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -3,21 +3,13 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_16571 surfaceDepthNoise Lnet/minecraft/class_3757; FIELD field_16572 verticalNoiseResolution I FIELD field_16573 defaultFluid Lnet/minecraft/class_2680; - FIELD field_16574 lowerInterpolatedNoise Lnet/minecraft/class_3537; - FIELD field_16575 interpolationNoise Lnet/minecraft/class_3537; FIELD field_16576 defaultBlock Lnet/minecraft/class_2680; - FIELD field_16577 random Lnet/minecraft/class_2919; + FIELD field_16577 random Lnet/minecraft/class_5819; FIELD field_16578 noiseSizeZ I - FIELD field_16579 noiseSizeY I FIELD field_16580 noiseSizeX I - FIELD field_16581 upperInterpolatedNoise Lnet/minecraft/class_3537; FIELD field_16648 AIR Lnet/minecraft/class_2680; - FIELD field_16649 NOISE_WEIGHT_TABLE [F FIELD field_24773 CODEC Lcom/mojang/serialization/Codec; FIELD field_24774 settings Ljava/util/function/Supplier; - FIELD field_24775 BIOME_WEIGHT_TABLE [F - FIELD field_24776 densityNoise Lnet/minecraft/class_3537; - FIELD field_24777 islandNoise Lnet/minecraft/class_3541; FIELD field_24778 seed J FIELD field_24779 worldHeight I METHOD (Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V @@ -29,49 +21,17 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 2 biomeSource ARG 3 seed ARG 5 settings - METHOD method_16405 sampleNoiseColumn ([DII)V - ARG 1 buffer - ARG 2 x - ARG 3 z - METHOD method_16406 sampleNoiseColumn (II)[D + METHOD method_16406 sampleNoiseColumn (IIII)[D ARG 1 x ARG 2 z - METHOD method_16411 sampleNoise (IIIDDDD)D - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 horizontalScale - ARG 6 verticalScale - ARG 8 horizontalStretch - ARG 10 verticalStretch METHOD method_16412 buildBedrock (Lnet/minecraft/class_2791;Ljava/util/Random;)V ARG 1 chunk ARG 2 random - METHOD method_16571 calculateNoiseWeight (III)D - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_16572 getNoiseWeight (III)D - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_16573 ([F)V - ARG 0 array - METHOD method_26262 getBlockState (DI)Lnet/minecraft/class_2680; - ARG 1 density - ARG 3 y - METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;)I + METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;II)Ljava/util/OptionalInt; ARG 1 x ARG 2 z ARG 3 states ARG 4 predicate - METHOD method_26983 (Lnet/minecraft/class_1923;Lit/unimi/dsi/fastutil/objects/ObjectList;IILit/unimi/dsi/fastutil/objects/ObjectList;Lnet/minecraft/class_3449;)V - ARG 5 start METHOD method_28548 matchesSettings (JLnet/minecraft/class_5321;)Z ARG 1 seed ARG 3 settingsKey - METHOD method_28551 ([F)V - ARG 0 array - METHOD method_28553 getRandomDensityAt (II)D - ARG 1 x - ARG 2 z diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping index 8458d4937c..a0095a404a 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructu METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_3037;)V ARG 1 feature ARG 2 config - METHOD method_28622 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_1959;ILnet/minecraft/class_5314;)Lnet/minecraft/class_3449; + METHOD method_28622 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_1959;ILnet/minecraft/class_5314;Lnet/minecraft/class_5539;)Lnet/minecraft/class_3449; COMMENT @see StructureFeature#tryPlaceStart ARG 1 registryManager ARG 2 chunkGenerator diff --git a/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping index 4a8047b0cc..91292ba80d 100644 --- a/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3021 net/minecraft/world/gen/feature/EndCityFeature - METHOD method_13085 getGenerationHeight (IILnet/minecraft/class_2794;)I + METHOD method_13085 getGenerationHeight (IILnet/minecraft/class_2794;Lnet/minecraft/class_5539;)I ARG 0 chunkX ARG 1 chunkZ ARG 2 chunkGenerator diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index 5294826eda..869b778bb1 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -9,12 +9,7 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature METHOD method_13150 register (Ljava/lang/String;Lnet/minecraft/class_3031;)Lnet/minecraft/class_3031; ARG 0 name ARG 1 feature - METHOD method_13151 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z - ARG 1 world - ARG 2 chunkGenerator - ARG 3 random - ARG 4 pos - ARG 5 config + METHOD method_13151 generate (Lnet/minecraft/class_5821;)Z METHOD method_13153 setBlockState (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping index 73fc3b8e96..c660b2f03f 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu ARG 0 random ARG 1 min ARG 2 max - METHOD method_27211 (Ljava/util/Random;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;)I + METHOD method_27211 (Ljava/util/Random;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;Lnet/minecraft/class_5539;)I ARG 0 random ARG 1 chunkGenerator ARG 2 verticalPlacement diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index 4e493acafe..178964a0d5 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 8 config METHOD method_14016 getStructureStartFactory ()Lnet/minecraft/class_3195$class_3774; METHOD method_14019 getName ()Ljava/lang/String; - METHOD method_14026 shouldStartAt (Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;JLnet/minecraft/class_2919;IILnet/minecraft/class_1959;Lnet/minecraft/class_1923;Lnet/minecraft/class_3037;)Z + METHOD method_14026 shouldStartAt (Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;JLnet/minecraft/class_2919;IILnet/minecraft/class_1959;Lnet/minecraft/class_1923;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;)Z COMMENT Checks if this structure can actually be placed at a potential structure position determined via COMMENT {@link #getStartChunk}. Specific structures override this method to reduce the spawn probability or COMMENT restrict the spawn in some other way. @@ -67,7 +67,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 3 boundingBox ARG 4 referenceCount ARG 5 worldSeed - METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_1959;ILnet/minecraft/class_2919;Lnet/minecraft/class_5314;Lnet/minecraft/class_3037;)Lnet/minecraft/class_3449; + METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_1959;ILnet/minecraft/class_2919;Lnet/minecraft/class_5314;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;)Lnet/minecraft/class_3449; COMMENT Tries to place a starting point for this type of structure in the given chunk. COMMENT

COMMENT If this structure doesn't have a starting point in the chunk, {@link StructureStart#DEFAULT} diff --git a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping index 70e6e2efb0..6b6fbd7737 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping @@ -15,13 +15,11 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet ARG 1 pos ARG 2 type METHOD method_19147 test (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z - ARG 1 pos ARG 2 predicate METHOD method_19150 get (Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; METHOD method_19153 releaseTicket (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_19154 getType (Lnet/minecraft/class_2338;)Ljava/util/Optional; - ARG 1 pos METHOD method_20350 add (Lnet/minecraft/class_4156;)Z ARG 1 poi METHOD method_20353 updatePointsOfInterest (Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index a9a646e467..427f950508 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -24,8 +24,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 shouldKeepTicking METHOD method_19291 onLoad (J)V ARG 1 pos - METHOD method_19292 isPosInvalid (Lnet/minecraft/class_4076;)Z - ARG 1 pos + METHOD method_19292 isPosInvalid (J)Z METHOD method_19293 getIfLoaded (J)Ljava/util/Optional; ARG 1 pos METHOD method_19294 get (J)Ljava/util/Optional;