22w43a stuff (#3369)

* 22w43a stuff

* Fix javadoc

* Map more stuff

* More field mappings

* Update mappings/net/minecraft/world/World.mapping

* Apply suggestions from code review
This commit is contained in:
apple502j 2022-11-01 20:11:24 +09:00 committed by GitHub
parent 0c4ab50914
commit 657bc4749b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 112 additions and 8 deletions

View File

@ -13,6 +13,7 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity
FIELD field_31301 PRIMARY_PROPERTY_INDEX I
FIELD field_31302 SECONDARY_PROPERTY_INDEX I
FIELD field_31303 PROPERTY_COUNT I
FIELD field_40328 CONTAINER_NAME_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state

View File

@ -10,3 +10,5 @@ CLASS net/minecraft/class_7132 net/minecraft/block/entity/SculkCatalystBlockEnti
ARG 2 state
ARG 3 blockEntity
METHOD method_41519 getSpreadManager ()Lnet/minecraft/class_7128;
METHOD method_45471 triggerCriteria (Lnet/minecraft/class_1309;)V
ARG 1 deadEntity

View File

@ -18,6 +18,8 @@ CLASS net/minecraft/class_7745 net/minecraft/client/gui/screen/pack/Experimental
METHOD method_45670 getTitleY ()I
CLASS class_7746 DetailsScreen
FIELD field_40451 packList Lnet/minecraft/class_7745$class_7746$class_7747;
METHOD method_45671 (Lnet/minecraft/class_4185;)V
ARG 1 button
CLASS class_7747 PackListWidget
METHOD <init> (Lnet/minecraft/class_7745$class_7746;Lnet/minecraft/class_310;Ljava/util/Collection;)V
ARG 2 client

View File

@ -44,6 +44,7 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
ARG 7 blue
ARG 8 alpha
METHOD method_22703 rotate (Lnet/minecraft/class_4587;)V
ARG 1 matrices
METHOD method_2851 setPivot (FFF)V
ARG 1 x
ARG 2 y

View File

@ -52,7 +52,6 @@ CLASS net/minecraft/class_4184 net/minecraft/client/render/Camera
COMMENT {@return the field of vision of this camera}
COMMENT
COMMENT @see GameRenderer#CAMERA_DEPTH
COMMENT @see net.minecraft.util.math.Matrix4f#viewboxMatrix
CLASS class_6355 Projection
COMMENT A projection of a camera. It is a 2-D rectangle in a 3-D volume.
COMMENT

View File

@ -2,6 +2,12 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum
FIELD field_20995 x D
FIELD field_20996 y D
FIELD field_20997 z D
FIELD field_40823 frustumIntersection Lorg/joml/FrustumIntersection;
METHOD <init> (Lnet/minecraft/class_4604;)V
ARG 1 frustum
METHOD <init> (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V
ARG 1 positionMatrix
ARG 2 projectionMatrix
METHOD method_23088 setPosition (DDD)V
ARG 1 cameraX
ARG 3 cameraY
@ -14,6 +20,7 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum
ARG 9 maxY
ARG 11 maxZ
METHOD method_23092 init (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V
ARG 1 positionMatrix
ARG 2 projectionMatrix
METHOD method_23093 isVisible (Lnet/minecraft/class_238;)Z
ARG 1 box

View File

@ -62,7 +62,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
COMMENT blocks is used to define a rectangular area to be rendered.
COMMENT
COMMENT @see Camera#getProjection()
COMMENT @see Matrix4f#viewboxMatrix
FIELD field_33626 renderTypeTextIntensityShader Lnet/minecraft/class_5944;
FIELD field_33627 renderTypeTextIntensitySeeThroughShader Lnet/minecraft/class_5944;
FIELD field_34055 hasWorldIcon Z

View File

@ -53,3 +53,6 @@ CLASS net/minecraft/class_765 net/minecraft/client/render/LightmapTextureManager
ARG 3 delta
METHOD method_42597 getDarknessFactor (F)F
ARG 1 delta
METHOD method_46557 clamp (Lorg/joml/Vector3f;)V
COMMENT Clamps each component of {@code vec} between {@code 0.0f} and {@code 1.0f}.
ARG 0 vec

View File

@ -40,10 +40,11 @@ CLASS net/minecraft/class_5944 net/minecraft/client/render/Shader
FIELD field_29493 programId I
FIELD field_29494 name Ljava/lang/String;
FIELD field_29495 dirty Z
FIELD field_32778 CORE_DIRECTORY Ljava/lang/String;
FIELD field_32778 SHADERS_DIRECTORY Ljava/lang/String;
FIELD field_32779 INCLUDE_DIRECTORY Ljava/lang/String;
FIELD field_36323 viewRotationMat Lnet/minecraft/class_284;
FIELD field_36373 fogShape Lnet/minecraft/class_284;
FIELD field_40512 CORE_DIRECTORY Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_293;)V
ARG 1 factory
ARG 2 name

View File

@ -2,3 +2,4 @@ CLASS net/minecraft/class_7752 net/minecraft/client/render/entity/model/ChestBoa
FIELD field_40467 CHEST_BOTTOM Ljava/lang/String;
FIELD field_40468 CHEST_LID Ljava/lang/String;
FIELD field_40469 CHEST_LOCK Ljava/lang/String;
METHOD method_45708 getTexturedModelData ()Lnet/minecraft/class_5607;

View File

@ -2,3 +2,4 @@ CLASS net/minecraft/class_7753 net/minecraft/client/render/entity/model/ChestRaf
FIELD field_40470 CHEST_BOTTOM Ljava/lang/String;
FIELD field_40471 CHEST_LID Ljava/lang/String;
FIELD field_40472 CHEST_LOCK Ljava/lang/String;
METHOD method_45709 getTexturedModelData ()Lnet/minecraft/class_5607;

View File

@ -7,3 +7,5 @@ CLASS net/minecraft/class_5600 net/minecraft/client/render/entity/model/EntityMo
ARG 2 signType
METHOD method_32075 (Lcom/google/common/collect/ImmutableMap;Lnet/minecraft/class_5601;)Z
ARG 1 layer
METHOD method_45716 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5607;Lnet/minecraft/class_4719;)V
ARG 2 signType

View File

@ -11,6 +11,8 @@ CLASS net/minecraft/class_1086 net/minecraft/client/render/model/ModelRotation
METHOD method_4699 get (II)Lnet/minecraft/class_1086;
ARG 0 x
ARG 1 y
METHOD method_4700 (Lnet/minecraft/class_1086;)Lnet/minecraft/class_1086;
ARG 0 rotation
METHOD method_4701 (Lnet/minecraft/class_1086;)Ljava/lang/Integer;
ARG 0 rotation
METHOD method_4703 getIndex (II)I

View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_4730 net/minecraft/client/util/SpriteIdentifier
FIELD field_21769 atlas Lnet/minecraft/class_2960;
FIELD field_21770 texture Lnet/minecraft/class_2960;
FIELD field_21771 layer Lnet/minecraft/class_1921;
FIELD field_40566 COMPARATOR Ljava/util/Comparator;
METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V
ARG 1 atlas
ARG 2 texture

View File

@ -920,6 +920,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
METHOD method_45321 getLeashOffset (F)Lnet/minecraft/class_243;
ARG 1 tickDelta
METHOD method_46395 extinguishWithSound ()V
METHOD method_46396 reinitDimensions ()V
METHOD method_5621 getMountedHeightOffset ()D
METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
COMMENT Called when this entity's collision box intersects {@code state}.

View File

@ -1,6 +1,11 @@
CLASS net/minecraft/class_6067 net/minecraft/entity/InventoryOwner
FIELD field_40736 INVENTORY_KEY Ljava/lang/String;
METHOD method_35199 getInventory ()Lnet/minecraft/class_1277;
METHOD method_43544 pickUpItem (Lnet/minecraft/class_1308;Lnet/minecraft/class_6067;Lnet/minecraft/class_1542;)V
ARG 0 entity
ARG 1 inventoryOwner
ARG 2 item
METHOD method_46399 writeInventory (Lnet/minecraft/class_2487;)V
ARG 1 nbt
METHOD method_46400 readInventory (Lnet/minecraft/class_2487;)V
ARG 1 nbt

View File

@ -46,3 +46,13 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer
METHOD method_27307 getModifierValue (Lnet/minecraft/class_1320;Ljava/util/UUID;)D
ARG 1 attribute
ARG 2 uuid
METHOD method_45329 getCustomInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324;
ARG 1 attribute
METHOD method_45330 hasModifierForAttribute (Lnet/minecraft/class_6880;Ljava/util/UUID;)Z
ARG 1 attribute
ARG 2 uuid
METHOD method_45331 hasAttribute (Lnet/minecraft/class_6880;)Z
ARG 1 attribute
METHOD method_45332 getModifierValue (Lnet/minecraft/class_6880;Ljava/util/UUID;)D
ARG 1 attribute
ARG 2 uuid

View File

@ -5,9 +5,11 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
FIELD field_5885 attributeModifiers Ljava/util/Map;
FIELD field_5886 color I
METHOD <init> (Lnet/minecraft/class_4081;I)V
ARG 1 category
ARG 2 color
METHOD method_18792 getCategory ()Lnet/minecraft/class_4081;
METHOD method_42126 setFactorCalculationDataSupplier (Ljava/util/function/Supplier;)Lnet/minecraft/class_1291;
ARG 1 factorCalculationDataSupplier
METHOD method_42127 getFactorCalculationDataSupplier ()Ljava/util/Optional;
METHOD method_5552 canApplyUpdateEffect (II)Z
ARG 1 duration

View File

@ -44,6 +44,7 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity
CLASS class_1562 TeleportTowardsPlayerGoal
FIELD field_18127 staringPlayerPredicate Lnet/minecraft/class_4051;
FIELD field_18876 validTargetPredicate Lnet/minecraft/class_4051;
FIELD field_40735 angerPredicate Ljava/util/function/Predicate;
FIELD field_7259 targetPlayer Lnet/minecraft/class_1657;
FIELD field_7260 enderman Lnet/minecraft/class_1560;
FIELD field_7261 ticksSinceUnseenTeleport I

View File

@ -13,6 +13,8 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V
ARG 1 gossipData
METHOD method_35194 getXp ()I
METHOD method_40125 (Lnet/minecraft/class_6880;)V
ARG 1 profession
METHOD method_7194 getConversionRate ()I
METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V
ARG 1 world

View File

@ -1,6 +1,9 @@
CLASS net/minecraft/class_1492 net/minecraft/entity/passive/AbstractDonkeyEntity
FIELD field_6943 CHEST Lnet/minecraft/class_2940;
METHOD method_26898 createAbstractDonkeyAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_45374 addChest (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
ARG 1 player
ARG 2 chest
METHOD method_6702 getInventoryColumns ()I
METHOD method_6703 hasChest ()Z
METHOD method_6704 setHasChest (Z)V

View File

@ -1,7 +1,10 @@
CLASS net/minecraft/class_7691 net/minecraft/entity/passive/CamelBrain
FIELD field_40157 WALK_TOWARD_ADULT_RANGE Lnet/minecraft/class_6019;
FIELD field_40158 SENSORS Lcom/google/common/collect/ImmutableList;
FIELD field_40159 MEMORY_MODULES Lcom/google/common/collect/ImmutableList;
METHOD method_45363 createProfile ()Lnet/minecraft/class_4095$class_5303;
METHOD method_45364 (Lnet/minecraft/class_1309;)Ljava/lang/Float;
ARG 0 entity
METHOD method_45365 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095;
ARG 0 brain
METHOD method_45366 updateActivities (Lnet/minecraft/class_7689;)V

View File

@ -93,20 +93,31 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps
ARG 2 k
METHOD method_29147 (Ljava/util/List;Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V
ARG 0 entry
ARG 2 pair
METHOD method_29148 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2487;Ljava/lang/String;)V
ARG 3 key
METHOD method_29152 (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V
ARG 1 entry
METHOD method_29153 (Lnet/minecraft/class_2487;Ljava/util/function/BiConsumer;)V
ARG 2 entryConsumer
METHOD method_29159 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
ARG 2 key
METHOD method_29161 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
ARG 2 key
METHOD method_46230 (Ljava/util/List;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult;
ARG 1 merger
METHOD method_46231 (Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V
ARG 1 nbt
METHOD method_46232 unpackMarker (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2520;
ARG 0 nbt
METHOD method_46233 (Lnet/minecraft/class_2499;Ljava/util/function/Consumer;)V
ARG 1 consumer
METHOD method_46234 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult;
ARG 1 merger
METHOD method_46235 createMerger (Lnet/minecraft/class_2520;)Ljava/util/Optional;
ARG 0 nbt
METHOD method_46236 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520;
ARG 0 nbt
METHOD remove (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
ARG 1 element
ARG 2 key

View File

@ -256,6 +256,12 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
COMMENT <p>This returns {@code true} for all added slots, {@value #EMPTY_SPACE_SLOT_INDEX},
COMMENT and {@code -1}.
ARG 1 slot
METHOD method_45409 handleSlotClick (Lnet/minecraft/class_1657;Lnet/minecraft/class_5536;Lnet/minecraft/class_1735;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
ARG 1 player
ARG 2 clickType
ARG 3 slot
ARG 4 stack
ARG 5 cursorStack
METHOD method_7591 packQuickCraftData (II)I
ARG 0 quickCraftStage
ARG 1 buttonId

View File

@ -188,6 +188,10 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
COMMENT the {@link BlockPos} to iterate around
ARG 3 range
COMMENT the maximum distance from the given pos in any axis
METHOD method_46558 toCenterPos ()Lnet/minecraft/class_243;
COMMENT {@return the center of this block position}
COMMENT
COMMENT @see Vec3d#ofCenter
CLASS 1
FIELD field_23945 pos Lnet/minecraft/class_2338$class_2339;
FIELD field_23946 remaining I

View File

@ -505,6 +505,9 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
ARG 2 upperBound
METHOD method_42626 magnitude (F)F
ARG 0 n
METHOD method_45309 ceil (FF)F
ARG 0 value
ARG 1 digits
METHOD method_45310 isMultipleOf (II)Z
ARG 0 a
ARG 1 b

View File

@ -8,7 +8,7 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d
COMMENT implementations and can be used as a map key.
COMMENT
COMMENT @see Vec3i
COMMENT @see Vec3f
COMMENT @see org.joml.Vector3f
FIELD field_1350 z D
COMMENT The Z coordinate of this vector.
FIELD field_1351 y D
@ -224,6 +224,14 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d
METHOD method_38499 withAxis (Lnet/minecraft/class_2350$class_2351;D)Lnet/minecraft/class_243;
ARG 1 axis
ARG 2 value
METHOD method_42394 (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
ARG 0 coordinates
METHOD method_42395 (Ljava/util/List;)Lnet/minecraft/class_243;
ARG 0 coords
METHOD method_42396 (Lnet/minecraft/class_243;)Ljava/util/List;
ARG 0 vec
METHOD method_43206 withBias (Lnet/minecraft/class_2350;D)Lnet/minecraft/class_243;
ARG 1 direction
ARG 2 value
METHOD method_46409 toVector3f ()Lorg/joml/Vector3f;
COMMENT {@return a JOML {@link org.joml.Vector3f} representing this vector}

View File

@ -3,15 +3,14 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i
COMMENT
COMMENT <p>This class is very often used to hold the coordinates. To hold a block position
COMMENT specifically, use {@link BlockPos} instead, which extends {@code Vec3i}. To hold
COMMENT positions for entities and other non-voxels, consider using {@link Vec3f} (that holds
COMMENT values using {@code float}) or {@link Vec3d} (that holds values using {@code double})
COMMENT instead.
COMMENT positions for entities and other non-voxels, consider using {@link Vec3d} that
COMMENT holds values using {@code double} instead.
COMMENT
COMMENT <p>{@code Vec3i} is read-only, but subclasses like {@link BlockPos.Mutable}
COMMENT may be mutable. Make sure to sanitize inputs of {@code Vec3i} if needed,
COMMENT such as calling {@link BlockPos#toImmutable()} or making new copies.
COMMENT
COMMENT @see Vec3f
COMMENT @see org.joml.Vector3f
COMMENT @see Vec3d
COMMENT @see BlockPos
FIELD field_11173 z I
@ -89,6 +88,12 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i
COMMENT {@return a vector which is offset by {@code 1} in the downward direction}
METHOD method_23854 toShortString ()Ljava/lang/String;
COMMENT {@return the coordinates joined with a colon and a space}
METHOD method_29124 (Lnet/minecraft/class_2382;)Ljava/util/stream/IntStream;
ARG 0 vec
METHOD method_29125 (Ljava/util/stream/IntStream;)Lcom/mojang/serialization/DataResult;
ARG 0 stream
METHOD method_29126 ([I)Lnet/minecraft/class_2382;
ARG 0 coordinates
METHOD method_30558 getComponentAlongAxis (Lnet/minecraft/class_2350$class_2351;)I
COMMENT {@return the component on the {@code axis} axis}
ARG 1 axis

View File

@ -45,6 +45,7 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic
ARG 2 pos
ARG 3 spawnEntry
METHOD method_8280 readNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V
ARG 1 world
ARG 2 pos
ARG 3 nbt
METHOD method_8282 updateSpawns (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V

View File

@ -178,6 +178,17 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
ARG 4 volume
ARG 5 pitch
ARG 6 useDistance
METHOD method_46407 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;Lnet/minecraft/class_243;FZLnet/minecraft/class_1927$class_4179;)Lnet/minecraft/class_1927;
COMMENT Creates an explosion.
COMMENT
COMMENT @see #createExplosion(Entity, DamageSource, ExplosionBehavior, double, double, double, float, boolean, Explosion.DestructionType)
ARG 1 entity
ARG 2 damageSource
ARG 3 behavior
ARG 4 pos
ARG 5 power
ARG 6 createFire
ARG 7 destructionType
METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V
ARG 1 pos
ARG 2 oldState

View File

@ -35,6 +35,10 @@ CLASS net/minecraft/class_7138 net/minecraft/world/gen/noise/NoiseConfig
METHOD method_42372 getSurfaceBuilder ()Lnet/minecraft/class_6724;
METHOD method_42373 getAquiferRandomDeriver ()Lnet/minecraft/class_6574;
METHOD method_42374 getOreRandomDeriver ()Lnet/minecraft/class_6574;
CLASS 1
FIELD field_40362 unwrapped Ljava/util/Map;
METHOD method_45512 unwrap (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910;
ARG 1 densityFunction
CLASS class_7271 LegacyNoiseDensityFunctionVisitor
FIELD field_38267 cache Ljava/util/Map;
METHOD method_42375 createRandom (J)Lnet/minecraft/class_5819;

View File

@ -21,3 +21,5 @@ CLASS net/minecraft/class_7477 net/minecraft/world/poi/PointOfInterestTypes
ARG 4 searchDistance
METHOD method_43994 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 id
METHOD method_46397 isPointOfInterest (Lnet/minecraft/class_2680;)Z
ARG 0 state