register upgrades conditionally

Signed-off-by: Kolja <contact@kolja.lu>

Author: ko-lja

src/main/java/lu/kolja/expandedae/datagen/ExpRecipeProvider.java

@@ -10,6 +10,7 @@
 import lu.kolja.expandedae.datagen.conditionals.ModNotLoadedCondition;
 import lu.kolja.expandedae.definition.ExpItems;
 import lu.kolja.expandedae.enums.ExpTiers;
+import lu.kolja.expandedae.xmod.extendedae.ExtendedAE;
 import lu.kolja.expandedae.xmod.megacells.MegaCells;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.*;
@@ -66,7 +67,7 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> out) {
                 .unlockedBy("has_capacity_card", has(CAPACITY_CARD))
                 .save(out, craftingId("exp_pattern_provider_upgrade"));
         conditional(
-                ShapedRecipeBuilder.shaped(MISC, MEGA_PATTERN_PROVIDER_UPGRADE)
+                ShapedRecipeBuilder.shaped(MISC, MegaCells.MEGA_PATTERN_PROVIDER_UPGRADE)
                         .pattern("EC")
                         .pattern("CE")
                         .define('C', CAPACITY_CARD)
@@ -78,7 +79,7 @@ out, loaded(MEGA.mod),
         );
 
         conditional(
-                ShapedRecipeBuilder.shaped(MISC, EXT_PATTERN_PROVIDER_UPGRADE)
+                ShapedRecipeBuilder.shaped(MISC, ExtendedAE.EXT_PATTERN_PROVIDER_UPGRADE)
                         .pattern("ECE")
                         .pattern("CEC")
                         .define('C', CAPACITY_CARD)

src/main/java/lu/kolja/expandedae/datagen/model/ExpItemModelProvider.java

@@ -5,6 +5,7 @@
 import lu.kolja.expandedae.Expandedae;
 import lu.kolja.expandedae.client.ExpCellModels;
 import lu.kolja.expandedae.definition.ExpItems;
+import lu.kolja.expandedae.xmod.extendedae.ExtendedAE;
 import lu.kolja.expandedae.xmod.megacells.MegaCells;
 import net.minecraft.data.PackOutput;
 import net.minecraft.resources.ResourceLocation;
@@ -30,8 +31,8 @@ protected void registerModels() {
 
         // General
         basicItem(EXP_PATTERN_PROVIDER_UPGRADE.asItem());
-        basicItem(MEGA_PATTERN_PROVIDER_UPGRADE.asItem());
-        basicItem(EXT_PATTERN_PROVIDER_UPGRADE.asItem());
+        basicItem(MegaCells.MEGA_PATTERN_PROVIDER_UPGRADE.asItem());
+        basicItem(ExtendedAE.EXT_PATTERN_PROVIDER_UPGRADE.asItem());
         // CARDS
         basicItem(AUTO_COMPLETE_CARD.asItem());
         basicItem(PATTERN_REFILLER_CARD.asItem());

src/main/java/lu/kolja/expandedae/definition/ExpItems.java

@@ -19,11 +19,10 @@
 import lu.kolja.expandedae.enums.Addons;
 import lu.kolja.expandedae.item.misc.ExpPatternProviderUpgradeItem;
 import lu.kolja.expandedae.item.linked.LinkedTerminalItem;
-import lu.kolja.expandedae.item.misc.ExtPatternProviderUpgradeItem;
-import lu.kolja.expandedae.item.misc.MegaPatternProviderUpgradeItem;
 import lu.kolja.expandedae.item.misc.PriorityCardItem;
 import lu.kolja.expandedae.item.part.ExpPatternProviderPartItem;
 import lu.kolja.expandedae.part.ExpPatternProviderPart;
+import lu.kolja.expandedae.xmod.extendedae.ExtendedAE;
 import lu.kolja.expandedae.xmod.megacells.MegaCells;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
@@ -58,16 +57,6 @@ public class ExpItems {
             "exp_pattern_provider_upgrade",
             ExpPatternProviderUpgradeItem::new
     );
-    public static final ItemDefinition<MegaPatternProviderUpgradeItem> MEGA_PATTERN_PROVIDER_UPGRADE = item(
-            "Mega Pattern Provider Upgrade",
-            "mega_pattern_provider_upgrade",
-            MegaPatternProviderUpgradeItem::new
-    );
-    public static final ItemDefinition<ExtPatternProviderUpgradeItem> EXT_PATTERN_PROVIDER_UPGRADE = item(
-            "Extended Pattern Provider Upgrade",
-            "ext_pattern_provider_upgrade",
-            ExtPatternProviderUpgradeItem::new
-    );
 
     public static final ItemDefinition<UpgradeCardItem> AUTO_COMPLETE_CARD = item(
             "Auto Complete Card",
@@ -229,6 +218,7 @@ static <T extends Item> ItemDefinition<T> item(
 
     static {
         if (Addons.MEGA.isLoaded) MegaCells.initItems();
+        if (Addons.EXT.isLoaded) ExtendedAE.initItems();
     }
 
     public static void init() {

src/main/java/lu/kolja/expandedae/xmod/extendedae/ExtendedAE.java

@@ -1,12 +1,20 @@
 package lu.kolja.expandedae.xmod.extendedae;
 
 import appeng.api.upgrades.Upgrades;
+import appeng.core.definitions.ItemDefinition;
 import com.glodblock.github.extendedae.common.EPPItemAndBlock;
 import com.glodblock.github.extendedae.common.items.ItemMEPackingTape;
 import lu.kolja.expandedae.definition.ExpBlocks;
 import lu.kolja.expandedae.definition.ExpItems;
+import lu.kolja.expandedae.item.misc.ExtPatternProviderUpgradeItem;
 
 public class ExtendedAE {
+    public static ItemDefinition<ExtPatternProviderUpgradeItem> EXT_PATTERN_PROVIDER_UPGRADE;
+
+    public static void initItems() {
+        EXT_PATTERN_PROVIDER_UPGRADE = ExpItems.item("Extended Pattern Provider Upgrade", "ext_pattern_provider_upgrade", ExtPatternProviderUpgradeItem::new);
+    }
+
     public ExtendedAE() {
         ItemMEPackingTape.registerPackableDevice(ExpBlocks.EXP_PATTERN_PROVIDER.id());
         ItemMEPackingTape.registerPackableDevice(ExpItems.EXP_PATTERN_PROVIDER_PART.id());

src/main/java/lu/kolja/expandedae/xmod/megacells/MegaCells.java

@@ -7,8 +7,11 @@
 import gripe._90.megacells.definition.MEGAItems;
 import lu.kolja.expandedae.cell.dual.DualStorageCell;
 import lu.kolja.expandedae.definition.ExpItems;
+import lu.kolja.expandedae.item.misc.MegaPatternProviderUpgradeItem;
 
 public class MegaCells {
+    public static ItemDefinition<MegaPatternProviderUpgradeItem> MEGA_PATTERN_PROVIDER_UPGRADE;
+
     public MegaCells() {
         Upgrades.add(ExpItems.AUTO_COMPLETE_CARD, MEGABlocks.MEGA_PATTERN_PROVIDER.asItem(), 1, "group.mega_pattern_provider.name");
         Upgrades.add(ExpItems.AUTO_COMPLETE_CARD, MEGAItems.MEGA_PATTERN_PROVIDER.asItem(), 1, "group.mega_pattern_provider.name");
@@ -21,6 +24,7 @@ public MegaCells() {
     public static ItemDefinition<MaterialItem> DUAL_CELL_MEGA_HOUSING;
 
     public static void initItems() {
+        MEGA_PATTERN_PROVIDER_UPGRADE = ExpItems.item("Mega Pattern Provider Upgrade", "mega_pattern_provider_upgrade", MegaPatternProviderUpgradeItem::new);
         DUAL_CELL_MEGA_HOUSING = ExpItems.item("ME MEGA Dual Cell Housing", "mega_dual_cell_housing", MaterialItem::new);
 
         DUAL_1M = ExpItems.dualCell("1m",