add energy and quantum bridge cards

src/main/java/com/glodblock/github/FluidCraft.java

@@ -76,6 +76,9 @@ public static void postInit(FMLPostInitializationEvent event) {
         if (!Config.removeRecipe) {
             RecipeLoader.INSTANCE.run();
         }
+        if (!ModAndClassUtil.NEW_HORIZONS_CORE_MOD) {
+            RecipeLoader.addTerminalCards();
+        }
         RecipeLoader.runTerminalRecipe();
 
         if (ModAndClassUtil.isV2) {

src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java

@@ -1,6 +1,8 @@
 package com.glodblock.github.common.item;
 
+import static com.glodblock.github.loader.recipe.WirelessTerminalEnergyRecipe.getEnergyCard;
 import static com.glodblock.github.loader.recipe.WirelessTerminalRecipe.getInfinityBoosterCard;
+import static com.glodblock.github.util.Util.DimensionalCoordSide.hasEnergyCard;
 import static com.glodblock.github.util.Util.hasInfinityBoosterCard;
 
 import java.util.List;
@@ -33,6 +35,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II
 
     protected GuiType type;
     public static String infinityBoosterCard = "infinityBoosterCard";
+    public static String infinityEnergyCard = "InfinityEnergyCard";
 
     public ItemBaseWirelessTerminal(GuiType t) {
         super();
@@ -41,7 +44,8 @@ public ItemBaseWirelessTerminal(GuiType t) {
 
     @Override
     public ItemStack onItemRightClick(final ItemStack item, final World w, final EntityPlayer player) {
-        if (player.isSneaking()) return removeInfinityBoosterCard(player, item);
+        if (player.isSneaking()) return removeInfinityBoosterCard(player, item); // todo: doesn't work in universal
+                                                                                 // terminal
         if (ForgeEventFactory.onItemUseStart(player, item, 1) > 0) {
             if (Platform.isClient()) {
                 return item;
@@ -98,6 +102,9 @@ public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<Str
             if (hasInfinityBoosterCard(stack)) {
                 lines.add("  " + EnumChatFormatting.GOLD + getInfinityBoosterCard().getDisplayName());
             }
+            if (hasEnergyCard(stack)) {
+                lines.add("  " + EnumChatFormatting.GOLD + getEnergyCard().getDisplayName());
+            }
         } else {
             lines.add(NameConst.i18n(NameConst.TT_CTRL_FOR_MORE));
         }

src/main/java/com/glodblock/github/common/item/ItemEnergyCard.java

@@ -0,0 +1,45 @@
+package com.glodblock.github.common.item;
+
+import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
+import com.glodblock.github.util.NameConst;
+import com.glodblock.github.util.RenderUtil;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class ItemEnergyCard extends FCBaseItem {
+
+    public ItemEnergyCard() {
+        super();
+        this.setMaxStackSize(64);
+        this.setUnlocalizedName(NameConst.ITEM_ENERGY_CARD);
+        this.setTextureName(FluidCraft.resource(NameConst.ITEM_ENERGY_CARD).toString());
+    }
+
+    @Override
+    public ItemEnergyCard register() {
+        GameRegistry.registerItem(this, NameConst.ITEM_ENERGY_CARD, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack stack, EntityPlayer player, List toolTip, boolean flag) {
+        if (isShiftKeyDown()) {
+            toolTip.addAll(RenderUtil.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_ENERGY_CARD_DESC)));
+        } else {
+            toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
+        }
+    }
+}

src/main/java/com/glodblock/github/common/item/ItemQuantumBridgeCard.java

@@ -0,0 +1,46 @@
+package com.glodblock.github.common.item;
+
+import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
+import com.glodblock.github.util.NameConst;
+import com.glodblock.github.util.RenderUtil;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class ItemQuantumBridgeCard extends FCBaseItem {
+
+    public ItemQuantumBridgeCard() {
+        super();
+        this.setMaxStackSize(64);
+        this.setUnlocalizedName(NameConst.ITEM_QUANTUM_BRIDGE_CARD);
+        this.setTextureName(FluidCraft.resource(NameConst.ITEM_QUANTUM_BRIDGE_CARD).toString());
+    }
+
+    @Override
+    public ItemQuantumBridgeCard register() {
+        GameRegistry.registerItem(this, NameConst.ITEM_QUANTUM_BRIDGE_CARD, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack stack, EntityPlayer player, List toolTip, boolean flag) {
+        if (isShiftKeyDown()) {
+            toolTip.addAll(
+                    RenderUtil.listFormattedStringToWidth(NameConst.i18n(NameConst.TT_QUANTUM_BRIDGE_CARD_DESC)));
+        } else {
+            toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
+        }
+    }
+}

src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java

@@ -18,6 +18,7 @@
 import com.glodblock.github.common.item.ItemBasicFluidStorageCell;
 import com.glodblock.github.common.item.ItemBasicFluidStoragePart;
 import com.glodblock.github.common.item.ItemCreativeFluidStorageCell;
+import com.glodblock.github.common.item.ItemEnergyCard;
 import com.glodblock.github.common.item.ItemFluidConversionMonitor;
 import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.common.item.ItemFluidEncodedPattern;
@@ -37,6 +38,7 @@
 import com.glodblock.github.common.item.ItemPartFluidTerminal;
 import com.glodblock.github.common.item.ItemPartLevelTerminal;
 import com.glodblock.github.common.item.ItemPortableFluidCell;
+import com.glodblock.github.common.item.ItemQuantumBridgeCard;
 import com.glodblock.github.common.item.ItemWirelessFluidTerminal;
 import com.glodblock.github.common.item.ItemWirelessInterfaceTerminal;
 import com.glodblock.github.common.item.ItemWirelessLevelTerminal;
@@ -135,6 +137,9 @@ public static void init() {}
     public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register();
     public static ItemFluidStorageHousing CELL_HOUSING = new ItemFluidStorageHousing().register();
 
+    public static ItemEnergyCard ENERGY_CARD = new ItemEnergyCard().register();
+    public static ItemQuantumBridgeCard QUANTUM_BRIDGE_CARD = new ItemQuantumBridgeCard().register();
+
     public static void loadSetting() {
         if (!Config.fluidCells) return;
         CellType.Cell1kPart.setItemInstance(CELL_PART);

src/main/java/com/glodblock/github/loader/RecipeLoader.java

@@ -23,6 +23,7 @@
 import static com.glodblock.github.loader.ItemAndBlockHolder.DECODER;
 import static com.glodblock.github.loader.ItemAndBlockHolder.DISCRETIZER;
 import static com.glodblock.github.loader.ItemAndBlockHolder.ENCODER;
+import static com.glodblock.github.loader.ItemAndBlockHolder.ENERGY_CARD;
 import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_AUTO_FILLER;
 import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_BUFFER;
 import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_CONVERSION_MONITOR;
@@ -43,6 +44,7 @@
 import static com.glodblock.github.loader.ItemAndBlockHolder.OC_EDITOR;
 import static com.glodblock.github.loader.ItemAndBlockHolder.PATTERN;
 import static com.glodblock.github.loader.ItemAndBlockHolder.PORTABLE_FLUID_CELL;
+import static com.glodblock.github.loader.ItemAndBlockHolder.QUANTUM_BRIDGE_CARD;
 import static com.glodblock.github.loader.ItemAndBlockHolder.QUANTUM_CELL;
 import static com.glodblock.github.loader.ItemAndBlockHolder.SINGULARITY_CELL;
 import static com.glodblock.github.loader.ItemAndBlockHolder.WALRUS;
@@ -67,6 +69,8 @@
 import com.glodblock.github.common.Config;
 import com.glodblock.github.common.item.FCBaseItemCell;
 import com.glodblock.github.common.storage.CellType;
+import com.glodblock.github.loader.recipe.WirelessTerminalEnergyRecipe;
+import com.glodblock.github.loader.recipe.WirelessTerminalQuantumBridgeRecipe;
 import com.glodblock.github.loader.recipe.WirelessTerminalRecipe;
 import com.glodblock.github.util.ModAndClassUtil;
 
@@ -169,6 +173,21 @@ public class RecipeLoader implements Runnable {
             .findItemStack("ae2wct", "wirelessCraftingTerminal", 1);
     public static final ItemStack BUCKET = new ItemStack(Items.bucket, 1);
     public static final ItemStack IRON_BAR = new ItemStack(Blocks.iron_bars, 1);
+    public static final ItemStack AE2_ADVANCED_CARD = new ItemStack(
+            GameRegistry.findItem("appliedenergistics2", "item.ItemMultiMaterial"),
+            1,
+            28);
+    public static final ItemStack AE2_WIRELESS_RECEIVER = new ItemStack(
+            GameRegistry.findItem("appliedenergistics2", "item.ItemMultiMaterial"),
+            1,
+            41);
+    public static final ItemStack AE2_BLOCK_CHARGER = GameRegistry
+            .findItemStack("appliedenergistics2", "tile.BlockCharger", 1);
+    public static final ItemStack AE2_SINGULARITY = new ItemStack(
+            GameRegistry.findItem("appliedenergistics2", "item.ItemMultiMaterial"),
+            1,
+            47);
+    public static final ItemStack NETHER_STAR = new ItemStack(Items.nether_star, 1);
 
     @Override
     public void run() {
@@ -639,13 +658,49 @@ public void run() {
         }
     }
 
+    public static void addTerminalCards() {
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        ENERGY_CARD.stack(),
+                        "DSD",
+                        "HAH",
+                        "DSD",
+                        'H',
+                        AE2_BLOCK_CHARGER,
+                        'D',
+                        AE2_DENSE_ENERGY_CELL,
+                        'A',
+                        AE2_ADVANCED_CARD,
+                        'S',
+                        AE2_SINGULARITY));
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        QUANTUM_BRIDGE_CARD.stack(),
+                        "QSQ",
+                        "WAW",
+                        "QSQ",
+                        'Q',
+                        AE2_QUANTUM_RING,
+                        'A',
+                        AE2_ADVANCED_CARD,
+                        'S',
+                        NETHER_STAR,
+                        'W',
+                        AE2_WIRELESS_RECEIVER));
+    }
+
     public static void runTerminalRecipe() {
-        if (ModAndClassUtil.WCT) {
-            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_PATTERN_TERM.stack()));
-            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_FLUID_TERM.stack()));
-            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_ULTRA_TERM.stack()));
-            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_INTERFACE_TERM.stack()));
-            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_LEVEL_TERM.stack()));
+        ItemStack[] fc2Terms = { WIRELESS_FLUID_TERM.stack(), WIRELESS_PATTERN_TERM.stack(),
+                WIRELESS_INTERFACE_TERM.stack(), WIRELESS_LEVEL_TERM.stack() };
+
+        for (ItemStack fc2term : fc2Terms) {
+            if (fc2term != null) {
+                if (ModAndClassUtil.WCT) { // deprecated, adding Infinity Booster Card from WCT mod
+                    GameRegistry.addRecipe(new WirelessTerminalRecipe(fc2term));
+                }
+                GameRegistry.addRecipe(new WirelessTerminalQuantumBridgeRecipe(fc2term));
+                GameRegistry.addRecipe(new WirelessTerminalEnergyRecipe(fc2term));
+            }
         }
 
         ItemStack[] term = { AE2_WIRELESS_TERMINAL, WIRELESS_FLUID_TERM.stack(), WIRELESS_PATTERN_TERM.stack(),

src/main/java/com/glodblock/github/loader/recipe/WirelessTerminalEnergyRecipe.java

@@ -0,0 +1,69 @@
+package com.glodblock.github.loader.recipe;
+
+import static com.glodblock.github.loader.ItemAndBlockHolder.ENERGY_CARD;
+import static com.glodblock.github.util.Util.DimensionalCoordSide.hasEnergyCard;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.ShapelessRecipes;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+import com.glodblock.github.common.item.ItemBaseWirelessTerminal;
+
+import appeng.util.Platform;
+
+public class WirelessTerminalEnergyRecipe extends ShapelessRecipes {
+
+    private final ItemStack installedTerm;
+    public static ItemStack energyCard = ENERGY_CARD.stack();
+
+    public WirelessTerminalEnergyRecipe(ItemStack term) {
+        super(term, Arrays.asList(term, getEnergyCard()));
+        this.installedTerm = installEnergyCard(term);
+    }
+
+    private boolean isEnergyCard(ItemStack is) {
+        if (is == null || is.getItem() == null) return false;
+        return (Objects.equals(energyCard.getItem(), is.getItem()));
+    }
+
+    public static ItemStack getEnergyCard() {
+        return energyCard;
+    }
+
+    @Override
+    public boolean matches(InventoryCrafting inv, World w) {
+        ItemStack term = inv.getStackInSlot(0);
+        ItemStack card = inv.getStackInSlot(1);
+        return term != null && term.getItem() instanceof ItemBaseWirelessTerminal
+                && !hasEnergyCard(term)
+                && isEnergyCard(card);
+    }
+
+    @Override
+    public ItemStack getCraftingResult(InventoryCrafting inv) {
+        return installEnergyCard(inv.getStackInSlot(0));
+    }
+
+    @Override
+    public int getRecipeSize() {
+        return 2;
+    }
+
+    private ItemStack installEnergyCard(ItemStack is) {
+        is = is.copy();
+        NBTTagCompound data = Platform.openNbtData(is);
+        data.setBoolean(ItemBaseWirelessTerminal.infinityEnergyCard, true);
+        is.setTagCompound(data);
+        return is;
+    }
+
+    @Override
+    public ItemStack getRecipeOutput() {
+        return installedTerm;
+    }
+}