aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2024-08-04 05:49:03 +0100
committerGitHub <noreply@github.com>2024-08-04 11:49:03 +0700
commitaaf88d87a2111ced5c381a016dbed6c136edb7fc (patch)
tree19ef14496af5c03119c711fbeaf1cf2c4c238789 /src/main
parent50c7afb6c42498c45b422dfd09a0b9433a061034 (diff)
downloadGT5-Unofficial-aaf88d87a2111ced5c381a016dbed6c136edb7fc.tar.gz
GT5-Unofficial-aaf88d87a2111ced5c381a016dbed6c136edb7fc.tar.bz2
GT5-Unofficial-aaf88d87a2111ced5c381a016dbed6c136edb7fc.zip
Circuit material overhaul (#2814)
* first push to use new Materials for circuits * dont deprecate or redefine ultimate * sa * move it * second round * dont deprecate or redefine advanced * part 3 * part 4 * part 5 * part 6 * mini fix
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java28
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java29
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java22
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java88
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java48
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java8
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/CircuitAssembler.java2
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java231
-rw-r--r--src/main/java/common/recipeLoaders/AssemblyLine.java18
-rw-r--r--src/main/java/common/recipeLoaders/Crafting.java6
-rw-r--r--src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java32
-rw-r--r--src/main/java/goodgenerator/crossmod/thaumcraft/Research.java10
-rw-r--r--src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java2
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader.java16
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader_02.java26
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java20
-rw-r--r--src/main/java/gregtech/api/enums/Tier.java64
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java52
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java4
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java78
-rw-r--r--src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java385
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java3
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java82
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java44
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java94
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java34
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java27
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java45
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java2
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java4
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java12
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/common/CI.java4
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java8
-rw-r--r--src/main/java/kubatech/loaders/RecipeLoader.java20
-rw-r--r--src/main/java/net/glease/ggfab/ComponentRecipeLoader.java6
43 files changed, 781 insertions, 805 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index 5b6ebe0a20..3889a8ffad 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -171,7 +171,7 @@ public class RecipeLoader {
.itemInputs(
ItemList.Hull_LuV.get(1),
WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 8),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 4),
ItemList.Conveyor_Module_LuV.get(4),
GT_Utility.copyAmount(2, LanthItemList.BEAMLINE_PIPE),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2),
@@ -190,7 +190,7 @@ public class RecipeLoader {
ItemList.Hull_LuV.get(1),
WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 8),
ItemList.Casing_Coil_Superconductor.get(2),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 8),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 8),
ItemList.Electric_Pump_LuV.get(2),
GT_Utility.copyAmount(2, LanthItemList.BEAMLINE_PIPE),
GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.VanadiumGallium, 2),
@@ -209,8 +209,8 @@ public class RecipeLoader {
ItemList.Hull_LuV.get(1),
WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 8),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 4),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 4),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 2),
GT_Utility.copyAmount(2, LanthItemList.BEAMLINE_PIPE),
GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.VanadiumGallium, 1),
GT_Utility.getIntegratedCircuit(16)
@@ -228,8 +228,8 @@ public class RecipeLoader {
ItemList.Hull_LuV.get(1),
WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 8),
ItemList.Casing_Coil_Superconductor.get(12),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 8),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 8),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 8),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 8),
GT_Utility.copyAmount(8, LanthItemList.BEAMLINE_PIPE),
GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.NiobiumTitanium, 8),
GT_Utility.getIntegratedCircuit(16))
@@ -317,7 +317,7 @@ public class RecipeLoader {
Materials.Copper.getPlates(4),
WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plate, 5),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorLuV, 4),
- new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 },
+ new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
ItemList.Emitter_LuV.get(6),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 32),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Electrum, 6))
@@ -341,7 +341,7 @@ public class RecipeLoader {
Materials.Copper.getPlates(4),
WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plate, 5),
GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorZPM, 4),
- new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 },
+ new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
ItemList.Emitter_ZPM.get(6),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 64),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Electrum, 6))
@@ -361,7 +361,7 @@ public class RecipeLoader {
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),
- new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 },
+ new Object[] { OrePrefixes.circuit.get(Materials.IV), 4 },
ItemList.Robot_Arm_LuV.get(2),
ItemList.Robot_Arm_LuV.get(2),
ItemList.Conveyor_Module_LuV.get(2),
@@ -411,7 +411,7 @@ public class RecipeLoader {
Materials.Argon.getGas(1000))
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),
- new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 },
+ new Object[] { OrePrefixes.circuit.get(Materials.IV), 4 },
ItemList.Robot_Arm_LuV.get(2),
ItemList.Robot_Arm_LuV.get(2),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16),
@@ -482,7 +482,7 @@ public class RecipeLoader {
)
.itemInputs(
ItemList.Hull_LuV.get(1),
- new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 },
+ new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 },
new ItemStack(LanthItemList.CAPILLARY_EXCHANGE, 2),
ItemList.Electric_Pump_LuV.get(1),
LanthItemList.BEAMLINE_PIPE,
@@ -506,7 +506,7 @@ public class RecipeLoader {
)
.itemInputs(
ItemList.Hull_LuV.get(1),
- new Object[] { OrePrefixes.circuit.get(Materials.Master), 6 },
+ new Object[] { OrePrefixes.circuit.get(Materials.LuV), 6 },
new ItemStack(LanthItemList.CAPILLARY_EXCHANGE, 4),
ItemList.Electric_Pump_LuV.get(2),
ItemList.Electric_Motor_LuV.get(4),
@@ -3429,7 +3429,7 @@ public class RecipeLoader {
ItemList.Electric_Motor_IV.get(4L),
ItemList.Electric_Pump_IV.get(4L),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4L),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(LanthItemList.DIGESTER)
.fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1440))
@@ -3444,7 +3444,7 @@ public class RecipeLoader {
ItemList.Electric_Motor_EV.get(4L),
ItemList.Electric_Pump_EV.get(2L),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4L),
GT_Utility.getIntegratedCircuit(2))
.itemOutputs(LanthItemList.DISSOLUTION_TANK)
.fluidInputs(Materials.Polytetrafluoroethylene.getMolten(720))
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
index f0c746dd64..59332b17a2 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
@@ -233,6 +233,6 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem
private boolean isLVCircuit(ItemStack stack) {
return BW_Util.checkStackAndPrefix(stack)
&& OrePrefixes.circuit.equals(GT_OreDictUnificator.getAssociation(stack).mPrefix)
- && GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial.equals(Materials.Basic);
+ && GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial.equals(Materials.LV);
}
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java
index 7c866d53d2..9d244e5eba 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java
@@ -41,7 +41,7 @@ public class Assembler implements Runnable {
.itemInputs(
new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0),
Materials.Lapis.getPlates(9),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2L),
GT_Utility.getIntegratedCircuit(17))
.itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1))
.fluidInputs(FluidRegistry.getFluidStack("ic2coolant", 1000))
@@ -111,7 +111,7 @@ public class Assembler implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
Materials.Aluminium.getPlates(1),
ItemList.Circuit_Board_Plastic.get(1L),
ItemList.Battery_RE_LV_Lithium.get(1L))
@@ -152,24 +152,13 @@ public class Assembler implements Runnable {
ItemStack converter = converters[j][i];
ItemStack eInput = input[j][i];
ItemStack eDynamo = dynamo[j][i];
- long recipeConsumption;
- switch (i) {
- case 0:
- recipeConsumption = TierEU.RECIPE_EV;
- break;
- case 1:
- recipeConsumption = TierEU.RECIPE_IV;
- break;
- case 2:
- recipeConsumption = TierEU.RECIPE_LuV;
- break;
- case 3:
- recipeConsumption = TierEU.RECIPE_ZPM;
- break;
- default:
- recipeConsumption = TierEU.RECIPE_EV;
- break;
- }
+ long recipeConsumption = switch (i) {
+ case 0 -> TierEU.RECIPE_EV;
+ case 1 -> TierEU.RECIPE_IV;
+ case 2 -> TierEU.RECIPE_LuV;
+ case 3 -> TierEU.RECIPE_ZPM;
+ default -> TierEU.RECIPE_EV;
+ };
int solderingAmount = Math.max(144 * i, 72) * (j + 1);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java
index 17a5d5b025..e156aacbe7 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java
@@ -376,7 +376,7 @@ public class CraftingRecipes implements Runnable {
BioItemList.mBioLabParts[2],
RecipeLoader.BITSD,
new Object[] { "SFE", "CPC", "NFN", 'N',
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', "circuit" + Materials.Data,
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', "circuit" + Materials.EV,
'F', ItemList.Field_Generator_EV.get(1L), 'E', ItemList.Emitter_EV.get(1L), 'S',
ItemList.Sensor_EV.get(1L), 'P',
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), });
@@ -385,20 +385,18 @@ public class CraftingRecipes implements Runnable {
BioItemList.mBioLabParts[3],
RecipeLoader.BITSD,
new Object[] { "SFE", "CPC", "NFN", 'N',
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C',
- "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E',
- ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P',
- WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), });
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', "circuit" + Materials.LuV,
+ 'F', ItemList.Field_Generator_LuV.get(1L), 'E', ItemList.Emitter_LuV.get(1L), 'S',
+ ItemList.Sensor_LuV.get(1L), 'P', WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), });
// ClonalCellularSynthesisModule
GT_ModHandler.addCraftingRecipe(
BioItemList.mBioLabParts[4],
RecipeLoader.BITSD,
new Object[] { "FEF", "CPC", "FSF", 'N',
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C',
- "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E',
- ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P',
- WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), });
+ GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', "circuit" + Materials.LuV,
+ 'F', ItemList.Field_Generator_LuV.get(1L), 'E', ItemList.Emitter_LuV.get(1L), 'S',
+ ItemList.Sensor_LuV.get(1L), 'P', WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), });
GT_ModHandler.addCraftingRecipe(
new GT_TileEntity_BioVat(
@@ -407,7 +405,7 @@ public class CraftingRecipes implements Runnable {
StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L),
RecipeLoader.BITSD,
new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C',
- "circuit" + Materials.Data, 'K', GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L),
+ "circuit" + Materials.EV, 'K', GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L),
'H', ItemList.MACHINE_HULLS[3].get(1L) });
ItemStack[] Pistons2 = { ItemList.Electric_Piston_HV.get(1L), ItemList.Electric_Piston_EV.get(1L),
@@ -421,8 +419,8 @@ public class CraftingRecipes implements Runnable {
Materials.Iridium, Materials.Osmium, Materials.Naquadah };
Materials[] wireMat2 = { Materials.Kanthal, Materials.Nichrome, Materials.TungstenSteel, Materials.Naquadah,
Materials.NaquadahAlloy, Materials.SuperconductorUHV };
- Materials[] circuits2 = { Materials.Advanced, Materials.Data, Materials.Elite, Materials.Master,
- Materials.Ultimate, Materials.SuperconductorUHV };
+ Materials[] circuits2 = { Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM,
+ Materials.UV };
for (int i = 3; i < GT_Values.VN.length - 1; i++) {
// 12625
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java
index 99eb6e7d7e..7d749d11b7 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java
@@ -100,50 +100,50 @@ public class BW_Meta_Items {
String tooltip = "";
String aOreDictPrefix = OrePrefixes.circuit.toString();
switch (aTier) {
- case 0:
- additionalOreDictData = Materials.Primitive.toString();
- tooltip = Materials.Primitive.getToolTip();
- break;
- case 1:
- additionalOreDictData = Materials.Basic.toString();
- tooltip = Materials.Basic.getToolTip();
- break;
- case 2:
- additionalOreDictData = Materials.Good.toString();
- tooltip = Materials.Good.getToolTip();
- break;
- case 3:
- additionalOreDictData = Materials.Advanced.toString();
- tooltip = Materials.Advanced.getToolTip();
- break;
- case 4:
- additionalOreDictData = Materials.Data.toString();
- tooltip = Materials.Data.getToolTip();
- break;
- case 5:
- additionalOreDictData = Materials.Elite.toString();
- tooltip = Materials.Elite.getToolTip();
- break;
- case 6:
- additionalOreDictData = Materials.Master.toString();
- tooltip = Materials.Master.getToolTip();
- break;
- case 7:
- additionalOreDictData = Materials.Ultimate.toString();
- tooltip = Materials.Ultimate.getToolTip();
- break;
- case 8:
- additionalOreDictData = Materials.SuperconductorUHV.toString();
- tooltip = Materials.SuperconductorUHV.getToolTip();
- break;
- case 9:
- additionalOreDictData = "Infinite";
- tooltip = "An Infinite Circuit";
- break;
- case 10:
- additionalOreDictData = "Bio";
- tooltip = "A Bio Circuit";
- break;
+ case 0 -> {
+ additionalOreDictData = Materials.ULV.toString();
+ tooltip = Materials.ULV.getToolTip();
+ }
+ case 1 -> {
+ additionalOreDictData = Materials.LV.toString();
+ tooltip = Materials.LV.getToolTip();
+ }
+ case 2 -> {
+ additionalOreDictData = Materials.MV.toString();
+ tooltip = Materials.MV.getToolTip();
+ }
+ case 3 -> {
+ additionalOreDictData = Materials.HV.toString();
+ tooltip = Materials.HV.getToolTip();
+ }
+ case 4 -> {
+ additionalOreDictData = Materials.EV.toString();
+ tooltip = Materials.EV.getToolTip();
+ }
+ case 5 -> {
+ additionalOreDictData = Materials.IV.toString();
+ tooltip = Materials.IV.getToolTip();
+ }
+ case 6 -> {
+ additionalOreDictData = Materials.LuV.toString();
+ tooltip = Materials.LuV.getToolTip();
+ }
+ case 7 -> {
+ additionalOreDictData = Materials.ZPM.toString();
+ tooltip = Materials.ZPM.getToolTip();
+ }
+ case 8 -> {
+ additionalOreDictData = Materials.UV.toString();
+ tooltip = Materials.UV.getToolTip();
+ }
+ case 9 -> {
+ additionalOreDictData = Materials.UHV.toString();
+ tooltip = Materials.UHV.getToolTip();
+ }
+ case 10 -> {
+ additionalOreDictData = Materials.UEV.toString();
+ tooltip = Materials.UEV.getToolTip();
+ }
}
ItemStack tStack = BW_Meta_Items.NEWCIRCUITS.addCircuit(aID, aName, tooltip, aTier);
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
index c374ae4d4e..35dea3f0ed 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
@@ -75,7 +75,7 @@ public class Assembler implements Runnable {
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 1),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16),
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2))
@@ -89,7 +89,7 @@ public class Assembler implements Runnable {
.itemInputs(
CustomItemList.eM_Power.get(1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1),
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2))
.itemOutputs(CustomItemList.eM_Computer_Casing.get(1))
.fluidInputs(Materials.Aluminium.getMolten(1296))
@@ -996,7 +996,7 @@ public class Assembler implements Runnable {
.itemInputs(
ItemList.Transformer_LuV_IV.get(1),
getItemContainer("Display").get(1),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 2),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4),
getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 2))
@@ -1010,7 +1010,7 @@ public class Assembler implements Runnable {
.itemInputs(
ItemList.Transformer_ZPM_LuV.get(1),
getItemContainer("Display").get(1),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2),
GT_OreDictUnificator
.get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4),
@@ -1025,7 +1025,7 @@ public class Assembler implements Runnable {
.itemInputs(
ItemList.Transformer_UV_ZPM.get(1),
getItemContainer("Display").get(1),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 2),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4),
getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 4))
@@ -1039,7 +1039,7 @@ public class Assembler implements Runnable {
.itemInputs(
ItemList.Transformer_MAX_UV.get(1),
getItemContainer("Display").get(1),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 2),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4),
getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 5))
@@ -1053,7 +1053,7 @@ public class Assembler implements Runnable {
.itemInputs(
getItemContainer("Transformer_UEV_UHV").get(1),
getItemContainer("Display").get(1),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 2),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4),
getModItem(BartWorks.ID, "BW_GlasBlocks", 4L, 5))
@@ -1067,7 +1067,7 @@ public class Assembler implements Runnable {
.itemInputs(
getItemContainer("Transformer_UIV_UEV").get(1),
getItemContainer("Display").get(1),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 2),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 2),
GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4),
getModItem(BartWorks.ID, "BW_GlasBlocks", 8L, 5))
@@ -1081,7 +1081,7 @@ public class Assembler implements Run