Skip to content

Commit

Permalink
25w07a stuff
Browse files Browse the repository at this point in the history
whole lotta refactors here
  • Loading branch information
Shnupbups committed Feb 18, 2025
1 parent e6943fd commit 56ce53d
Show file tree
Hide file tree
Showing 42 changed files with 535 additions and 161 deletions.
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 2 world
ARG 3 pos
ARG 4 entity
ARG 5 handler
METHOD method_9549 getCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265;
COMMENT @see AbstractBlockState#getCollisionShape(BlockView, BlockPos, ShapeContext)
ARG 1 state
Expand Down
9 changes: 9 additions & 0 deletions mappings/net/minecraft/block/EntityShapeContext.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,24 @@ CLASS net/minecraft/class_3727 net/minecraft/block/EntityShapeContext
FIELD field_17594 heldItem Lnet/minecraft/class_1799;
FIELD field_24425 walkOnFluidPredicate Ljava/util/function/Predicate;
FIELD field_27935 entity Lnet/minecraft/class_1297;
FIELD field_56696 placement Z
METHOD <init> (Lnet/minecraft/class_1297;ZZ)V
ARG 1 entity
ARG 2 collidesWithFluid
ARG 3 placement
METHOD <init> (ZZDLnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_1297;)V
ARG 1 descending
ARG 2 placement
ARG 3 minY
ARG 5 heldItem
ARG 6 walkOnFluidPredicate
ARG 7 entity
METHOD method_27868 (Lnet/minecraft/class_3610;)Z
ARG 0 fluidState
METHOD method_32480 getEntity ()Lnet/minecraft/class_1297;
METHOD method_61894 (Lnet/minecraft/class_3610;)Z
ARG 0 state
METHOD method_61895 (Lnet/minecraft/class_3610;)Z
ARG 0 state
METHOD method_67717 (Lnet/minecraft/class_1309;Lnet/minecraft/class_3610;)Z
ARG 1 state
11 changes: 0 additions & 11 deletions mappings/net/minecraft/block/ItemFrameBlockStates.mapping

This file was deleted.

7 changes: 7 additions & 0 deletions mappings/net/minecraft/block/ShapeContext.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,10 @@ CLASS net/minecraft/class_3726 net/minecraft/block/ShapeContext
ARG 1 state
ARG 2 world
ARG 3 pos
METHOD method_67713 (Lnet/minecraft/class_1309;Lnet/minecraft/class_3610;)Z
ARG 1 state
METHOD method_67714 (Lnet/minecraft/class_3610;)Z
ARG 0 state
METHOD method_67715 ofPlacement (Lnet/minecraft/class_1297;)Lnet/minecraft/class_3726;
ARG 0 placer
METHOD method_67716 isPlacement ()Z
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity
FIELD field_17377 lock Lnet/minecraft/class_1273;
FIELD field_17378 propertyDelegate Lnet/minecraft/class_3913;
FIELD field_19177 beamSegments Ljava/util/List;
FIELD field_19178 beamEmitters Ljava/util/List;
FIELD field_19179 minY I
FIELD field_31300 LEVEL_PROPERTY_INDEX I
FIELD field_31301 PRIMARY_PROPERTY_INDEX I
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS net/minecraft/class_2776 net/minecraft/block/enums/StructureBlockMode
FIELD field_12698 name Ljava/lang/String;
FIELD field_26444 text Lnet/minecraft/class_2561;
FIELD field_56673 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 name
METHOD method_30844 asText ()Lnet/minecraft/class_2561;
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/class_4917 net/minecraft/client/data/BlockModelDefinitionCreator
COMMENT A supplier of a block state JSON definition.
METHOD method_25743 getBlock ()Lnet/minecraft/class_2248;
METHOD method_67844 createBlockModelDefinition ()Lnet/minecraft/class_790;
157 changes: 157 additions & 0 deletions mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions mappings/net/minecraft/client/data/BlockStateSupplier.mapping

This file was deleted.

93 changes: 71 additions & 22 deletions mappings/net/minecraft/client/data/BlockStateVariantMap.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,58 @@ CLASS net/minecraft/class_4926 net/minecraft/client/data/BlockStateVariantMap
METHOD method_25789 (Lnet/minecraft/class_4934;)Z
ARG 1 propertiesMap
METHOD method_25790 register (Lnet/minecraft/class_4934;Ljava/lang/Object;)V
ARG 1 condition
ARG 1 properties
ARG 2 variant
METHOD method_25791 getProperties ()Ljava/util/List;
METHOD method_25792 checkAllPropertyDefinitions ()V
METHOD method_25792 validate ()V
METHOD method_67864 models (Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4927;
ARG 0 property
METHOD method_67865 models (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4928;
ARG 0 property1
ARG 1 property2
METHOD method_67866 models (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4929;
ARG 0 property1
ARG 1 property2
ARG 2 property3
METHOD method_67867 models (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4930;
ARG 0 property1
ARG 1 property2
ARG 2 property3
ARG 3 property4
METHOD method_67868 models (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4931;
ARG 0 property1
ARG 1 property2
ARG 2 property3
ARG 3 property4
ARG 4 property5
METHOD method_67869 operations (Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4927;
ARG 0 property
METHOD method_67870 operations (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4928;
ARG 0 property1
ARG 1 property2
METHOD method_67871 operations (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4929;
ARG 0 property1
ARG 1 property2
ARG 2 property3
METHOD method_67872 operations (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4930;
ARG 0 property1
ARG 1 property2
ARG 2 property3
ARG 3 property4
METHOD method_67873 operations (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4931;
ARG 0 property1
ARG 1 property2
ARG 2 property3
ARG 3 property4
ARG 4 property5
CLASS class_4927 SingleProperty
FIELD field_22864 property Lnet/minecraft/class_2769;
METHOD <init> (Lnet/minecraft/class_2769;)V
ARG 1 property
METHOD method_25794 register (Ljava/lang/Comparable;Ljava/lang/Object;)Lnet/minecraft/class_4926$class_4927;
ARG 1 value
METHOD method_25795 register (Ljava/util/function/Function;)Lnet/minecraft/class_4926;
ARG 1 property
ARG 2 variant
METHOD method_25795 generate (Ljava/util/function/Function;)Lnet/minecraft/class_4926;
ARG 1 variantFactory
METHOD method_25796 (Ljava/util/function/Function;Ljava/lang/Comparable;)V
ARG 2 value
Expand All @@ -28,9 +70,10 @@ CLASS net/minecraft/class_4926 net/minecraft/client/data/BlockStateVariantMap
ARG 1 first
ARG 2 second
METHOD method_25798 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Object;)Lnet/minecraft/class_4926$class_4928;
ARG 1 firstValue
ARG 2 secondValue
METHOD method_25800 register (Ljava/util/function/BiFunction;)Lnet/minecraft/class_4926;
ARG 1 firstProperty
ARG 2 secondProperty
ARG 3 variant
METHOD method_25800 generate (Ljava/util/function/BiFunction;)Lnet/minecraft/class_4926;
ARG 1 variantFactory
METHOD method_25802 (Ljava/lang/Comparable;Ljava/util/function/BiFunction;Ljava/lang/Comparable;)V
ARG 3 secondValue
Expand All @@ -44,11 +87,13 @@ CLASS net/minecraft/class_4926 net/minecraft/client/data/BlockStateVariantMap
ARG 1 first
ARG 2 second
ARG 3 third
METHOD method_25805 register (Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_4926;
METHOD method_25805 generate (Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_4926;
ARG 1 variantFactory
METHOD method_25807 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Object;)Lnet/minecraft/class_4926$class_4929;
ARG 1 firstValue
ARG 2 secondValue
ARG 3 thirdValue
ARG 1 firstProperty
ARG 2 secondProperty
ARG 3 thirdProperty
ARG 4 variant
METHOD method_25808 (Lcom/mojang/datafixers/util/Function3;Ljava/lang/Comparable;)V
ARG 2 firstValue
METHOD method_25809 (Ljava/lang/Comparable;Lcom/mojang/datafixers/util/Function3;Ljava/lang/Comparable;)V
Expand All @@ -66,11 +111,13 @@ CLASS net/minecraft/class_4926 net/minecraft/client/data/BlockStateVariantMap
ARG 3 third
ARG 4 fourth
METHOD method_25812 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Object;)Lnet/minecraft/class_4926$class_4930;
ARG 1 firstValue
ARG 2 secondValue
ARG 3 thirdValue
ARG 4 fourthValue
METHOD method_35886 register (Lcom/mojang/datafixers/util/Function4;)Lnet/minecraft/class_4926;
ARG 1 firstProperty
ARG 2 secondProperty
ARG 3 thirdProperty
ARG 4 fourthProperty
ARG 5 variant
METHOD method_35886 generate (Lcom/mojang/datafixers/util/Function4;)Lnet/minecraft/class_4926;
ARG 1 variantFactory
METHOD method_35888 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lcom/mojang/datafixers/util/Function4;Ljava/lang/Comparable;)V
ARG 5 fourthValue
METHOD method_35889 (Ljava/lang/Comparable;Ljava/lang/Comparable;Lcom/mojang/datafixers/util/Function4;Ljava/lang/Comparable;)V
Expand All @@ -92,12 +139,14 @@ CLASS net/minecraft/class_4926 net/minecraft/client/data/BlockStateVariantMap
ARG 4 fourth
ARG 5 fifth
METHOD method_25814 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Object;)Lnet/minecraft/class_4926$class_4931;
ARG 1 firstValue
ARG 2 secondValue
ARG 3 thirdValue
ARG 4 fourthValue
ARG 5 fifthValue
METHOD method_35897 register (Lcom/mojang/datafixers/util/Function5;)Lnet/minecraft/class_4926;
ARG 1 firstProperty
ARG 2 secondProperty
ARG 3 thirdProperty
ARG 4 fourthProperty
ARG 5 fifthProperty
ARG 6 variant
METHOD method_35897 generate (Lcom/mojang/datafixers/util/Function5;)Lnet/minecraft/class_4926;
ARG 1 variantFactory
METHOD method_35899 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lcom/mojang/datafixers/util/Function5;Ljava/lang/Comparable;)V
ARG 6 fifthValue
METHOD method_35900 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lcom/mojang/datafixers/util/Function5;Ljava/lang/Comparable;)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
CLASS net/minecraft/class_4922 net/minecraft/client/data/MultipartBlockStateSupplier
CLASS net/minecraft/class_4922 net/minecraft/client/data/MultipartBlockModelDefinitionCreator
FIELD field_22855 block Lnet/minecraft/class_2248;
FIELD field_22856 multiparts Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_2248;)V
ARG 1 block
METHOD method_25758 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4922;
ARG 0 block
METHOD method_25761 with (Lnet/minecraft/class_815;Lnet/minecraft/class_807;)Lnet/minecraft/class_4922;
ARG 1 condition
ARG 2 part
METHOD method_25762 with (Lnet/minecraft/class_10795;Lnet/minecraft/class_807;)Lnet/minecraft/class_4922;
ARG 1 conditionBuilder
ARG 2 part
METHOD method_25764 with (Lnet/minecraft/class_807;)Lnet/minecraft/class_4922;
ARG 1 part
METHOD method_67851 validate (Lnet/minecraft/class_815;)V
ARG 1 selector
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
CLASS net/minecraft/class_4925 net/minecraft/client/data/VariantsBlockModelDefinitionCreator
FIELD field_22859 block Lnet/minecraft/class_2248;
FIELD field_22861 definedProperties Ljava/util/Set;
FIELD field_56798 variants Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_2248;Ljava/util/List;Ljava/util/Set;)V
ARG 1 block
ARG 2 variants
ARG 3 definedProperties
METHOD method_25775 coordinate (Lnet/minecraft/class_4926;)Lnet/minecraft/class_4925;
COMMENT Appends a block state variant map to this block state information.
COMMENT
COMMENT <p>A block state variant map defines some of the variant settings based
COMMENT on a defined set of properties in the block state, such as the model
COMMENT of the block state is determined by a coordinated map of power and
COMMENT machine type property, and the y rotation determined by a facing
COMMENT property, etc.
COMMENT
COMMENT @return this block state file
ARG 1 variantMap
METHOD method_67852 of (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4925$class_10796;
ARG 0 block
METHOD method_67853 of (Lnet/minecraft/class_2248;Lnet/minecraft/class_807;)Lnet/minecraft/class_4925;
ARG 0 block
ARG 1 model
METHOD method_67854 (Lnet/minecraft/class_2248;Ljava/util/Set;Lnet/minecraft/class_2769;)V
ARG 2 property
METHOD method_67855 (Lnet/minecraft/class_4926;Lnet/minecraft/class_4925$class_10797;)Ljava/util/stream/Stream;
ARG 1 variant
METHOD method_67856 apply (Lnet/minecraft/class_10804;)Lnet/minecraft/class_4925;
ARG 1 operator
METHOD method_67857 (Lnet/minecraft/class_10804;Lnet/minecraft/class_4925$class_10797;)Ljava/util/stream/Stream;
ARG 1 variant
METHOD method_67858 validateAndAddProperties (Ljava/util/Set;Lnet/minecraft/class_2248;Lnet/minecraft/class_4926;)Ljava/util/Set;
ARG 0 definedProperties
ARG 1 block
ARG 2 variantMap
CLASS class_10796 Empty
FIELD field_56799 block Lnet/minecraft/class_2248;
METHOD <init> (Lnet/minecraft/class_2248;)V
ARG 1 block
METHOD method_67859 with (Lnet/minecraft/class_4926;)Lnet/minecraft/class_4925;
ARG 1 variantMap
CLASS class_10797 Entry
METHOD method_67861 apply (Lnet/minecraft/class_4926;)Ljava/util/stream/Stream;
ARG 1 operatorMap
METHOD method_67862 apply (Lnet/minecraft/class_10804;)Ljava/util/stream/Stream;
ARG 1 operator
METHOD method_67863 (Ljava/util/Map$Entry;)Lnet/minecraft/class_4925$class_10797;
ARG 1 variant

This file was deleted.

9 changes: 8 additions & 1 deletion mappings/net/minecraft/client/item/ItemModelManager.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ CLASS net/minecraft/class_10442 net/minecraft/client/item/ItemModelManager
ARG 1 renderState
ARG 2 stack
ARG 3 transformationMode
METHOD method_65598 renderItem (Lnet/minecraft/class_10444;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)V
ARG 4 entity
METHOD method_65598 clearAndUpdate (Lnet/minecraft/class_10444;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)V
ARG 1 renderState
ARG 2 stack
ARG 3 transformationMode
ARG 4 world
ARG 5 entity
ARG 6 seed
METHOD method_65912 hasHandAnimationOnSwap (Lnet/minecraft/class_1799;)Z
ARG 1 stack
5 changes: 5 additions & 0 deletions mappings/net/minecraft/client/render/WorldRenderer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,14 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
ARG 3 vertexConsumers
METHOD method_62207 renderEntities (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_4184;Lnet/minecraft/class_9779;Ljava/util/List;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 camera
ARG 4 tickCounter
ARG 5 entities
METHOD method_62208 renderBlockEntities (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_4184;F)V
ARG 1 matrices
ARG 2 entityVertexConsumers
ARG 3 effectVertexConsumers
ARG 4 camera
ARG 5 tickProgress
METHOD method_62209 addWeatherParticlesAndSound (Lnet/minecraft/class_4184;)V
Expand All @@ -250,6 +253,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
ARG 1 camera
ARG 2 frustum
ARG 3 output
METHOD method_62217 (Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_4588;Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588;
ARG 2 renderLayer
METHOD method_62219 scheduleChunkRenders (IIIIII)V
ARG 1 minX
ARG 2 minY
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
ARG 1 entity
ARG 2 stack
ARG 3 transformationMode
ARG 4 matrices
ARG 5 vertexConsumers
ARG 6 world
ARG 7 light
ARG 8 overlay
ARG 9 seed
METHOD method_23178 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;IILnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;I)V
ARG 1 stack
ARG 2 transformationMode
Expand Down Expand Up @@ -47,6 +53,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
ARG 3 light
ARG 4 overlay
ARG 5 tints
ARG 6 quads
ARG 7 layer
ARG 8 glint
METHOD method_65569 getTint ([II)I
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CLASS net/minecraft/class_10455 net/minecraft/client/render/item/model/SpecialIt
FIELD field_56973 settings Lnet/minecraft/class_10809;
METHOD <init> (Lnet/minecraft/class_10515;Lnet/minecraft/class_10809;)V
ARG 1 specialModelType
ARG 2 base
ARG 2 settings
CLASS class_10456 Unbaked
FIELD field_55368 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_65636 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS net/minecraft/class_10811 net/minecraft/client/render/model/BlockStateManagers
FIELD field_56981 ITEM_FRAME Lnet/minecraft/class_2689;
FIELD field_56982 GLOW_ITEM_FRAME Lnet/minecraft/class_2689;
FIELD field_56983 glowItemFrameId Lnet/minecraft/class_2960;
FIELD field_56984 itemFrameId Lnet/minecraft/class_2960;
FIELD field_56985 STATIC_MANAGERS Ljava/util/Map;
METHOD method_68013 createIdToManagerMapper ()Ljava/util/function/Function;
METHOD method_68014 getStateForItemFrame (ZZ)Lnet/minecraft/class_2680;
ARG 0 hasGlow
ARG 1 hasMap
METHOD method_68015 createItemFrameStateManager ()Lnet/minecraft/class_2689;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ CLASS net/minecraft/class_9824 net/minecraft/client/render/model/BlockStatesLoad
ARG 1 stateManager
ARG 2 definitions
METHOD method_65718 load (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 0 resourceManager
ARG 1 prepareExecutor
METHOD method_65719 (Ljava/util/List;)Lnet/minecraft/class_9824$class_10095;
ARG 0 definitions
CLASS class_10094 PackBlockStateDefinition
CLASS class_10095 BlockStateDefinition
METHOD method_65721 (Ljava/util/function/Function;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage;
ARG 2 resourceMap
CLASS class_10094 LoadedBlockStateDefinition
CLASS class_10095 LoadedModels
Loading

0 comments on commit 56ce53d

Please sign in to comment.