aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-21 20:29:38 +0200
committerGitHub <noreply@github.com>2023-04-21 20:29:38 +0200
commitde864236f83dc31c53ca77a6939357a0959bca75 (patch)
treeef739fd9426e7c2525b1560386faaa5bb893e30d /src/main/java/gregtech/common/items
parent285a75535d07f2037967b1208a5840fb81719514 (diff)
downloadGT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.tar.gz
GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.tar.bz2
GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.zip
Recipes ra2 (#1872)
* Recipes RA2 fixes * Use \uXXXX for non-ASCII characters * Misc cleanup (#1888) * migrate away from addThermalCentrifugeRecipe * split recipes of GT_Block_Stones_Abstract * migrate away from addForgeHammerRecipe * migrate away from addChemicalBathRecipe * remove "DisableOldChemicalRecipes" and its usage, as it's disabled by default in NH and it increases recipe complexity for nothing * Remove underground biomes ore classes, as it's not present in NH * migrate away from addFluidCannerRecipe * migrate away from addFluidExtractionRecipe * migrate away from addChemicalRecipe * migrate away from addMultiblockChemicalRecipe * deprecate addChemicalRecipeForBasicMachineOnly * migrate away from addCentrifugeRecipe * spotlessApply * fixing wrong merge conflict solving * Add Tengam materials (#1891) * Add Tengam materials * Change new recipes to consume 15/16 Amp * Remove now redundant `break` statements * fix comb chances? * fix centrifuge code not working --------- Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r--src/main/java/gregtech/common/items/GT_FluidDisplayItem.java10
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java18
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java141
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java395
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java7
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java183
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java44
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java47
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java1
9 files changed, 498 insertions, 348 deletions
diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index 4aec0ed5c7..850fe21811 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -28,7 +28,6 @@ import gregtech.api.enums.Materials;
import gregtech.api.items.GT_Generic_Item;
import gregtech.api.util.GT_Utility;
-@SuppressWarnings({ "rawtypes", "unchecked" })
public class GT_FluidDisplayItem extends GT_Generic_Item {
private static final Map<Fluid, String> sFluidTooltips = new HashMap<>();
@@ -132,11 +131,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
// 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;
+ List<String> tTooltip = tContainer.getTooltip(null, true);
+ for (String tInfo : tTooltip) {
+ if (!tInfo.contains(" ") && !tInfo.contains(":") && tTooltip.indexOf(tInfo) != 0) {
+ return tInfo;
}
}
}
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index 739a3c7b9e..53daa4d813 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -2,6 +2,8 @@ package gregtech.common.items;
import static gregtech.api.enums.Mods.GalacticraftMars;
import static gregtech.api.enums.Textures.BlockIcons.*;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.client.GT_TooltipHandler.Tier.*;
import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
@@ -105,9 +107,19 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
setBurnValue(17000 + Materials.Wood.mMetaItemSubID, 1600);
GT_OreDictUnificator.addToBlacklist(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));
- GT_ModHandler.addCompressionRecipe(
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L),
- new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));
+
+ // Compressor recipe
+ {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L))
+ .itemOutputs(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+ }
+
GregTech_API.registerCover(
new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID),
TextureFactory.of(COVER_WOOD_PLATE),
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index d419747c8a..da5f25a96f 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -2,6 +2,8 @@ package gregtech.common.items;
import static gregtech.api.enums.Mods.Forestry;
import static gregtech.api.enums.Textures.BlockIcons.*;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.enchantment.Enchantment;
@@ -36,6 +38,8 @@ import gregtech.common.covers.redstone.GT_Cover_WirelessFluidDetector;
import gregtech.common.covers.redstone.GT_Cover_WirelessItemDetector;
import gregtech.common.covers.redstone.GT_Cover_WirelessMaintenanceDetector;
import gregtech.common.items.behaviors.Behaviour_Arrow;
+import ic2.api.crops.CropCard;
+import ic2.api.crops.Crops;
public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
@@ -2619,27 +2623,116 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
ItemList.Crop_Drop_Tine.get(1L),
GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L));
- GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Coppon.get(4L), new ItemStack(Blocks.wool, 1, 1));
- GT_ModHandler
- .addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler
- .addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler
- .addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler
- .addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler.addCompressionRecipe(
- ItemList.Crop_Drop_BobsYerUncleRanks.get(4L),
- ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Tine.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Rape.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler
- .addCompressionRecipe(new ItemStack(Blocks.red_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L));
- GT_ModHandler.addCompressionRecipe(
- new ItemStack(Blocks.yellow_flower, 8, 32767),
- ItemList.IC2_PlantballCompressed.get(1L));
+ // Compression recipes
+ {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_Coppon.get(4L))
+ .itemOutputs(new ItemStack(Blocks.wool, 1, 1))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_Plumbilia.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_Argentia.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_Indigo.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_Ferru.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_Aurelia.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_OilBerry.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_Tine.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemList.Crop_Drop_Rape.get(4L))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(new ItemStack(Blocks.red_flower, 8, 32767))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(new ItemStack(Blocks.yellow_flower, 8, 32767))
+ .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(sCompressorRecipes);
+ }
GT_ModHandler.addPulverisationRecipe(
ItemList.Food_Sliced_Cheese.get(1L),
@@ -2699,10 +2792,10 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
32_000_000,
100);
try {
- ic2.api.crops.CropCard tCrop;
- GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[13], "mDrop")
+ CropCard tCrop;
+ GT_Utility.getField(tCrop = Crops.instance.getCropList()[13], "mDrop")
.set(tCrop, ItemList.Crop_Drop_Ferru.get(1L));
- GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[14], "mDrop")
+ GT_Utility.getField(tCrop = Crops.instance.getCropList()[14], "mDrop")
.set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L));
} catch (Throwable e) {
if (GT_Values.D1) {
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
index 594c5841f5..015be426c8 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
@@ -26,7 +26,6 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
OrePrefixes.crateGtPlate,
OrePrefixes.nanite);
INSTANCE = this;
- int tLastID = 0;
Object[] o = new Object[0];
/**
@@ -36,9 +35,9 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
* + sulfurci acid wetware lifesupport board / fiberglass CB + teflon +
*/
ItemList.Circuit_Board_Wetware
- .set(addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o));
- ItemList.Circuit_Board_Plastic.set(addItem(tLastID = 7, "Plastic Circuit Board", "A Good Board", o));
- ItemList.Circuit_Board_Bio.set(addItem(tLastID = 8, "Bio Circuit Board", "Bio genetic mutated Board", o));
+ .set(addItem(6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o));
+ ItemList.Circuit_Board_Plastic.set(addItem(7, "Plastic Circuit Board", "A Good Board", o));
+ ItemList.Circuit_Board_Bio.set(addItem(8, "Bio Circuit Board", "Bio genetic mutated Board", o));
/**
* electronic components: vacuum tube (glass tube + red alloy cables) basic electronic circuits normal+smd coils
@@ -46,68 +45,67 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
*/
ItemList.Circuit_Parts_ResistorSMD.set(
addItem(
- tLastID = 11,
+ 11,
"SMD Resistor",
"Electronic Component",
OrePrefixes.componentCircuit.get(Materials.Resistor),
SubTag.NO_UNIFICATION));
- ItemList.Circuit_Parts_Glass_Tube.set(addItem(tLastID = 12, "Glass Tube", "", o));
- ItemList.Circuit_Parts_Coil.set(addItem(tLastID = 14, "Small Coil", "Basic Electronic Component", o));
+ ItemList.Circuit_Parts_Glass_Tube.set(addItem(12, "Glass Tube", "", o));
+ ItemList.Circuit_Parts_Coil.set(addItem(14, "Small Coil", "Basic Electronic Component", o));
ItemList.Circuit_Parts_DiodeSMD.set(
addItem(
- tLastID = 16,
+ 16,
"SMD Diode",
"Electronic Component",
OrePrefixes.componentCircuit.get(Materials.Diode),
SubTag.NO_UNIFICATION));
ItemList.Circuit_Parts_TransistorSMD.set(
addItem(
- tLastID = 18,
+ 18,
"SMD Transistor",
"Electronic Component",
OrePrefixes.componentCircuit.get(Materials.Transistor),
SubTag.NO_UNIFICATION));
ItemList.Circuit_Parts_CapacitorSMD.set(
addItem(
- tLastID = 20,
+ 20,
"SMD Capacitor",
"Electronic Component",
OrePrefixes.componentCircuit.get(Materials.Capacitor),
SubTag.NO_UNIFICATION));
ItemList.Circuit_Parts_GlassFiber
- .set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o));
- ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o));
- ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o));
+ .set(addItem(21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o));
+ ItemList.Circuit_Parts_PetriDish.set(addItem(22, "Petri Dish", "For cultivating cells", o));
+ ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(23, "Reinforced Glass Tube", "", o));
ItemList.Circuit_Parts_ResistorASMD
- .set(addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o));
- ItemList.Circuit_Parts_DiodeASMD
- .set(addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o));
+ .set(addItem(24, "Advanced SMD Resistor", "Advanced Electronic Component", o));
+ ItemList.Circuit_Parts_DiodeASMD.set(addItem(25, "Advanced SMD Diode", "Advanced Electronic Component", o));
ItemList.Circuit_Parts_TransistorASMD
- .set(addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o));
+ .set(addItem(26, "Advanced SMD Transistor", "Advanced Electronic Component", o));
ItemList.Circuit_Parts_CapacitorASMD
- .set(addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o));
+ .set(addItem(27, "Advanced SMD Capacitor", "Advanced Electronic Component", o));
ItemList.Circuit_Parts_ResistorXSMD
- .set(addItem(tLastID = 178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o));
+ .set(addItem(178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o));
ItemList.Circuit_Parts_DiodeXSMD
- .set(addItem(tLastID = 179, "Optical SMD Diode", "Highly Advanced Electronic Component", o));
+ .set(addItem(179, "Optical SMD Diode", "Highly Advanced Electronic Component", o));
ItemList.Circuit_Parts_TransistorXSMD
- .set(addItem(tLastID = 180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o));
+ .set(addItem(180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o));
ItemList.Circuit_Parts_CapacitorXSMD
- .set(addItem(tLastID = 181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o));
+ .set(addItem(181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o));
ItemList.Circuit_Parts_InductorSMD.set(
addItem(
- tLastID = 182,
+ 182,
"SMD Inductor",
"Electronic Component",
OrePrefixes.componentCircuit.get(Materials.Inductor),
SubTag.NO_UNIFICATION));
ItemList.Circuit_Parts_InductorASMD
- .set(addItem(tLastID = 183, "Advanced SMD Inductor", "Advanced Electronic Component", o));
+ .set(addItem(183, "Advanced SMD Inductor", "Advanced Electronic Component", o));
ItemList.Circuit_Parts_InductorXSMD
- .set(addItem(tLastID = 184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o));
+ .set(addItem(184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o));
GT_OreDictUnificator
.set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L));
@@ -156,107 +154,104 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
*
* quantum chips
*/
- ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Boule", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Ingot.set(addItem(30, "Monocrystalline Silicon Boule", "Raw Circuit", o));
ItemList.Circuit_Silicon_Ingot2
- .set(addItem(tLastID = 31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+ .set(addItem(31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o));
ItemList.Circuit_Silicon_Ingot3
- .set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+ .set(addItem(32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o));
ItemList.Circuit_Silicon_Ingot4
- .set(addItem(tLastID = 150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+ .set(addItem(150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o));
ItemList.Circuit_Silicon_Ingot5
- .set(addItem(tLastID = 152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Ingot6
- .set(addItem(tLastID = 721, "Optically Enriched Crystalline Boule", "Raw Circuit", o));
+ .set(addItem(152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Ingot6.set(addItem(721, "Optically Enriched Crystalline Boule", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Phosphorus doped Wafer", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Wafer3.set(addItem(tLastID = 35, "Naquadah doped Wafer", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Wafer4.set(addItem(tLastID = 151, "Europium doped Wafer", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Wafer5.set(addItem(tLastID = 153, "Americium doped Wafer", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Wafer6.set(addItem(tLastID = 722, "Photonically Prepared Wafer", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Wafer7.set(addItem(tLastID = 723, "Photonically Enhanced Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Wafer.set(addItem(33, "Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Wafer2.set(addItem(34, "Phosphorus doped Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Wafer3.set(addItem(35, "Naquadah doped Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Wafer4.set(addItem(151, "Europium doped Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Wafer5.set(addItem(153, "Americium doped Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Wafer6.set(addItem(722, "Photonically Prepared Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Wafer7.set(addItem(723, "Photonically Enhanced Wafer", "Raw Circuit", o));
- ItemList.Circuit_Wafer_ILC.set(addItem(tLastID = 36, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o));
- ItemList.Circuit_Chip_ILC.set(addItem(tLastID = 37, "Integrated Logic Circuit", "Integrated Circuit", o));
+ ItemList.Circuit_Wafer_ILC.set(addItem(36, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o));
+ ItemList.Circuit_Chip_ILC.set(addItem(37, "Integrated Logic Circuit", "Integrated Circuit", o));
- ItemList.Circuit_Wafer_Ram.set(addItem(tLastID = 38, "Random Access Memory Chip (Wafer)", "Raw Circuit", o));
- ItemList.Circuit_Chip_Ram.set(addItem(tLastID = 39, "Random Access Memory Chip", "Integrated Circuit", o));
+ ItemList.Circuit_Wafer_Ram.set(addItem(38, "Random Access Memory Chip (Wafer)", "Raw Circuit", o));
+ ItemList.Circuit_Chip_Ram.set(addItem(39, "Random Access Memory Chip", "Integrated Circuit", o));
- ItemList.Circuit_Wafer_NAND.set(addItem(tLastID = 40, "NAND Memory Chip (Wafer)", "Raw Circuit", o));
- ItemList.Circuit_Chip_NAND.set(addItem(tLastID = 41, "NAND Memory Chip", "Integrated Circuit", o));
+ ItemList.Circuit_Wafer_NAND.set(addItem(40, "NAND Memory Chip (Wafer)", "Raw Circuit", o));
+ ItemList.Circuit_Chip_NAND.set(addItem(41, "NAND Memory Chip", "Integrated Circuit", o));
- ItemList.Circuit_Wafer_NOR.set(addItem(tLastID = 42, "NOR Memory Chip (Wafer)", "Raw Circuit", o));
- ItemList.Circuit_Chip_NOR.set(addItem(tLastID = 43, "NOR Memory Chip", "Integrated Circuit", o));
+ ItemList.Circuit_Wafer_NOR.set(addItem(42, "NOR Memory Chip (Wafer)", "Raw Circuit", o));
+ ItemList.Circuit_Chip_NOR.set(addItem(43, "NOR Memory Chip", "Integrated Circuit", o));
- ItemList.Circuit_Wafer_CPU.set(addItem(tLastID = 44, "Central Processing Unit (Wafer)", "Raw Circuit", o));
- ItemList.Circuit_Chip_CPU.set(addItem(tLastID = 45, "Central Processing Unit", "Integrated Circuit", o));
+ ItemList.Circuit_Wafer_CPU.set(addItem(44, "Central Processing Unit (Wafer)", "Raw Circuit", o));
+ ItemList.Circuit_Chip_CPU.set(addItem(45, "Central Processing Unit", "Integrated Circuit", o));
- ItemList.Circuit_Wafer_SoC.set(addItem(tLastID = 46, "SoC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_SoC.set(addItem(tLastID = 47, "SoC", "System on a Chip", o));
+ ItemList.Circuit_Wafer_SoC.set(addItem(46, "SoC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_SoC.set(addItem(47, "SoC", "System on a Chip", o));
- ItemList.Circuit_Wafer_SoC2.set(addItem(tLastID = 48, "ASoC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_SoC2.set(addItem(tLastID = 49, "ASoC", "Advanced System on a Chip", o));
+ ItemList.Circuit_Wafer_SoC2.set(addItem(48, "ASoC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_SoC2.set(addItem(49, "ASoC", "Advanced System on a Chip", o));
- ItemList.Circuit_Wafer_PIC.set(addItem(tLastID = 50, "PIC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_PIC.set(addItem(tLastID = 51, "Power IC", "Power Circuit", o));
+ ItemList.Circuit_Wafer_PIC.set(addItem(50, "PIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_PIC.set(addItem(51, "Power IC", "Power Circuit", o));
- ItemList.Circuit_Wafer_HPIC.set(addItem(tLastID = 52, "HPIC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_HPIC.set(addItem(tLastID = 53, "High Power IC", "High Power Circuit", o));
+ ItemList.Circuit_Wafer_HPIC.set(addItem(52, "HPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_HPIC.set(addItem(53, "High Power IC", "High Power Circuit", o));
- ItemList.Circuit_Wafer_NanoCPU.set(addItem(tLastID = 54, "NanoCPU Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_NanoCPU
- .set(addItem(tLastID = 55, "Nanocomponent Central Processing Unit", "Power Circuit", o));
+ ItemList.Circuit_Wafer_NanoCPU.set(addItem(54, "NanoCPU Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_NanoCPU.set(addItem(55, "Nanocomponent Central Processing Unit", "Power Circuit", o));
- ItemList.Circuit_Wafer_QuantumCPU.set(addItem(tLastID = 56, "QBit Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_QuantumCPU.set(addItem(tLastID = 57, "QBit Processing Unit", "Quantum CPU", o));
+ ItemList.Circuit_Wafer_QuantumCPU.set(addItem(56, "QBit Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_QuantumCPU.set(addItem(57, "QBit Processing Unit", "Quantum CPU", o));
- ItemList.Circuit_Wafer_UHPIC.set(addItem(tLastID = 58, "UHPIC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_UHPIC.set(addItem(tLastID = 59, "Ultra High Power IC", "Ultra High Power Circuit", o));
+ ItemList.Circuit_Wafer_UHPIC.set(addItem(58, "UHPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_UHPIC.set(addItem(59, "Ultra High Power IC", "Ultra High Power Circuit", o));
- ItemList.Circuit_Wafer_Simple_SoC.set(addItem(tLastID = 60, "Simple SoC Wafer", "Raw Primitive Circuit", o));
- ItemList.Circuit_Chip_Simple_SoC.set(addItem(tLastID = 61, "Simple SoC", "Simple System on a Chip", o));
+ ItemList.Circuit_Wafer_Simple_SoC.set(addItem(60, "Simple SoC Wafer", "Raw Primitive Circuit", o));
+ ItemList.Circuit_Chip_Simple_SoC.set(addItem(61, "Simple SoC", "Simple System on a Chip", o));
- ItemList.Circuit_Wafer_ULPIC.set(addItem(tLastID = 62, "ULPIC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_ULPIC.set(addItem(tLastID = 63, "Ultra Low Power IC", "Ultra Low Power Circuit", o));
+ ItemList.Circuit_Wafer_ULPIC.set(addItem(62, "ULPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_ULPIC.set(addItem(63, "Ultra Low Power IC", "Ultra Low Power Circuit", o));
- ItemList.Circuit_Wafer_LPIC.set(addItem(tLastID = 64, "LPIC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_LPIC.set(addItem(tLastID = 65, "Low Power IC", "Low Power Circuit", o));
+ ItemList.Circuit_Wafer_LPIC.set(addItem(64, "LPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_LPIC.set(addItem(65, "Low Power IC", "Low Power Circuit", o));
- ItemList.Circuit_Wafer_NPIC.set(addItem(tLastID = 160, "NPIC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_NPIC.set(addItem(tLastID = 161, "Nano Power IC", "Nano Power Circuit", o));
+ ItemList.Circuit_Wafer_NPIC.set(addItem(160, "NPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_NPIC.set(addItem(161, "Nano Power IC", "Nano Power Circuit", o));
- ItemList.Circuit_Wafer_PPIC.set(addItem(tLastID = 162, "PPIC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_PPIC.set(addItem(tLastID = 163, "Piko Power IC", "Piko Power Circuit", o));
+ ItemList.Circuit_Wafer_PPIC.set(addItem(162, "PPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_PPIC.set(addItem(163, "Piko Power IC", "Piko Power Circuit", o));
- ItemList.Circuit_Wafer_QPIC.set(addItem(tLastID = 164, "QPIC Wafer", "Raw Circuit", o));
- ItemList.Circuit_Chip_QPIC.set(addItem(tLastID = 165, "Quantum Power IC", "Quantum Power Circuit", o));
+ ItemList.Circuit_Wafer_QPIC.set(addItem(164, "QPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_QPIC.set(addItem(165, "Quantum Power IC", "Quantum Power Circuit", o));
- ItemList.Circuit_Wafer_Bioware.set(addItem(tLastID = 188, "Living Bio Wafer", "Raw Circuit", o));
- ItemList.Circuit_Parts_Chip_Bioware.set(addItem(tLastID = 189, "Living Bio Chip", "Needed for Circuits", o));
+ ItemList.Circuit_Wafer_Bioware.set(addItem(188, "Living Bio Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Parts_Chip_Bioware.set(addItem(189, "Living Bio Chip", "Needed for Circuits", o));
/**
* Engraved Crystal Chip Engraved Lapotron Chip Crystal CPU SoCrystal stem cells (disassemble eggs)
*/
ItemList.Circuit_Chip_CrystalSoC2
- .set(addItem(tLastID = 68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o));
- ItemList.Circuit_Parts_RawCrystalChip
- .set(addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o));
- ItemList.Circuit_Chip_CrystalCPU.set(addItem(tLastID = 70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal
- // chip
- // elite
- // part
- ItemList.Circuit_Chip_CrystalSoC.set(addItem(tLastID = 71, "Crystal SoC", "Crystal System on a Chip", o));
- ItemList.Circuit_Chip_NeuroCPU.set(addItem(tLastID = 72, "Neuro Processing Unit", "Neuro CPU", o));
- ItemList.Circuit_Chip_Stemcell.set(addItem(tLastID = 73, "Stemcells", "Raw inteligence", o));
+ .set(addItem(68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o));
+ ItemList.Circuit_Parts_RawCrystalChip.set(addItem(69, "Raw Crystal Chip", "Raw Crystal Processor", o));
+ ItemList.Circuit_Chip_CrystalCPU.set(addItem(70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal
+ // chip
+ // elite
+ // part
+ ItemList.Circuit_Chip_CrystalSoC.set(addItem(71, "Crystal SoC", "Crystal System on a Chip", o));
+ ItemList.Circuit_Chip_NeuroCPU.set(addItem(72, "Neuro Processing Unit", "Neuro CPU", o));
+ ItemList.Circuit_Chip_Stemcell.set(addItem(73, "Stemcells", "Raw inteligence", o));
ItemList.Circuit_Parts_RawCrystalParts
- .set(addItem(tLastID = 74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o));
- ItemList.Circuit_Chip_Biocell.set(addItem(tLastID = 76, "Biocells", "Mutated Raw inteligence", o));
- ItemList.Circuit_Chip_BioCPU.set(addItem(tLastID = 77, "Bio Processing Unit", "Bio CPU", o));
- ItemList.Circuit_Chip_Optical.set(addItem(tLastID = 724, "Raw Exposed Optical Chip", "Raw Optical Chip", o));
+ .set(addItem(74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o));
+ ItemList.Circuit_Chip_Biocell.set(addItem(76, "Biocells", "Mutated Raw inteligence", o));
+ ItemList.Circuit_Chip_BioCPU.set(addItem(77, "Bio Processing Unit", "Bio CPU", o));
+ ItemList.Circuit_Chip_Optical.set(addItem(724, "Raw Exposed Optical Chip", "Raw Optical Chip", o));
// Nand Chip
ItemList.NandChip.set(
addItem(
- tLastID = 75,
+ 75,
"NAND Chip",
"A very simple Circuit",
OrePrefixes.circuit.get(Materials.Primitive),
@@ -269,7 +264,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
// Integrated Logic Circuit Item01
ItemList.Circuit_Integrated_Good.set(
addItem(
- tLastID = 79,
+ 79,
"Good Integrated Circuit",
"Good Circuit",
OrePrefixes.circuit.get(Materials.Good),
@@ -280,7 +275,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
ItemList.Circuit_Microprocessor.set(
addItem(
- tLastID = 78,
+ 78,
"Microprocessor",
"A Basic Circuit",
OrePrefixes.circuit.get(Materials.Basic),
@@ -288,7 +283,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Microprocessor.get(1), LV);
ItemList.Circuit_Processor.set(
addItem(
- tLastID = 80,
+ 80,
"Integrated Processor",
"A Good Circuit",
OrePrefixes.circuit.get(Materials.Good),
@@ -301,7 +296,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
ItemList.Circuit_Nanoprocessor.set(
addItem(
- tLastID = 82,
+ 82,
"Nanoprocessor",
"An Advanced Circuit",
OrePrefixes.circuit.get(Materials.Advanced),
@@ -309,7 +304,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Nanoprocessor.get(1), HV);
ItemList.Circuit_Nanocomputer.set(
addItem(
- tLastID = 83,
+ 83,
"Nanoprocessor Assembly",
"An Extreme Circuit",
OrePrefixes.circuit.get(Materials.Data),
@@ -317,7 +312,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Nanocomputer.get(1), EV);
ItemList.Circuit_Elitenanocomputer.set(
addItem(
- tLastID = 84,
+ 84,
"Elite Nanocomputer",
"An Elite Circuit",
OrePrefixes.circuit.get(Materials.Elite),
@@ -328,7 +323,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
// Quantum circuits
ItemList.Circuit_Quantumprocessor.set(
addItem(
- tLastID = 85,
+ 85,
"Quantumprocessor",
"An Extreme Circuit",
OrePrefixes.circuit.get(Materials.Data),
@@ -336,7 +331,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Quantumprocessor.get(1), EV);
ItemList.Circuit_Quantumcomputer.set(
addItem(
- tLastID = 86,
+ 86,
"Quantumprocessor Assembly",
"An Elite Circuit",
OrePrefixes.circuit.get(Materials.Elite),
@@ -344,7 +339,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Quantumcomputer.get(1), IV);
ItemList.Circuit_Masterquantumcomputer.set(
addItem(
- tLastID = 87,
+ 87,
"Master Quantumcomputer",
"A Master Circuit",
OrePrefixes.circuit.get(Materials.Master),
@@ -352,7 +347,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Masterquantumcomputer.get(1), LuV);
ItemList.Circuit_Quantummainframe.set(
addItem(
- tLastID = 88,
+ 88,
"Quantumprocessor Mainframe",
"An Ultimate Circuit",
OrePrefixes.circuit.get(Materials.Ultimate),
@@ -362,7 +357,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
// Crystal circuits
ItemList.Circuit_Crystalprocessor.set(
addItem(
- tLastID = 89,
+ 89,
"Crystalprocessor",
"An Elite Circuit",
OrePrefixes.circuit.get(Materials.Elite),
@@ -370,7 +365,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Crystalprocessor.get(1), IV);
ItemList.Circuit_Crystalcomputer.set(
addItem(
- tLastID = 96,
+ 96,
"Crystalprocessor Assembly",
"A Master Circuit",
OrePrefixes.circuit.get(Materials.Master),
@@ -378,7 +373,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Crystalcomputer.get(1), LuV);
ItemList.Circuit_Ultimatecrystalcomputer.set(
addItem(
- tLastID = 90,
+ 90,
"Ultimate Crystalcomputer",
"An Ultimate Circuit",
OrePrefixes.circuit.get(Materials.Ultimate),
@@ -386,10 +381,10 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Ultimatecrystalcomputer.get(1), ZPM);
ItemList.Circuit_Crystalmainframe.set(
addItem(
- tLastID = 91,
+ 91,
"Crystalprocessor Mainframe",
"A Super Circuit",
- OrePrefixes.circuit.get(Materials.Superconductor),
+ OrePrefixes.circuit.get(Materials.SuperconductorUHV),
SubTag.NO_UNIFICATION));
registerTieredTooltip(ItemList.Circuit_Crystalmainframe.get(1), UV);
@@ -399,7 +394,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
// Wetware circuits
ItemList.Circuit_Neuroprocessor.set(
addItem(
- tLastID = 92,
+ 92,
"Wetwareprocessor",
"A Master Circuit",
OrePrefixes.circuit.get(Materials.Master),
@@ -407,7 +402,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Neuroprocessor.get(1), LuV);
ItemList.Circuit_Wetwarecomputer.set(
addItem(
- tLastID = 93,
+ 93,
"Wetwareprocessor Assembly",
"An Ultimate Circuit",
OrePrefixes.circuit.get(Materials.Ultimate),
@@ -415,15 +410,15 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Wetwarecomputer.get(1), ZPM);
ItemList.Circuit_Wetwaresupercomputer.set(
addItem(
- tLastID = 94,
+ 94,
"Wetware Supercomputer",
"A Super Circuit",
- OrePrefixes.circuit.get(Materials.Superconductor),
+ OrePrefixes.circuit.get(Materials.SuperconductorUHV),
SubTag.NO_UNIFICATION));
registerTieredTooltip(ItemList.Circuit_Wetwaresupercomputer.get(1), UV);
ItemList.Circuit_Wetwaremainframe.set(
addItem(
- tLastID = 95,
+ 95,
"Wetware Mainframe",
"An Infinite Circuit",
OrePrefixes.circuit.get(Materials.Infinite),
@@ -433,7 +428,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
// Bioware circuits.
ItemList.Circuit_Bioprocessor.set(
addItem(
- tLastID = 97,
+ 97,
"Bioprocessor",
"An Ultimate Circuit",
OrePrefixes.circuit.get(Materials.Ultimate),
@@ -441,15 +436,15 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Bioprocessor.get(1), ZPM);
ItemList.Circuit_Biowarecomputer.set(
addItem(
- tLastID = 98,
+ 98,
"Biowareprocessor Assembly",
"A Super Circuit",
- OrePrefixes.circuit.get(Materials.Superconductor),
+ OrePrefixes.circuit.get(Materials.SuperconductorUHV),
SubTag.NO_UNIFICATION));
registerTieredTooltip(ItemList.Circuit_Biowarecomputer.get(1), UV);
ItemList.Circuit_Biowaresupercomputer.set(
addItem(
- tLastID = 99,
+ 99,
"Bioware Supercomputer",
"An Infinite Circuit",
OrePrefixes.circuit.get(Materials.Infinite),
@@ -457,42 +452,40 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_Biowaresupercomputer.get(1), UHV);
ItemList.Circuit_Biomainframe.set(
addItem(
- tLastID = 120,
+ 120,
"Bio Mainframe",
"A Bio Circuit",
OrePrefixes.circuit.get(Materials.Bio),
SubTag.NO_UNIFICATION));
registerTieredTooltip(ItemList.Circuit_Biomainframe.get(1), UEV);
- ItemList.Circuit_Board_Coated_Basic.set(addItem(tLastID = 100, "Circuit Board", "A basic Circuit Board", o));
- ItemList.Circuit_Board_Phenolic_Good
- .set(addItem(tLastID = 101, "Good Circuit Board", "A good Circuit Board", o));
+ ItemList.Circuit_Board_Coated_Basic.set(addItem(100, "Circuit Board", "A basic Circuit Board", o));
+ ItemList.Circuit_Board_Phenolic_Good.set(addItem(101, "Good Circuit Board", "A good Circuit Board", o));
ItemList.Circuit_Board_Epoxy_Advanced
- .set(addItem(tLastID = 102, "Advanced Circuit Board", "A advanced Circuit Board", o));
+ .set(addItem(102, "Advanced Circuit Board", "A advanced Circuit Board", o));
ItemList.Circuit_Board_Fiberglass_Advanced
- .set(addItem(tLastID = 103, "More Advanced Circuit Board", "A more advanced Circuit Board", o));
+ .set(addItem(103, "More Advanced Circuit Board", "A more advanced Circuit Board", o));
ItemList.Circuit_Board_Multifiberglass_Elite
- .set(addItem(tLastID = 104, "Elite Circuit Board", "A elite Circuit Board", o));
+ .set(addItem(104, "Elite Circuit Board", "A elite Circuit Board", o));
ItemList.Circuit_Board_Wetware_Extreme
- .set(addItem(tLastID = 105, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o));
- ItemList.Circuit_Board_Plastic_Advanced.set(addItem(tLastID = 106, "Plastic Circuit Board", "A good Board", o));
+ .set(addItem(105, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o));
+ ItemList.Circuit_Board_Plastic_Advanced.set(addItem(106, "Plastic Circuit Board", "A good Board", o));
ItemList.Circuit_Board_Bio_Ultra
- .set(addItem(tLastID = 107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o));
- ItemList.Circuit_Board_Optical
- .set(addItem(tLastID = 728, "Optical Circuit Board", "Optically Infused Board", o));
+ .set(addItem(107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o));
+ ItemList.Circuit_Board_Optical.set(addItem(728, "Optical Circuit Board", "Optically Infused Board", o));
// Optical circuits
ItemList.Circuit_OpticalProcessor.set(
addItem(
- tLastID = 154,
+ 154,
"Optical Processor",
"An Optical Circuit",
- OrePrefixes.circuit.get(Materials.Superconductor),
+ OrePrefixes.circuit.get(Materials.SuperconductorUHV),
SubTag.NO_UNIFICATION));
registerTieredTooltip(ItemList.Circuit_OpticalProcessor.get(1), UV);
ItemList.Circuit_OpticalAssembly.set(
addItem(
- tLastID = 155,
+ 155,
"Optical Assembly",
"An Optical Circuit",
OrePrefixes.circuit.get(Materials.Infinite),
@@ -500,7 +493,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_OpticalAssembly.get(1), UHV);
ItemList.Circuit_OpticalComputer.set(
addItem(
- tLastID = 156,
+ 156,
"Optical Computer",
"An Optical Circuit",
OrePrefixes.circuit.get(Materials.Bio),
@@ -508,7 +501,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_OpticalComputer.get(1), UEV);
ItemList.Circuit_OpticalMainframe.set(
addItem(
- tLastID = 157,
+ 157,
"Optical Mainframe",
"An Optical Circuit",
OrePrefixes.circuit.get(Materials.Optical),
@@ -518,7 +511,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
// Exotic circuits
ItemList.Circuit_ExoticProcessor.set(
addItem(
- tLastID = 166,
+ 166,
"Exotic Processor",
"An Exotic Circuit",
OrePrefixes.circuit.get(Materials.Infinite),
@@ -526,7 +519,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_ExoticProcessor.get(1), UHV);
ItemList.Circuit_ExoticAssembly.set(
addItem(
- tLastID = 167,
+ 167,
"Exotic Assembly",
"An Exotic Circuit",
OrePrefixes.circuit.get(Materials.Bio),
@@ -534,7 +527,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_ExoticAssembly.get(1), UEV);
ItemList.Circuit_ExoticComputer.set(
addItem(
- tLastID = 168,
+ 168,
"Exotic Computer",
"An Exotic Circuit",
OrePrefixes.circuit.get(Materials.Optical),
@@ -542,7 +535,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_ExoticComputer.get(1), UIV);
ItemList.Circuit_ExoticMainframe.set(
addItem(
- tLastID = 169,
+ 169,
"Exotic Mainframe",
"An Exotic Circuit",
OrePrefixes.circuit.get(Materials.Exotic),
@@ -552,7 +545,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
// Cosmic circuits
ItemList.Circuit_CosmicProcessor.set(
addItem(
- tLastID = 170,
+ 170,
"Cosmic Processor",
"A Cosmic Circuit",
OrePrefixes.circuit.get(Materials.Bio),
@@ -560,7 +553,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_CosmicProcessor.get(1), UEV);
ItemList.Circuit_CosmicAssembly.set(
addItem(
- tLastID = 171,
+ 171,
"Cosmic Assembly",
"A Cosmic Circuit",
OrePrefixes.circuit.get(Materials.Optical),
@@ -568,7 +561,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_CosmicAssembly.get(1), UIV);
ItemList.Circuit_CosmicComputer.set(
addItem(
- tLastID = 172,
+ 172,
"Cosmic Computer",
"A Cosmic Circuit",
OrePrefixes.circuit.get(Materials.Exotic),
@@ -576,7 +569,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_CosmicComputer.get(1), UMV);
ItemList.Circuit_CosmicMainframe.set(
addItem(
- tLastID = 173,
+ 173,
"Cosmic Mainframe",
"A Cosmic Circuit",
OrePrefixes.circuit.get(Materials.Cosmic),
@@ -586,7 +579,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
// Transcendent circuits
ItemList.Circuit_TranscendentProcessor.set(
addItem(
- tLastID = 174,
+ 174,
"Temporally Transcendent Processor",
"A circuit operating outside of known spacetime",
OrePrefixes.circuit.get(Materials.Optical),
@@ -594,7 +587,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_TranscendentProcessor.get(1), UIV);
ItemList.Circuit_TranscendentAssembly.set(
addItem(
- tLastID = 175,
+ 175,
"Temporally Transcendent Assembly",
"A circuit operating outside of known spacetime",
OrePrefixes.circuit.get(Materials.Exotic),
@@ -602,7 +595,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_TranscendentAssembly.get(1), UMV);
ItemList.Circuit_TranscendentComputer.set(
addItem(
- tLastID = 176,
+ 176,
"Temporally Transcendent Computer",
"A circuit operating outside of known spacetime",
OrePrefixes.circuit.get(Materials.Cosmic),
@@ -610,18 +603,18 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
registerTieredTooltip(ItemList.Circuit_TranscendentComputer.get(1), UXV);
ItemList.Circuit_TranscendentMainframe.set(
addItem(
- tLastID = 177,
+ 177,
"Temporally Transcendent Mainframe",
"A circuit operating outside of known spacetime",
OrePrefixes.circuit.get(Materials.Transcendent),
SubTag.NO_UNIFICATION));
registerTieredTooltip(ItemList.Circuit_TranscendentMainframe.get(1), MAX);
- ItemList.Tube_Wires.set(addItem(tLastID = 110, "Tube Wires", "For the Vacuum Tubes", o));
+ ItemList.Tube_Wires.set(addItem(110, "Tube Wires", "For the Vacuum Tubes", o));
ItemList.Cover_SolarPanel_UHV.set(
addItem(
- tLastID = 130,
+ 130,
"Solar Panel (UHV)",
"Ultimate High Voltage Solar Panel (Needs cleaning with right click)",
new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L),
@@ -629,7 +622,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L)));
ItemList.Cover_SolarPanel_UEV.set(
addItem(
- tLastID = 131,
+ 131,
"Solar Panel (UEV)",
"Ultimate Extreme Voltage Solar Panel (Needs cleaning with right click)",
new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L),
@@ -637,7 +630,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L)));
ItemList.Cover_SolarPanel_UIV.set(
addItem(
- tLastID = 132,
+ 132,
"Solar Panel (UIV)",
"Ultimate Insane Voltage Solar Panel (Needs cleaning with right click)",
new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L),
@@ -657,209 +650,209 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
TextureFactory.of(SOLARPANEL_UIV),
new GT_Cover_SolarPanel(33554432));
- ItemList.ULV_Coil.set(addItem(tLastID = 140, "Ultra Low Voltage Coil", "Primitive Coil", o));
- ItemList.LV_Coil.set(addItem(tLastID = 141, "Low Voltage Coil", "Basic Coil", o));
- ItemList.MV_Coil.set(addItem(tLastID = 142, "Medium Voltage Coil", "Good Coil", o));
- ItemList.HV_Coil.set(addItem(tLastID = 143, "High Voltage Coil", "Advanced Coil", o));
- ItemList.EV_Coil.set(addItem(tLastID = 144, "Extreme Voltage Coil", "Extreme Coil", o));
- ItemList.IV_Coil.set(addItem(tLastID = 145, "Insane Voltage Coil", "Elite Coil", o));
- ItemList.LuV_Coil.set(addItem(tLastID = 146, "Ludicrous Voltage Coil", "Master Coil", o));
- ItemList.ZPM_Coil.set(addItem(tLastID = 147, "ZPM Voltage Coil", "Ultimate Coil", o));
- ItemList.UV_Coil.set(addItem(tLastID = 148, "Ultimate Voltage Coil", "Super Coil", o));
- ItemList.UHV_Coil.set(addItem(tLastID = 149, "Highly Ultimate Voltage Coil", "Infinite Coil", o));
+ ItemList.ULV_Coil.set(addItem(140, "Ultra Low Voltage Coil", "Primitive Coil", o));
+ ItemList.LV_Coil.set(addItem(141, "Low Voltage Coil", "Basic Coil", o));
+ ItemList.MV_Coil.set(addItem(142, "Medium Voltage Coil", "Good Coil", o));
+ ItemList.HV_Coil.set(addItem(143, "High Voltage Coil", "Advanced Coil", o));
+ ItemList.EV_Coil.set(addItem(144, "Extreme Voltage Coil", "Extreme Coil", o));
+ ItemList.IV_Coil.set(addItem(145, "Insane Voltage Coil", "Elite Coil", o));
+ ItemList.LuV_Coil.set(addItem(146, "Ludicrous Voltage Coil", "Master Coil", o));
+ ItemList.ZPM_Coil.set(addItem(147, "ZPM Voltage Coil", "Ultimate Coil", o));
+ ItemList.UV_Coil.set(addItem(148, "Ultimate Voltage Coil", "Super Coil", o));
+ ItemList.UHV_Coil.set(addItem(149, "Highly Ultimate Voltage Coil", "Infinite Coil", o));
- ItemList.GalliumArsenideCrystal.set(addItem(tLastID = 190, "Gallium Arsenide Crystal", "For making boules", o));
+ ItemList.GalliumArsenideCrystal.set(addItem(190, "Gallium Arsenide Crystal", "For making boules", o));
ItemList.GalliumArsenideCrystalSmallPart
- .set(addItem(tLastID = 191, "Small Gallium Arsenide Crystal", "For making boules", o));
- ItemList.KevlarFiber.set(addItem(tLastID = 192, "Kevlar Fiber", "For make Kevlar Plates", o));
- ItemList.WovenKevlar.set(addItem(tLastID = 193, "Woven Kevlar", "For make Kevlar Plates", o));
- ItemList.Spinneret.set(addItem(tLastID = 194, "Spinneret", "For make Kevlar Fiber", o));
+ .set(addItem(191, "Small Gallium Arsenide Crystal", "For making boules", o));
+ ItemList.KevlarFiber.set(addItem(192, "Kevlar Fiber", "For make Kevlar Plates", o));
+ ItemList.WovenKevlar.set(addItem(193, "Woven Kevlar", "For make Kevlar Plates", o));
+ ItemList.Spinneret.set(addItem(194, "Spinneret", "For make Kevlar Fiber", o));
- ItemList.IndustrialApiary_Upgrade_Frame.set(addItem(tLastID = 199, "Upgrade Frame", "Crafting component", o));
+ ItemList.IndustrialApiary_Upgrade_Frame.set(addItem(199, "Upgrade Frame", "Crafting component", o));
ItemList.IndustrialApiary_Upgrade_Acceleration_1.set(
addItem(
- tLastID = 200,
+ 200,
"Acceleration Upgrade x2",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 2x acceleration level/n * Energy Consumption +1 AMP LV",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_Acceleration_2.set(
addItem(
- tLastID = 201,
+ 201,
"Acceleration Upgrade x4",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 4x acceleration level/n * Energy Consumption +1 AMP MV",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_Acceleration_3.set(
addItem(
- tLastID = 202,
+ 202,
"Acceleration Upgrade x8",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 8x acceleration level/n * Energy Consumption +1 AMP HV",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_Acceleration_4.set(
addItem(
- tLastID = 203,
+ 203,
"Acceleration Upgrade x16",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 16x acceleration level/n * Energy Consumption +1 AMP EV",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_Acceleration_5.set(
addItem(
- tLastID = 204,
+ 204,
"Acceleration Upgrade x32",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 32x acceleration level/n * Energy Consumption +1 AMP IV",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_Acceleration_6.set(
addItem(
- tLastID = 205,
+ 205,
"Acceleration Upgrade x64",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 64x acceleration level/n * Energy Consumption +1 AMP LuV",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_Acceleration_7.set(
addItem(
- tLastID = 206,
+ 206,
"Acceleration Upgrade x128",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 128x acceleration level/n * Energy Consumption +1 AMP ZPM",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_Acceleration_8.set(
addItem(
- tLastID = 207,
+ 207,
"Acceleration Upgrade x256",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 256x acceleration level/n * Energy Consumption +1 AMP UV",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.set(
addItem(
- tLastID = 208,
+ 208,
"Upgraded Acceleration Upgrade x256",
"Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 256x acceleration level/n * Will also grant 8x production upgrade/n * Energy Consumption +1 AMP UV",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_PRODUCTION.set(
addItem(
- tLastID = 209,
+ 209,
"Production Upgrade",
"Production upgrade for Industrial Apiary/n Maximum Installed: 8/n Increases production modifier by 0.25/n Energy Consumption +40%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_PLAINS.set(
addItem(
- tLastID = 210,
+ 210,
"Plains Emulation Upgrade",
"Plains emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Plains/n * Energy Consumption +40%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_LIGHT.set(
addItem(
- tLastID = 211,
+ 211,
"Light Upgrade",
"Light upgrade for Industrial Apiary/n Maximum Installed: 1/n * Internal Lighting/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_FLOWERING.set(
addItem(
- tLastID = 212,
+ 212,
"Flowering Upgrade",
"Flowering upgrade for Industrial Apiary/n Maximum Installed: 8/n * Flowering and Pollination +20%/n * Energy Consumption +10%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_WINTER.set(
addItem(
- tLastID = 213,
+ 213,
"Winter Emulation Upgrade",
"Winter emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Taiga/n * Energy Consumption +50%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_DRYER.set(
addItem(
- tLastID = 214,
+ 214,
"Dryer Upgrade",
"Dryer upgrade for Industrial Apiary/n Maximum Installed: 8/n * Humidity -25%/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_AUTOMATION.set(
addItem(
- tLastID = 215,
+ 215,
"Automation Upgrade",
"Automation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Automation/n * Energy Consumption +10%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.set(
addItem(
- tLastID = 216,
+ 216,
"Humidifier Upgrade",
"Humidifier upgrade for Industrial Apiary/n Maximum Installed: 8/n * Humidity +25%/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_HELL.set(
addItem(
- tLastID = 217,
+ 217,
"HELL Emulation Upgrade",
"HELL emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: HELL/n * Energy Consumption +50%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_POLLEN.set(
addItem(
- tLastID = 218,
+ 218,
"Pollen Scrubber Upgrade",
"Pollen scrubber upgrade for Industrial Apiary/n Maximum Installed: 1/n * Flowering and Pollination -100%/n * Energy Consumption +30%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_DESERT.set(
addItem(
- tLastID = 219,
+ 219,
"Desert Emulation Upgrade",
"Desert emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Desert/n * Energy Consumption +20%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_COOLER.set(
addItem(
- tLastID = 220,
+ 220,
"Cooler Upgrade",
"Cooler upgrade for Industrial Apiary/n Maximum Installed: 8/n * Temperature -25%/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_LIFESPAN.set(
addItem(
- tLastID = 221,
+ 221,
"Lifespan Upgrade",
"Lifespan upgrade for Industrial Apiary/n Maximum Installed: 4/n * Lifespan -33%/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_SEAL.set(
addItem(
- tLastID = 222,
+ 222,
"Seal Upgrade",
"Seal upgrade for Industrial Apiary/n Maximum Installed: 1/n * Rain Protection/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_STABILIZER.set(
addItem(
- tLastID = 223,
+ 223,
"Genetic Stabilizer Upgrade",
"Genetic stabilizer upgrade for Industrial Apiary/n Maximum Installed: 1/n * Genetic Decay -100%/n * Energy Consumption +150%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_JUNGLE.set(
addItem(
- tLastID = 224,
+ 224,
"Jungle Emulation Upgrade",
"Jungle emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Jungle/n * Energy Consumption +20%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_TERRITORY.set(
addItem(
- tLastID = 225,
+ 225,
"Territory Upgrade",
"Territory upgrade for Industrial Apiary/n Maximum Installed: 4/n * Territory +50%/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_OCEAN.set(
addItem(
- tLastID = 226,
+ 226,
"Ocean Emulation Upgrade",
"Ocean emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Ocean/n * Energy Consumption +20%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_SKY.set(
addItem(
- tLastID = 227,
+ 227,
"Open Sky Upgrade",
"Open sky upgrade for Industrial Apiary/n Maximum Installed: 1/n * Open Sky Simulation/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_HEATER.set(
addItem(
- tLastID = 228,
+ 228,
"Heater Upgrade",
"Heater upgrade for Industrial Apiary/n Maximum Installed: 8/n * Temperature +25%/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_SIEVE.set(
addItem(
- tLastID = 229,
+ 229,
"Sieve Upgrade",
"Sieve upgrade for Industrial Apiary/n Maximum Installed: 1/n * Pollen Collection/n * Energy Consumption +25%",
OrePrefixes.apiaryUpgrade.name()));
ItemList.IndustrialApiary_Upgrade_UNLIGHT.set(
addItem(
- tLastID = 231,
+ 231,
"Night Upgrade",
"Night upgrade for Industrial Apiary/n Maximum Installed: 1/n * Internal Darkness/n * Energy Consumption +5%",
OrePrefixes.apiaryUpgrade.name()));
@@ -903,11 +896,9 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
"BY THE POWERS OF NAUGHTINESS, I COMMAND THIS PARTICULAR STAR, TO BE REALLY, REALLY HOT",
SubTag.NO_UNIFICATION));
- ItemList.Optical_Cpu_Containment_Housing
- .set(addItem(tLastID = 727, "Optical CPU Containment Housing", "CPU Housing", o));
- ItemList.Optically_Perfected_CPU.set(addItem(tLastID = 726, "Optically Perfected CPU", "Perfected CPU!", o));
- ItemList.Optically_Compatible_Memory
- .set(addItem(tLastID = 725, "Optically Compatible Memory", "Its in the name!", o));
+ ItemList.Optical_Cpu_Containment_Housing.set(addItem(727, "Optical CPU Containment Housing", "CPU Housing", o));
+ ItemList.Optically_Perfected_CPU.set(addItem(726, "Optically Perfected CPU", "Perfected CPU!", o));
+ ItemList.Optically_Compatible_Memory.set(addItem(725, "Optically Compatible Memory", "Its in the name!", o));
int whiteDwarfIDs = 729;
ItemList.White_Dwarf_Shape_Extruder_Plate.set(
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
index 8979d358f1..32f1d41197 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
@@ -176,12 +176,10 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
/** Struct class holding data that we need to properly handle a registered fluid cell item. */
private static class RegisteredFluidData {
- private final Fluid fluid;
private final short[] rgba;
private final IIconContainer iconContainer;
- private RegisteredFluidData(Fluid fluid, short[] rgba, IIconContainer iconContainer) {
- this.fluid = fluid;
+ private RegisteredFluidData(short[] rgba, IIconContainer iconContainer) {
this.rgba = rgba;
this.iconContainer = iconContainer;
}
@@ -279,7 +277,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
int color = fluid.getColor();
short[] rgba = GT_Util.getRGBaArray(color);
- registeredFluidDataMap.put(id, new RegisteredFluidData(fluid, rgba, iconContainerMap.get(cellType)));
+ registeredFluidDataMap.put(id, new RegisteredFluidData(rgba, iconContainerMap.get(cellType)));
}
private void registerOreDict() {
@@ -309,7 +307,6 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
return ItemList.Cell_Empty.get(1L);
}
- @SuppressWarnings("unchecked")
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) {
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 60fbeb075a..8956aa4ae2 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -2,6 +2,10 @@ package gregtech.common.items;
import static gregtech.api.enums.GT_Values.*;
import static gregtech.api.enums.Mods.*;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.util.GT_RecipeConstants.CLEANROOM;
+import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
import java.util.Arrays;
import java.util.List;
@@ -24,6 +28,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import forestry.api.recipes.RecipeManagers;
import gregtech.GT_Mod;
+import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -1558,18 +1563,25 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
}
public void addFluidExtractorProcess(CombType comb, FluidStack fluid, Voltage volt) {
- if (fluid == null) return;
- RA.addFluidExtractionRecipe(
- GT_Utility.copyAmount(1, getStackForType(comb)),
- null,
- fluid,
- 100 * 100,
- (fluid.getFluid()
- .getDensity() * 128 > 0
- ? (fluid.getFluid()
- .getDensity() * 100)
- : 128),
- volt.getSimpleEnergy() / 2);
+ if (fluid == null) {
+ return;
+ }
+
+ int duration = (fluid.getFluid()
+ .getDensity() * 128 > 0
+ ? (fluid.getFluid()
+ .getDensity() * 100)
+ : 128);
+ int eut = volt.getSimpleEnergy() / 2;
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1, getStackForType(comb)))
+ .noItemOutputs()
+ .noFluidInputs()
+ .fluidOutputs(fluid)
+ .duration(duration)
+ .eut(eut)
+ .addTo(sFluidExtractionRecipes);
}
/**
@@ -1584,65 +1596,70 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
public void addProcessGT(CombType comb, Materials[] aMaterial, Voltage volt) {
ItemStack tComb = getStackForType(comb);
for (Materials materials : aMaterial) {
- if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4) != NI) {
+ if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4) != null) {
+ ItemStack combInput;
+ ItemStack combOutput;
+ FluidStack fluidInput;
+ FluidStack fluidOutput;
+ int durationTicks;
+ int eut;
+ boolean requiresCleanroom;
switch (comb) {
- case NEUTRONIUM:
- RA.addChemicalRecipe(
- GT_Utility.copyAmount(4, tComb),
- null,
- volt.getFluidAccordingToCombTier(),
- Materials.Neutronium.getMolten(576l),
- Materials.Neutronium.getNuggets(1),
- NI,
- volt.getComplexTime() * 17,
- volt.getChemicalEnergy(),
- volt.compareTo(Voltage.IV) > 0);
- case OSMIUM:
- RA.addChemicalRecipe(
- GT_Utility.copyAmount(4, tComb),
- null,
- volt.getFluidAccordingToCombTier(),
- Materials.Osmium.getMolten(288l),
- Materials.Osmium.getNuggets(1),
- NI,
- volt.getComplexTime() * 17,
- volt.getChemicalEnergy(),
- volt.compareTo(Voltage.IV) > 0);
- case PLATINUM:
- RA.addChemicalRecipe(
- GT_Utility.copyAmount(4, tComb),
- null,
- volt.getFluidAccordingToCombTier(),
- Materials.Platinum.getMolten(288l),
- Materials.Platinum.getNuggets(1),
- NI,
- volt.getComplexTime() * 10,
- volt.getChemicalEnergy(),
- volt.compareTo(Voltage.HV) > 0);
- case IRIDIUM:
- RA.addChemicalRecipe(
- GT_Utility.copyAmount(4, tComb),
- null,
- volt.getFluidAccordingToCombTier(),
- Materials.Iridium.getMolten(288l),
- Materials.Iridium.getNuggets(1),
- NI,
- volt.getComplexTime() * 14,
- volt.getChemicalEnergy(),
- volt.compareTo(Voltage.EV) > 0);
- default:
- RA.addChemicalRecipe(
- GT_Utility.copyAmount(4, tComb),
- null,
- volt.getFluidAccordingToCombTier(),
- null,
- GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4),
- NI,
- volt.getComplexTime(),
- volt.getChemicalEnergy(),
- volt.compareTo(Voltage.IV) > 0);
- break;
+ case NEUTRONIUM -> {
+ combInput = GT_Utility.copyAmount(4, tComb);
+ combOutput = Materials.Neutronium.getNuggets(1);
+ fluidInput = volt.getFluidAccordingToCombTier();
+ fluidOutput = Materials.Neutronium.getMolten(576);
+ durationTicks = volt.getComplexTime() * 17;
+ eut = volt.getChemicalEnergy();
+ requiresCleanroom = volt.compareTo(Voltage.IV) > 0;
+ }
+ case OSMIUM -> {
+ combInput = GT_Utility.copyAmount(4, tComb);
+ combOutput = Materials.Osmium.getNuggets(1);
+ fluidInput = volt.getFluidAccordingToCombTier();
+ fluidOutput = Materials.Osmium.getMolten(288);
+ durationTicks = volt.getComplexTime() * 17;
+ eut = volt.getChemicalEnergy();
+ requiresCleanroom = volt.compareTo(Voltage.IV) > 0;
+ }
+ case PLATINUM -> {
+ combInput = GT_Utility.copyAmount(4, tComb);
+ combOutput = Materials.Platinum.getNuggets(1);
+ fluidInput = volt.getFluidAccordingToCombTier();
+ fluidOutput = Materials.Platinum.getMolten(288);
+ durationTicks = volt.getComplexTime() * 10;
+ eut = volt.getChemicalEnergy();
+ requiresCleanroom = volt.compareTo(Voltage.HV) > 0;
+ }
+ case IRIDIUM -> {
+ combInput = GT_Utility.copyAmount(4, tComb);
+ combOutput = Materials.Iridium.getNuggets(1);
+ fluidInput = volt.getFluidAccordingToCombTier();
+ fluidOutput = Materials.Iridium.getMolten(288);
+ durationTicks = volt.getComplexTime() * 14;
+ eut = volt.getChemicalEnergy();
+ requiresCleanroom = volt.compareTo(Voltage.EV) > 0;
+ }
+ default -> {
+ combInput = GT_Utility.copyAmount(4, tComb);
+ combOutput = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4);
+ fluidInput = volt.getFluidAccordingToCombTier();
+ fluidOutput = null;
+ durationTicks = volt.getComplexTime();
+ eut = volt.getChemicalEnergy();
+ requiresCleanroom = volt.compareTo(Voltage.IV) > 0;
+ }
}
+ GT_Values.RA.stdBuilder()
+ .itemInputs(combInput)
+ .itemOutputs(combOutput)
+ .fluidInputs(fluidInput)
+ .fluidOutputs(fluidOutput)
+ .duration(durationTicks)
+ .eut(eut)
+ .metadata(CLEANROOM, requiresCleanroom)
+ .addTo(UniversalChemical);
}
}
}
@@ -1719,25 +1736,15 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
RecipeManagers.centrifugeManager.addRecipe(40, tComb, Product.build());
}
- aItem = Arrays.copyOf(aItem, 6);
- if (aItem.length > 6) {
- chance = Arrays.copyOf(chance, 6);
- }
-
- RA.addCentrifugeRecipe(
- tComb,
- NI,
- NF,
- NF,
- aItem[0],
- aItem[1],
- aItem[2],
- aItem[3],
- aItem[4],
- aItem[5],
- chance,
- duration,
- volt.getSimpleEnergy());
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tComb)
+ .itemOutputs(aItem)
+ .outputChances(chance)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(duration)
+ .eut(volt.getSimpleEnergy())
+ .addTo(sCentrifugeRecipes);
}
public void registerOreDict() {
diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java
index 6e62281812..2c32383d1f 100644
--- a/src/main/java/gregtech/common/items/ItemDrop.java
+++ b/src/main/java/gregtech/common/items/ItemDrop.java
@@ -6,6 +6,9 @@ import static gregtech.api.enums.Mods.GregTech;
import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
import static gregtech.api.enums.Mods.MagicBees;
import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
import java.util.List;
@@ -24,6 +27,7 @@ import forestry.api.core.Tabs;
import forestry.api.recipes.RecipeManagers;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
public class ItemDrop extends Item {
@@ -188,19 +192,51 @@ public class ItemDrop extends Item {
}
public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) {
- GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 32, aEUt);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tDrop)
+ .itemOutputs(aOutput2)
+ .outputChances(aChance)
+ .noFluidInputs()
+ .fluidOutputs(aOutput)
+ .duration(1 * SECONDS + 12 * TICKS)
+ .eut(aEUt)
+ .addTo(sFluidExtractionRecipes);
}
public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aDuration,
int aEUt) {
- GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, aDuration, aEUt);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tDrop)
+ .itemOutputs(aOutput2)
+ .outputChances(aChance)
+ .noFluidInputs()
+ .fluidOutputs(aOutput)
+ .duration(aDuration)
+ .eut(aEUt)
+ .addTo(sFluidExtractionRecipes);
}
public void addProcessMV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) {
- GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 128, aEUt);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tDrop)
+ .itemOutputs(aOutput2)
+ .outputChances(aChance)
+ .noFluidInputs()
+ .fluidOutputs(aOutput)
+ .duration(6 * SECONDS + 8 * TICKS)
+ .eut(aEUt)
+ .addTo(sFluidExtractionRecipes);
}
public void addProcessHV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance) {
- GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 480, 480);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tDrop)
+ .itemOutputs(aOutput2)
+ .outputChances(aChance)
+ .noFluidInputs()
+ .fluidOutputs(aOutput)
+ .duration(24 * SECONDS)
+ .eut(TierEU.RECIPE_HV)
+ .addTo(sFluidExtractionRecipes);
}
}
diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java
index 8513c02e2a..5559de9013 100644
--- a/src/main/java/gregtech/common/items/ItemPropolis.java
+++ b/src/main/java/gregtech/common/items/ItemPropolis.java
@@ -3,6 +3,9 @@ package gregtech.common.items;
import static gregtech.api.enums.Mods.GregTech;
import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
import java.util.List;
@@ -20,6 +23,7 @@ import forestry.api.core.Tabs;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -103,27 +107,38 @@ public class ItemPropolis extends Item {
}
public void addProcessHV(ItemStack tPropolis, ItemStack aOutput2) {
- GT_Values.RA
- .addFluidExtractionRecipe(tPropolis, aOutput2, FluidRegistry.getFluidStack("endergoo", 100), 5000, 50, 480);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tPropolis)
+ .itemOutputs(aOutput2)
+ .outputChances(5000)
+ .noFluidInputs()
+ .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 100))
+ .duration(2 * SECONDS + 10 * TICKS)
+ .eut(TierEU.RECIPE_HV)
+ .addTo(sFluidExtractionRecipes);
}
public void addProcessEV(ItemStack tPropolis, ItemStack aOutput2) {
- GT_Values.RA.addFluidExtractionRecipe(
- tPropolis,
- aOutput2,
- FluidRegistry.getFluidStack("endergoo", 200),
- 2500,
- 100,
- 1920);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tPropolis)
+ .itemOutputs(aOutput2)
+ .outputChances(2500)
+ .noFluidInputs()
+ .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 200))
+ .duration(5 * SECONDS)
+ .eut(TierEU.RECIPE_EV)
+ .addTo(sFluidExtractionRecipes);
}
public void addProcessIV(ItemStack tPropolis, ItemStack aOutput2) {
- GT_Values.RA.addFluidExtractionRecipe(
- tPropolis,
- aOutput2,
- FluidRegistry.getFluidStack("endergoo", 300),
- 1500,
- 150,
- 7680);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tPropolis)
+ .itemOutputs(aOutput2)
+ .outputChances(1500)
+ .noFluidInputs()
+ .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 300))
+ .duration(7 * SECONDS + 10 * TICKS)
+ .eut(TierEU.RECIPE_IV)
+ .addTo(sFluidExtractionRecipes);
}
}
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
index fd7e1a7965..f9621a8da4 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
@@ -113,6 +113,7 @@ public class Behaviour_Spray_Color extends Behaviour_None {
case SOUTH -> aZ += 1;
case WEST -> aX -= 1;
case EAST -> aX += 1;
+ default -> throw new IllegalArgumentException("Unexpected value: " + lookSide);
}
}
tNBT.removeTag("GT.RemainingPaint");
generated by cgit (git 2.46.0) at 2025-06-01 04:21:26 +0000