Skip to content

Commit

Permalink
25w08a stuff
Browse files Browse the repository at this point in the history
I'll leave the texture and screenshot stuff to someone who's more well versed in that...
  • Loading branch information
Shnupbups committed Feb 19, 2025
1 parent 81e5868 commit 0aaf419
Show file tree
Hide file tree
Showing 23 changed files with 139 additions and 5 deletions.
10 changes: 10 additions & 0 deletions mappings/net/minecraft/client/color/block/BlockColors.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,13 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors
ARG 1 world
ARG 2 pos
ARG 3 tintIndex
METHOD method_68158 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 tintIndex
METHOD method_68159 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 tintIndex
12 changes: 12 additions & 0 deletions mappings/net/minecraft/client/color/world/BiomeColors.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1163 net/minecraft/client/color/world/BiomeColors
FIELD field_5664 FOLIAGE_COLOR Lnet/minecraft/class_6539;
FIELD field_5665 GRASS_COLOR Lnet/minecraft/class_6539;
FIELD field_5666 WATER_COLOR Lnet/minecraft/class_6539;
FIELD field_57104 DRY_FOLIAGE_COLOR Lnet/minecraft/class_6539;
METHOD method_23791 (Lnet/minecraft/class_1959;DD)I
ARG 0 biome
ARG 1 x
Expand All @@ -19,3 +20,14 @@ CLASS net/minecraft/class_1163 net/minecraft/client/color/world/BiomeColors
METHOD method_4966 getFoliageColor (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I
ARG 0 world
ARG 1 pos
METHOD method_68161 (Lnet/minecraft/class_1959;DD)I
ARG 0 biome
ARG 1 x
ARG 3 z
METHOD method_68162 (Lnet/minecraft/class_1959;DD)I
ARG 0 biome
ARG 1 x
ARG 3 z
METHOD method_68163 getDryFoliageColor (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I
ARG 0 world
ARG 1 pos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS net/minecraft/class_994 net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer
FIELD field_4892 SKIN Lnet/minecraft/class_2960;
FIELD field_4892 TEXTURE Lnet/minecraft/class_2960;
FIELD field_53224 woolModel Lnet/minecraft/class_583;
FIELD field_53225 babyWoolModel Lnet/minecraft/class_583;
METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CLASS net/minecraft/class_10830 net/minecraft/client/render/entity/feature/SheepWoolUndercoatFeatureRenderer
FIELD field_57105 TEXTURE Lnet/minecraft/class_2960;
FIELD field_57106 model Lnet/minecraft/class_583;
FIELD field_57107 babyModel Lnet/minecraft/class_583;
METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V
ARG 1 context
ARG 2 loader
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityMo
FIELD field_56088 SKELETON_HORSE_BABY_SADDLE Lnet/minecraft/class_5601;
FIELD field_56089 ZOMBIE_HORSE_SADDLE Lnet/minecraft/class_5601;
FIELD field_56090 ZOMBIE_HORSE_BABY_SADDLE Lnet/minecraft/class_5601;
FIELD field_57102 SHEEP_WOOL_UNDERCOAT Lnet/minecraft/class_5601;
FIELD field_57103 SHEEP_BABY_WOOL_UNDERCOAT Lnet/minecraft/class_5601;
METHOD method_32076 getLayers ()Ljava/util/stream/Stream;
METHOD method_32079 registerMain (Ljava/lang/String;)Lnet/minecraft/class_5601;
ARG 0 id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ CLASS net/minecraft/class_10063 net/minecraft/client/render/entity/state/SheepEn
FIELD field_53561 sheared Z
FIELD field_53562 color Lnet/minecraft/class_1767;
FIELD field_53563 id I
METHOD method_68166 getRgbColor ()I
METHOD method_68167 isJeb ()Z
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
CLASS net/minecraft/class_1100 net/minecraft/client/render/model/UnbakedModel
FIELD field_57026 PARTICLE_TEXTURE Ljava/lang/String;
METHOD comp_3740 guiLight ()Lnet/minecraft/class_1100$class_4751;
METHOD comp_3742 transformations ()Lnet/minecraft/class_809;
METHOD comp_3743 textures ()Lnet/minecraft/class_10419$class_10420;
METHOD comp_3744 parentId ()Lnet/minecraft/class_2960;
CLASS class_4751 GuiLight
FIELD field_21858 ITEM Lnet/minecraft/class_1100$class_4751;
COMMENT The model will be shaded from the front, like a basic item
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked
FIELD comp_3740 guiLight Lnet/minecraft/class_1100$class_4751;
FIELD comp_3742 transformations Lnet/minecraft/class_809;
FIELD comp_3743 textures Lnet/minecraft/class_10419$class_10420;
FIELD comp_3744 parentId Lnet/minecraft/class_2960;
FIELD field_4254 GSON Lcom/google/gson/Gson;
METHOD method_3437 deserialize (Ljava/io/Reader;)Lnet/minecraft/class_793;
ARG 0 input
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/class_10831 net/minecraft/client/resource/DryFoliageColormapResourceSupplier
FIELD field_57108 DRY_FOLIAGE_COLORMAP Lnet/minecraft/class_2960;
METHOD method_68169 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)[I
ARG 1 resourceManager
ARG 2 profiler
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/world/ClientWorld.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
ARG 6 maxZ
METHOD method_62895 onChunkUnload (J)V
ARG 1 sectionPos
METHOD method_68160 (Lnet/minecraft/class_2338;)I
ARG 1 pos
METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V
ARG 1 shouldKeepTicking
CLASS class_5271 Properties
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/component/DataComponentTypes.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes
FIELD field_56152 TROPICAL_FISH_BASE_COLOR Lnet/minecraft/class_9331;
FIELD field_56508 COW_VARIANT Lnet/minecraft/class_9331;
FIELD field_56595 CHICKEN_VARIANT Lnet/minecraft/class_9331;
FIELD field_57109 WOLF_SOUND_VARIANT Lnet/minecraft/class_9331;
METHOD method_57884 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
METHOD method_57885 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
Expand Down Expand Up @@ -219,3 +220,5 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes
ARG 0 builder
METHOD method_67554 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
METHOD method_68171 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis
FIELD field_55584 LAZY_ENTITY_REFERENCE Lnet/minecraft/class_2941;
FIELD field_56413 COW_VARIANT Lnet/minecraft/class_2941;
FIELD field_56523 CHICKEN_VARIANT Lnet/minecraft/class_2941;
FIELD field_57073 WOLF_SOUND_VARIANT Lnet/minecraft/class_2941;
METHOD method_12719 getId (Lnet/minecraft/class_2941;)I
ARG 0 handler
METHOD method_12720 register (Lnet/minecraft/class_2941;)V
Expand Down
10 changes: 10 additions & 0 deletions mappings/net/minecraft/entity/passive/WolfEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
FIELD field_30387 TAMED_MAX_HEALTH F
FIELD field_49722 VARIANT Lnet/minecraft/class_2940;
FIELD field_56658 DEFAULT_COLLAR_COLOR Lnet/minecraft/class_1767;
FIELD field_57075 SOUND_VARIANT Lnet/minecraft/class_2940;
FIELD field_6944 furWet Z
FIELD field_6945 lastShakeProgress F
FIELD field_6946 BEGGING Lnet/minecraft/class_2940;
Expand Down Expand Up @@ -54,6 +55,15 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
METHOD method_6714 getTailAngle ()F
METHOD method_6719 getBegAnimationProgress (F)F
ARG 1 tickProgress
METHOD method_68128 (Lnet/minecraft/class_5321;)Ljava/util/Optional;
ARG 1 soundVariantKey
METHOD method_68129 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
ARG 0 soundVariantId
METHOD method_68130 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V
ARG 1 soundVariant
METHOD method_68131 getSoundVariant ()Lnet/minecraft/class_6880;
METHOD method_68132 setSoundVariant (Lnet/minecraft/class_6880;)V
ARG 1 soundVariant
CLASS class_1494 AvoidLlamaGoal
FIELD field_6954 wolf Lnet/minecraft/class_1493;
METHOD <init> (Lnet/minecraft/class_1493;Lnet/minecraft/class_1493;Ljava/lang/Class;FDD)V
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/class_10823 net/minecraft/entity/passive/WolfSoundVariant
FIELD field_57076 CODEC Lcom/mojang/serialization/Codec;
FIELD field_57077 NETWORK_CODEC Lcom/mojang/serialization/Codec;
FIELD field_57078 ENTRY_CODEC Lcom/mojang/serialization/Codec;
FIELD field_57079 PACKET_CODEC Lnet/minecraft/class_9139;
METHOD method_68133 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_68134 createCodec ()Lcom/mojang/serialization/Codec;
27 changes: 27 additions & 0 deletions mappings/net/minecraft/entity/passive/WolfSoundVariants.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
CLASS net/minecraft/class_10824 net/minecraft/entity/passive/WolfSoundVariants
FIELD field_57080 CLASSIC Lnet/minecraft/class_5321;
FIELD field_57081 PUGLIN Lnet/minecraft/class_5321;
FIELD field_57082 SAD Lnet/minecraft/class_5321;
FIELD field_57083 ANGRY Lnet/minecraft/class_5321;
FIELD field_57084 GRUMPY Lnet/minecraft/class_5321;
FIELD field_57085 BIG Lnet/minecraft/class_5321;
FIELD field_57086 CUTE Lnet/minecraft/class_5321;
METHOD method_68135 of (Lnet/minecraft/class_10824$class_10825;)Lnet/minecraft/class_5321;
ARG 0 type
METHOD method_68136 select (Lnet/minecraft/class_5455;Lnet/minecraft/class_5819;)Lnet/minecraft/class_6880;
ARG 0 registries
ARG 1 random
METHOD method_68137 bootstrap (Lnet/minecraft/class_7891;)V
ARG 0 registry
METHOD method_68138 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_10824$class_10825;)V
ARG 0 registry
ARG 1 key
ARG 2 type
CLASS class_10825 Type
FIELD field_57094 id Ljava/lang/String;
FIELD field_57095 suffix Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
ARG 3 id
ARG 4 suffix
METHOD method_68139 getId ()Ljava/lang/String;
METHOD method_68140 getSoundEventSuffix ()Ljava/lang/String;
6 changes: 6 additions & 0 deletions mappings/net/minecraft/sound/SoundEvents.mapping
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS net/minecraft/class_3417 net/minecraft/sound/SoundEvents
FIELD field_39027 GOAT_HORN_SOUND_COUNT I
FIELD field_39028 GOAT_HORN_SOUNDS Lcom/google/common/collect/ImmutableList;
FIELD field_57074 WOLF_SOUNDS Ljava/util/Map;
METHOD method_14838 register (Ljava/lang/String;)Lnet/minecraft/class_3414;
ARG 0 id
METHOD method_43045 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)Lnet/minecraft/class_6880;
Expand All @@ -22,3 +23,8 @@ CLASS net/minecraft/class_3417 net/minecraft/sound/SoundEvents
ARG 1 soundId
METHOD method_47966 registerReference (Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883;
ARG 0 id
METHOD method_68125 (Lnet/minecraft/class_10824$class_10825;)Lnet/minecraft/class_10823;
ARG 0 type
METHOD method_68126 createWolfSoundMap ()Ljava/util/Map;
METHOD method_68127 (Lnet/minecraft/class_10824$class_10825;)Lnet/minecraft/class_10824$class_10825;
ARG 0 type
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/biome/Biome.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome
METHOD method_48163 hasPrecipitation ()Z
METHOD method_65133 getMusicVolume ()F
METHOD method_66386 getGrassColor ()I
METHOD method_68145 getDryFoliageColor ()I
METHOD method_68146 getDefaultDryFoliageColor ()I
METHOD method_8685 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Z
ARG 1 world
ARG 2 pos
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/world/biome/BiomeColors.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/class_10828 net/minecraft/world/biome/BiomeColors
METHOD method_68142 getColor (DD[II)I
ARG 0 temperature
ARG 2 downfall
ARG 4 colormap
ARG 5 fallback
19 changes: 18 additions & 1 deletion mappings/net/minecraft/world/biome/BiomeEffects.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,22 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects
FIELD field_26420 grassColor Ljava/util/Optional;
FIELD field_26421 grassColorModifier Lnet/minecraft/class_4763$class_5486;
FIELD field_55050 musicVolume F
FIELD field_57099 dryFoliageColor Ljava/util/Optional;
METHOD <init> (IIIILjava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_4763$class_5486;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;F)V
ARG 1 fogColor
ARG 2 waterColor
ARG 3 waterFogColor
ARG 4 skyColor
ARG 5 foliageColor
ARG 6 grassColor
ARG 6 dryFoliageColor
ARG 7 grassColor
ARG 8 grassColorModifier
ARG 9 particleConfig
ARG 10 loopSound
ARG 11 moodSound
ARG 12 additionsSound
ARG 13 music
ARG 14 musicVolume
METHOD method_24387 getFogColor ()I
METHOD method_24388 getWaterColor ()I
METHOD method_24389 getWaterFogColor ()I
Expand Down Expand Up @@ -74,7 +83,12 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects
ARG 0 effects
METHOD method_30817 (Lnet/minecraft/class_4763;)Ljava/lang/Integer;
ARG 0 effects
METHOD method_65134 (Lnet/minecraft/class_4763;)Ljava/lang/Float;
ARG 0 effects
METHOD method_65135 getMusicVolume ()F
METHOD method_68147 getDryFoliageColor ()Ljava/util/Optional;
METHOD method_68148 (Lnet/minecraft/class_4763;)Ljava/util/Optional;
ARG 0 effects
CLASS class_4764 Builder
FIELD field_22071 fogColor Ljava/util/OptionalInt;
FIELD field_22072 waterColor Ljava/util/OptionalInt;
Expand All @@ -89,6 +103,7 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects
FIELD field_26424 grassColor Ljava/util/Optional;
FIELD field_26425 grassColorModifier Lnet/minecraft/class_4763$class_5486;
FIELD field_55051 musicVolume F
FIELD field_57100 dryFoliageColor Ljava/util/Optional;
METHOD method_24391 build ()Lnet/minecraft/class_4763;
METHOD method_24392 fogColor (I)Lnet/minecraft/class_4763$class_4764;
ARG 1 fogColor
Expand Down Expand Up @@ -119,6 +134,8 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects
ARG 1 musicVolume
METHOD method_65138 music (Lnet/minecraft/class_6012;)Lnet/minecraft/class_4763$class_4764;
ARG 1 music
METHOD method_68149 dryFoliageColor (I)Lnet/minecraft/class_4763$class_4764;
ARG 1 dryFoliageColor
CLASS class_5486 GrassColorModifier
FIELD field_26429 CODEC Lcom/mojang/serialization/Codec;
FIELD field_26430 name Ljava/lang/String;
Expand Down
8 changes: 8 additions & 0 deletions mappings/net/minecraft/world/biome/DryFoliageColors.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/class_10829 net/minecraft/world/biome/DryFoliageColors
FIELD field_57097 DEFAULT I
FIELD field_57098 colorMap [I
METHOD method_68143 getColor (DD)I
ARG 0 temperature
ARG 2 downfall
METHOD method_68144 setColorMap ([I)V
ARG 0 pixels
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/biome/FoliageColors.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ CLASS net/minecraft/class_1926 net/minecraft/world/biome/FoliageColors
METHOD method_8340 setColorMap ([I)V
ARG 0 pixels
METHOD method_8344 getColor (DD)I
ARG 0 temperature
ARG 2 downfall
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/biome/GrassColors.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ CLASS net/minecraft/class_1933 net/minecraft/world/biome/GrassColors
METHOD method_8376 setColorMap ([I)V
ARG 0 map
METHOD method_8377 getColor (DD)I
ARG 0 temperature
ARG 2 downfall
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator
FIELD field_35342 DEFAULT_FOG_COLOR I
FIELD field_35436 DEFAULT_MUSIC Lnet/minecraft/class_5195;
FIELD field_51968 SWAMP_SKELETON_WEIGHT I
FIELD field_57111 DEFAULT_DRY_FOLIAGE_COLOR I
METHOD method_30683 createJungle (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959;
ARG 0 featureLookup
ARG 1 carverLookup
Expand Down Expand Up @@ -142,6 +143,10 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator
ARG 4 waterFogColor
ARG 5 grassColor
ARG 6 foliageColor
ARG 7 dryFoliageColor
ARG 8 spawnSettings
ARG 9 generationSettings
ARG 10 music
METHOD method_39152 createBiome (ZFFLnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959;
ARG 0 precipitation
ARG 1 temperature
Expand Down

0 comments on commit 0aaf419

Please sign in to comment.