diff --git a/src/main/java/com/glodblock/github/common/item/ItemDefectiveSingularityFluidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemDefectiveSingularityFluidStorageCell.java index 6aff97fa..67665d4c 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemDefectiveSingularityFluidStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemDefectiveSingularityFluidStorageCell.java @@ -54,6 +54,7 @@ public class ItemDefectiveSingularityFluidStorageCell extends AEBaseItem final IMEInventoryHandler inventory = AEApi.instance().registries().cell() .getCellInventory(stack, null, StorageChannel.FLUIDS); if (inventory instanceof final IFluidCellInventoryHandler handler) { + lines.add(NameConst.i18n(NameConst.TT_DEFECTIVE_SINGULARITY_CELL)); lines.add(GuiText.VoidCellTooltip.getLocal()); lines.add(0 + " " + GuiText.Of.getLocal() + " \u00A7k9999\u00A77 " + GuiText.BytesUsed.getLocal()); final IFluidCellInventory inv = handler.getCellInv(); diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 49d9a594..522a2c18 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -141,7 +141,7 @@ public class ItemAndBlockHolder { 16384, 5, 600000D).register(); - public static ItemDefectiveSingularityFluidStorageCell FLUID_VOID_CELL = new ItemDefectiveSingularityFluidStorageCell() + public static ItemDefectiveSingularityFluidStorageCell DEFECTIVE_SINGULARITY_CELL = new ItemDefectiveSingularityFluidStorageCell() .register(); public static ItemCreativeFluidStorageCell CREATIVE_CELL = new ItemCreativeFluidStorageCell().register(); public static ItemInfinityWaterStorageCell INFINITY_WATER_CELL = new ItemInfinityWaterStorageCell().register(); diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java index 86dd882d..f4060f64 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -1,59 +1,7 @@ package com.glodblock.github.loader; import static com.glodblock.github.common.storage.CellType.Cell16384kPart; -import static com.glodblock.github.loader.ItemAndBlockHolder.BUFFER; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL1024K; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL1024KM; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL16384K; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL16384KM; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL16K; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL16KM; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL1K; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL1KM; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL256K; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL256KM; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL4096K; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL4096KM; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL4K; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL4KM; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL64K; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL64KM; -import static com.glodblock.github.loader.ItemAndBlockHolder.CELL_HOUSING; -import static com.glodblock.github.loader.ItemAndBlockHolder.CERTUS_QUARTZ_TANK; -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; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_EXPORT_BUS; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_IMPORT_BUS; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_INTERFACE; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_INTERFACE_P2P; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_LEVEL_EMITTER; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_STORAGE_BUS; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_STORAGE_MONITOR; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERM; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERMINAL; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERMINAL_EX; -import static com.glodblock.github.loader.ItemAndBlockHolder.INFINITY_WATER_CELL; -import static com.glodblock.github.loader.ItemAndBlockHolder.INTERFACE; -import static com.glodblock.github.loader.ItemAndBlockHolder.LARGE_BUFFER; -import static com.glodblock.github.loader.ItemAndBlockHolder.LEVEL_MAINTAINER; -import static com.glodblock.github.loader.ItemAndBlockHolder.LEVEL_TERMINAL; -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; -import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_FLUID_TERM; -import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_INTERFACE_TERM; -import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_LEVEL_TERM; -import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_PATTERN_TERM; -import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_ULTRA_TERM; +import static com.glodblock.github.loader.ItemAndBlockHolder.*; import static net.minecraft.init.Blocks.redstone_torch; import static net.minecraft.init.Items.fish; @@ -505,6 +453,20 @@ public class RecipeLoader implements Runnable { QUANTUM_CELL, 'M', AE2_MATTER_CONDENSER)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + DEFECTIVE_SINGULARITY_CELL, + "ABA", + "BDB", + "CCC", + 'A', + AE2_QUARTZ_GLASS, + 'B', + "dustGlowstone", + 'C', + "gemDiamond", + 'D', + AE2_SINGULARITY)); for (FCBaseItemCell cell : cells) { if (cell.getHousing().getItemDamage() == 0) { GameRegistry.addRecipe( diff --git a/src/main/java/com/glodblock/github/util/NameConst.java b/src/main/java/com/glodblock/github/util/NameConst.java index cf9f0bd3..cee9affe 100644 --- a/src/main/java/com/glodblock/github/util/NameConst.java +++ b/src/main/java/com/glodblock/github/util/NameConst.java @@ -104,6 +104,7 @@ public class NameConst { public static final String TT_ENERGY_CARD_DESC = TT_ENERGY_CARD + ".desc"; public static final String TT_QUANTUM_BRIDGE_CARD = TT_KEY + "quantum_bridge_card"; public static final String TT_QUANTUM_BRIDGE_CARD_DESC = TT_QUANTUM_BRIDGE_CARD + ".desc"; + public static final String TT_DEFECTIVE_SINGULARITY_CELL = TT_KEY + ITEM_DEFECTIVE_SINGULARITY_FLUID_STORAGE; public static final String WAILA_KEY = FluidCraft.MODID + ".waila."; public static final String WAILA_ENABLE = WAILA_KEY + "enable"; diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index dc0aa10f..aee30e1e 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -115,6 +115,7 @@ ae2fc.tooltip.ultra_terminal=Right click + sneaking to switch mode. ae2fc.tooltip.ultra_terminal.tips=ToolTips: ae2fc.tooltip.ultra_terminal.tips.desc=1.You can put it to baubles slot and use hotkey to open.\n2.Interface mode hold §3Shift§7 toggle interface renamer button.\n3.When you are in the crafting plan screen.\nHold §3Shift§7 click cancel button will automatically add missing items to NEI bookmark. ae2fc.tooltip.infinity_fluid=§aInfinity§r +ae2fc.tooltip.fluid_storage.singularity.defective=Absolute §kVOID§r ae2fc.tooltip.quantum_bridge_card.desc=Allows wireless terminals to connect to a quantum bridge, allowing for unlimited range ae2fc.tooltip.energy_card.desc=Infinity Energy for the Wireless Terminal