Feature/creative tab

src/main/java/li/cil/oc/api/Items.java

@@ -104,6 +104,22 @@ public static ItemStack registerEEPROM(String name, byte[] code, byte[] data, bo
         return ItemStack.EMPTY;
     }
 
+    /**
+     * The stack will be listed in the creative tab of OpenComputers.
+     *
+     * Call this in the init phase or later, <em>not</em> in pre-init.
+     *
+     * @param stack     the stack to add in the creative tab.
+     * @param name      the label of the EEPROM.
+     * @param section_id the section to put the stack in.
+     *
+     */
+    public static ItemStack registerStack(ItemStack stack, String name, String section_id) {
+        if (API.items != null)
+            return API.items.registerStack(stack, name, section_id);
+        return ItemStack.EMPTY;
+    }
+
     // ----------------------------------------------------------------------- //
 
     private Items() {

src/main/java/li/cil/oc/api/detail/ItemAPI.java

@@ -83,4 +83,16 @@ ItemStack registerFloppy(String name, ResourceLocation loc, DyeColor color,
      * adding a recipe for your custom BIOS, for example.
      */
     ItemStack registerEEPROM(String name, byte[] code, byte[] data, boolean readonly);
+
+    /**
+     * The stack will be listed in the creative tab of OpenComputers.
+     *
+     * Call this in the init phase or later, <em>not</em> in pre-init.
+     *
+     * @param stack     the stack to add in the creative tab.
+     * @param name      the label of the EEPROM.
+     * @param sectionId the section to put the stack in.
+     *
+     */
+    ItemStack registerStack(ItemStack stack, String name, String sectionId);
 }

src/main/java/li/cil/oc/common/openprinter/OpenPrinter.java

@@ -46,6 +46,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.function.Consumer;
+
 /**
  * OpenPrinter, integrated directly into OpenComputers.
  *
@@ -162,20 +164,19 @@ private static void registerOpenComputersIntegration() {
         } catch (RuntimeException exception) {
             LOGGER.warn("Could not register the OpenPrinter tools disk", exception);
         }
-    }
 
-    public static void addCreativeItems(BuildCreativeModeTabContentsEvent event) {
-        event.accept(PRINTER.get());
-        event.accept(SHREDDER.get());
-        event.accept(FILE_CABINET.get());
-        event.accept(BRIEFCASE.get());
-        event.accept(PRINTED_PAGE.get());
-        event.accept(BLACK_INK.get());
-        event.accept(COLOR_INK.get());
-        event.accept(PAPER_SHREDS.get());
-        event.accept(FOLDER.get());
-        // The tools disk is registered through OpenComputers' public floppy API,
-        // which already adds it to the OpenComputers creative tab.
+
+        li.cil.oc.api.Items.registerStack(PRINTER.toStack(), PRINTER.getRegisteredName(), "25_components");
+
+        li.cil.oc.api.Items.registerStack(SHREDDER.toStack(), SHREDDER.getRegisteredName(), "49_tools");
+        li.cil.oc.api.Items.registerStack(FILE_CABINET.toStack(), FILE_CABINET.getRegisteredName(), "49_tools");
+        li.cil.oc.api.Items.registerStack(BRIEFCASE.toStack(), BRIEFCASE.getRegisteredName(), "49_tools");
+        li.cil.oc.api.Items.registerStack(PRINTED_PAGE.toStack(), PRINTED_PAGE.getRegisteredName(), "49_tools");
+        li.cil.oc.api.Items.registerStack(FOLDER.toStack(), PRINTED_PAGE.getRegisteredName(), "49_tools");
+
+        li.cil.oc.api.Items.registerStack(BLACK_INK.toStack(), BLACK_INK.getRegisteredName(), "50_materials");
+        li.cil.oc.api.Items.registerStack(COLOR_INK.toStack(), COLOR_INK.getRegisteredName(), "50_materials");
+        li.cil.oc.api.Items.registerStack(PAPER_SHREDS.toStack(), PAPER_SHREDS.getRegisteredName(), "50_materials");
     }
 
     /**

src/main/java/li/cil/oc/mixin/accessor/AbstractContainerScreenAccess.java

@@ -0,0 +1,14 @@
+package li.cil.oc.mixin.accessor;
+
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(AbstractContainerScreen.class)
+public interface AbstractContainerScreenAccess {
+    @Accessor()
+    int getLeftPos();
+
+    @Accessor
+    int getTopPos();
+}

src/main/java/li/cil/oc/mixin/accessor/CreativeModeInventoryScreenAccess.java

@@ -0,0 +1,13 @@
+package li.cil.oc.mixin.accessor;
+
+import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
+import net.minecraft.util.Mth;
+import net.minecraft.world.item.CreativeModeTab;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(CreativeModeInventoryScreen.class)
+public interface CreativeModeInventoryScreenAccess {
+    @Shadow
+    static CreativeModeTab selectedTab = null;
+}

src/main/resources/assets/opencomputers/lang/en_us.json

@@ -189,6 +189,12 @@
   "item.oc.worldsensorcard": "World Sensor Card",
   "item.oc.wrench": "Scrench",
   "itemGroup.OpenComputers": "OpenComputers",
+  "itemGroup.OpenComputers.section.10_networking": "Networking§f",
+  "itemGroup.OpenComputers.section.25_components": "Components§f",
+  "itemGroup.OpenComputers.section.49_tools": "Tools§f",
+  "itemGroup.OpenComputers.section.50_materials": "Materials§f",
+  "itemGroup.OpenComputers.section.80_upgrade": "Upgrades§f",
+  "itemGroup.OpenComputers.section.99_misc": "Miscellaneous§f",
   "entity.oc.Drone": "Drone",
   "entity.oc.TrainRobot": "Train Robot",
   "oc:gui.Analyzer.Address": "§6Address§f: %s",

src/main/resources/opencomputers.core.mixins.json

@@ -0,0 +1,18 @@
+{
+  "required": false,
+  "minVersion": "0.8",
+  "package": "li.cil.oc.mixin",
+  "compatibilityLevel": "JAVA_21",
+  "client": [
+    "CreativeModeInventoryScreenMixin",
+    "ItemPickerMenuMixin",
+    "accessor.CreativeModeInventoryScreenAccess",
+    "accessor.AbstractContainerScreenAccess"
+  ],
+  "mixins": [
+    "CreativeModeTabMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

src/main/scala/li/cil/oc/Constants.scala

@@ -3,7 +3,6 @@ package li.cil.oc
 import li.cil.oc.util.ItemUtils
 
 object Constants {
-
   object BlockName {
     final val Adapter = "adapter"
     final val Assembler = "assembler"

src/main/scala/li/cil/oc/CreativeTab.scala

@@ -4,16 +4,14 @@ import li.cil.oc.common.init.OCItems
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.chat.Component
 import net.minecraft.world.item.{CreativeModeTab, CreativeModeTabs}
-import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent
 import net.neoforged.bus.api.SubscribeEvent
-import net.neoforged.neoforge.registries.{DeferredRegister, DeferredHolder}
-import li.cil.oc.integration.opencomputers.ModOpenComputers
-import li.cil.oc.common.openprinter.OpenPrinter
+import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent
+import net.neoforged.neoforge.registries.{DeferredHolder, DeferredRegister}
 
 object CreativeTab {
   val CREATIVE_TABS: DeferredRegister[CreativeModeTab] =
     DeferredRegister.create(Registries.CREATIVE_MODE_TAB, OpenComputers.ID)
-
+  var CURRENT_ROW = 0
   val MAIN: DeferredHolder[CreativeModeTab, CreativeModeTab] = CREATIVE_TABS.register("main", () =>
     CreativeModeTab.builder()
       .title(Component.translatable(s"itemGroup.${OpenComputers.Name}"))
@@ -23,11 +21,8 @@ object CreativeTab {
 
   @SubscribeEvent
   def onBuildContents(event: BuildCreativeModeTabContentsEvent): Unit = {
-    if (event.getTabKey == MAIN.getKey) {
-      OCItems.decorateCreativeTab(event, ModOpenComputers.hasRedstoneCardT2)
-      OpenPrinter.addCreativeItems(event)
-    } else if (event.getTabKey == CreativeModeTabs.TOOLS_AND_UTILITIES) {
+    if (event.getTabKey == CreativeModeTabs.TOOLS_AND_UTILITIES) {
       event.accept(OCItems.createChargedHoverBoots())
     }
   }
-}
+}

src/main/scala/li/cil/oc/common/Loot.scala

@@ -269,7 +269,7 @@ object Loot {
         val root = "opencomputers/eeproms/" + id.getPath
         val code = readEEPROMResource(json, "code", id, root, manager)
         val data = readEEPROMResource(json, "data", id, root, manager)
-        val stack = OCItems.createEEPROM(label, code.orNull, data.orNull, readonly)
+        val stack = OCItems.registerEEPROM(label, code.orNull, data.orNull, readonly)
         datapackEEPROMs += stack
         eepromsForServer += stack
         eepromsForClient += stack.copy()
@@ -332,12 +332,8 @@ object Loot {
     } else new Callable[FileSystem] {
       override def call(): FileSystem = api.FileSystem.fromResource(ResourceLocation.fromNamespaceAndPath(Settings.resourceDomain, "loot/" + path))
     }
-    val stack = registerLootDisk(path, ResourceLocation.fromNamespaceAndPath(Settings.resourceDomain, path), color.getOrElse(DyeColor.LIGHT_GRAY), callable, doRecipeCycling = true)
-    stack.set(DataComponents.CUSTOM_NAME, Component.literal(name))
-    if (!external) {
-      OCItems.registerStack(stack, path)
-      lootDiskDescriptorIds += path
-    }
+    val stack = OCItems.registerFloppy(path, ResourceLocation.fromNamespaceAndPath(Settings.resourceDomain, path), color.getOrElse(DyeColor.LIGHT_GRAY), callable, doRecipeCycling = true)
+    lootDiskDescriptorIds += path
     stack
   }
 }