diff --git a/common/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/ItemGroupRegistrationEvent.java b/common/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/ItemGroupRegistrationEvent.java index 8667120..3584045 100644 --- a/common/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/ItemGroupRegistrationEvent.java +++ b/common/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/ItemGroupRegistrationEvent.java @@ -11,4 +11,5 @@ public interface ItemGroupRegistrationEvent { ResourceKey getTab(); boolean hasPermissions(); void addAfter(ItemLike reference, List stacks); + void addAfter(ItemStack reference, List stacks); } diff --git a/common/src/main/java/io/github/slimeistdev/crystalline_sky/registry/CrystallineItems.java b/common/src/main/java/io/github/slimeistdev/crystalline_sky/registry/CrystallineItems.java index cec4e58..08bef15 100644 --- a/common/src/main/java/io/github/slimeistdev/crystalline_sky/registry/CrystallineItems.java +++ b/common/src/main/java/io/github/slimeistdev/crystalline_sky/registry/CrystallineItems.java @@ -70,7 +70,8 @@ public class CrystallineItems { stacks.add(new ItemStack(WEEPING_SKY_LIGHT)); - event.addAfter(Items.LIGHT, stacks); + ItemStack light0 = LightBlock.setLightOnStack(new ItemStack(Items.LIGHT), 0); + event.addAfter(light0, stacks); } } diff --git a/fabric/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/fabric/ItemGroupRegistrationEventImpl.java b/fabric/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/fabric/ItemGroupRegistrationEventImpl.java index 2d76f0b..2034599 100644 --- a/fabric/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/fabric/ItemGroupRegistrationEventImpl.java +++ b/fabric/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/fabric/ItemGroupRegistrationEventImpl.java @@ -36,6 +36,11 @@ public class ItemGroupRegistrationEventImpl implements ItemGroupRegistrationEven entries.addAfter(reference, stacks); } + @Override + public void addAfter(ItemStack reference, List stacks) { + entries.addAfter(reference, stacks); + } + public static void register() { ItemGroupEvents.MODIFY_ENTRIES_ALL.register((tab, entries) -> { CrystallineItems.onItemGroupRegistration(new ItemGroupRegistrationEventImpl( diff --git a/neoforge/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/neoforge/ItemGroupRegistrationEventImpl.java b/neoforge/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/neoforge/ItemGroupRegistrationEventImpl.java index 040af77..4b95477 100644 --- a/neoforge/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/neoforge/ItemGroupRegistrationEventImpl.java +++ b/neoforge/src/main/java/io/github/slimeistdev/crystalline_sky/multiloader/neoforge/ItemGroupRegistrationEventImpl.java @@ -32,9 +32,13 @@ public class ItemGroupRegistrationEventImpl implements ItemGroupRegistrationEven public void addAfter(ItemLike reference, List stacks) { // WARN: this is sort of hacky, but it should do for our current use cases ItemStack referenceStack = new ItemStack(reference.asItem()); + addAfter(referenceStack, stacks); + } - for (ItemStack stack : stacks) { - event.insertAfter(referenceStack, stack, PARENT_AND_SEARCH_TABS); + @Override + public void addAfter(ItemStack reference, List stacks) { + for (int i = stacks.size() - 1; i >= 0; i--) { + event.insertAfter(reference, stacks.get(i), PARENT_AND_SEARCH_TABS); } } }