From 7444e6b5ca46a58f6e92c4482f23e6e9af577365 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 20 May 2026 18:39:50 -0400 Subject: [PATCH] Resolve `Pool` name collision --- .../minecraft/client/util/{ => memory}/ObjectAllocator.mapping | 2 +- .../client/util/{Pool.mapping => memory/ObjectPool.mapping} | 2 +- .../collection/{WeightedList.mapping => ShufflingList.mapping} | 2 +- .../util/collection/{Pool.mapping => WeightedPool.mapping} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename mappings/net/minecraft/client/util/{ => memory}/ObjectAllocator.mapping (75%) rename mappings/net/minecraft/client/util/{Pool.mapping => memory/ObjectPool.mapping} (89%) rename mappings/net/minecraft/util/collection/{WeightedList.mapping => ShufflingList.mapping} (95%) rename mappings/net/minecraft/util/collection/{Pool.mapping => WeightedPool.mapping} (97%) diff --git a/mappings/net/minecraft/client/util/ObjectAllocator.mapping b/mappings/net/minecraft/client/util/memory/ObjectAllocator.mapping similarity index 75% rename from mappings/net/minecraft/client/util/ObjectAllocator.mapping rename to mappings/net/minecraft/client/util/memory/ObjectAllocator.mapping index 12e2cb0bc2..2d19390bf1 100644 --- a/mappings/net/minecraft/client/util/ObjectAllocator.mapping +++ b/mappings/net/minecraft/client/util/memory/ObjectAllocator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9922 net/minecraft/client/util/ObjectAllocator +CLASS net/minecraft/class_9922 net/minecraft/client/util/memory/ObjectAllocator FIELD field_52741 TRIVIAL Lnet/minecraft/class_9922; METHOD method_61948 acquire (Lnet/minecraft/class_9924;)Ljava/lang/Object; ARG 1 factory diff --git a/mappings/net/minecraft/client/util/Pool.mapping b/mappings/net/minecraft/client/util/memory/ObjectPool.mapping similarity index 89% rename from mappings/net/minecraft/client/util/Pool.mapping rename to mappings/net/minecraft/client/util/memory/ObjectPool.mapping index dab4de230a..0de10e8618 100644 --- a/mappings/net/minecraft/client/util/Pool.mapping +++ b/mappings/net/minecraft/client/util/memory/ObjectPool.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9920 net/minecraft/client/util/Pool +CLASS net/minecraft/class_9920 net/minecraft/client/util/memory/ObjectPool FIELD field_52736 lifespan I FIELD field_52737 entries Ljava/util/Deque; METHOD (I)V diff --git a/mappings/net/minecraft/util/collection/WeightedList.mapping b/mappings/net/minecraft/util/collection/ShufflingList.mapping similarity index 95% rename from mappings/net/minecraft/util/collection/WeightedList.mapping rename to mappings/net/minecraft/util/collection/ShufflingList.mapping index 22e7150991..338e6ae7f8 100644 --- a/mappings/net/minecraft/util/collection/WeightedList.mapping +++ b/mappings/net/minecraft/util/collection/ShufflingList.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6032 net/minecraft/util/collection/WeightedList +CLASS net/minecraft/class_6032 net/minecraft/util/collection/ShufflingList FIELD field_30169 entries Ljava/util/List; FIELD field_30170 random Lnet/minecraft/class_5819; METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/util/collection/Pool.mapping b/mappings/net/minecraft/util/collection/WeightedPool.mapping similarity index 97% rename from mappings/net/minecraft/util/collection/Pool.mapping rename to mappings/net/minecraft/util/collection/WeightedPool.mapping index a9010f6b68..9e28fbc189 100644 --- a/mappings/net/minecraft/util/collection/Pool.mapping +++ b/mappings/net/minecraft/util/collection/WeightedPool.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6012 net/minecraft/util/collection/Pool +CLASS net/minecraft/class_6012 net/minecraft/util/collection/WeightedPool FIELD field_29934 totalWeight I FIELD field_29935 entries Ljava/util/List; FIELD field_55646 FLATTENED_CONTENT_THRESHOLD I