aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r--src/main/java/gregtech/common/items/CombType.java61
-rw-r--r--src/main/java/gregtech/common/items/DropType.java45
-rw-r--r--src/main/java/gregtech/common/items/GT_DepletetCell_Item.java17
-rw-r--r--src/main/java/gregtech/common/items/GT_FluidDisplayItem.java83
-rw-r--r--src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java207
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java5306
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java2530
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java598
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java28
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java48
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java788
-rw-r--r--src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java16
-rw-r--r--src/main/java/gregtech/common/items/GT_SensorCard_Item.java22
-rw-r--r--src/main/java/gregtech/common/items/GT_VolumetricFlask.java61
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java2544
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java288
-rw-r--r--src/main/java/gregtech/common/items/ItemPollen.java123
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java182
-rw-r--r--src/main/java/gregtech/common/items/PollenType.java11
-rw-r--r--src/main/java/gregtech/common/items/PropolisType.java39
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java44
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow_Potion.java24
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java105
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java13
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java3
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java47
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java20
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java56
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_None.java56
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java30
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java29
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java41
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_PrintedPages.java3
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java85
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java43
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java28
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Screwdriver.java13
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java26
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_SensorKit.java22
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java76
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java19
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java46
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java101
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java19
44 files changed, 11420 insertions, 2526 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 50e3e853b2..49acf1be32 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -2,12 +2,10 @@ package gregtech.common.items;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_LanguageManager;
-
-import java.rmi.MarshalException;
import java.util.Arrays;
public enum CombType {
- //Organic Line
+ // Organic Line
LIGNIE(0, "lignite", true, Materials.Lignite, 100, 0x58300B, 0x906237),
COAL(1, "coal", true, Materials.Coal, 100, 0x525252, 0x666666),
STICKY(2, "stickyresin", true, Materials._NULL, 50, 0x2E8F5B, 0xDCC289),
@@ -15,14 +13,14 @@ public enum CombType {
APATITE(4, "apatite", true, Materials.Apatite, 100, 0xc1c1f6, 0x676784),
ASH(5, "ash", true, Materials.Ash, 100, 0x1e1a18, 0xc6c6c6),
- //IC2 Line
+ // IC2 Line
COOLANT(6, "coolant", true, Materials._NULL, 100, 0x144F5A, 0x2494A2),
ENERGY(7, "energy", true, Materials._NULL, 80, 0xC11F1F, 0xEBB9B9),
LAPOTRON(8, "lapotron", true, Materials._NULL, 60, 0x1414FF, 0x6478FF),
PYROTHEUM(9, "pyrotheum", true, Materials.Pyrotheum, 50, 0xffebc4, 0xe36400),
CRYOTHEUM(10, "cryotheum", true, Materials.Pyrotheum, 50, 0x2660ff, 0x5af7ff),
- //Alloy Line
+ // Alloy Line
REDALLOY(11, "redalloy", true, Materials.RedAlloy, 100, 0xE60000, 0xB80000),
REDSTONEALLOY(12, "redstonealloy", true, Materials.RedstoneAlloy, 90, 0xB80000, 0xA50808),
CONDUCTIVEIRON(13, "conductiveiron", true, Materials.ConductiveIron, 80, 0x817671, 0xCEADA3),
@@ -34,7 +32,7 @@ public enum CombType {
STAINLESSSTEEL(19, "stainlesssteel", true, Materials.StainlessSteel, 75, 0x778899, 0xC8C8DC),
ENDERIUM(20, "enderium", true, Materials.Enderium, 40, 0x2E8B57, 0x599087),
- //Thaumcraft Line
+ // Thaumcraft Line
THAUMIUMDUST(21, "thaumiumdust", true, Materials.Thaumium, 100, 0x7A007A, 0x5C005C),
THAUMIUMSHARD(22, "thaumiumshard", true, Materials._NULL, 85, 0x9966FF, 0xAD85FF),
AMBER(23, "amber", true, Materials.Amber, 90, 0x774B15, 0xEE7700),
@@ -48,7 +46,7 @@ public enum CombType {
DIVIDED(31, "divided", true, Materials.Unstable, 40, 0xF0F0F0, 0xDCDCDC),
SPARKELING(32, "sparkling", true, Materials.NetherStar, 40, 0x7A007A, 0xFFFFFF),
- //Gem Line
+ // Gem Line
STONE(33, "stone", true, Materials._NULL, 70, 0x808080, 0x999999),
CERTUS(34, "certus", true, Materials.CertusQuartz, 100, 0x57CFFB, 0xBBEEFF),
FLUIX(35, "fluix", true, Materials.Fluix, 100, 0xA375FF, 0xB591FF),
@@ -66,7 +64,7 @@ public enum CombType {
GROSSULAR(47, "grossular", true, Materials.Grossular, 100, 0x9B4E00, 0x8B8B8B),
FIRESTONE(48, "firestone", true, Materials.Firestone, 100, 0xC00000, 0xFF0000),
- //Metals Line
+ // Metals Line
SLAG(49, "slag", true, Materials._NULL, 50, 0xD4D4D4, 0x58300B),
COPPER(50, "copper", true, Materials.Copper, 100, 0xFF6600, 0xE65C00),
TIN(51, "tin", true, Materials.Tin, 100, 0xD4D4D4, 0xDDDDDD),
@@ -81,7 +79,7 @@ public enum CombType {
GALLIUM(60, "gallium", true, Materials.Gallium, 75, 0x8B8B8B, 0xC5C5E4),
ARSENIC(61, "arsenic", true, Materials.Arsenic, 75, 0x736C52, 0x292412),
- //Rare Metals Line
+ // Rare Metals Line
BAUXITE(62, "bauxite", true, Materials.Bauxite, 85, 0x6B3600, 0x8B8B8B),
ALUMINIUM(63, "aluminium", true, Materials.Aluminium, 60, 0x008AB8, 0xD6D6FF),
MANGANESE(64, "manganese", true, Materials.Manganese, 30, 0xD5D5D5, 0xAAAAAA),
@@ -98,7 +96,7 @@ public enum CombType {
ELECTROTINE(75, "electrotine", true, Materials.Electrotine, 75, 0x1E90FF, 0x3CB4C8),
ALMANDINE(76, "almandine", true, Materials.Almandine, 85, 0xC60000, 0x8B8B8B),
- //Radioactive Line
+ // Radioactive Line
URANIUM(77, "uranium", true, Materials.Uranium, 50, 0x19AF19, 0x169E16),
PLUTONIUM(78, "plutonium", true, Materials.Plutonium, 10, 0x240000, 0x570000),
NAQUADAH(79, "naquadah", true, Materials.Naquadah, 10, 0x000000, 0x004400),
@@ -109,14 +107,14 @@ public enum CombType {
AMERICIUM(84, "americium", true, Materials.Americium, 5, 0xE6E6FF, 0xC8C8C8),
NEUTRONIUM(85, "neutronium", true, Materials.Neutronium, 2, 0xFFF0F0, 0xFAFAFA),
- //Twilight
+ // Twilight
NAGA(86, "naga", true, Materials._NULL, 100, 0x0D5A0D, 0x28874B),
LICH(87, "lich", true, Materials._NULL, 90, 0x5C605E, 0xC5C5C5),
HYDRA(88, "hydra", true, Materials._NULL, 80, 0x872836, 0xB8132C),
URGHAST(89, "urghast", true, Materials._NULL, 70, 0x7C0618, 0xA7041C),
SNOWQUEEN(90, "snowqueen", true, Materials._NULL, 60, 0x9C0018, 0xD02001),
- //Space
+ // Space
SPACE(91, "space", true, Materials._NULL, 100, 0x003366, 0xC0C0C0),
METEORICIRON(92, "meteoriciron", true, Materials.MeteoricIron, 100, 0x321928, 0x643250),
DESH(93, "desh", true, Materials.Desh, 90, 0x282828, 0x323232),
@@ -129,7 +127,7 @@ public enum CombType {
BLACKPLUTONIUM(100, "blackplutonium", true, Materials.Quantium, 25, 0x000000, 0x323232),
TRINIUM(101, "trinium", true, Materials.Trinium, 25, 0xB0E0E6, 0xC8C8D2),
- //Planet
+ // Planet
MERCURY(102, "mercury", true, Materials._NULL, 65, 0x4A4033, 0xB5A288),
VENUS(103, "venus", true, Materials._NULL, 65, 0x120E07, 0x272010),
MOON(104, "moon", true, Materials._NULL, 90, 0x373735, 0x7E7E78),
@@ -146,12 +144,12 @@ public enum CombType {
BARNARDA(115, "barnarda", true, Materials._NULL, 10, 0x0D5A0D, 0xE6C18D),
VEGA(116, "vega", true, Materials._NULL, 10, 0x1A2036, 0xB5C0DE),
- //Infinity
+ // Infinity
COSMICNEUTRONIUM(117, "cosmicneutronium", true, Materials._NULL, 5, 0x484848, 0x323232),
INFINITYCATALYST(118, "infinitycatalyst", true, Materials._NULL, 2, 0xFFFFFF, 0xFFFFFF),
INFINITY(119, "infinity", true, Materials._NULL, 1, 0xFFFFFF, 0xFFFFFF),
- //HEE
+ // HEE
ENDDUST(120, "enddust", true, Materials._NULL, 50, 0x003A7D, 0xCC00FA),
ECTOPLASMA(121, "ectoplasma", true, Materials._NULL, 35, 0x381C40, 0xDCB0E5),
ARCANESHARD(122, "arcaneshard", true, Materials._NULL, 35, 0x333D82, 0x9010AD),
@@ -164,24 +162,25 @@ public enum CombType {
RUNEII(129, "rune2", true, Materials._NULL, 10, 0xE31010, 0x0104D9),
FIREESSENSE(130, "fireessence", true, Materials._NULL, 30, 0xFFA157, 0xD41238),
CRYOLITE(131, "cryolite", true, Materials.Cryolite, 90, 0xBFEFFF, 0x73B9D0),
- //(NOBLE) GAS LINE
+ // (NOBLE) GAS LINE
HELIUM(132, "helium", true, Materials.Helium, 90, 0xFFA9FF, 0xFFFFC3),
ARGON(133, "argon", true, Materials.Argon, 95, 0x89D9E1, 0x160822),
- //XENON, NEON and KRYPTON Fluid extractor Recipes are located in GT_MachineRecipeLoader.java
+ // XENON, NEON and KRYPTON Fluid extractor Recipes are located in GT_MachineRecipeLoader.java
XENON(134, "xenon", true, Materials._NULL, 85, 0x160822, 0x8A97B0),
NEON(135, "neon", true, Materials._NULL, 90, 0xFF7200, 0xFFC826),
KRYPTON(136, "krypton", true, Materials._NULL, 85, 0x160822, 0x8A97B0),
NITROGEN(137, "nitrogen", true, Materials.Nitrogen, 100, 0xA52A2A, 0xFFC832),
OXYGEN(138, "oxygen", true, Materials.Oxygen, 100, 0x8F8FFF, 0xFFFFFF),
HYDROGEN(139, "hydrogen", true, Materials.Hydrogen, 100, 0xFF1493, 0xFFFFFF),
- //Those are supposed to be in the organic branch, but that would require shifting all comb IDs and we don't want to risk it.
+ // Those are supposed to be in the organic branch, but that would require shifting all comb IDs and we don't want to
+ // risk it.
PHOSPHORUS(140, "phosphorus", true, Materials.Phosphorus, 100, 0xC1C1F6, 0xFFC826),
MICA(141, "mica", true, Materials.Mica, 100, 0x8A97B0, 0x2F3641),
- //Seaweed is located in the planet line
+ // Seaweed is located in the planet line
SEAWEED(142, "seaweed", true, Materials._NULL, 90, 0x83FF83, 0xCBCBCB),
- //just Walrus
+ // just Walrus
WALRUS(143, "walrus", true, Materials._NULL, 100, 0xB5CFC9, 0xD6D580),
- //TC infused Air shards line. Recipes in GT_MachineRecipeLoader.java Lines 1500+ + Nether/Endshard
+ // TC infused Air shards line. Recipes in GT_MachineRecipeLoader.java Lines 1500+ + Nether/Endshard
INFUSEDAER(144, "infusedair", true, Materials._NULL, 100, 0x60602F, 0xFFFF7E),
INFUSEDTERRA(145, "infusedterra", true, Materials._NULL, 100, 0x003300, 0x008600),
INFUSEDIGNIS(146, "infusedignis", true, Materials._NULL, 100, 0x3B0E00, 0xED3801),
@@ -196,11 +195,11 @@ public enum CombType {
CAELESTISGREEN(155, "caelestisgreen", true, Materials._NULL, 100, 0x00FF00, 0xB233FF),
CAELESTISBLUE(156, "caelestisblue", true, Materials._NULL, 100, 0x0000FF, 0xFF99A5),
UNKNOWNWATER(157, "unknownwater", true, Materials._NULL, 100, 0x36ABFF, 0x4333A5),
- //ESSENTIA gets a use soon. Dont remove.
+ // ESSENTIA gets a use soon. Dont remove.
ESSENTIA(158, "essentia", true, Materials._NULL, 100, 0xED3601, 0xFF6D50),
INDIUM(159, "indium", true, Materials.Indium, 100, 0x8F5D99, 0xFFA9FF),
- //ALWAYS KEEP _NULL AT THE BOTTOM
+ // ALWAYS KEEP _NULL AT THE BOTTOM
_NULL(-1, "INVALIDCOMB", false, Materials._NULL, 0, 0, 0);
public boolean showInList;
@@ -221,8 +220,7 @@ public enum CombType {
}
CombType(int id, String pName, boolean show, Materials material, int chance, int... color) {
- if (id < 0 && !"INVALIDCOMB".equals(pName))
- throw new IllegalArgumentException();
+ if (id < 0 && !"INVALIDCOMB".equals(pName)) throw new IllegalArgumentException();
this.id = id;
this.name = pName;
this.material = material;
@@ -237,11 +235,12 @@ public enum CombType {
public String getName() {
- return GT_LanguageManager.addStringLocalization("comb." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
+ return GT_LanguageManager.addStringLocalization(
+ "comb." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
}
public int[] getColours() {
- return color == null || color.length != 2 ? new int[]{0, 0} : color;
+ return color == null || color.length != 2 ? new int[] {0, 0} : color;
}
public int getId() {
@@ -256,12 +255,14 @@ public enum CombType {
private static final CombType[] VALUES;
static {
- int biggestId = Arrays.stream(CombType.values()).mapToInt(CombType::getId).max().getAsInt();
+ int biggestId = Arrays.stream(CombType.values())
+ .mapToInt(CombType::getId)
+ .max()
+ .getAsInt();
VALUES = new CombType[biggestId + 1];
Arrays.fill(VALUES, _NULL);
for (CombType type : CombType.values()) {
- if (type != _NULL)
- VALUES[type.getId()] = type;
+ if (type != _NULL) VALUES[type.getId()] = type;
}
}
}
diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java
index f3ea945016..6bc8eadcf7 100644
--- a/src/main/java/gregtech/common/items/DropType.java
+++ b/src/main/java/gregtech/common/items/DropType.java
@@ -4,32 +4,32 @@ import gregtech.api.enums.Materials;
import gregtech.api.util.GT_LanguageManager;
public enum DropType {
-
- OIL("oil",true),
- MUTAGEN("small mutagen catalyst",true),
- COOLANT("coolant",true),
- HOT_COOLANT("hot coolant",true),
- HYDRA("hydra blood",true),
- SNOW_QUEEN("snowqueen blood",true),
- OXYGEN("oxygen",true),
- LAPIS("lapis coolant",true),
- ENDERGOO("ender goo",true);
-
- private static int[][] colours = new int[][]{
- {0x19191B, 0x303032},
- {0xffc100, 0x00ff11},
- {0x144F5A, 0x2494A2},
- {0xC11F1F, 0xEBB9B9},
- {0x872836, 0xB8132C},
- {0xD02001, 0x9C0018},
- {0x003366, 0x0066BB},
- {0x1727b1, 0x008ce3},
- {0xA005E7, 0x161616},
+ OIL("oil", true),
+ MUTAGEN("small mutagen catalyst", true),
+ COOLANT("coolant", true),
+ HOT_COOLANT("hot coolant", true),
+ HYDRA("hydra blood", true),
+ SNOW_QUEEN("snowqueen blood", true),
+ OXYGEN("oxygen", true),
+ LAPIS("lapis coolant", true),
+ ENDERGOO("ender goo", true);
+
+ private static int[][] colours = new int[][] {
+ {0x19191B, 0x303032},
+ {0xffc100, 0x00ff11},
+ {0x144F5A, 0x2494A2},
+ {0xC11F1F, 0xEBB9B9},
+ {0x872836, 0xB8132C},
+ {0xD02001, 0x9C0018},
+ {0x003366, 0x0066BB},
+ {0x1727b1, 0x008ce3},
+ {0xA005E7, 0x161616},
};
public boolean showInList;
public Materials material;
public int chance;
private String name;
+
private DropType(String pName, boolean show) {
this.name = pName;
this.showInList = show;
@@ -41,7 +41,8 @@ public enum DropType {
public String getName() {
- return GT_LanguageManager.addStringLocalization("drop." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Drop");
+ return GT_LanguageManager.addStringLocalization(
+ "drop." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Drop");
}
public int[] getColours() {
diff --git a/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java b/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java
index 056ab796fa..7a4df4f1a3 100644
--- a/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java
+++ b/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java
@@ -11,11 +11,19 @@ public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item {
}
@Override
- public void processChamber(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, boolean paramBoolean) {
- }
+ public void processChamber(
+ IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, boolean paramBoolean) {}
@Override
- public boolean acceptUraniumPulse(IReactor paramIReactor, ItemStack paramItemStack1, ItemStack paramItemStack2, int paramInt1, int paramInt2, int paramInt3, int paramInt4, boolean paramBoolean) {
+ public boolean acceptUraniumPulse(
+ IReactor paramIReactor,
+ ItemStack paramItemStack1,
+ ItemStack paramItemStack2,
+ int paramInt1,
+ int paramInt2,
+ int paramInt3,
+ int paramInt4,
+ boolean paramBoolean) {
return false;
}
@@ -35,7 +43,8 @@ public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item {
}
@Override
- public int alterHeat(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, int paramInt3) {
+ public int alterHeat(
+ IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, int paramInt3) {
return 0;
}
diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index a2879844aa..aa9a150b7e 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -7,6 +7,11 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.items.GT_Generic_Item;
import gregtech.api.util.GT_Utility;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Stream;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -20,13 +25,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-@SuppressWarnings({"rawtypes","unchecked"})
+@SuppressWarnings({"rawtypes", "unchecked"})
public class GT_FluidDisplayItem extends GT_Generic_Item {
private static final Map<Fluid, String> sFluidTooltips = new HashMap<>();
@@ -39,8 +38,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
@Override
protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
if (FluidRegistry.getFluid(aStack.getItemDamage()) != null) {
- String tChemicalFormula = getChemicalFormula(new FluidStack(FluidRegistry.getFluid(aStack.getItemDamage()), 1));
- if (!tChemicalFormula.isEmpty()) aList.add(EnumChatFormatting.YELLOW + tChemicalFormula + EnumChatFormatting.RESET);
+ String tChemicalFormula =
+ getChemicalFormula(new FluidStack(FluidRegistry.getFluid(aStack.getItemDamage()), 1));
+ if (!tChemicalFormula.isEmpty())
+ aList.add(EnumChatFormatting.YELLOW + tChemicalFormula + EnumChatFormatting.RESET);
}
NBTTagCompound aNBT = aStack.getTagCompound();
if (GT_Values.D1) {
@@ -52,17 +53,20 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
if (aNBT != null) {
long tToolTipAmount = aNBT.getLong("mFluidDisplayAmount");
if (tToolTipAmount > 0L) {
- aList.add(EnumChatFormatting.BLUE + "Amount: " + GT_Utility.formatNumbers(tToolTipAmount) + " L" + EnumChatFormatting.GRAY);
+ aList.add(EnumChatFormatting.BLUE + "Amount: " + GT_Utility.formatNumbers(tToolTipAmount) + " L"
+ + EnumChatFormatting.GRAY);
}
- aList.add(EnumChatFormatting.RED + "Temperature: " + GT_Utility.formatNumbers(aNBT.getLong("mFluidDisplayHeat")) + " K" + EnumChatFormatting.GRAY);
- aList.add(EnumChatFormatting.GREEN + String.format(transItem("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GRAY);
+ aList.add(EnumChatFormatting.RED + "Temperature: "
+ + GT_Utility.formatNumbers(aNBT.getLong("mFluidDisplayHeat")) + " K" + EnumChatFormatting.GRAY);
+ aList.add(EnumChatFormatting.GREEN
+ + String.format(transItem("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid")
+ + EnumChatFormatting.GRAY);
}
}
@Override
@SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister aIconRegister) {
- }
+ public void registerIcons(IIconRegister aIconRegister) {}
@Override
public IIcon getIconFromDamage(int aMetaData) {
@@ -104,32 +108,32 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
@SideOnly(Side.CLIENT)
public String getChemicalFormula(FluidStack aRealFluid) {
- return sFluidTooltips.computeIfAbsent(aRealFluid.getFluid(),
- fluid -> {
- for(ItemStack tContainer : GT_Utility.getContainersFromFluid(aRealFluid)) {
- if (isCell(tContainer)) {
- Materials tMaterial = getMaterialFromCell(tContainer);
- if (!tMaterial.equals(Materials._NULL)) {
- if (tMaterial.mChemicalFormula.equals("?")) {
- return "";
- }
- else {
- return tMaterial.mChemicalFormula;
- }
- }
- else {
- // For GT++ Fluid Display
- // GT++ didn't register a Material in GT, so I have too find the Chemical Formula in its cell's tooltip
- List tTooltip = tContainer.getTooltip(null, true);
- for (Object tInfo : tTooltip) {
- if (!((String) tInfo).contains(" ") && !((String) tInfo).contains(":") && tTooltip.indexOf(tInfo) != 0) {
- return (String) tInfo;
- }
- }
+ return sFluidTooltips.computeIfAbsent(aRealFluid.getFluid(), fluid -> {
+ for (ItemStack tContainer : GT_Utility.getContainersFromFluid(aRealFluid)) {
+ if (isCell(tContainer)) {
+ Materials tMaterial = getMaterialFromCell(tContainer);
+ if (!tMaterial.equals(Materials._NULL)) {
+ if (tMaterial.mChemicalFormula.equals("?")) {
+ return "";
+ } else {
+ return tMaterial.mChemicalFormula;
+ }
+ } else {
+ // For GT++ Fluid Display
+ // GT++ didn't register a Material in GT, so I have too find the Chemical Formula in its cell's
+ // tooltip
+ List tTooltip = tContainer.getTooltip(null, true);
+ for (Object tInfo : tTooltip) {
+ if (!((String) tInfo).contains(" ")
+ && !((String) tInfo).contains(":")
+ && tTooltip.indexOf(tInfo) != 0) {
+ return (String) tInfo;
}
}
}
- return "";
+ }
+ }
+ return "";
});
}
@@ -160,10 +164,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
String tOreDictName = OreDictionary.getOreName(tOreDict);
if (tOreDictName.startsWith("cell")) {
return Materials.getRealMaterial(
- tOreDictName.replace("cell", "")
- .replace("Molten", "")
- .replace("Plasma", "")
- );
+ tOreDictName.replace("cell", "").replace("Molten", "").replace("Plasma", ""));
}
}
return Materials._NULL;
diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
index 052e5ed1b6..74dab0e74e 100644
--- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
+++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
@@ -1,5 +1,8 @@
package gregtech.common.items;
+import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
+
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -18,6 +21,11 @@ import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -34,19 +42,11 @@ import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.FakePlayer;
import org.apache.commons.lang3.tuple.Pair;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiFunction;
-import java.util.function.Predicate;
-
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
-
public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetworkUpdatableItem {
private static final String aTextEmptyRow = " ";
private static final List<ItemStack> ALL_VARIANTS = new ArrayList<>();
protected IIcon[] mIconDamage = new IIcon[25];
+
public GT_IntegratedCircuit_Item() {
super("integrated_circuit", "Programmed Circuit", "");
setHasSubtypes(true);
@@ -61,33 +61,84 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
ALL_VARIANTS.add(aStack);
}
- GT_ModHandler.addShapelessCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 0L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{OrePrefixes.circuit.get(Materials.Basic)});
+ GT_ModHandler.addShapelessCraftingRecipe(
+ ItemList.Circuit_Integrated.getWithDamage(1L, 0L),
+ GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[] {OrePrefixes.circuit.get(Materials.Basic)});
long bits = GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE;
- GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 1L), bits, new Object[]{"d ", "