1.21-pre3 stuff (FabricMC#3893)

* 1.21-pre3 stuff * Add color unpicks
kevinthegreat1 · Jun 7, 2024 · 67f3fcd · 67f3fcd
1 parent 5cae99e
commit 67f3fcd
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 1 deletion.
diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping
@@ -104,9 +104,24 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
 		ARG 1 vertices
 		ARG 2 entity
 		ARG 3 tickDelta
+		ARG 4 red
+		ARG 5 green
+		ARG 6 blue
 	METHOD method_3958 shouldRenderHitboxes ()Z
 	METHOD method_3959 getSquaredDistanceToCamera (DDD)D
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
 	METHOD method_43336 getHeldItemRenderer ()Lnet/minecraft/class_759;
+	METHOD method_61170 renderServerSideHitbox (Lnet/minecraft/class_4587;Lnet/minecraft/class_1297;Lnet/minecraft/class_4597;)V
+		ARG 0 matrices
+		ARG 1 entity
+		ARG 2 vertexConsumers
+	METHOD method_61171 drawVector (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lorg/joml/Vector3f;Lnet/minecraft/class_243;I)V
+		ARG 0 matrices
+		ARG 1 vertexConsumers
+		ARG 2 offset
+		ARG 3 vec
+		ARG 4 color
+	METHOD method_61172 getIntegratedServerEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
+		ARG 0 entity
diff --git a/...tity/ReplaceDiscEnchantmentEffect.mapping → ...tity/ReplaceDiskEnchantmentEffect.mapping b/...tity/ReplaceDiscEnchantmentEffect.mapping → ...tity/ReplaceDiskEnchantmentEffect.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_9730 net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffect
+CLASS net/minecraft/class_9730 net/minecraft/enchantment/effect/entity/ReplaceDiskEnchantmentEffect
 	FIELD field_51716 CODEC Lcom/mojang/serialization/MapCodec;
 	METHOD method_60244 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6646;)Ljava/lang/Boolean;
 		ARG 2 predicate

diff --git a/mappings/net/minecraft/entity/Leashable.mapping b/mappings/net/minecraft/entity/Leashable.mapping
@@ -44,6 +44,13 @@ CLASS net/minecraft/class_9817 net/minecraft/entity/Leashable
 		ARG 1 unresolvedLeashHolderId
 	METHOD method_60969 canLeashAttachTo ()Z
 	METHOD method_60970 detachLeash ()V
+	METHOD method_61161 applyLeashElasticity (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V
+		ARG 0 entity
+		ARG 1 leashHolder
+		ARG 2 distance
+	METHOD method_61162 applyLeashElasticity (Lnet/minecraft/class_1297;F)V
+		ARG 1 leashHolder
+		ARG 2 distance
 	CLASS class_9818 LeashData
 		FIELD field_52217 leashHolder Lnet/minecraft/class_1297;
 		FIELD field_52218 unresolvedLeashData Lcom/mojang/datafixers/util/Either;

diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping
@@ -46,6 +46,8 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns
 		COMMENT </ul>
 	METHOD method_55696 updateModifier (Lnet/minecraft/class_1322;)V
 		ARG 1 modifier
+	METHOD method_61163 overwritePersistentModifier (Lnet/minecraft/class_1322;)V
+		ARG 1 modifier
 	METHOD method_6192 setBaseValue (D)V
 		ARG 1 baseValue
 	METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Map;

diff --git a/mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping b/mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_1532 net/minecraft/entity/decoration/LeashKnotEntity
 		ARG 1 world
 		ARG 2 pos
 	METHOD method_59944 onPlace ()V
+	METHOD method_61164 (Lnet/minecraft/class_1657;Lnet/minecraft/class_9817;)Z
+		ARG 2 entity
 	METHOD method_6932 getOrCreate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1532;
 		ARG 0 world
 		ARG 1 pos
diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
@@ -161,6 +161,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 	METHOD method_60983 tryClearCurrentExplosion ()V
 	METHOD method_60984 setIgnoreFallDamageFromCurrentExplosion (Z)V
 		ARG 1 ignoreFallDamageFromCurrentExplosion
+	METHOD method_61165 shouldIgnoreFallDamageFromCurrentExplosion ()Z
 	METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I
 		ARG 1 recipes
 	METHOD method_7255 addExperience (I)V

diff --git a/mappings/net/minecraft/item/LeadItem.mapping b/mappings/net/minecraft/item/LeadItem.mapping
@@ -1,4 +1,12 @@
 CLASS net/minecraft/class_1804 net/minecraft/item/LeadItem
+	METHOD method_55761 (Lnet/minecraft/class_1657;Lnet/minecraft/class_9817;)Z
+		ARG 1 entity
+	METHOD method_61166 collectLeashablesAround (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Ljava/util/List;
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 predicate
+	METHOD method_61167 (Ljava/util/function/Predicate;Lnet/minecraft/class_1297;)Z
+		ARG 1 entity
 	METHOD method_7994 attachHeldMobsToBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269;
 		ARG 0 player
 		ARG 1 world

diff --git a/mappings/net/minecraft/item/TridentItem.mapping b/mappings/net/minecraft/item/TridentItem.mapping
@@ -4,3 +4,5 @@ CLASS net/minecraft/class_1835 net/minecraft/item/TridentItem
 	FIELD field_30928 THROW_SPEED F
 	METHOD method_57395 createAttributeModifiers ()Lnet/minecraft/class_9285;
 	METHOD method_58420 createToolComponent ()Lnet/minecraft/class_9424;
+	METHOD method_61168 isAboutToBreak (Lnet/minecraft/class_1799;)Z
+		ARG 0 stack
diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping
@@ -27,6 +27,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 	FIELD field_31833 SIZE_HALF I
 	FIELD field_33991 MAX_DECORATIONS I
 	FIELD field_33992 decorationCount I
+	FIELD field_52316 FRAME_PREFIX Ljava/lang/String;
 	METHOD <init> (IIBZZZLnet/minecraft/class_5321;)V
 		ARG 1 centerX
 		ARG 2 centerZ
@@ -129,6 +130,8 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		ARG 3 decoration
 	METHOD method_57627 (Ljava/lang/String;Lnet/minecraft/class_9292$class_9293;Lnet/minecraft/class_9292;)Lnet/minecraft/class_9292;
 		ARG 2 decorations
+	METHOD method_61169 getFrameDecorationKey (I)Ljava/lang/String;
+		ARG 0 id
 	CLASS class_23 PlayerUpdateTracker
 		FIELD field_124 emptyPacketsRequested I
 		FIELD field_125 player Lnet/minecraft/class_1657;

diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping
@@ -436,3 +436,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 		ARG 2 predicate
 		ARG 3 errorMessageSupplier
 	METHOD method_61093 getRotation ()Lnet/minecraft/class_2470;
+	METHOD method_61173 expectEntityIn (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/lang/String;)V
+		ARG 1 entity
+		ARG 2 box
+		ARG 3 message
diff --git a/mappings/net/minecraft/util/Colors.mapping b/mappings/net/minecraft/util/Colors.mapping
@@ -19,3 +19,7 @@ CLASS net/minecraft/class_8012 net/minecraft/util/Colors
 	FIELD field_49788 ALTERNATE_WHITE I
 		COMMENT Represents a variant of the color white, used so that the two alternate with
 		COMMENT each other, {@code 0xFFBABABA}.
+	FIELD field_52312 GREEN I
+		COMMENT Represents the color green, {@code 0xFF00FF00}.
+	FIELD field_52313 BLUE I
+		COMMENT Represents the color blue, {@code 0xFF0000FF}.
diff --git a/unpick-definitions/colors.unpick b/unpick-definitions/colors.unpick
@@ -6,6 +6,8 @@ constant argb_color net/minecraft/util/Colors GRAY
 constant argb_color net/minecraft/util/Colors LIGHT_GRAY
 constant argb_color net/minecraft/util/Colors ALTERNATE_WHITE
 constant argb_color net/minecraft/util/Colors RED
+constant argb_color net/minecraft/util/Colors GREEN
+constant argb_color net/minecraft/util/Colors BLUE
 constant argb_color net/minecraft/util/Colors LIGHT_RED
 constant argb_color net/minecraft/util/Colors YELLOW
 constant argb_color net/minecraft/util/Colors LIGHT_YELLOW