diff --git a/common/src/main/java/dev/architectury/registry/client/rendering/ColorHandlerRegistry.java b/common/src/main/java/dev/architectury/registry/client/rendering/ColorHandlerRegistry.java index 10cb8b24..8f42bcb5 100644 --- a/common/src/main/java/dev/architectury/registry/client/rendering/ColorHandlerRegistry.java +++ b/common/src/main/java/dev/architectury/registry/client/rendering/ColorHandlerRegistry.java @@ -55,13 +55,13 @@ public final class ColorHandlerRegistry { @SafeVarargs @ExpectPlatform - public static void registerItemColors(ItemColor color, Supplier... items) { + public static void registerItemColors(ItemColor color, Supplier... items) { throw new AssertionError(); } @SafeVarargs @ExpectPlatform - public static void registerBlockColors(BlockColor color, Supplier... blocks) { + public static void registerBlockColors(BlockColor color, Supplier... blocks) { throw new AssertionError(); } } diff --git a/fabric/src/main/java/dev/architectury/registry/client/rendering/fabric/ColorHandlerRegistryImpl.java b/fabric/src/main/java/dev/architectury/registry/client/rendering/fabric/ColorHandlerRegistryImpl.java index 12ed5f16..73697862 100644 --- a/fabric/src/main/java/dev/architectury/registry/client/rendering/fabric/ColorHandlerRegistryImpl.java +++ b/fabric/src/main/java/dev/architectury/registry/client/rendering/fabric/ColorHandlerRegistryImpl.java @@ -30,18 +30,18 @@ import java.util.function.Supplier; public class ColorHandlerRegistryImpl { @SafeVarargs - public static void registerItemColors(ItemColor itemColor, Supplier... items) { + public static void registerItemColors(ItemColor itemColor, Supplier... items) { Objects.requireNonNull(itemColor, "color is null!"); ColorProviderRegistry.ITEM.register(itemColor, unpackItems(items)); } @SafeVarargs - public static void registerBlockColors(BlockColor blockColor, Supplier... blocks) { + public static void registerBlockColors(BlockColor blockColor, Supplier... blocks) { Objects.requireNonNull(blockColor, "color is null!"); ColorProviderRegistry.BLOCK.register(blockColor, unpackBlocks(blocks)); } - private static ItemLike[] unpackItems(Supplier[] items) { + private static ItemLike[] unpackItems(Supplier[] items) { var array = new ItemLike[items.length]; for (var i = 0; i < items.length; i++) { array[i] = Objects.requireNonNull(items[i].get()); @@ -49,7 +49,7 @@ public class ColorHandlerRegistryImpl { return array; } - private static Block[] unpackBlocks(Supplier[] blocks) { + private static Block[] unpackBlocks(Supplier[] blocks) { var array = new Block[blocks.length]; for (var i = 0; i < blocks.length; i++) { array[i] = Objects.requireNonNull(blocks[i].get()); diff --git a/forge/src/main/java/me/shedaniel/architectury/registry/forge/ColorHandlersImpl.java b/forge/src/main/java/me/shedaniel/architectury/registry/forge/ColorHandlersImpl.java index 9985e828..d6520b1f 100644 --- a/forge/src/main/java/me/shedaniel/architectury/registry/forge/ColorHandlersImpl.java +++ b/forge/src/main/java/me/shedaniel/architectury/registry/forge/ColorHandlersImpl.java @@ -36,8 +36,8 @@ import java.util.Objects; import java.util.function.Supplier; public class ColorHandlersImpl { - private static final List[]>> ITEM_COLORS = Lists.newArrayList(); - private static final List[]>> BLOCK_COLORS = Lists.newArrayList(); + private static final List[]>> ITEM_COLORS = Lists.newArrayList(); + private static final List[]>> BLOCK_COLORS = Lists.newArrayList(); static { EventBuses.onRegistered(ArchitecturyForge.MOD_ID, bus -> { @@ -47,20 +47,20 @@ public class ColorHandlersImpl { @SubscribeEvent public static void onItemColorEvent(ColorHandlerEvent.Item event) { - for (Pair[]> pair : ITEM_COLORS) { + for (Pair[]> pair : ITEM_COLORS) { event.getItemColors().register(pair.getLeft(), unpackItems(pair.getRight())); } } @SubscribeEvent public static void onBlockColorEvent(ColorHandlerEvent.Block event) { - for (Pair[]> pair : BLOCK_COLORS) { + for (Pair[]> pair : BLOCK_COLORS) { event.getBlockColors().register(pair.getLeft(), unpackBlocks(pair.getRight())); } } @SafeVarargs - public static void registerItemColors(ItemColor itemColor, Supplier... items) { + public static void registerItemColors(ItemColor itemColor, Supplier... items) { Objects.requireNonNull(itemColor, "color is null!"); if (Minecraft.getInstance().getItemColors() == null) { ITEM_COLORS.add(Pair.of(itemColor, items)); @@ -70,7 +70,7 @@ public class ColorHandlersImpl { } @SafeVarargs - public static void registerBlockColors(BlockColor blockColor, Supplier... blocks) { + public static void registerBlockColors(BlockColor blockColor, Supplier... blocks) { Objects.requireNonNull(blockColor, "color is null!"); if (Minecraft.getInstance().getBlockColors() == null) { BLOCK_COLORS.add(Pair.of(blockColor, blocks)); @@ -79,7 +79,7 @@ public class ColorHandlersImpl { } } - private static ItemLike[] unpackItems(Supplier[] items) { + private static ItemLike[] unpackItems(Supplier[] items) { ItemLike[] array = new ItemLike[items.length]; for (int i = 0; i < items.length; i++) { array[i] = Objects.requireNonNull(items[i].get()); @@ -87,7 +87,7 @@ public class ColorHandlersImpl { return array; } - private static Block[] unpackBlocks(Supplier[] blocks) { + private static Block[] unpackBlocks(Supplier[] blocks) { Block[] array = new Block[blocks.length]; for (int i = 0; i < blocks.length; i++) { array[i] = Objects.requireNonNull(blocks[i].get());