Skip to content

Commit

Permalink
24w36a
Browse files Browse the repository at this point in the history
  • Loading branch information
modmuss50 committed Sep 4, 2024
1 parent b5def06 commit 48ff281
Show file tree
Hide file tree
Showing 113 changed files with 140 additions and 919 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
id 'net.fabricmc.filament'
}

def minecraft_version = "24w35a"
def minecraft_version = "24w36a"

filament {
minecraftVersion = minecraft_version
Expand Down
2 changes: 0 additions & 2 deletions mappings/net/minecraft/block/DispenserBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock
FIELD field_46212 LOGGER Lorg/slf4j/Logger;
FIELD field_46336 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_51412 DEFAULT_BEHAVIOR Lnet/minecraft/class_2347;
METHOD method_10008 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)V
ARG 0 map
METHOD method_10009 registerBehavior (Lnet/minecraft/class_1935;Lnet/minecraft/class_2357;)V
ARG 0 provider
ARG 1 behavior
Expand Down
2 changes: 0 additions & 2 deletions mappings/net/minecraft/block/EndGatewayBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
CLASS net/minecraft/class_2329 net/minecraft/block/EndGatewayBlock
FIELD field_46343 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_60989 getTeleportVelocity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243;
ARG 0 entity
6 changes: 1 addition & 5 deletions mappings/net/minecraft/block/NetherPortalBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@ CLASS net/minecraft/class_2423 net/minecraft/block/NetherPortalBlock
ARG 4 scaledPos
ARG 5 inNether
ARG 6 worldBorder
METHOD method_60774 getExitPortalTarget (Lnet/minecraft/class_3218;Lnet/minecraft/class_5459$class_5460;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;FFLnet/minecraft/class_5454$class_9823;)Lnet/minecraft/class_5454;
METHOD method_60774 getExitPortalTarget (Lnet/minecraft/class_3218;Lnet/minecraft/class_5459$class_5460;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Lnet/minecraft/class_5454$class_9823;)Lnet/minecraft/class_5454;
ARG 0 world
ARG 1 exitPortalRectangle
ARG 2 axis
ARG 3 positionInPortal
ARG 4 entity
ARG 5 velocity
ARG 6 yaw
ARG 7 pitch
ARG 8 postDimensionTransition
METHOD method_60775 (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z
ARG 2 posx
METHOD method_60777 getExitPortalTarget (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;Lnet/minecraft/class_5459$class_5460;Lnet/minecraft/class_3218;Lnet/minecraft/class_5454$class_9823;)Lnet/minecraft/class_5454;
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/TripwireBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CLASS net/minecraft/class_2538 net/minecraft/block/TripwireBlock
ARG 1 world
ARG 2 pos
ARG 3 state
METHOD method_10780 updatePowered (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
METHOD method_10780 updatePowered (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/List;)V
ARG 1 world
ARG 2 pos
METHOD method_54060 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
Expand Down

This file was deleted.

25 changes: 5 additions & 20 deletions mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,20 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
ARG 1 stack
METHOD method_18346 registerDefaults ()V
CLASS 10
FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347;
CLASS 11
METHOD method_58765 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V
ARG 1 armorStand
CLASS 12
METHOD method_58766 (Lnet/minecraft/class_1309;)Z
ARG 0 entity
CLASS 11
CLASS 13
METHOD method_58767 (Lnet/minecraft/class_1496;)Z
ARG 0 horse
CLASS 14
METHOD method_58768 (Lnet/minecraft/class_1492;)Z
ARG 0 donkey
CLASS 15
FIELD field_50240 fallbackBehavior Lnet/minecraft/class_2347;
CLASS 16
CLASS 17
METHOD method_58769 (Lnet/minecraft/class_1792;)V
ARG 0 item
CLASS 2
CLASS 3
CLASS 4
CLASS 5
CLASS 6
METHOD method_58770 (Lnet/minecraft/class_4970$class_4971;)Z
ARG 0 state
METHOD method_58771 replace (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
ARG 1 pointer
ARG 2 oldStack
ARG 3 newStack
CLASS 7
CLASS 8
FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347;
CLASS 9
METHOD method_58765 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V
ARG 1 armorStand
3 changes: 3 additions & 0 deletions mappings/net/minecraft/class_10178.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS net/minecraft/class_10178
METHOD method_16211 createTask (Ljava/lang/Runnable;)Ljava/lang/Runnable;
METHOD method_16898 getName ()Ljava/lang/String;
5 changes: 2 additions & 3 deletions mappings/net/minecraft/client/gui/DrawContext.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
ARG 2 text
ARG 3 x
ARG 4 y
METHOD method_51435 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;IILnet/minecraft/class_8000;)V
METHOD method_51435 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;IILnet/minecraft/class_8000;Lnet/minecraft/class_2960;)V
ARG 1 textRenderer
ARG 2 components
ARG 3 x
Expand All @@ -265,7 +265,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
ARG 3 positioner
ARG 4 x
ARG 5 y
METHOD method_51437 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;Ljava/util/Optional;II)V
METHOD method_51437 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/class_2960;)V
ARG 1 textRenderer
ARG 2 text
ARG 3 data
Expand Down Expand Up @@ -313,7 +313,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
ARG 3 x
ARG 4 y
METHOD method_51448 getMatrices ()Lnet/minecraft/class_4587;
METHOD method_51450 getVertexConsumers ()Lnet/minecraft/class_4597$class_4598;
METHOD method_51452 draw ()V
METHOD method_51737 fill (IIIIII)V
ARG 1 x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB
ARG 2 resetCurrentPage
ARG 3 filteringCraftable
METHOD method_2628 drawTooltip (Lnet/minecraft/class_332;II)V
ARG 1 context
ARG 2 x
ARG 3 y
METHOD method_2629 onRecipesDisplayed (Ljava/util/List;)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,51 +1,9 @@
CLASS net/minecraft/class_8002 net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer
COMMENT A class for rendering a background box for a tooltip.
FIELD field_41694 BACKGROUND_COLOR I
FIELD field_41695 START_Y_BORDER_COLOR I
FIELD field_41696 END_Y_BORDER_COLOR I
METHOD method_47946 render (Lnet/minecraft/class_332;IIIII)V
METHOD method_47946 render (Lnet/minecraft/class_332;IIIIILnet/minecraft/class_2960;)V
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
ARG 5 z
METHOD method_47947 renderVerticalLine (Lnet/minecraft/class_332;IIIIII)V
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 height
ARG 4 z
ARG 5 startColor
ARG 6 endColor
METHOD method_47948 renderBorder (Lnet/minecraft/class_332;IIIIIII)V
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
ARG 5 z
ARG 6 startColor
ARG 7 endColor
METHOD method_47949 renderVerticalLine (Lnet/minecraft/class_332;IIIII)V
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 height
ARG 4 z
ARG 5 color
METHOD method_47950 renderRectangle (Lnet/minecraft/class_332;IIIIII)V
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
ARG 5 z
ARG 6 color
METHOD method_47951 renderHorizontalLine (Lnet/minecraft/class_332;IIIII)V
ARG 0 context
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 z
ARG 5 color
6 changes: 0 additions & 6 deletions mappings/net/minecraft/client/input/Input.mapping
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
CLASS net/minecraft/class_744 net/minecraft/client/input/Input
FIELD field_3903 sneaking Z
FIELD field_3904 jumping Z
FIELD field_3905 movementForward F
FIELD field_3906 pressingRight Z
FIELD field_3907 movementSideways F
FIELD field_3908 pressingLeft Z
FIELD field_3909 pressingBack Z
FIELD field_3910 pressingForward Z
METHOD method_20622 hasForwardMovement ()Z
METHOD method_3128 getMovementInput ()Lnet/minecraft/class_241;
METHOD method_3129 tick (ZF)V
Expand Down
15 changes: 10 additions & 5 deletions mappings/net/minecraft/client/model/ModelPart.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
METHOD method_41924 scale (Lorg/joml/Vector3f;)V
ARG 1 vec3f
CLASS class_593 Quad
FIELD field_21618 direction Lorg/joml/Vector3f;
FIELD field_3502 vertices [Lnet/minecraft/class_630$class_618;
FIELD comp_3184 vertices [Lnet/minecraft/class_630$class_618;
FIELD comp_3185 direction Lorg/joml/Vector3f;
METHOD <init> ([Lnet/minecraft/class_630$class_618;FFFFFFZLnet/minecraft/class_2350;)V
ARG 1 vertices
ARG 2 u1
Expand All @@ -89,10 +89,12 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
ARG 7 squishV
ARG 8 flip
ARG 9 direction
METHOD comp_3184 vertices ()[Lnet/minecraft/class_630$class_618;
METHOD comp_3185 direction ()Lorg/joml/Vector3f;
CLASS class_618 Vertex
FIELD field_3603 v F
FIELD field_3604 u F
FIELD field_3605 pos Lorg/joml/Vector3f;
FIELD comp_3186 pos Lorg/joml/Vector3f;
FIELD comp_3187 u F
FIELD comp_3188 v F
METHOD <init> (FFFFF)V
ARG 1 x
ARG 2 y
Expand All @@ -103,6 +105,9 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
ARG 1 pos
ARG 2 u
ARG 3 v
METHOD comp_3186 pos ()Lorg/joml/Vector3f;
METHOD comp_3187 u ()F
METHOD comp_3188 v ()F
METHOD method_2837 remap (FF)Lnet/minecraft/class_630$class_618;
ARG 1 u
ARG 2 v
Expand Down
1 change: 0 additions & 1 deletion mappings/net/minecraft/client/option/ServerList.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ CLASS net/minecraft/class_641 net/minecraft/client/option/ServerList
FIELD field_3749 servers Ljava/util/List;
FIELD field_3750 client Lnet/minecraft/class_310;
FIELD field_3751 LOGGER Lorg/slf4j/Logger;
FIELD field_39360 IO_EXECUTOR Lnet/minecraft/class_3846;
FIELD field_39437 MAX_HIDDEN_ENTRIES I
FIELD field_39438 hiddenServers Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_310;)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre
ARG 1 storage
METHOD method_52827 schedulePropagationFrom (Lnet/minecraft/class_846$class_851;)V
ARG 1 builtChunk
METHOD method_52828 (Lnet/minecraft/class_4604;Ljava/util/List;)V
METHOD method_52828 (Lnet/minecraft/class_4604;Ljava/util/List;Ljava/util/List;)V
ARG 1 frustum
ARG 2 builtChunks
METHOD method_52831 getRenderedChunk (JLnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;)Lnet/minecraft/class_846$class_851;
Expand All @@ -42,10 +42,6 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre
ARG 3 builtChunks
METHOD method_52837 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762;
ARG 1 chunk
METHOD method_62924 (Ljava/util/List;Lnet/minecraft/class_10143$class_10147;ZI)V
ARG 1 node
ARG 2 skipVisibilityCheck
ARG 3 depth
METHOD method_62925 getOctree ()Lnet/minecraft/class_10143;
CLASS class_5972 ChunkInfoList
FIELD field_29620 current [Lnet/minecraft/class_8679$class_762;
Expand Down
5 changes: 1 addition & 4 deletions mappings/net/minecraft/client/render/WorldRenderer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
FIELD field_45616 builtChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
FIELD field_53072 renderedEntities Ljava/util/List;
FIELD field_53073 renderedEntitiesCount I
FIELD field_53074 lastCameraPos Lnet/minecraft/class_243;
FIELD field_53075 skyRendering Lnet/minecraft/class_9975;
FIELD field_53076 cloudRenderer Lnet/minecraft/class_9955;
FIELD field_53077 worldBorderRendering Lnet/minecraft/class_9978;
Expand Down Expand Up @@ -191,9 +190,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
METHOD method_62196 getCloudRenderer ()Lnet/minecraft/class_9955;
METHOD method_62197 isSkyDark (F)Z
ARG 1 tickDelta
METHOD method_62198 translucentSort (Lnet/minecraft/class_243;Lnet/minecraft/class_1921;)V
ARG 1 cameraPos
ARG 2 renderLayer
METHOD method_62198 translucentSort (Lnet/minecraft/class_243;)V
METHOD method_62199 renderLateDebug (Lnet/minecraft/class_9909;Lnet/minecraft/class_243;Lnet/minecraft/class_9958;)V
ARG 1 frameGraphBuilder
ARG 2 pos
Expand Down
31 changes: 1 addition & 30 deletions mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
FIELD field_18766 cameraPosition Lnet/minecraft/class_243;
FIELD field_20828 buffers Lnet/minecraft/class_750;
FIELD field_20829 mailbox Lnet/minecraft/class_3846;
FIELD field_20830 executor Ljava/util/concurrent/Executor;
FIELD field_20831 world Lnet/minecraft/class_638;
FIELD field_20832 worldRenderer Lnet/minecraft/class_761;
Expand All @@ -23,9 +22,6 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
METHOD method_19420 getCameraPosition ()Lnet/minecraft/class_243;
METHOD method_22752 setWorld (Lnet/minecraft/class_638;)V
ARG 1 world
METHOD method_22755 (Lnet/minecraft/class_750;Lnet/minecraft/class_846$class_4690;Ljava/lang/Throwable;)V
ARG 2 result
ARG 3 throwable
METHOD method_22756 send (Lnet/minecraft/class_846$class_851$class_4577;)V
ARG 1 task
METHOD method_22761 upload ()V
Expand Down Expand Up @@ -78,9 +74,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
METHOD <init> (Lnet/minecraft/class_846;IJ)V
ARG 2 index
ARG 3 sectionPos
METHOD method_22773 scheduleSort (Lnet/minecraft/class_1921;Lnet/minecraft/class_846;)Z
ARG 1 layer
ARG 2 chunkRenderer
METHOD method_22773 scheduleSort (Lnet/minecraft/class_846;)V
METHOD method_22777 scheduleRebuild (Lnet/minecraft/class_846;Lnet/minecraft/class_6850;)V
ARG 1 chunkRenderer
ARG 2 builder
Expand Down Expand Up @@ -111,10 +105,6 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
METHOD method_3675 clear ()V
METHOD method_3677 getData ()Lnet/minecraft/class_846$class_849;
METHOD method_40051 getBoundingBox ()Lnet/minecraft/class_238;
METHOD method_52841 isAtPos (III)Z
ARG 1 sectionX
ARG 2 sectionY
ARG 3 sectionZ
METHOD method_60908 setData (Lnet/minecraft/class_846$class_849;)V
ARG 1 chunkData
METHOD method_60909 getVertexSorter ()Lnet/minecraft/class_8251;
Expand All @@ -124,14 +114,8 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
ARG 1 direction
METHOD method_62975 getSectionPos ()J
CLASS class_4577 Task
FIELD field_20835 distance D
FIELD field_20836 cancelled Ljava/util/concurrent/atomic/AtomicBoolean;
FIELD field_53959 prioritized Z
METHOD <init> (Lnet/minecraft/class_846$class_851;DZ)V
ARG 2 distance
ARG 4 prioritized
METHOD compareTo (Ljava/lang/Object;)I
ARG 1 other
METHOD method_22782 cancel ()V
METHOD method_22783 run (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture;
ARG 1 buffers
Expand All @@ -140,23 +124,10 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
METHOD method_62977 getOrigin ()Lnet/minecraft/class_2338;
CLASS class_4578 RebuildTask
FIELD field_20838 region Lnet/minecraft/class_853;
METHOD <init> (Lnet/minecraft/class_846$class_851;DLnet/minecraft/class_853;Z)V
ARG 2 distance
ARG 4 region
ARG 5 prioritized
METHOD method_22788 (Ljava/util/List;Lnet/minecraft/class_846$class_849;Lnet/minecraft/class_1921;Lnet/minecraft/class_9801;)V
ARG 3 renderLayer
ARG 4 buffer
METHOD method_23619 (Lnet/minecraft/class_846$class_849;Ljava/util/List;Ljava/lang/Throwable;)Lnet/minecraft/class_846$class_4690;
ARG 2 results
ARG 3 throwable
CLASS class_4579 SortTask
FIELD field_20841 data Lnet/minecraft/class_846$class_849;
METHOD <init> (Lnet/minecraft/class_846$class_851;DLnet/minecraft/class_846$class_849;)V
ARG 2 distance
ARG 4 data
METHOD method_22789 (Lnet/minecraft/class_846$class_4690;Ljava/lang/Throwable;)Lnet/minecraft/class_846$class_4690;
ARG 1 result
ARG 2 throwable
METHOD method_22790 (Ljava/lang/Void;)Lnet/minecraft/class_846$class_4690;
ARG 0 v
6 changes: 3 additions & 3 deletions mappings/net/minecraft/client/render/chunk/Octree.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CLASS net/minecraft/class_10143 net/minecraft/client/render/chunk/Octree
ARG 2 viewDistance
ARG 3 sizeY
ARG 4 bottomY
METHOD method_62911 visit (Lnet/minecraft/class_10143$class_10148;Lnet/minecraft/class_4604;)V
METHOD method_62911 visit (Lnet/minecraft/class_10143$class_10148;Lnet/minecraft/class_4604;I)V
ARG 1 visitor
ARG 2 frustum
METHOD method_62912 add (Lnet/minecraft/class_846$class_851;)Z
Expand Down Expand Up @@ -56,14 +56,14 @@ CLASS net/minecraft/class_10143 net/minecraft/client/render/chunk/Octree
CLASS class_10146 Leaf
CLASS class_10147 Node
METHOD method_62915 getBuiltChunk ()Lnet/minecraft/class_846$class_851;
METHOD method_62917 visit (Lnet/minecraft/class_10143$class_10148;ZLnet/minecraft/class_4604;I)V
METHOD method_62917 visit (Lnet/minecraft/class_10143$class_10148;ZLnet/minecraft/class_4604;IIZ)V
ARG 1 visitor
ARG 2 skipVisibilityCheck
ARG 3 frustum
ARG 4 depth
METHOD method_62920 getBoundingBox ()Lnet/minecraft/class_238;
CLASS class_10148 Visitor
METHOD visit (Lnet/minecraft/class_10143$class_10147;ZI)V
METHOD visit (Lnet/minecraft/class_10143$class_10147;ZIZ)V
ARG 1 node
ARG 2 skipVisibilityCheck
ARG 3 depth
Loading

0 comments on commit 48ff281

Please sign in to comment.