Skip to content

Commit

Permalink
24w10a
Browse files Browse the repository at this point in the history
  • Loading branch information
modmuss50 committed Mar 6, 2024
1 parent e6eb0fe commit c085684
Show file tree
Hide file tree
Showing 53 changed files with 180 additions and 280 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id 'net.fabricmc.filament'
}

def minecraft_version = "24w09a"
def minecraft_version = "24w10a"

filament {
minecraftVersion = minecraft_version
Expand Down
6 changes: 2 additions & 4 deletions mappings/net/minecraft/block/FlowerBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock
FIELD field_45775 stewEffects Lnet/minecraft/class_9298;
FIELD field_46354 STEW_EFFECT_CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46355 CODEC Lcom/mojang/serialization/MapCodec;
METHOD <init> (Lnet/minecraft/class_6880;ILnet/minecraft/class_4970$class_2251;)V
METHOD <init> (Lnet/minecraft/class_6880;FLnet/minecraft/class_4970$class_2251;)V
ARG 1 stewEffect
ARG 2 duration
ARG 3 settings
METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Lnet/minecraft/class_9298;
METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;F)Lnet/minecraft/class_9298;
ARG 0 effect
ARG 1 duration
METHOD method_54016 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
34 changes: 17 additions & 17 deletions mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,23 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
ARG 0 pointer
ARG 1 entityType
ARG 2 direction
CLASS 2
METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V
ARG 1 entity
CLASS 3
METHOD method_27159 (Lnet/minecraft/class_1309;)Z
ARG 0 entity
CLASS 4
METHOD method_27160 (Lnet/minecraft/class_1496;)Z
ARG 0 entity
CLASS 5
METHOD method_27161 (Lnet/minecraft/class_1492;)Z
ARG 0 entity
CLASS 7
METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V
ARG 1 entity
CLASS 9
FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347;
CLASS 10
FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347;
CLASS 17
Expand All @@ -23,9 +40,6 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
ARG 1 pointer
ARG 2 emptyBottleStack
ARG 3 filledBottleStack
CLASS 2
METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V
ARG 1 entity
CLASS 22
FIELD field_38001 fallback Lnet/minecraft/class_2347;
CLASS 24
Expand All @@ -45,17 +59,3 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
CLASS 1
METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V
ARG 1 entity
CLASS 3
METHOD method_27159 (Lnet/minecraft/class_1309;)Z
ARG 0 entity
CLASS 4
METHOD method_27160 (Lnet/minecraft/class_1496;)Z
ARG 0 entity
CLASS 5
METHOD method_27161 (Lnet/minecraft/class_1492;)Z
ARG 0 entity
CLASS 7
METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V
ARG 1 entity
CLASS 9
FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347;
5 changes: 0 additions & 5 deletions mappings/net/minecraft/block/entity/BannerBlockEntity.mapping
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity
FIELD field_11772 customName Lnet/minecraft/class_2561;
FIELD field_11773 patternsComponent Lnet/minecraft/class_9307;
FIELD field_11774 baseColor Lnet/minecraft/class_1767;
FIELD field_31296 MAX_PATTERN_COUNT I
FIELD field_31297 PATTERNS_KEY Ljava/lang/String;
FIELD field_49402 LOGGER Lorg/slf4j/Logger;
FIELD field_49403 patternsComponentWithBase Lnet/minecraft/class_9307;
METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state
Expand All @@ -18,6 +16,3 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity
METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V
ARG 1 stack
ARG 2 baseColor
METHOD method_57565 setPatterns (Lnet/minecraft/class_9307;)V
ARG 1 patternsComponent
METHOD method_57570 getPatterns ()Lnet/minecraft/class_9307;
3 changes: 0 additions & 3 deletions mappings/net/minecraft/block/entity/BannerPattern.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern
METHOD method_22536 getSpriteId (Lnet/minecraft/class_5321;Z)Lnet/minecraft/class_2960;
ARG 0 pattern
ARG 1 banner
6 changes: 2 additions & 4 deletions mappings/net/minecraft/block/entity/BannerPatterns.mapping
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
CLASS net/minecraft/class_7446 net/minecraft/block/entity/BannerPatterns
METHOD method_43721 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2582;
ARG 0 registry
METHOD method_43721 registerAndGetDefault (Lnet/minecraft/class_7891;)V
METHOD method_43722 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
ARG 0 id
METHOD method_57577 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2582;
ARG 0 registry
METHOD method_57577 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;)V
ARG 1 key
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
CLASS net/minecraft/class_2624 net/minecraft/block/entity/LockableContainerBlockEntity
FIELD field_12045 lock Lnet/minecraft/class_1273;
FIELD field_17376 customName Lnet/minecraft/class_2561;
METHOD method_11281 setHeldStacks (Lnet/minecraft/class_2371;)V
METHOD method_11282 getHeldStacks ()Lnet/minecraft/class_2371;
METHOD method_17487 checkUnlocked (Lnet/minecraft/class_1657;Lnet/minecraft/class_1273;Lnet/minecraft/class_2561;)Z
ARG 0 player
ARG 1 lock
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlockEntity
FIELD field_12036 lootTableSeed J
FIELD field_12037 lootTableId Lnet/minecraft/class_2960;
METHOD method_11281 setHeldStacks (Lnet/minecraft/class_2371;)V
ARG 1 list
METHOD method_11282 getHeldStacks ()Lnet/minecraft/class_2371;
METHOD method_11285 (Lnet/minecraft/class_2960;)V
ARG 1 id
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ CLASS net/minecraft/class_2627 net/minecraft/block/entity/ShulkerBoxBlockEntity
FIELD field_12059 AVAILABLE_SLOTS [I
FIELD field_12060 cachedColor Lnet/minecraft/class_1767;
FIELD field_31356 INVENTORY_SIZE I
FIELD field_31361 ITEMS_KEY Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_1767;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 color
ARG 2 pos
Expand Down
12 changes: 3 additions & 9 deletions mappings/net/minecraft/block/entity/SkullBlockEntity.mapping
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
FIELD field_12087 owner Lcom/mojang/authlib/GameProfile;
FIELD field_12087 owner Lnet/minecraft/class_9296;
FIELD field_12089 userCache Lcom/google/common/cache/LoadingCache;
FIELD field_31363 SKULL_OWNER_KEY Ljava/lang/String;
FIELD field_34029 currentExecutor Ljava/util/concurrent/Executor;
FIELD field_41315 poweredTicks I
FIELD field_41316 powered Z
Expand All @@ -11,9 +10,8 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state
METHOD method_11333 setOwner (Lcom/mojang/authlib/GameProfile;)V
ARG 1 owner
METHOD method_11334 getOwner ()Lcom/mojang/authlib/GameProfile;
METHOD method_11333 setOwner (Lnet/minecraft/class_9296;)V
METHOD method_11334 getOwner ()Lnet/minecraft/class_9296;
METHOD method_11339 loadOwnerProperties ()V
METHOD method_39765 setServices (Lnet/minecraft/class_7497;Ljava/util/concurrent/Executor;)V
ARG 0 apiServices
Expand All @@ -31,10 +29,6 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
ARG 0 runnable
METHOD method_52580 fetchProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
ARG 0 name
METHOD method_52586 hasTextures (Lcom/mojang/authlib/GameProfile;)Z
ARG 0 profile
METHOD method_52587 (Ljava/util/Optional;)V
ARG 1 profile
METHOD method_54081 fetchProfile (Ljava/lang/String;Lnet/minecraft/class_7497;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;
ARG 0 name
ARG 1 apiServices
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/MinecraftClient.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_1735 fpsCounter I
FIELD field_1738 currentFps I
FIELD field_1739 networkProxy Ljava/net/Proxy;
FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960;
FIELD field_17404 renderTaskQueue Ljava/util/Queue;
FIELD field_17405 worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference;
FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960;
FIELD field_1741 pausedTickDelta F
FIELD field_1742 itemRenderer Lnet/minecraft/class_918;
FIELD field_1743 skipGameRender Z
Expand Down
8 changes: 4 additions & 4 deletions mappings/net/minecraft/client/gui/screen/StatsScreen.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen
ARG 1 statType
METHOD method_19410 getStatType (I)Lnet/minecraft/class_3448;
ARG 1 headerColumn
CLASS class_450 ItemComparator
METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I
ARG 1 a
ARG 2 b
CLASS class_4199 Entry
FIELD field_33830 item Lnet/minecraft/class_1792;
METHOD <init> (Lnet/minecraft/class_447$class_4200;Lnet/minecraft/class_1792;)V
Expand All @@ -75,10 +79,6 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen
ARG 4 y
ARG 5 white
METHOD method_37307 getItem ()Lnet/minecraft/class_1792;
CLASS class_450 ItemComparator
METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I
ARG 1 a
ARG 2 b
CLASS class_4202 EntityStatsListWidget
FIELD field_18763 screen Lnet/minecraft/class_447;
METHOD <init> (Lnet/minecraft/class_447;Lnet/minecraft/class_310;)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree
METHOD method_37076 addButton (Lnet/minecraft/class_339;)V
ARG 1 button
METHOD method_37078 tickButtons ()V
CLASS class_4072 IconButtonWidget
FIELD field_45445 texture Lnet/minecraft/class_2960;
METHOD <init> (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V
ARG 1 x
ARG 2 y
ARG 3 texture
ARG 4 message
CLASS class_467 CancelButtonWidget
METHOD <init> (Lnet/minecraft/class_466;II)V
ARG 2 x
Expand Down Expand Up @@ -64,6 +57,13 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree
METHOD method_2401 setDisabled (Z)V
ARG 1 disabled
METHOD method_2402 isDisabled ()Z
CLASS class_4072 IconButtonWidget
FIELD field_45445 texture Lnet/minecraft/class_2960;
METHOD <init> (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V
ARG 1 x
ARG 2 y
ARG 3 texture
ARG 4 message
CLASS class_6392 BeaconButtonWidget
METHOD method_37080 tick (I)V
ARG 1 level
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi
METHOD method_36889 (Lnet/minecraft/class_4267;Lnet/minecraft/class_350$class_351;)V
ARG 1 server
METHOD method_52204 onRemoved ()V
CLASS class_504 Entry
CLASS class_4268 ScanningEntry
FIELD field_19112 client Lnet/minecraft/class_310;
CLASS class_4269 LanServerEntry
Expand Down Expand Up @@ -88,4 +89,3 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi
METHOD method_49300 uploadFavicon ([B)Z
ARG 1 bytes
METHOD method_55815 update ()V
CLASS class_504 Entry
26 changes: 13 additions & 13 deletions mappings/net/minecraft/client/model/ModelPart.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,6 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
METHOD method_2837 remap (FF)Lnet/minecraft/class_630$class_618;
ARG 1 u
ARG 2 v
CLASS class_6229 CuboidConsumer
METHOD method_35748 accept (Lnet/minecraft/class_4587$class_4665;Ljava/lang/String;ILnet/minecraft/class_630$class_628;)V
COMMENT Accepts a cuboid from a model part.
COMMENT
COMMENT @see ModelPart#forEachCuboid(MatrixStack, CuboidConsumer)
ARG 1 matrix
COMMENT the current matrix transformation from the model parts
ARG 2 path
COMMENT the path of the current model part, separated by {@code /}
ARG 3 index
COMMENT the index of the current cuboid in the current model part
ARG 4 cuboid
COMMENT the current cuboid
CLASS class_628 Cuboid
FIELD field_3643 minZ F
FIELD field_3644 minY F
Expand Down Expand Up @@ -157,3 +144,16 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
ARG 6 green
ARG 7 blue
ARG 8 alpha
CLASS class_6229 CuboidConsumer
METHOD method_35748 accept (Lnet/minecraft/class_4587$class_4665;Ljava/lang/String;ILnet/minecraft/class_630$class_628;)V
COMMENT Accepts a cuboid from a model part.
COMMENT
COMMENT @see ModelPart#forEachCuboid(MatrixStack, CuboidConsumer)
ARG 1 matrix
COMMENT the current matrix transformation from the model parts
ARG 2 path
COMMENT the path of the current model part, separated by {@code /}
ARG 3 index
COMMENT the index of the current cuboid in the current model part
ARG 4 cuboid
COMMENT the current cuboid
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/option/GameOptions.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
COMMENT or {@linkplain net.minecraft.block.Block#getPickStack(net.minecraft.world.WorldView,
COMMENT net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) block} the player is looking at.
COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_MIDDLE the middle mouse button} by default.
FIELD field_1872 overrideWidth I
FIELD field_18725 backgroundForChatOnly Lnet/minecraft/class_7172;
FIELD field_18726 textBackgroundOpacity Lnet/minecraft/class_7172;
FIELD field_1872 overrideWidth I
FIELD field_1873 autoSuggestions Lnet/minecraft/class_7172;
FIELD field_1874 loadToolbarActivatorKey Lnet/minecraft/class_304;
COMMENT A key binding for loading the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}.
Expand Down
8 changes: 4 additions & 4 deletions mappings/net/minecraft/client/particle/DamageParticle.mapping
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle
CLASS class_3939 Factory
FIELD field_18291 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_658 DefaultFactory
FIELD field_17790 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
Expand All @@ -11,3 +7,7 @@ CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle
FIELD field_17791 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_3939 Factory
FIELD field_18291 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkParticle
CLASS class_3997 FlashFactory
FIELD field_17810 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_678 Flash
CLASS class_679 ExplosionFactory
FIELD field_17811 spriteProvider Lnet/minecraft/class_4002;
Expand Down Expand Up @@ -64,3 +60,7 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic
METHOD method_3032 explodeBurst (Lit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V
ARG 3 trail
ARG 4 flicker
CLASS class_3997 FlashFactory
FIELD field_17810 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
8 changes: 4 additions & 4 deletions mappings/net/minecraft/client/particle/FlameParticle.mapping
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CLASS net/minecraft/class_687 net/minecraft/client/particle/FlameParticle
CLASS class_5613 SmallFactory
FIELD field_27736 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_688 Factory
FIELD field_17812 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_5613 SmallFactory
FIELD field_27736 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ CLASS net/minecraft/class_725 net/minecraft/client/particle/SquidInkParticle
ARG 12 velocityZ
ARG 14 color
ARG 15 spriteProvider
CLASS class_5788 GlowSquidInkFactory
FIELD field_28460 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_726 Factory
FIELD field_17878 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_5788 GlowSquidInkFactory
FIELD field_28460 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle
CLASS class_3991 Factory
FIELD field_17880 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_730 DolphinFactory
FIELD field_17881 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
Expand All @@ -15,6 +11,10 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle
FIELD field_17883 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_3991 Factory
FIELD field_17880 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_8254 EggCrackFactory
FIELD field_43374 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
Expand Down
Loading

0 comments on commit c085684

Please sign in to comment.