From 8cab880e98b1ebec36e751894c842c1fa4b4e4e3 Mon Sep 17 00:00:00 2001 From: Eli Orona Date: Sat, 23 Oct 2021 15:04:05 -0700 Subject: [PATCH] Apply suggestions from @LambdAurora Co-authored-by: LambdAurora --- .../java/org/quiltmc/qsl/itemgroup/api/QuiltItemGroup.java | 4 ++-- .../org/quiltmc/qsl/itemgroup/impl/CreativeGuiExtensions.java | 1 + .../org/quiltmc/qsl/itemgroup/impl/ItemGroupExtensions.java | 1 + .../impl/QuiltCreativePlayerInventoryScreenWidgets.java | 1 + .../org/quiltmc/qsl/items/itemgroup/test/ItemGroupTest.java | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/api/QuiltItemGroup.java b/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/api/QuiltItemGroup.java index d596e93eaf..58775ee7ba 100644 --- a/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/api/QuiltItemGroup.java +++ b/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/api/QuiltItemGroup.java @@ -40,7 +40,7 @@ public final class QuiltItemGroup extends ItemGroup { private @Nullable ItemStack icon; private final @Nullable Consumer> stacksForDisplay; - private QuiltItemGroup(int index, String id, @NotNull Supplier iconSupplier, @Nullable Consumer> stacksForDisplay) { + private QuiltItemGroup(int index, String id, Supplier iconSupplier, @Nullable Consumer> stacksForDisplay) { super(index, id); this.iconSupplier = iconSupplier; this.stacksForDisplay = stacksForDisplay; @@ -66,7 +66,7 @@ public void setIcon(ItemStack icon) { @Override public ItemStack createIcon() { - ItemStack supplierIcon = iconSupplier.get(); + ItemStack supplierIcon = this.iconSupplier.get(); if (!supplierIcon.isEmpty()) { return supplierIcon; } else if (icon == null) { diff --git a/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/CreativeGuiExtensions.java b/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/CreativeGuiExtensions.java index 8bc1cdf4d8..286ba1a4e9 100644 --- a/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/CreativeGuiExtensions.java +++ b/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/CreativeGuiExtensions.java @@ -16,6 +16,7 @@ package org.quiltmc.qsl.itemgroup.impl; +@ApiStatus.Internal public interface CreativeGuiExtensions { void qsl$nextPage(); diff --git a/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/ItemGroupExtensions.java b/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/ItemGroupExtensions.java index f13e44a9db..403e23dd4e 100644 --- a/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/ItemGroupExtensions.java +++ b/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/ItemGroupExtensions.java @@ -16,6 +16,7 @@ package org.quiltmc.qsl.itemgroup.impl; +@ApiStatus.Internal public interface ItemGroupExtensions { void qsl$expandArray(); } diff --git a/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/QuiltCreativePlayerInventoryScreenWidgets.java b/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/QuiltCreativePlayerInventoryScreenWidgets.java index 99c60225df..45b461d845 100644 --- a/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/QuiltCreativePlayerInventoryScreenWidgets.java +++ b/library/items/item_group/src/main/java/org/quiltmc/qsl/itemgroup/impl/QuiltCreativePlayerInventoryScreenWidgets.java @@ -31,6 +31,7 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; +@ApiStatus.Internal public final class QuiltCreativePlayerInventoryScreenWidgets { private static final Identifier BUTTON_TEXTURE = new Identifier("qsl_items_item_group", "textures/gui/creative_buttons.png"); public static final Set ALWAYS_SHOWN_GROUPS = new HashSet<>(); diff --git a/library/items/item_group/src/testmod/java/org/quiltmc/qsl/items/itemgroup/test/ItemGroupTest.java b/library/items/item_group/src/testmod/java/org/quiltmc/qsl/items/itemgroup/test/ItemGroupTest.java index ab827f5bda..1d8cd152c5 100644 --- a/library/items/item_group/src/testmod/java/org/quiltmc/qsl/items/itemgroup/test/ItemGroupTest.java +++ b/library/items/item_group/src/testmod/java/org/quiltmc/qsl/items/itemgroup/test/ItemGroupTest.java @@ -27,7 +27,7 @@ import net.fabricmc.api.ModInitializer; public class ItemGroupTest implements ModInitializer { - public static final String MOD_ID = "qsl_items_item_group_testmod"; + public static final String NAMESPACE = "qsl_items_item_group_testmod"; // Adds an item group with all items in it private static final ItemGroup SUPPLIER_ITEM_GROUP = QuiltItemGroup.builder(new Identifier(MOD_ID, "test_supplied_group")) .icon(() -> new ItemStack(Items.STONE))