diff --git a/build.gradle b/build.gradle index 29cc9db93b..918e873d78 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "19w34a" +def minecraft_version = "19w35a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping deleted file mode 100644 index 73bf8f9a4a..0000000000 --- a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping +++ /dev/null @@ -1,23 +0,0 @@ -CLASS com/mojang/blaze3d/platform/TextureUtil - METHOD bind (I)V - ARG 0 texture - METHOD prepareImage (III)V - ARG 0 texture - ARG 1 width - ARG 2 height - METHOD prepareImage (IIII)V - ARG 0 texture - ARG 1 levels - ARG 2 width - ARG 3 height - METHOD prepareImage (Lnet/minecraft/class_1011$class_1013;III)V - ARG 0 pixelFormat - ARG 1 texture - ARG 2 width - ARG 3 height - METHOD prepareImage (Lnet/minecraft/class_1011$class_1013;IIII)V - ARG 0 pixelFormat - ARG 1 texture - ARG 2 levels - ARG 3 width - ARG 4 height diff --git a/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping b/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping index d8d90a504d..8d6dd88ff5 100644 --- a/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping +++ b/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping @@ -3,8 +3,7 @@ CLASS net/minecraft/class_2312 net/minecraft/block/AbstractRedstoneGateBlock FIELD field_10912 SHAPE Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings - METHOD method_10000 getMaxInputLevelSides (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)I - ARG 1 view + METHOD method_10000 getMaxInputLevelSides (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)I ARG 2 pos ARG 3 state METHOD method_9988 isTargetNotAligned (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z @@ -27,12 +26,10 @@ CLASS net/minecraft/class_2312 net/minecraft/block/AbstractRedstoneGateBlock ARG 1 view ARG 2 pos ARG 3 state - METHOD method_9995 getInputLevel (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I - ARG 1 view + METHOD method_9995 getInputLevel (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I ARG 2 pos ARG 3 dir - METHOD method_9996 isLocked (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z - ARG 1 world + METHOD method_9996 isLocked (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 2 pos ARG 3 state METHOD method_9997 updateTarget (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 2ca5443b23..563a82684d 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -17,14 +17,12 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock METHOD method_18476 getDirection (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; ARG 0 world ARG 1 pos - METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;I)Ljava/util/Optional; + METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Ljava/util/Optional; ARG 0 type - ARG 1 world ARG 2 pos ARG 3 index - METHOD method_9486 canWakeUpAt (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Ljava/util/Optional; + METHOD method_9486 canWakeUpAt (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 0 type - ARG 1 world ARG 2 pos METHOD method_9487 getColor ()Lnet/minecraft/class_1767; METHOD method_9488 getDirectionTowardsOtherPart (Lnet/minecraft/class_2742;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 164e3927d9..d553ec6729 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -94,8 +94,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 state ARG 3 hitResult ARG 4 entity - METHOD method_20044 isSolidSmallSquare (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 0 world + METHOD method_20044 isSolidSmallSquare (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 pos ARG 2 side METHOD method_20045 isSideSolidFullSquare (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z @@ -147,9 +146,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 3 blockEntity ARG 4 entity ARG 5 stack - METHOD method_9514 onRandomTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V + METHOD method_9514 onRandomTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 state - ARG 2 world ARG 3 pos ARG 4 random METHOD method_9515 appendProperties (Lnet/minecraft/class_2689$class_2690;)V @@ -244,10 +242,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_9543 hasDynamicBounds ()Z METHOD method_9545 getFluidState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; ARG 1 state - METHOD method_9546 getBlockBrightness (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I - ARG 1 state - ARG 2 view - ARG 3 pos METHOD method_9548 onEntityCollision (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)V ARG 1 state ARG 2 world @@ -279,9 +273,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 state ARG 2 view ARG 3 pos - METHOD method_9558 canPlaceAt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z + METHOD method_9558 canPlaceAt (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 1 state - ARG 2 world ARG 3 pos METHOD method_9559 getStateForNeighborUpdate (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 state @@ -298,8 +291,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 world ARG 2 pos ARG 3 blockEntity - METHOD method_9563 getTickRate (Lnet/minecraft/class_1941;)I - ARG 1 world + METHOD method_9563 getTickRate (Lnet/minecraft/class_4538;)I METHOD method_9564 getDefaultState ()Lnet/minecraft/class_2680; METHOD method_9565 onStacksDropped (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 1 state @@ -382,9 +374,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 world ARG 2 pos ARG 3 explosion - METHOD method_9588 onScheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V + METHOD method_9588 onScheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 state - ARG 2 world ARG 3 pos ARG 4 random METHOD method_9589 hasBlockEntityBreakingRender (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 96c039fc03..2e28317dd5 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -46,8 +46,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 3 type ARG 4 data METHOD method_11584 hasComparatorOutput ()Z - METHOD method_11585 scheduledTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V - ARG 1 world + METHOD method_11585 scheduledTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 2 pos ARG 3 rnd METHOD method_11586 getPistonBehavior ()Lnet/minecraft/class_3619; @@ -59,8 +58,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 2 view ARG 3 pos METHOD method_11590 initShapeCache ()V - METHOD method_11591 canPlaceAt (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z - ARG 1 world + METHOD method_11591 canPlaceAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 2 pos METHOD method_11592 isSideInvisible (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z ARG 1 neighbor @@ -137,8 +135,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState METHOD method_11623 isTranslucent (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 view ARG 2 pos - METHOD method_11624 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V - ARG 1 world + METHOD method_11624 onRandomTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 2 pos ARG 3 rnd METHOD method_11625 getTopMaterialColor (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3620; @@ -160,9 +157,6 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 1 view ARG 2 pos ARG 3 entity - METHOD method_11632 getBlockBrightness (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I - ARG 1 view - ARG 2 pos METHOD method_11633 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2680; ARG 0 dynamic METHOD method_11634 emitsRedstonePower ()Z diff --git a/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping b/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping index 7a36304389..eaadcd8a07 100644 --- a/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping +++ b/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping @@ -14,6 +14,5 @@ CLASS net/minecraft/class_2276 net/minecraft/block/CarvedPumpkinBlock ARG 1 world ARG 2 pos METHOD method_9732 getSnowGolemDispenserPattern ()Lnet/minecraft/class_2700; - METHOD method_9733 canDispense (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z - ARG 1 world + METHOD method_9733 canDispense (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 2 pos diff --git a/mappings/net/minecraft/block/ChorusFlowerBlock.mapping b/mappings/net/minecraft/block/ChorusFlowerBlock.mapping index c8d03542d8..c975108427 100644 --- a/mappings/net/minecraft/block/ChorusFlowerBlock.mapping +++ b/mappings/net/minecraft/block/ChorusFlowerBlock.mapping @@ -13,8 +13,7 @@ CLASS net/minecraft/class_2279 net/minecraft/block/ChorusFlowerBlock ARG 1 world ARG 2 pos ARG 3 age - METHOD method_9746 isSurroundedByAir (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 0 world + METHOD method_9746 isSurroundedByAir (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 pos ARG 2 exceptDirection METHOD method_9747 die (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/block/FallingBlock.mapping b/mappings/net/minecraft/block/FallingBlock.mapping index 7871e7028d..a2abf98e34 100644 --- a/mappings/net/minecraft/block/FallingBlock.mapping +++ b/mappings/net/minecraft/block/FallingBlock.mapping @@ -13,8 +13,5 @@ CLASS net/minecraft/class_2346 net/minecraft/block/FallingBlock ARG 2 pos METHOD method_10130 getColor (Lnet/minecraft/class_2680;)I ARG 1 state - METHOD method_10131 tryStartFalling (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos METHOD method_10132 configureFallingBlockEntity (Lnet/minecraft/class_1540;)V ARG 1 entity diff --git a/mappings/net/minecraft/block/FarmlandBlock.mapping b/mappings/net/minecraft/block/FarmlandBlock.mapping index fa42acc174..32fd7be9bf 100644 --- a/mappings/net/minecraft/block/FarmlandBlock.mapping +++ b/mappings/net/minecraft/block/FarmlandBlock.mapping @@ -10,6 +10,5 @@ CLASS net/minecraft/class_2344 net/minecraft/block/FarmlandBlock ARG 0 state ARG 1 world ARG 2 pos - METHOD method_10126 isWaterNearby (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z - ARG 0 world + METHOD method_10126 isWaterNearby (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 1 pos diff --git a/mappings/net/minecraft/block/Fertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping index 7611c29c96..f892a0c132 100644 --- a/mappings/net/minecraft/block/Fertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -9,8 +9,7 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable ARG 2 pos ARG 3 state ARG 4 isClient - METHOD method_9652 grow (Lnet/minecraft/class_1937;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 1 world + METHOD method_9652 grow (Lnet/minecraft/class_3218;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 2 random ARG 3 pos ARG 4 state diff --git a/mappings/net/minecraft/block/FireBlock.mapping b/mappings/net/minecraft/block/FireBlock.mapping index 3abd5dca34..9ef1e4b29b 100644 --- a/mappings/net/minecraft/block/FireBlock.mapping +++ b/mappings/net/minecraft/block/FireBlock.mapping @@ -24,8 +24,7 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock METHOD method_10193 areBlocksAroundFlammable (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos - METHOD method_10194 getBurnChance (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)I - ARG 1 world + METHOD method_10194 getBurnChance (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)I ARG 2 pos METHOD method_10195 isFlammable (Lnet/minecraft/class_2680;)Z ARG 1 blockState diff --git a/mappings/net/minecraft/block/MushroomPlantBlock.mapping b/mappings/net/minecraft/block/MushroomPlantBlock.mapping index 90acd0e6a9..9cb135c010 100644 --- a/mappings/net/minecraft/block/MushroomPlantBlock.mapping +++ b/mappings/net/minecraft/block/MushroomPlantBlock.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_2420 net/minecraft/block/MushroomPlantBlock FIELD field_11304 SHAPE Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings - METHOD method_10349 trySpawningBigMushroom (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z - ARG 1 world + METHOD method_10349 trySpawningBigMushroom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z ARG 2 pos ARG 3 state ARG 4 random diff --git a/mappings/net/minecraft/block/SaplingBlock.mapping b/mappings/net/minecraft/block/SaplingBlock.mapping index 8f5bad0dc8..51e0520ad5 100644 --- a/mappings/net/minecraft/block/SaplingBlock.mapping +++ b/mappings/net/minecraft/block/SaplingBlock.mapping @@ -5,8 +5,4 @@ CLASS net/minecraft/class_2473 net/minecraft/block/SaplingBlock METHOD (Lnet/minecraft/class_2647;Lnet/minecraft/class_2248$class_2251;)V ARG 1 generator ARG 2 settings - METHOD method_10507 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)V - ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 random + METHOD method_10507 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)V diff --git a/mappings/net/minecraft/block/SpreadableBlock.mapping b/mappings/net/minecraft/block/SpreadableBlock.mapping index 068be2d2f9..d1573c750a 100644 --- a/mappings/net/minecraft/block/SpreadableBlock.mapping +++ b/mappings/net/minecraft/block/SpreadableBlock.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/class_2500 net/minecraft/block/SpreadableBlock METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings - METHOD method_10613 canSpread (Lnet/minecraft/class_2680;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z + METHOD method_10613 canSpread (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 0 state - ARG 1 world ARG 2 pos - METHOD method_10614 canSurvive (Lnet/minecraft/class_2680;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z + METHOD method_10614 canSurvive (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 0 state - ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/WallMountedBlock.mapping b/mappings/net/minecraft/block/WallMountedBlock.mapping index b3e6940670..4ed33ed2a1 100644 --- a/mappings/net/minecraft/block/WallMountedBlock.mapping +++ b/mappings/net/minecraft/block/WallMountedBlock.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2341 net/minecraft/block/WallMountedBlock ARG 1 settings METHOD method_10119 getDirection (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350; ARG 0 state - METHOD method_20046 canPlaceAt (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 0 world + METHOD method_20046 canPlaceAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 pos ARG 2 direction diff --git a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping index b040b17249..26d16c72ba 100644 --- a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping @@ -17,11 +17,11 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity ARG 0 world ARG 1 pos METHOD method_11415 getDrawnSidesCount ()I - METHOD method_11416 createPortal (Lnet/minecraft/class_2338;)V + METHOD method_11416 createPortal (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V METHOD method_11417 getRecentlyGeneratedBeamHeight (F)F ARG 1 tickDelta METHOD method_11418 setExitPortalPos (Lnet/minecraft/class_2338;Z)V METHOD method_11419 findBestPortalExitPos ()Lnet/minecraft/class_2338; METHOD method_11420 isRecentlyGenerated ()Z METHOD method_11421 needsCooldownBeforeTeleporting ()Z - METHOD method_11422 createPortal ()V + METHOD method_11422 createPortal (Lnet/minecraft/class_3218;)V diff --git a/mappings/net/minecraft/block/pattern/BlockPattern.mapping b/mappings/net/minecraft/block/pattern/BlockPattern.mapping index c27dafe249..deaae7f34d 100644 --- a/mappings/net/minecraft/block/pattern/BlockPattern.mapping +++ b/mappings/net/minecraft/block/pattern/BlockPattern.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2700 net/minecraft/block/pattern/BlockPattern CLASS class_2701 BlockStateCacheLoader - FIELD field_12359 world Lnet/minecraft/class_1941; + FIELD field_12359 world Lnet/minecraft/class_4538; FIELD field_12360 forceLoad Z CLASS class_2702 Result FIELD field_12361 depth I @@ -44,11 +44,8 @@ CLASS net/minecraft/class_2700 net/minecraft/block/pattern/BlockPattern ARG 3 offsetLeft ARG 4 offsetDown ARG 5 offsetForwards - METHOD method_11708 searchAround (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2700$class_2702; - ARG 1 world - METHOD method_11709 makeCache (Lnet/minecraft/class_1941;Z)Lcom/google/common/cache/LoadingCache; - ARG 0 world - ARG 1 forceLoad + METHOD method_11708 searchAround (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2700$class_2702; + METHOD method_11709 makeCache (Lnet/minecraft/class_4538;Z)Lcom/google/common/cache/LoadingCache; METHOD method_11710 getWidth ()I METHOD method_11711 testTransform (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;Lcom/google/common/cache/LoadingCache;)Lnet/minecraft/class_2700$class_2702; ARG 1 frontTopLeft diff --git a/mappings/net/minecraft/block/pattern/CachedBlockPosition.mapping b/mappings/net/minecraft/block/pattern/CachedBlockPosition.mapping index bce637ce63..67c48a91c7 100644 --- a/mappings/net/minecraft/block/pattern/CachedBlockPosition.mapping +++ b/mappings/net/minecraft/block/pattern/CachedBlockPosition.mapping @@ -3,14 +3,14 @@ CLASS net/minecraft/class_2694 net/minecraft/block/pattern/CachedBlockPosition FIELD field_12327 blockEntity Lnet/minecraft/class_2586; FIELD field_12328 cachedEntity Z FIELD field_12329 forceLoad Z - FIELD field_12330 world Lnet/minecraft/class_1941; + FIELD field_12330 world Lnet/minecraft/class_4538; FIELD field_12331 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Z)V + METHOD (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)V ARG 2 pos ARG 3 forceLoad METHOD method_11678 matchesBlockState (Ljava/util/function/Predicate;)Ljava/util/function/Predicate; ARG 0 state - METHOD method_11679 getWorld ()Lnet/minecraft/class_1941; + METHOD method_11679 getWorld ()Lnet/minecraft/class_4538; METHOD method_11680 getBlockEntity ()Lnet/minecraft/class_2586; METHOD method_11681 getBlockState ()Lnet/minecraft/class_2680; METHOD method_11683 getBlockPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping index b86b849bf5..334b3b2808 100644 --- a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping @@ -6,4 +6,4 @@ CLASS net/minecraft/class_2650 net/minecraft/block/sapling/LargeTreeSaplingGener ARG 3 x ARG 4 z METHOD method_11443 createLargeTreeFeature (Ljava/util/Random;)Lnet/minecraft/class_2944; - METHOD method_11444 generateLargeTree (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;II)Z + METHOD method_11444 generateLargeTree (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;II)Z diff --git a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping index d9add143c6..c7706a5c5b 100644 --- a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_2647 net/minecraft/block/sapling/SaplingGenerator METHOD method_11430 createTreeFeature (Ljava/util/Random;)Lnet/minecraft/class_2944; - METHOD method_11431 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z - ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 random + METHOD method_11431 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z diff --git a/mappings/net/minecraft/class_4538.mapping b/mappings/net/minecraft/class_4538.mapping new file mode 100644 index 0000000000..14652bce70 --- /dev/null +++ b/mappings/net/minecraft/class_4538.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_4538 + METHOD method_8392 getChunk (II)Lnet/minecraft/class_2791; + METHOD method_8393 isChunkLoaded (II)Z + METHOD method_8402 getChunk (IILnet/minecraft/class_2806;Z)Lnet/minecraft/class_2791; + METHOD method_8594 getAmbientDarkness ()I + METHOD method_8597 getDimension ()Lnet/minecraft/class_2869; + METHOD method_8598 getTopPosition (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + METHOD method_8608 isClient ()Z + METHOD method_8615 getSeaLevel ()I + METHOD method_8624 getLightLevel (Lnet/minecraft/class_2902$class_2903;II)I diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 18573b26fc..0560acac34 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3195 levelName Ljava/lang/String; FIELD field_3197 buttonGenerateBonusItems Lnet/minecraft/class_4185; FIELD field_3198 buttonCustomizeType Lnet/minecraft/class_4185; - FIELD field_3201 gameMode Ljava/lang/String; + FIELD field_3201 gameMode Lnet/minecraft/class_525$class_4539; FIELD field_3203 buttonGenerateStructures Lnet/minecraft/class_4185; FIELD field_3204 generatorType I FIELD field_3205 buttonCreateLevel Lnet/minecraft/class_4185; diff --git a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping index e976d5b78d..30c88e4bec 100644 --- a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping +++ b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping @@ -24,5 +24,4 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer METHOD method_3211 applyFog (Lnet/minecraft/class_4184;I)V METHOD method_3212 setFogBlack (Z)V ARG 1 fogBlack - METHOD method_3213 updateColorInWater (Lnet/minecraft/class_4184;Lnet/minecraft/class_1941;)V - ARG 2 world + METHOD method_3213 updateColorInWater (Lnet/minecraft/class_4184;Lnet/minecraft/class_4538;)V diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index cd7af146d2..fce12ee177 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -24,8 +24,6 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender FIELD field_19322 floatCache Lit/unimi/dsi/fastutil/longs/Long2FloatLinkedOpenHashMap; METHOD method_20548 enable ()V METHOD method_20549 getInt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I - ARG 1 state - ARG 2 blockView ARG 3 pos METHOD method_20550 disable ()V METHOD method_20551 getFloat (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)F @@ -77,8 +75,6 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender ARG 3 red ARG 4 green METHOD method_3370 tesselateQuadsFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;IZLnet/minecraft/class_287;Ljava/util/List;Ljava/util/BitSet;)V - ARG 1 view - ARG 2 state ARG 3 pos ARG 4 brightness ARG 5 checkBrightness diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 3c5628f2d1..fc7fbc13a5 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 6 z METHOD method_3927 setRenderOutlines (Z)V ARG 1 renderOutlines - METHOD method_3928 projectShadow (Lnet/minecraft/class_2680;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;DDDLnet/minecraft/class_2338;FFDDD)V + METHOD method_3928 projectShadow (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;DDDLnet/minecraft/class_2338;FFDDD)V METHOD method_3929 getOutlineColor (Lnet/minecraft/class_1297;)I ARG 1 entity METHOD method_3930 renderLabel (Lnet/minecraft/class_1297;DDDLjava/lang/String;D)V @@ -45,7 +45,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 1 entity ARG 2 visibleRegion METHOD method_3934 renderShadow (Lnet/minecraft/class_1297;DDDFF)V - METHOD method_3935 getWorld ()Lnet/minecraft/class_1941; + METHOD method_3935 getWorld ()Lnet/minecraft/class_4538; METHOD method_3936 render (Lnet/minecraft/class_1297;DDDFF)V ARG 1 entity ARG 2 x diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 9ec3270a9c..d68a65a31e 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -93,10 +93,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 o METHOD method_17681 getWidth ()F METHOD method_17682 getHeight ()F - METHOD method_17833 calculateTangentialMotionVector (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1941;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; + METHOD method_17833 calculateTangentialMotionVector (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; ARG 0 collisionVector ARG 1 observerBounds - ARG 2 world ARG 3 context ARG 4 collisions METHOD method_17835 handleCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 0a6674a272..392efc27b8 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -73,8 +73,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_5882 getTranslationKey ()Ljava/lang/String; METHOD method_5883 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world - METHOD method_5884 getOriginY (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;ZLnet/minecraft/class_238;)D - ARG 0 world + METHOD method_5884 getOriginY (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;ZLnet/minecraft/class_238;)D ARG 1 pos ARG 3 boundingBox METHOD method_5886 newInstance (Lnet/minecraft/class_1937;Lnet/minecraft/class_1299;)Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping b/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping index 4ab59f06f8..6822937710 100644 --- a/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping @@ -3,6 +3,5 @@ CLASS net/minecraft/class_1342 net/minecraft/entity/ai/goal/BreatheAirGoal METHOD (Lnet/minecraft/class_1314;)V ARG 1 mob METHOD method_6252 moveToAir ()V - METHOD method_6253 isAirPos (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z - ARG 1 world + METHOD method_6253 isAirPos (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping index be7459c431..c34b639066 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1350 net/minecraft/entity/ai/goal/FollowOwnerGoal FIELD field_6444 owner Lnet/minecraft/class_1309; - FIELD field_6445 world Lnet/minecraft/class_1941; + FIELD field_6445 world Lnet/minecraft/class_4538; FIELD field_6446 navigation Lnet/minecraft/class_1408; FIELD field_6448 tameable Lnet/minecraft/class_1321; FIELD field_6449 minDistance F diff --git a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping index 765bce08dc..c04a110fa5 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping @@ -25,6 +25,5 @@ CLASS net/minecraft/class_1367 net/minecraft/entity/ai/goal/MoveToTargetPosGoal ARG 1 mob METHOD method_6294 shouldResetPath ()Z METHOD method_6295 hasReached ()Z - METHOD method_6296 isTargetPos (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z - ARG 1 world + METHOD method_6296 isTargetPos (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping index 133b06a164..7cafb576fd 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker FIELD field_25 swims Z - FIELD field_26 blockView Lnet/minecraft/class_1941; FIELD field_27 pathsThroughDoors Z FIELD field_29 entersOpenDoors Z FIELD field_32 pathNodeCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_33 entity Lnet/minecraft/class_1308; - METHOD method_12 init (Lnet/minecraft/class_1941;Lnet/minecraft/class_1308;)V + METHOD method_12 init (Lnet/minecraft/class_1950;Lnet/minecraft/class_1308;)V METHOD method_13 getPathNode (III)Lnet/minecraft/class_9; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping index 80c63a4db5..acc133eb90 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_13 net/minecraft/entity/ai/pathing/PathNodeNavigator FIELD field_61 pathNodeMaker Lnet/minecraft/class_8; FIELD field_62 minHeap Lnet/minecraft/class_5; - METHOD method_52 pathfind (Lnet/minecraft/class_1941;Lnet/minecraft/class_1308;Ljava/util/Set;FI)Lnet/minecraft/class_11; + METHOD method_52 pathfind (Lnet/minecraft/class_1950;Lnet/minecraft/class_1308;Ljava/util/Set;FI)Lnet/minecraft/class_11; METHOD method_54 pathfind (Lnet/minecraft/class_9;Ljava/util/Map;FI)Lnet/minecraft/class_11; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index bad1487d9f..96c7e90730 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeInstance METHOD method_6192 setBaseValue (D)V ARG 1 baseValue - METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Collection; + METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Set; ARG 1 operation METHOD method_6194 getValue ()D - METHOD method_6195 getModifiers ()Ljava/util/Collection; + METHOD method_6195 getModifiers ()Ljava/util/Set; METHOD method_6196 hasModifier (Lnet/minecraft/class_1322;)Z ARG 1 modifier METHOD method_6197 addModifier (Lnet/minecraft/class_1322;)V diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 93fd32aa90..e261c2109b 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -97,8 +97,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 2 previous ARG 3 slot METHOD method_5956 canBeControlledByRider ()Z - METHOD method_5957 canSpawn (Lnet/minecraft/class_1941;)Z - ARG 1 world + METHOD method_5957 canSpawn (Lnet/minecraft/class_4538;)Z METHOD method_5958 mobTick ()V METHOD method_5959 initGoals ()V METHOD method_5960 changeAngle (FFF)F diff --git a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping b/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping index 9c527f6f3d..a9dc0bccbc 100644 --- a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping @@ -3,9 +3,8 @@ CLASS net/minecraft/class_1314 net/minecraft/entity/mob/MobEntityWithAi ARG 1 type METHOD method_6142 updateForLeashLength (F)V ARG 1 leashLength - METHOD method_6144 getPathfindingFavor (Lnet/minecraft/class_2338;Lnet/minecraft/class_1941;)F + METHOD method_6144 getPathfindingFavor (Lnet/minecraft/class_2338;Lnet/minecraft/class_4538;)F ARG 1 pos - ARG 2 world METHOD method_6148 getRunFromLeashSpeed ()D METHOD method_6149 getPathfindingFavor (Lnet/minecraft/class_2338;)F ARG 1 pos diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index 1037e78ea1..d289a56bf6 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -39,7 +39,7 @@ CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity ARG 1 target METHOD method_7156 updateStretch ()V METHOD method_7157 isSmall ()Z - METHOD method_7158 getDamageAmount ()I + METHOD method_7158 getDamageAmount ()F METHOD method_7159 makesJumpSound ()Z METHOD method_7160 getSquishSound ()Lnet/minecraft/class_3414; METHOD method_7161 setSize (IZ)V diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 8975da43c5..04f34d2ba5 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -31,8 +31,6 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity CLASS class_4478 PollinateGoal FIELD field_20378 pollinationTicks I FIELD field_20379 lastPollinationTick I - METHOD method_21819 (Lnet/minecraft/class_2248;)Z - ARG 0 block METHOD method_21820 completedPollination ()Z METHOD method_21821 getFlower ()Ljava/util/Optional; CLASS class_4479 BeeWanderAroundGoal @@ -60,9 +58,6 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity ARG 8 z ARG 10 y ARG 12 effect - METHOD method_21770 getBlockInRange (Ljava/util/function/Predicate;D)Ljava/util/Optional; - ARG 1 isValid - ARG 2 distance METHOD method_21775 setBeeFlag (IZ)V ARG 1 bit ARG 2 value diff --git a/mappings/net/minecraft/fluid/BaseFluid.mapping b/mappings/net/minecraft/fluid/BaseFluid.mapping index bb6662a934..077e1317cf 100644 --- a/mappings/net/minecraft/fluid/BaseFluid.mapping +++ b/mappings/net/minecraft/fluid/BaseFluid.mapping @@ -6,8 +6,7 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 1 world ARG 2 pos ARG 3 state - METHOD method_15727 getUpdatedState (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; - ARG 1 world + METHOD method_15727 getUpdatedState (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; ARG 2 pos ARG 3 state METHOD method_15728 getFlowing (IZ)Lnet/minecraft/class_3610; @@ -27,8 +26,7 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 5 fromPos ARG 6 fromState METHOD method_15737 isInfinite ()Z - METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_1941;)I - ARG 1 world + METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_4538;)I METHOD method_15745 flow (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_3610;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index c9dbac1cf5..2a3bf451dc 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid 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_1941;)I + METHOD method_15789 getTickRate (Lnet/minecraft/class_4538;)I METHOD method_15790 toBlockState (Lnet/minecraft/class_3610;)Lnet/minecraft/class_2680; METHOD method_15791 matches (Lnet/minecraft/class_3494;)Z METHOD method_15792 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 1ed277682f..628486534b 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -33,8 +33,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem METHOD method_8001 getOrCreateMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; ARG 0 map ARG 1 world - METHOD method_8002 fillExplorationMap (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V - ARG 0 world + METHOD method_8002 fillExplorationMap (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V ARG 1 map METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)I ARG 0 stack diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 8139c62341..953551f968 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager FIELD field_19337 chunkCache [Lnet/minecraft/class_2791; METHOD (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;ILnet/minecraft/class_3949;Ljava/util/function/Supplier;)V ARG 5 workerExecutor + METHOD method_12129 getChunkGenerator ()Lnet/minecraft/class_2794; METHOD method_14096 updateCameraPosition (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_14128 markForUpdate (Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 4bb081a949..724beca235 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -138,3 +138,4 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_8416 addLightning (Lnet/minecraft/class_1538;)V METHOD method_8448 updatePlayersSleeping ()V METHOD method_8468 checkSessionLock ()V + METHOD method_8487 locateStructure (Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index 37c8bf4a50..5659f7f3c9 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -72,11 +72,8 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 6 z ARG 7 facing ARG 8 lootTbaleId - METHOD method_14931 generate (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)Z + METHOD method_14931 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)Z ARG 1 world - ARG 2 random - ARG 3 boundingBox - ARG 4 pos METHOD method_14933 fillWithOutlineUnderSealevel (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Random;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V ARG 3 random METHOD method_14934 getFacing ()Lnet/minecraft/class_2350; @@ -95,7 +92,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 8 maxZ ARG 9 replaceBlocks ARG 10 random - METHOD method_14939 isUnderSeaLevel (Lnet/minecraft/class_1941;IIILnet/minecraft/class_3341;)Z + METHOD method_14939 isUnderSeaLevel (Lnet/minecraft/class_4538;IIILnet/minecraft/class_3341;)Z ARG 2 x ARG 3 z ARG 4 y diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index b7b4097972..2c13db2bdb 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -26,11 +26,8 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart METHOD method_14972 toTag (II)Lnet/minecraft/class_2487; ARG 1 chunkX ARG 2 chunkZ - METHOD method_14974 generateStructure (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V + METHOD method_14974 generateStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V ARG 1 world - ARG 2 random - ARG 3 boundingBox - ARG 4 pos METHOD method_14979 isInExistingChunk ()Z METHOD method_16655 initialize (Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;IILnet/minecraft/class_1959;)V ARG 1 chunkGenerator diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index 283b4bb673..3bfb63dc7f 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -3,13 +3,9 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement METHOD method_16622 setProjection (Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3784; ARG 1 projection METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786; - METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;)Z + METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;)Z ARG 1 structureManager ARG 2 world - ARG 3 pos - ARG 4 rotation - ARG 5 boundingBox - ARG 6 random METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;)Ljava/util/List; ARG 1 structureManager ARG 2 pos diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping index 46771fa621..ebde24e87b 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProcessor - METHOD method_15110 process (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; - ARG 1 world + METHOD method_15110 process (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; ARG 2 pos ARG 5 placementData METHOD method_16772 getType ()Lnet/minecraft/class_3828; diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index 0a6797bff1..a90a3e1271 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -52,4 +52,4 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes METHOD method_17786 union (Lnet/minecraft/class_265;[Lnet/minecraft/class_265;)Lnet/minecraft/class_265; ARG 0 first ARG 1 others - METHOD method_17945 calculateSoftOffset (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Lnet/minecraft/class_1941;DLnet/minecraft/class_3726;Ljava/util/stream/Stream;)D + METHOD method_17945 calculateSoftOffset (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Ljava/util/stream/Stream;)D diff --git a/mappings/net/minecraft/world/ExtendedBlockView.mapping b/mappings/net/minecraft/world/ExtendedBlockView.mapping index d3c37f3985..a330e8c960 100644 --- a/mappings/net/minecraft/world/ExtendedBlockView.mapping +++ b/mappings/net/minecraft/world/ExtendedBlockView.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_1920 net/minecraft/world/ExtendedBlockView METHOD method_8310 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; METHOD method_8311 isSkyVisible (Lnet/minecraft/class_2338;)Z - METHOD method_8313 getLightmapIndex (Lnet/minecraft/class_2338;I)I - ARG 1 pos + METHOD method_8313 getLightmapIndex (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I METHOD method_8314 getLightLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_2338;)I ARG 1 type diff --git a/mappings/net/minecraft/world/ModifiableWorld.mapping b/mappings/net/minecraft/world/ModifiableWorld.mapping index 8447cbaf6c..1ace36cb11 100644 --- a/mappings/net/minecraft/world/ModifiableWorld.mapping +++ b/mappings/net/minecraft/world/ModifiableWorld.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld METHOD method_8649 spawnEntity (Lnet/minecraft/class_1297;)Z METHOD method_8650 clearBlockState (Lnet/minecraft/class_2338;Z)Z - METHOD method_8651 breakBlock (Lnet/minecraft/class_2338;Z)Z + METHOD method_8651 breakBlock (Lnet/minecraft/class_2338;ZLnet/minecraft/class_1297;)Z ARG 1 pos METHOD method_8652 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Z ARG 1 pos diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 1e1ca22607..3d3c9e0ebb 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -3,8 +3,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper METHOD method_8657 getSpawnPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2818;)Lnet/minecraft/class_2338; ARG 0 world ARG 1 chunk - METHOD method_8658 getEntitySpawnPos (Lnet/minecraft/class_1941;Lnet/minecraft/class_1299;II)Lnet/minecraft/class_2338; - ARG 0 world + METHOD method_8658 getEntitySpawnPos (Lnet/minecraft/class_4538;Lnet/minecraft/class_1299;II)Lnet/minecraft/class_2338; ARG 1 entityType ARG 2 x ARG 3 z @@ -12,8 +11,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 0 chunkGenerator ARG 1 entityCategory ARG 3 pos - METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z - ARG 1 world + METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z ARG 2 pos ARG 3 entityType METHOD method_8661 populateEntities (Lnet/minecraft/class_1936;Lnet/minecraft/class_1959;IILjava/util/Random;)V @@ -24,9 +22,8 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 0 blockView ARG 1 pos ARG 2 state - METHOD method_8663 spawnEntitiesInChunk (Lnet/minecraft/class_1311;Lnet/minecraft/class_1937;Lnet/minecraft/class_2818;Lnet/minecraft/class_2338;)V + METHOD method_8663 spawnEntitiesInChunk (Lnet/minecraft/class_1311;Lnet/minecraft/class_3218;Lnet/minecraft/class_2818;Lnet/minecraft/class_2338;)V ARG 0 category - ARG 1 world ARG 2 chunk ARG 3 spawnPos METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1964; diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping index e183700881..c091ae9a94 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/ViewableWorld.mapping @@ -1,69 +1,20 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld - METHOD method_16955 getChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2791; - ARG 1 pos - METHOD method_16956 getChunk (IILnet/minecraft/class_2806;)Lnet/minecraft/class_2791; - ARG 1 chunkX - ARG 2 chunkZ - ARG 3 requiredState METHOD method_17892 doesNotCollide (Lnet/minecraft/class_1297;)Z METHOD method_18026 doesNotCollide (Lnet/minecraft/class_238;)Z - METHOD method_20311 getLeastChunkStatusForCollisionCalculation ()Lnet/minecraft/class_2806; - METHOD method_8392 getChunk (II)Lnet/minecraft/class_2791; - ARG 1 chunkX - ARG 2 chunkZ - METHOD method_8393 isChunkLoaded (II)Z - ARG 1 chunkX - ARG 2 chunkZ - METHOD method_8402 getChunk (IILnet/minecraft/class_2806;Z)Lnet/minecraft/class_2791; - ARG 1 chunkX - ARG 2 chunkZ - ARG 3 leastStatus - ARG 4 create - METHOD method_8585 isWaterAt (Lnet/minecraft/class_2338;)Z - ARG 1 pos METHOD method_8587 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 entityBoundingBox - METHOD method_8589 getTop (Lnet/minecraft/class_2902$class_2903;II)I - ARG 1 type - ARG 2 x - ARG 3 z METHOD method_8590 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Z ARG 1 entity ARG 2 entityBoundingBox ARG 3 otherEntities - METHOD method_8591 isBlockLoaded (Lnet/minecraft/class_2338;)Z - METHOD method_8594 getAmbientDarkness ()I - METHOD method_8596 getEmittedStrongRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I - ARG 1 pos - METHOD method_8597 getDimension ()Lnet/minecraft/class_2869; - METHOD method_8598 getTopPosition (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; - ARG 1 type - METHOD method_8599 intersectsFluid (Lnet/minecraft/class_238;)Z METHOD method_8600 getCollisionShapes (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; - METHOD method_8602 getLightLevel (Lnet/minecraft/class_2338;)I - 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_8608 isClient ()Z - METHOD method_8610 getBrightness (Lnet/minecraft/class_2338;)F METHOD method_8611 intersectsEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_265;)Z ARG 1 except ARG 2 shape - METHOD method_8615 getSeaLevel ()I - METHOD method_8617 isAreaLoaded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z - ARG 1 min - ARG 2 max METHOD method_8621 getWorldBorder ()Lnet/minecraft/class_2784; - METHOD method_8623 isAir (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_8624 getLightLevel (Lnet/minecraft/class_2338;I)I - METHOD method_8627 isAreaLoaded (IIIIII)Z - ARG 1 minX - ARG 2 minY - ARG 3 minZ - ARG 4 maxX METHOD method_8628 canPlace (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Z ARG 1 state ARG 2 pos diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 20917c7739..cff97dc281 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -150,11 +150,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 3 y ARG 5 z ARG 7 sound - METHOD method_8487 locateStructure (Ljava/lang/String;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; - ARG 1 id - ARG 2 center - ARG 3 radius - ARG 4 skipExistingChunks METHOD method_8488 getReceivedStrongRedstonePower (Lnet/minecraft/class_2338;)I METHOD method_8492 updateNeighbor (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V ARG 1 pos diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 66b691daef..df7143ee8a 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -88,8 +88,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_21740 getTemperature (Lnet/minecraft/class_2338;)F ARG 1 blockPos METHOD method_8684 hasStructureFeature (Lnet/minecraft/class_3195;)Z - METHOD method_8685 canSetSnow (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Z)Z - ARG 1 world + METHOD method_8685 canSetSnow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Z ARG 2 pos METHOD method_8686 getScale ()F METHOD method_8687 getWaterColor ()I @@ -102,8 +101,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8693 getName ()Lnet/minecraft/class_2561; METHOD method_8694 getPrecipitation ()Lnet/minecraft/class_1959$class_1963; METHOD method_8695 getDepth ()F - METHOD method_8696 canSetIce (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z - ARG 1 world + METHOD method_8696 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 2 blockPos METHOD method_8697 getSkyColor (F)I ARG 1 temperature @@ -128,8 +126,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 10 seaLevel ARG 11 seed METHOD method_8704 getTemperatureGroup ()Lnet/minecraft/class_1959$class_1962; - METHOD method_8705 canSetSnow (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z - ARG 1 world + METHOD method_8705 canSetSnow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 2 blockPos METHOD method_8706 getStructureFeatureConfig (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3037; METHOD method_8707 computeTemperature (Lnet/minecraft/class_2338;)F diff --git a/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping b/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping index ec90fcf92d..4ea75587ae 100644 --- a/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_3640 net/minecraft/world/biome/layer/SetBaseBiomesLaye FIELD field_16072 MOUNTAINS_ID I FIELD field_16073 DESERT_ID I FIELD field_16074 BIRCH_FOREST_ID I - FIELD field_16075 config Lnet/minecraft/class_2906; FIELD field_16076 SNOWY_TAIGA_ID I FIELD field_16077 TAIGA_ID I FIELD field_16078 SWAMP_ID I @@ -22,6 +21,5 @@ CLASS net/minecraft/class_3640 net/minecraft/world/biome/layer/SetBaseBiomesLaye FIELD field_16081 GIANT_TREE_TAIGA_ID I FIELD field_16082 OLD_GROUP_1 [I FIELD field_16083 PLAINS_ID I - METHOD (Lnet/minecraft/class_1942;Lnet/minecraft/class_2906;)V + METHOD (Lnet/minecraft/class_1942;I)V ARG 1 generatorType - ARG 2 generatorConfig diff --git a/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping b/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping index 47ac5d786f..549754f5f8 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSourceType.mapping @@ -1,17 +1,15 @@ CLASS net/minecraft/class_1969 net/minecraft/world/biome/source/BiomeSourceType FIELD field_9398 CHECKERBOARD Lnet/minecraft/class_1969; FIELD field_9399 THE_END Lnet/minecraft/class_1969; - FIELD field_9400 config Ljava/util/function/Supplier; + FIELD field_9400 config Ljava/util/function/Function; FIELD field_9401 FIXED Lnet/minecraft/class_1969; FIELD field_9402 VANILLA_LAYERED Lnet/minecraft/class_1969; FIELD field_9403 biomeSource Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;Ljava/util/function/Supplier;)V + METHOD (Ljava/util/function/Function;Ljava/util/function/Function;)V ARG 1 biomeSource - ARG 2 config METHOD method_8772 applyConfig (Lnet/minecraft/class_1970;)Lnet/minecraft/class_1966; ARG 1 config - METHOD method_8773 register (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Supplier;)Lnet/minecraft/class_1969; + METHOD method_8773 register (Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_1969; ARG 0 id ARG 1 biomeSource - ARG 2 config - METHOD method_8774 getConfig ()Lnet/minecraft/class_1970; + METHOD method_8774 getConfig (Lnet/minecraft/class_31;)Lnet/minecraft/class_1970; diff --git a/mappings/net/minecraft/world/biome/source/TheEndBiomeSourceConfig.mapping b/mappings/net/minecraft/world/biome/source/TheEndBiomeSourceConfig.mapping index 3034d613fc..a4f76f5976 100644 --- a/mappings/net/minecraft/world/biome/source/TheEndBiomeSourceConfig.mapping +++ b/mappings/net/minecraft/world/biome/source/TheEndBiomeSourceConfig.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_2167 net/minecraft/world/biome/source/TheEndBiomeSourceConfig FIELD field_9814 seed J METHOD method_9204 getSeed ()J - METHOD method_9205 setSeed (J)Lnet/minecraft/class_2167; - ARG 1 seed diff --git a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig.mapping b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig.mapping index 0f4403d2a1..6944818490 100644 --- a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig.mapping +++ b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_2084 net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig FIELD field_9669 generatorSettings Lnet/minecraft/class_2906; - FIELD field_9670 levelProperties Lnet/minecraft/class_31; - METHOD method_9002 setLevelProperties (Lnet/minecraft/class_31;)Lnet/minecraft/class_2084; - ARG 1 properties - METHOD method_9003 getLevelProperties ()Lnet/minecraft/class_31; METHOD method_9004 setGeneratorSettings (Lnet/minecraft/class_2906;)Lnet/minecraft/class_2084; ARG 1 generatorSettings METHOD method_9005 getGeneratorSettings ()Lnet/minecraft/class_2906; diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 65835f4ecd..a2e0b43225 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -28,7 +28,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12021 getBlockEntityPositions ()Ljava/util/Set; METHOD method_12022 setBiomeArray ([Lnet/minecraft/class_1959;)V ARG 1 biomeArray - METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568; METHOD method_12024 getBlockEntityTagAt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; ARG 1 pos METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; @@ -44,10 +43,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 type METHOD method_12033 getInhabitedTime ()J METHOD method_12034 setStructureStarts (Ljava/util/Map;)V - METHOD method_12035 getLightLevel (Lnet/minecraft/class_2338;IZ)I - ARG 1 pos - ARG 2 darkness - ARG 3 includeSkyLight METHOD method_12036 getBiomeArray ()[Lnet/minecraft/class_1959; METHOD method_12037 setHeightmap (Lnet/minecraft/class_2902$class_2903;[J)V ARG 1 type @@ -62,5 +57,3 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12044 needsSaving ()Z METHOD method_16552 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; ARG 1 pos - METHOD method_17032 setLightingProvider (Lnet/minecraft/class_3568;)V - ARG 1 lightingProvider diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index 5edc67fb99..59501d3d9e 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager METHOD method_12128 setMobSpawnOptions (ZZ)V ARG 1 spawnMonsters ARG 2 spawnAnimals - METHOD method_12129 getChunkGenerator ()Lnet/minecraft/class_2794; METHOD method_12130 getLightingProvider ()Lnet/minecraft/class_3568; METHOD method_20529 shouldTickBlock (Lnet/minecraft/class_2338;)Z ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index 6baa926feb..e86082b908 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk FIELD field_12929 entities Ljava/util/List; FIELD field_12930 structureReferences Ljava/util/Map; FIELD field_17105 lightingProvider Lnet/minecraft/class_3568; + METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568; METHOD method_12295 getEntities ()Ljava/util/List; METHOD method_12296 getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList; METHOD method_12300 getPackedSectionRelative (Lnet/minecraft/class_2338;)S @@ -43,3 +44,4 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk METHOD method_12316 getBlockEntityTags ()Ljava/util/Map; METHOD method_16679 getSection (I)Lnet/minecraft/class_2826; ARG 1 y + METHOD method_17032 setLightingProvider (Lnet/minecraft/class_3568;)V diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 54d790336f..c2df7c91f7 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_12858 world Lnet/minecraft/class_1937; METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2839;)V ARG 1 world + METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568; METHOD method_12200 getWorld ()Lnet/minecraft/class_1937; METHOD method_12201 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2818$class_2819;)Lnet/minecraft/class_2586; ARG 1 pos @@ -61,7 +62,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12226 setLoadedToWorld (Z)V METHOD method_12232 setUnsaved (Z)V ARG 1 unsaved - METHOD method_12233 getLightLevel (Lnet/minecraft/class_2338;I)I METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; ARG 1 x ARG 2 y