feat: expose creative mode tab id

As requested by Technici4n For addon mods who want to add few items to our main tab.
refinedmods · Oct 12, 2024 · eff65a8 · eff65a8
1 parent a2da917
commit eff65a8
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 14 deletions.
diff --git a/...common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java b/...common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java
@@ -54,6 +54,7 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
@@ -207,4 +208,6 @@ EnergyStorage asBlockItemEnergyStorage(
     Optional<Pattern> getPattern(ItemStack stack, Level level);
 
     void openAutocraftingPreview(List<ResourceAmount> requests, @Nullable Object parentScreen);
+
+    ResourceLocation getCreativeModeTabId();
 }
diff --git a/...n-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java b/...n-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java
@@ -54,6 +54,7 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
@@ -408,6 +409,11 @@ public void openAutocraftingPreview(final List<ResourceAmount> requests, @Nullab
         ensureLoaded().openAutocraftingPreview(requests, parentScreen);
     }
 
+    @Override
+    public ResourceLocation getCreativeModeTabId() {
+        return ensureLoaded().getCreativeModeTabId();
+    }
+
     private RefinedStorageApi ensureLoaded() {
         if (delegate == null) {
             throw new IllegalStateException("API not loaded yet");

diff --git a/...age-common/src/main/java/com/refinedmods/refinedstorage/common/RefinedStorageApiImpl.java b/...age-common/src/main/java/com/refinedmods/refinedstorage/common/RefinedStorageApiImpl.java
@@ -50,6 +50,7 @@
 import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceProvider;
 import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry;
 import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier;
+import com.refinedmods.refinedstorage.common.content.ContentIds;
 import com.refinedmods.refinedstorage.common.grid.NoopGridSynchronizer;
 import com.refinedmods.refinedstorage.common.grid.screen.hint.GridInsertionHintsImpl;
 import com.refinedmods.refinedstorage.common.grid.screen.hint.ItemGridInsertionHint;
@@ -104,6 +105,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
@@ -605,4 +607,9 @@ public void openAutocraftingPreview(final List<ResourceAmount> requests, @Nullab
         }
         ClientPlatformUtil.openCraftingPreview(requests, parentScreen);
     }
+
+    @Override
+    public ResourceLocation getCreativeModeTabId() {
+        return ContentIds.CREATIVE_MODE_TAB;
+    }
 }
diff --git a/.../main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java b/.../main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java
@@ -32,7 +32,6 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;

diff --git a/...n/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItem.java b/...n/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItem.java
@@ -82,10 +82,10 @@ private InteractionResult applyConfiguration(
 
     private void tryTransferUpgrades(final Player player,
                                      final ConfigurationCardTarget target,
-                                     final List<ItemStack> upgradeItems) {
-        for (final ItemStack upgradeItem : upgradeItems) {
-            final int upgradeIndexInPlayerInventory = player.getInventory().findSlotMatchingItem(upgradeItem);
-            if (upgradeIndexInPlayerInventory >= 0 && target.addUpgrade(upgradeItem)) {
+                                     final List<ItemStack> upgrades) {
+        for (final ItemStack upgrade : upgrades) {
+            final int upgradeIndexInPlayerInventory = player.getInventory().findSlotMatchingItem(upgrade);
+            if (upgradeIndexInPlayerInventory >= 0 && target.addUpgrade(upgrade)) {
                 player.getInventory().removeItem(upgradeIndexInPlayerInventory, 1);
             }
         }

diff --git a/...finedmods/refinedstorage/common/constructordestructor/AbstractConstructorBlockEntity.java b/...finedmods/refinedstorage/common/constructordestructor/AbstractConstructorBlockEntity.java
@@ -36,7 +36,6 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 

diff --git a/...torage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java b/...torage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java
@@ -9,6 +9,8 @@
 import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier;
 
 public final class ContentIds {
+    public static final ResourceLocation CREATIVE_MODE_TAB = createIdentifier("general");
+
     public static final ResourceLocation DISK_DRIVE = createIdentifier("disk_drive");
     public static final ResourceLocation MACHINE_CASING = createIdentifier("machine_casing");
     public static final ResourceLocation CABLE = createIdentifier("cable");

diff --git a/...main/java/com/refinedmods/refinedstorage/common/exporter/AbstractExporterBlockEntity.java b/...main/java/com/refinedmods/refinedstorage/common/exporter/AbstractExporterBlockEntity.java
@@ -41,7 +41,6 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import org.slf4j.Logger;

diff --git a/...main/java/com/refinedmods/refinedstorage/common/importer/AbstractImporterBlockEntity.java b/...main/java/com/refinedmods/refinedstorage/common/importer/AbstractImporterBlockEntity.java
@@ -40,7 +40,6 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import org.slf4j.Logger;

diff --git a/...java/com/refinedmods/refinedstorage/common/networking/WirelessTransmitterBlockEntity.java b/...java/com/refinedmods/refinedstorage/common/networking/WirelessTransmitterBlockEntity.java
@@ -27,7 +27,6 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 

diff --git a/...nedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java b/...nedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java
@@ -28,7 +28,6 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 

diff --git a/...torage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java b/...torage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java
@@ -400,7 +400,7 @@ public boolean allowComponentsUpdateAnimation(final Player player,
     private void registerCreativeModeTab() {
         Registry.register(
             BuiltInRegistries.CREATIVE_MODE_TAB,
-            createIdentifier("general"),
+            RefinedStorageApi.INSTANCE.getCreativeModeTabId(),
             CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0)
                 .title(ContentNames.MOD)
                 .icon(() -> new ItemStack(Blocks.INSTANCE.getCreativeController().getDefault()))

diff --git a/...torage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java b/...torage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java
@@ -528,7 +528,7 @@ public void onRegister(final RegisterEvent e) {
             helper -> registerLootFunctions(new DirectRegistryCallback<>(BuiltInRegistries.LOOT_FUNCTION_TYPE))
         );
         e.register(Registries.CREATIVE_MODE_TAB, helper -> helper.register(
-            createIdentifier("general"),
+            RefinedStorageApi.INSTANCE.getCreativeModeTabId(),
             CreativeModeTab.builder()
                 .title(ContentNames.MOD)
                 .icon(() -> new ItemStack(Blocks.INSTANCE.getCreativeController().getDefault()))

diff --git a/...e-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTest.java b/...e-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTest.java
@@ -129,7 +129,7 @@ public static void shouldExportItemWithRegulatorUpgrade(final GameTestHelper hel
             if (upgrade.getItem() instanceof RegulatorUpgradeItem upgradeItem) {
                 upgradeItem.setAmount(upgrade, asResource(DIRT.getDefaultInstance()), 10);
             }
-            exporter.addUpgradeItem(upgrade);
+            exporter.addUpgrade(upgrade);
 
             // Assert
             sequence

diff --git a/...e-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTest.java b/...e-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTest.java
@@ -140,7 +140,7 @@ public static void shouldImportItemWithRegulatorUpgrade(final GameTestHelper hel
             if (upgrade.getItem() instanceof RegulatorUpgradeItem upgradeItem) {
                 upgradeItem.setAmount(upgrade, asResource(DIRT.getDefaultInstance()), 10);
             }
-            importer.addUpgradeItem(upgrade);
+            importer.addUpgrade(upgrade);
 
             // Assert
             sequence