Skip to content

Commit

Permalink
25w03a
Browse files Browse the repository at this point in the history
  • Loading branch information
modmuss50 committed Jan 15, 2025
1 parent 981458d commit 8863cd7
Show file tree
Hide file tree
Showing 111 changed files with 159 additions and 1,106 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 = "25w02a"
def minecraft_version = "25w03a"

filament {
minecraftVersion = minecraft_version
Expand Down
3 changes: 1 addition & 2 deletions mappings/net/minecraft/block/Block.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
METHOD method_9543 hasDynamicBounds ()Z
METHOD method_9544 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V
ARG 2 stack
METHOD method_9554 onLandedUpon (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;F)V
METHOD method_9554 onLandedUpon (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;D)V
COMMENT Called when the entity lands on the block.
COMMENT
COMMENT <p>Default implementation deals fall damage to the entity. Blocks that increase or
Expand All @@ -269,7 +269,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 2 state
ARG 3 pos
ARG 4 entity
ARG 5 fallDistance
METHOD method_9556 afterBreak (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2586;Lnet/minecraft/class_1799;)V
COMMENT Called server-side when the block is broken by the player using correct tool.
COMMENT This is called after {@link #onBroken} but has the tool requirement.
Expand Down
21 changes: 2 additions & 19 deletions mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,18 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
ARG 0 pointer
ARG 1 stack
METHOD method_18346 registerDefaults ()V
CLASS 10
METHOD method_58766 (Lnet/minecraft/class_1309;)Z
ARG 0 entity
CLASS 11
METHOD method_58767 (Lnet/minecraft/class_1492;)Z
ARG 0 entity
CLASS 12
FIELD field_54200 fallbackBehavior Lnet/minecraft/class_2347;
CLASS 13
CLASS 14
METHOD method_64102 (Lnet/minecraft/class_1792;)V
ARG 0 item
CLASS 15
CLASS 2
CLASS 3
CLASS 4
METHOD method_64103 (Lnet/minecraft/class_4970$class_4971;)Z
ARG 0 state
METHOD method_64104 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 5
CLASS 6
METHOD method_58770 (Lnet/minecraft/class_1792;)V
ARG 0 item
CLASS 7
CLASS 8
FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347;
CLASS 9
CLASS 8
METHOD method_58765 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V
ARG 1 armorStand
CLASS 9
9 changes: 0 additions & 9 deletions mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity
ARG 2 state
METHOD method_10936 setCustomName (Lnet/minecraft/class_2561;)V
ARG 1 customName
METHOD method_10937 getBeamSegments ()Ljava/util/List;
METHOD method_10938 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;)V
ARG 0 world
ARG 1 pos
Expand Down Expand Up @@ -53,11 +52,3 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity
ARG 2 effect
METHOD method_55779 (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_5321;)V
ARG 2 entryKey
CLASS class_2581 BeamSegment
FIELD field_11804 height I
FIELD field_11805 color I
METHOD <init> (I)V
ARG 1 color
METHOD method_10942 increaseHeight ()V
METHOD method_10943 getHeight ()I
METHOD method_10944 getColor ()I
11 changes: 2 additions & 9 deletions mappings/net/minecraft/block/entity/BlockEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
COMMENT affects the saved NBT; otherwise, the game might not save the block entity.
METHOD method_57567 addComponents (Lnet/minecraft/class_9323$class_9324;)V
ARG 1 builder
METHOD method_57568 readComponents (Lnet/minecraft/class_2586$class_9473;)V
METHOD method_57568 readComponents (Lnet/minecraft/class_9473;)V
ARG 1 components
METHOD method_57569 removeFromCopiedStackNbt (Lnet/minecraft/class_2487;)V
ARG 1 nbt
Expand Down Expand Up @@ -257,17 +257,10 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
METHOD method_61176 supports (Lnet/minecraft/class_2680;)Z
ARG 1 state
METHOD method_61177 getNameForReport ()Ljava/lang/String;
METHOD method_66473 onStateReplaced (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V
METHOD method_66473 onStateReplaced (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 oldState
ARG 3 moved
METHOD method_66474 (Ljava/lang/String;)V
ARG 0 error
CLASS class_9472 Components
FIELD field_50176 CODEC Lcom/mojang/serialization/Codec;
CLASS class_9473 ComponentsAccess
METHOD method_58694 get (Lnet/minecraft/class_9331;)Ljava/lang/Object;
ARG 1 type
METHOD method_58695 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 type
ARG 2 fallback
6 changes: 6 additions & 0 deletions mappings/net/minecraft/block/entity/ComponentsAccess.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/class_9473 net/minecraft/block/entity/ComponentsAccess
METHOD method_58694 get (Lnet/minecraft/class_9331;)Ljava/lang/Object;
ARG 1 type
METHOD method_58695 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 type
ARG 2 fallback
10 changes: 10 additions & 0 deletions mappings/net/minecraft/class_10633.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CLASS net/minecraft/class_10633
METHOD method_10937 getBeamSegments ()Ljava/util/List;
CLASS class_2581 BeamSegment
FIELD field_11804 height I
FIELD field_11805 color I
METHOD <init> (I)V
ARG 1 color
METHOD method_10942 increaseHeight ()V
METHOD method_10943 getHeight ()I
METHOD method_10944 getColor ()I
2 changes: 0 additions & 2 deletions mappings/net/minecraft/client/gl/ShaderLoader.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ CLASS net/minecraft/class_10151 net/minecraft/client/gl/ShaderLoader
METHOD method_62957 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 1 path
CLASS class_10152 LoadException
METHOD <init> (Ljava/lang/String;)V
ARG 1 message
CLASS class_10153 Definitions
FIELD field_53948 EMPTY Lnet/minecraft/class_10151$class_10153;
CLASS class_10154 ShaderKey
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
CLASS net/minecraft/class_10234 net/minecraft/client/realms/exception/upload/FailedRealmsUploadException
FIELD field_54366 errorMessage Lnet/minecraft/class_2561;
METHOD <init> (Ljava/lang/String;)V
ARG 1 errorMessage
METHOD <init> (Lnet/minecraft/class_2561;)V
ARG 1 errorMessage
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
CLASS net/minecraft/class_838 net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer
METHOD <init> (Lnet/minecraft/class_5614$class_5615;)V
ARG 1 ctx
METHOD method_3585 renderInvisibleBlocks (Lnet/minecraft/class_2633;Lnet/minecraft/class_4597;Lnet/minecraft/class_4587;)V
ARG 1 entity
ARG 2 vertexConsumers
ARG 3 matrices
METHOD method_61047 (Lnet/minecraft/class_2633;Lnet/minecraft/class_4588;Lnet/minecraft/class_4587;)V
ARG 1 entity
ARG 2 vertexConsumer
ARG 3 matrices
METHOD method_3585 renderInvisibleBlocks (Lnet/minecraft/class_2586;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_4597;Lnet/minecraft/class_4587;)V
METHOD method_61048 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_2350;III)V
ARG 4 direction
ARG 5 x
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
CLASS net/minecraft/class_9991 net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer
FIELD field_53184 DONKEY_TEXTURE Lnet/minecraft/class_2960;
FIELD field_53185 MULE_TEXTURE Lnet/minecraft/class_2960;
FIELD field_53186 texture Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Z)V
METHOD <init> (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_9991$class_10650;)V
ARG 1 context
ARG 2 layer
ARG 3 babyLayer
ARG 4 mule
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
CLASS net/minecraft/class_961 net/minecraft/client/render/entity/UndeadHorseEntityRenderer
FIELD field_53201 ZOMBIE_HORSE_TEXTURE Lnet/minecraft/class_2960;
FIELD field_53202 SKELETON_HORSE_TEXTURE Lnet/minecraft/class_2960;
FIELD field_53203 texture Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Z)V
METHOD <init> (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_961$class_10651;)V
ARG 1 ctx
ARG 2 layer
ARG 3 babyLayer
ARG 4 skeleton

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,7 @@ CLASS net/minecraft/class_3885 net/minecraft/client/render/entity/feature/Villag
ARG 3 entityType
METHOD method_17152 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
ARG 0 levelToId
METHOD method_17153 getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/class_7922;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889;
ARG 1 hatLookUp
ARG 2 keyType
ARG 3 registry
ARG 4 key
METHOD method_17154 (Ljava/lang/String;Lnet/minecraft/class_7922;Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889;
ARG 4 k
METHOD method_17153 getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/class_6880;)Lnet/minecraft/class_3888$class_3889;
METHOD method_17155 getTexture (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
ARG 1 keyType
ARG 2 keyId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,7 @@ CLASS net/minecraft/class_549 net/minecraft/client/render/entity/model/AbstractH
FIELD field_32489 ANGRY_ANIMATION_BODY_PITCH_MULTIPLIER F
FIELD field_32490 HEAD_TAIL_BASE_PITCH F
FIELD field_32491 ANGRY_ANIMATION_HIND_LEG_PITCH_MULTIPLIER F
FIELD field_32496 SADDLE Ljava/lang/String;
COMMENT The key of the saddle mane model part, whose value is {@value}.
FIELD field_32497 LEFT_SADDLE_MOUTH Ljava/lang/String;
COMMENT The key of the left saddle mouth model part, whose value is {@value}.
FIELD field_32498 LEFT_SADDLE_LINE Ljava/lang/String;
COMMENT The key of the left saddle line model part, whose value is {@value}.
FIELD field_32499 RIGHT_SADDLE_MOUTH Ljava/lang/String;
COMMENT The key of the right saddle mouth model part, whose value is {@value}.
FIELD field_32500 RIGHT_SADDLE_LINE Ljava/lang/String;
COMMENT The key of the right saddle line model part, whose value is {@value}.
FIELD field_32501 HEAD_SADDLE Ljava/lang/String;
COMMENT The key of the head saddle model part, whose value is {@value}.
FIELD field_32502 MOUTH_SADDLE_WRAP Ljava/lang/String;
COMMENT The key of the mouth saddle wrap mane model part, whose value is {@value}.
FIELD field_3300 tail Lnet/minecraft/class_630;
FIELD field_3301 straps [Lnet/minecraft/class_630;
FIELD field_3304 saddle [Lnet/minecraft/class_630;
FIELD field_3305 body Lnet/minecraft/class_630;
FIELD field_3307 head Lnet/minecraft/class_630;
FIELD field_52854 BABY_TRANSFORMER Lnet/minecraft/class_9953;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
CLASS net/minecraft/class_7751 net/minecraft/client/render/entity/model/CamelEntityModel
FIELD field_40459 LIMB_ANGLE_SCALE F
FIELD field_40460 SADDLE Ljava/lang/String;
FIELD field_40461 BRIDLE Ljava/lang/String;
FIELD field_40462 REINS Ljava/lang/String;
FIELD field_40464 head Lnet/minecraft/class_630;
FIELD field_40465 saddleAndBridle [Lnet/minecraft/class_630;
FIELD field_40466 reins [Lnet/minecraft/class_630;
FIELD field_42227 LIMB_DISTANCE_SCALE F
FIELD field_52883 BABY_TRANSFORMER Lnet/minecraft/class_9953;
METHOD method_45704 updateVisibleParts (Lnet/minecraft/class_10007;)V
ARG 1 state
METHOD method_45705 setHeadAngles (Lnet/minecraft/class_10007;FF)V
ARG 1 state
ARG 2 headYaw
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ CLASS net/minecraft/class_587 net/minecraft/client/render/entity/model/PigEntity
FIELD field_52925 BABY_TRANSFORMER Lnet/minecraft/class_9953;
METHOD method_32025 getTexturedModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5607;
ARG 0 dilation
METHOD method_66535 getSaddleTexturedModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5607;
ARG 0 dilation
METHOD method_66536 getModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609;
ARG 0 dilation
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CLASS net/minecraft/class_590 net/minecraft/client/render/entity/model/PolarBearEntityModel
FIELD field_52928 BABY_TRANSFORMER Lnet/minecraft/class_9953;
METHOD method_32029 getTexturedModelData ()Lnet/minecraft/class_5607;
METHOD method_32029 getTexturedModelData (Z)Lnet/minecraft/class_5607;
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
CLASS net/minecraft/class_10007 net/minecraft/client/render/entity/state/CamelEntityRenderState
FIELD field_53289 saddled Z
FIELD field_53290 hasPassengers Z
FIELD field_53291 jumpCooldown F
FIELD field_53292 sittingTransitionAnimationState Lnet/minecraft/class_7094;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
CLASS net/minecraft/class_10019 net/minecraft/client/render/entity/state/LivingHorseEntityRenderState
FIELD field_53346 saddled Z
FIELD field_53347 hasPassengers Z
FIELD field_53348 waggingTail Z
FIELD field_53349 eatingGrassAnimationProgress F
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
CLASS net/minecraft/class_10053 net/minecraft/client/render/entity/state/PigEntityRenderState
FIELD field_53515 saddled Z
FIELD field_55877 variant Lnet/minecraft/class_10586;

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CLASS net/minecraft/class_10070 net/minecraft/client/render/entity/state/StriderEntityRenderState
FIELD field_53585 saddled Z
FIELD field_53586 cold Z
FIELD field_53587 hasPassengers Z
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,3 @@ CLASS net/minecraft/class_10494 net/minecraft/client/render/item/property/select
METHOD method_65686 create (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_10494$class_10495;
ARG 0 propertyCodec
ARG 1 valueCodec
METHOD method_65687 (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 2 instance
METHOD method_65688 (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
ARG 0 cases
METHOD method_65690 (Lcom/google/common/collect/Multiset$Entry;)Z
ARG 0 entry
2 changes: 0 additions & 2 deletions mappings/net/minecraft/client/util/GlException.mapping
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
CLASS net/minecraft/class_4718 net/minecraft/client/util/GlException
METHOD <init> (Ljava/lang/String;)V
ARG 1 message
METHOD <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
ARG 1 message
ARG 2 cause

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions mappings/net/minecraft/component/ComponentHolder.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,6 @@ CLASS net/minecraft/class_9322 net/minecraft/component/ComponentHolder
COMMENT @see ComponentMap
COMMENT @see ComponentChanges
METHOD method_57353 getComponents ()Lnet/minecraft/class_9323;
METHOD method_57824 get (Lnet/minecraft/class_9331;)Ljava/lang/Object;
COMMENT {@return the value for the component {@code type}, or {@code null} if the
COMMENT component is missing}
COMMENT
COMMENT <p>The returned value should never be mutated.
ARG 1 type
METHOD method_57825 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object;
COMMENT {@return the value for the component {@code type}, or {@code fallback} if the
COMMENT component is missing}
COMMENT
COMMENT <p>This method does not initialize the components with {@code fallback}.
COMMENT The returned value should never be mutated.
ARG 1 type
ARG 2 fallback
METHOD method_57826 contains (Lnet/minecraft/class_9331;)Z
COMMENT {@return whether the held components include {@code type}}
COMMENT
Expand Down
7 changes: 0 additions & 7 deletions mappings/net/minecraft/component/ComponentMap.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,10 @@ CLASS net/minecraft/class_9323 net/minecraft/component/ComponentMap
METHOD method_57827 builder ()Lnet/minecraft/class_9323$class_9324;
METHOD method_57828 filtered (Ljava/util/function/Predicate;)Lnet/minecraft/class_9323;
ARG 1 predicate
METHOD method_57829 get (Lnet/minecraft/class_9331;)Ljava/lang/Object;
ARG 1 type
METHOD method_57830 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 type
ARG 2 fallback
METHOD method_57831 getTypes ()Ljava/util/Set;
METHOD method_57832 contains (Lnet/minecraft/class_9331;)Z
ARG 1 type
METHOD method_57833 stream ()Ljava/util/stream/Stream;
METHOD method_57834 copy (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336;
ARG 1 type
METHOD method_57835 size ()I
METHOD method_57836 (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336;
ARG 1 type
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ CLASS net/minecraft/class_9264 net/minecraft/datafixer/fix/BannerPatternFormatFi
FIELD field_49187 OLD_TO_NEW_PATTERNS Ljava/util/Map;
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
ARG 1 outputSchema
METHOD method_57192 getColorFromInt (I)Ljava/lang/String;
ARG 0 color
METHOD method_57193 replacePatterns (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
METHOD method_57195 replacePatternAndColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
Loading

0 comments on commit 8863cd7

Please sign in to comment.