1.18-rc stuff (#2887)

* 1.18-rc1 stuff

resolves #2886

* small things

* Update WorldRenderer.mapping

* stuff

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Shnupbups 2021-11-28 09:03:48 +11:00 committed by GitHub
parent f4e55dd00a
commit fbcd127c32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 89 additions and 2 deletions

View File

@ -104,7 +104,9 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
ARG 0 entity
METHOD method_19418 getCamera ()Lnet/minecraft/class_4184;
METHOD method_22709 loadProjectionMatrix (Lnet/minecraft/class_1159;)V
ARG 1 projectionMatrix
METHOD method_22973 getBasicProjectionMatrix (D)Lnet/minecraft/class_1159;
ARG 1 fov
METHOD method_22974 getLightmapTextureManager ()Lnet/minecraft/class_765;
METHOD method_22975 getOverlayTexture ()Lnet/minecraft/class_4608;
METHOD method_31136 renderNausea (F)V
@ -126,6 +128,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
ARG 3 tickDelta
METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F
ARG 0 entity
ARG 1 tickDelta
METHOD method_3176 updateWorldIcon (Ljava/nio/file/Path;)V
ARG 1 path
METHOD method_3182 tick ()V

View File

@ -12,6 +12,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
FIELD field_25279 transparencyShader Lnet/minecraft/class_279;
FIELD field_27740 frustum Lnet/minecraft/class_4604;
FIELD field_27741 blockEntityRenderDispatcher Lnet/minecraft/class_824;
FIELD field_34807 chunkInfos Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
FIELD field_34816 builtChunks Ljava/util/concurrent/BlockingQueue;
FIELD field_4055 noCullingBlockEntities Ljava/util/Set;
FIELD field_4056 capturedFrustum Lnet/minecraft/class_4604;
FIELD field_4058 blockBreakingInfos Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
@ -89,8 +91,13 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
ARG 5 renderBlockOutline
ARG 6 camera
ARG 7 gameRenderer
ARG 8 lightmapTextureManager
ARG 9 positionMatrix
METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 matrices
ARG 3 entity
ARG 10 pos
ARG 11 state
METHOD method_22713 tickRainSplashing (Lnet/minecraft/class_4184;)V
ARG 1 camera
METHOD method_22714 renderWeather (Lnet/minecraft/class_765;FDDD)V
@ -152,6 +159,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
ARG 4 green
ARG 5 blue
ARG 6 alpha
METHOD method_22986 (Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_4588;Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588;
ARG 2 renderLayer
METHOD method_22987 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V
ARG 1 info
METHOD method_22989 renderChunkDebugInfo (Lnet/minecraft/class_4184;)V
@ -205,12 +214,15 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4587;DDDLnet/minecraft/class_1159;)V
ARG 1 renderLayer
ARG 2 matrices
ARG 9 positionMatrix
METHOD method_3252 tick ()V
METHOD method_3254 drawEntityOutlinesFramebuffer ()V
METHOD method_3255 renderStars (Lnet/minecraft/class_287;)V
ARG 1 buffer
METHOD method_3257 renderSky (Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;FLjava/lang/Runnable;)V
ARG 1 matrices
ARG 2 projectionMatrix
ARG 3 tickDelta
METHOD method_3258 drawBox (Lnet/minecraft/class_287;DDDDDDFFFF)V
ARG 0 buffer
ARG 1 x1
@ -225,6 +237,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
ARG 16 alpha
METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;FDDD)V
ARG 1 matrices
ARG 2 projectionMatrix
ARG 3 tickDelta
METHOD method_3265 renderDarkSky ()V
METHOD method_3267 cleanUp ()V
METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066;
@ -308,6 +322,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
METHOD method_35776 killFrustum ()V
METHOD method_38549 (Lnet/minecraft/class_4184;Ljava/util/Queue;)V
ARG 1 camera
METHOD method_38550 addBuiltChunk (Lnet/minecraft/class_846$class_851;)V
ARG 1 chunk
METHOD method_38551 applyFrustum (Lnet/minecraft/class_4604;)V
ARG 1 frustum
METHOD method_38553 (Lnet/minecraft/class_2338;Lnet/minecraft/class_846$class_851;)Z
@ -328,6 +344,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
METHOD method_8564 processGlobalEvent (ILnet/minecraft/class_2338;I)V
ARG 1 eventId
ARG 2 pos
ARG 3 data
METHOD method_8567 processWorldEvent (Lnet/minecraft/class_1657;ILnet/minecraft/class_2338;I)V
ARG 1 source
ARG 2 eventId
@ -381,7 +398,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
ARG 2 cause
CLASS class_5972 ChunkInfoList
FIELD field_29620 current [Lnet/minecraft/class_761$class_762;
METHOD <init> (I)V
ARG 1 size
METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_761$class_762;
ARG 1 chunk
METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_761$class_762;)V
ARG 1 chunk
ARG 2 info

View File

@ -44,6 +44,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
METHOD method_3622 getDebugString ()Ljava/lang/String;
METHOD method_3627 rebuild (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_6850;)V
ARG 1 chunk
ARG 2 builder
METHOD method_3630 isEmpty ()Z
METHOD method_3632 reset ()V
METHOD method_3633 clear ()V
@ -87,9 +88,11 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
ARG 2 chunkRenderer
METHOD method_22777 scheduleRebuild (Lnet/minecraft/class_846;Lnet/minecraft/class_6850;)V
ARG 1 chunkRenderer
ARG 2 builder
METHOD method_22778 setNoCullingBlockEntities (Ljava/util/Set;)V
ARG 1 noCullingBlockEntities
METHOD method_22781 rebuild (Lnet/minecraft/class_6850;)V
ARG 1 builder
METHOD method_3651 isChunkNonEmpty (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_3653 setOrigin (III)V
@ -111,6 +114,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
METHOD method_3672 needsRebuild ()Z
METHOD method_3673 shouldBuild ()Z
METHOD method_3674 createRebuildTask (Lnet/minecraft/class_6850;)Lnet/minecraft/class_846$class_851$class_4577;
ARG 1 builder
METHOD method_3675 clear ()V
METHOD method_3676 getNeighborPosition (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338;
ARG 1 direction

View File

@ -0,0 +1,22 @@
CLASS net/minecraft/class_6850 net/minecraft/client/render/chunk/ChunkRendererRegionBuilder
FIELD field_36314 chunks Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
METHOD method_39968 (Lnet/minecraft/class_1937;J)Lnet/minecraft/class_6850$class_6851;
ARG 1 pos
METHOD method_39969 build (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_853;
ARG 1 world
ARG 2 startPos
ARG 3 endPos
ARG 4 offset
METHOD method_39970 isEmptyBetween (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;II[[Lnet/minecraft/class_6850$class_6851;)Z
ARG 0 startPos
ARG 1 endPos
ARG 2 offsetX
ARG 3 offsetZ
ARG 4 chunks
CLASS class_6851 ClientChunk
FIELD field_36315 chunk Lnet/minecraft/class_2818;
FIELD field_36316 renderedChunk Lnet/minecraft/class_6849;
METHOD <init> (Lnet/minecraft/class_2818;)V
ARG 1 chunk
METHOD method_39971 getChunk ()Lnet/minecraft/class_2818;
METHOD method_39972 getRenderedChunk ()Lnet/minecraft/class_6849;

View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_1400 net/minecraft/entity/ai/goal/ActiveTargetGoal
COMMENT A target goal that finds a target by entity class when the goal starts.
FIELD field_36304 DEFAULT_RECIPROCAL_CHANCE I
FIELD field_6641 reciprocalChance I
COMMENT The reciprocal of chance to actually search for a target on every tick
COMMENT when this goal is not started. This is also the average number of ticks
@ -18,6 +19,11 @@ CLASS net/minecraft/class_1400 net/minecraft/entity/ai/goal/ActiveTargetGoal
ARG 1 mob
ARG 2 targetClass
ARG 3 checkVisibility
METHOD <init> (Lnet/minecraft/class_1308;Ljava/lang/Class;ZLjava/util/function/Predicate;)V
ARG 1 mob
ARG 2 targetClass
ARG 3 checkVisibility
ARG 4 targetPredicate
METHOD <init> (Lnet/minecraft/class_1308;Ljava/lang/Class;ZZ)V
ARG 1 mob
ARG 2 targetClass

View File

@ -34,3 +34,4 @@ CLASS net/minecraft/class_1593 net/minecraft/entity/mob/PhantomEntity
CLASS class_1601 MovementGoal
METHOD method_7104 isNearTarget ()Z
CLASS class_1602 SwoopMovementGoal
FIELD field_36306 catsNearby Z

View File

@ -20,6 +20,8 @@ CLASS net/minecraft/class_270 net/minecraft/scoreboard/AbstractTeam
METHOD <init> (Ljava/lang/String;ILjava/lang/String;I)V
ARG 3 name
ARG 4 value
METHOD method_1207 (Lnet/minecraft/class_270$class_271;)Ljava/lang/String;
ARG 0 collisionRule
METHOD method_1209 getDisplayName ()Lnet/minecraft/class_2561;
METHOD method_1210 getRule (Ljava/lang/String;)Lnet/minecraft/class_270$class_271;
ARG 0 name
@ -30,6 +32,8 @@ CLASS net/minecraft/class_270 net/minecraft/scoreboard/AbstractTeam
METHOD <init> (Ljava/lang/String;ILjava/lang/String;I)V
ARG 3 name
ARG 4 value
METHOD method_1212 (Lnet/minecraft/class_270$class_272;)Ljava/lang/String;
ARG 0 visibilityRule
METHOD method_1213 getRule (Ljava/lang/String;)Lnet/minecraft/class_270$class_272;
ARG 0 name
METHOD method_1214 getDisplayName ()Lnet/minecraft/class_2561;

View File

@ -12,6 +12,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard
FIELD field_31889 MIN_SIDEBAR_TEAM_DISPLAY_SLOT_ID I
FIELD field_31890 MAX_SIDEBAR_TEAM_DISPLAY_SLOT_ID I
FIELD field_31891 DISPLAY_SLOT_COUNT I
FIELD field_36309 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD method_1150 resetEntityScore (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_1151 getObjectives ()Ljava/util/Collection;

View File

@ -25,6 +25,8 @@ CLASS net/minecraft/class_274 net/minecraft/scoreboard/ScoreboardCriterion
METHOD method_1225 getName ()Ljava/lang/String;
METHOD method_1226 isReadOnly ()Z
METHOD method_1227 getDefaultRenderType ()Lnet/minecraft/class_274$class_275;
METHOD method_17948 (Ljava/lang/String;ILnet/minecraft/class_3448;)Ljava/util/Optional;
ARG 2 type
METHOD method_37269 create (Ljava/lang/String;ZLnet/minecraft/class_274$class_275;)Lnet/minecraft/class_274;
ARG 0 name
ARG 1 readOnly

View File

@ -16,5 +16,7 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState
ARG 1 nbt
METHOD method_1222 writeDisplaySlotsNbt (Lnet/minecraft/class_2487;)V
ARG 1 nbt
METHOD method_17947 (Lnet/minecraft/class_2487;Lnet/minecraft/class_274;)V
ARG 2 criterion
METHOD method_32481 readNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273;
ARG 1 nbt

View File

@ -15,6 +15,7 @@ CLASS net/minecraft/class_6608 net/minecraft/server/command/ResetChunksCommand
METHOD method_38626 executeResetChunks (Lnet/minecraft/class_2168;IZ)I
ARG 0 source
ARG 1 radius
ARG 2 skipOldChunks
METHOD method_38627 (Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
ARG 0 chunk
METHOD method_38628 (Lcom/mojang/brigadier/context/CommandContext;)I

View File

@ -93,6 +93,9 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder
METHOD method_30312 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 2 pos
ARG 3 state
METHOD method_39967 combineSavingFuture (Ljava/lang/String;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 thenDesc
ARG 2 then
CLASS class_3194 LevelType
METHOD method_14014 isAfter (Lnet/minecraft/class_3193$class_3194;)Z
ARG 1 levelType

View File

@ -14,6 +14,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
FIELD field_19336 chunkStatusCache [Lnet/minecraft/class_2806;
FIELD field_19337 chunkCache [Lnet/minecraft/class_2791;
FIELD field_24455 spawnInfo Lnet/minecraft/class_1948$class_5262;
FIELD field_36301 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IIZLnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;)V
ARG 1 world
ARG 2 session

View File

@ -194,6 +194,9 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
ARG 1 player
ARG 2 usePlayerWatchedSection
ARG 3 distance
METHOD method_37902 (Lnet/minecraft/class_2794;)V
ARG 1 chunkGenerator
METHOD method_37904 verifyChunkGenerator ()V
METHOD method_37905 isOnDistanceEdge (IIIII)Z
ARG 0 x1
ARG 1 z1

View File

@ -109,6 +109,8 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer
ARG 2 serialized
METHOD method_39794 (Ljava/util/function/Consumer;Lnet/minecraft/class_2837;I)V
ARG 2 id
METHOD method_39893 (Lnet/minecraft/class_2814;I)I
ARG 2 id
METHOD method_39957 copy ()Lnet/minecraft/class_2841;
CLASS class_4464 Counter
COMMENT A counter that receives a palette entry and its number of occurences

View File

@ -26,6 +26,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_2839;Lnet/minecraft/class_2818$class_6829;)V
ARG 1 world
ARG 2 protoChunk
ARG 3 entityLoader
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

View File

@ -11,4 +11,5 @@ CLASS net/minecraft/class_5873 net/minecraft/world/gen/carver/CarverContext
ARG 1 posToBiome
ARG 2 chunk
ARG 3 pos
ARG 4 hasFluid
METHOD method_39115 getRegistryManager ()Lnet/minecraft/class_5455;

View File

@ -58,3 +58,4 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator
ARG 3 chunk
ARG 4 chunkNoiseSampler
ARG 5 pos
ARG 6 hasFluid

View File

@ -30,16 +30,20 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui
ARG 3 seaLevel
ARG 4 seed
ARG 6 randomProvider
METHOD method_39102 (Lnet/minecraft/class_6557;IIILnet/minecraft/class_5539;)V
METHOD method_39102 placeBadlandsPillar (Lnet/minecraft/class_6557;IIILnet/minecraft/class_5539;)V
ARG 1 column
ARG 2 x
ARG 3 z
ARG 4 surfaceY
ARG 5 chunk
METHOD method_39103 getTerracottaBlock (III)Lnet/minecraft/class_2680;
ARG 1 x
ARG 2 y
ARG 3 z
METHOD method_39104 (ILnet/minecraft/class_1959;Lnet/minecraft/class_6557;Lnet/minecraft/class_2338$class_2339;III)V
METHOD method_39104 placeIceberg (ILnet/minecraft/class_1959;Lnet/minecraft/class_6557;Lnet/minecraft/class_2338$class_2339;III)V
ARG 1 minY
ARG 2 biome
ARG 3 column
ARG 4 mutablePos
ARG 5 x
ARG 6 z
@ -66,6 +70,7 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui
ARG 4 chunk
ARG 5 chunkNoiseSampler
ARG 6 pos
ARG 7 hasFluid
METHOD method_39112 getNoiseSampler (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216;
ARG 1 noise
METHOD method_39333 isDefaultBlock (Lnet/minecraft/class_2680;)Z

View File

@ -40,3 +40,7 @@ CLASS net/minecraft/class_6725 net/minecraft/world/gen/surfacebuilder/VanillaSur
ARG 0 block
METHOD method_39138 createNetherSurfaceRule ()Lnet/minecraft/class_6686$class_6708;
METHOD method_39139 getEndStoneRule ()Lnet/minecraft/class_6686$class_6708;
METHOD method_39922 createDefaultRule (ZZZ)Lnet/minecraft/class_6686$class_6708;
ARG 0 surface
ARG 1 bedrockRoof
ARG 2 bedrockFloor