diff --git a/src/main/java/gregtech/api/gui/GuiTextures.java b/src/main/java/gregtech/api/gui/GuiTextures.java index e6694a04ba6..745751df132 100644 --- a/src/main/java/gregtech/api/gui/GuiTextures.java +++ b/src/main/java/gregtech/api/gui/GuiTextures.java @@ -125,6 +125,7 @@ public class GuiTextures { public static final TextureArea PROGRESS_BAR_SIFT = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_sift.png"); public static final TextureArea PROGRESS_BAR_SLICE = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_slice.png"); public static final TextureArea PROGRESS_BAR_WIREMILL = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_wiremill.png"); + public static final TextureArea PROGRESS_BAR_CIRCUIT_ASSEMBLER = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_circuit_assembler.png"); //JEI public static final TextureArea MULTIBLOCK_CATEGORY = TextureArea.fullImage("textures/gui/icon/coke_oven.png"); diff --git a/src/main/java/gregtech/api/items/materialitem/DustMetaItem.java b/src/main/java/gregtech/api/items/materialitem/DustMetaItem.java index 8003ca1fddb..382f8799f4d 100644 --- a/src/main/java/gregtech/api/items/materialitem/DustMetaItem.java +++ b/src/main/java/gregtech/api/items/materialitem/DustMetaItem.java @@ -31,8 +31,7 @@ public DustMetaItem() { for (SimpleDustMaterial material : SimpleDustMaterial.MATERIAL_REGISTRY) { int i = SimpleDustMaterial.MATERIAL_REGISTRY.getIDForObject(material); for (int j = 0; j < orePrefixes.length; j++) { - OrePrefix orePrefix = orePrefixes[j]; - if (material.hasFlag(GENERATE_SMALL_TINY)) { + if (j == 2 || material.hasFlag(GENERATE_SMALL_TINY)) { generatedItems.add((short) (i * 3 + j)); } } @@ -58,14 +57,13 @@ public void registerModels() { TShortObjectHashMap alreadyRegistered = new TShortObjectHashMap<>(); for (short metaItem : generatedItems) { OrePrefix prefix = orePrefixes[metaItem % 3]; - MaterialIconSet materialIconSet = SimpleDustMaterial.MATERIAL_REGISTRY.getObjectById(metaItem / 3).iconSet; - short registrationKey = (short) (metaItem + materialIconSet.ordinal()); - if (!alreadyRegistered.containsKey(registrationKey)) { + MaterialIconSet materialIconSet = SimpleDustMaterial.MATERIAL_REGISTRY.getObjectById((metaItem - (metaItem % 3)) / 3).iconSet; + if (!alreadyRegistered.containsKey(metaItem)) { ResourceLocation resourceLocation = prefix.materialIconType.getItemModelPath(materialIconSet); ModelBakery.registerItemVariants(this, resourceLocation); - alreadyRegistered.put(registrationKey, new ModelResourceLocation(resourceLocation, "inventory")); + alreadyRegistered.put(metaItem, new ModelResourceLocation(resourceLocation, "inventory")); } - ModelResourceLocation resourceLocation = alreadyRegistered.get(registrationKey); + ModelResourceLocation resourceLocation = alreadyRegistered.get(metaItem); metaItemsModels.put(metaItem, resourceLocation); } } diff --git a/src/main/java/gregtech/api/items/metaitem/MetaItem.java b/src/main/java/gregtech/api/items/metaitem/MetaItem.java index 6bcdc7fb10d..731eadc3bf9 100644 --- a/src/main/java/gregtech/api/items/metaitem/MetaItem.java +++ b/src/main/java/gregtech/api/items/metaitem/MetaItem.java @@ -80,7 +80,7 @@ public static List> getMetaItems() { return Collections.unmodifiableList(META_ITEMS); } - protected TShortObjectMap metaItems = new TShortObjectHashMap<>(); + protected Map metaItems = new TreeMap<>(); private Map names = new HashMap<>(); protected TShortObjectMap metaItemsModels = new TShortObjectHashMap<>(); protected TShortObjectHashMap specialItemsModels = new TShortObjectHashMap<>(); @@ -102,7 +102,7 @@ public void registerColor() { @SideOnly(Side.CLIENT) public void registerModels() { - for (short itemMetaKey : metaItems.keys()) { + for (short itemMetaKey : metaItems.keySet()) { T metaValueItem = metaItems.get(itemMetaKey); int numberOfModels = metaValueItem.getModelAmount(); if (numberOfModels > 1) { @@ -224,7 +224,7 @@ public final T addItem(int metaValue, String unlocalizedName) { } public final Collection getAllItems() { - return Collections.unmodifiableCollection(metaItems.valueCollection()); + return Collections.unmodifiableCollection(metaItems.values()); } public final T getItem(short metaValue) { @@ -570,7 +570,7 @@ public void getSubItems(CreativeTabs tab, NonNullList subItems) { if (tab != GregTechAPI.TAB_GREGTECH && tab != CreativeTabs.SEARCH) { return; } - for (T enabledItem : metaItems.valueCollection()) { + for (T enabledItem : metaItems.values()) { if (!enabledItem.isVisible()) continue; ItemStack itemStack = enabledItem.getStackForm(); diff --git a/src/main/java/gregtech/api/recipes/RecipeMaps.java b/src/main/java/gregtech/api/recipes/RecipeMaps.java index 4e446b68e56..660bf3962ec 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipes/RecipeMaps.java @@ -710,6 +710,12 @@ public class RecipeMaps { .setSlotOverlay(false, false, GuiTextures.BENDER_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, ProgressWidget.MoveType.HORIZONTAL); + @ZenProperty + public static final RecipeMap CIRCUIT_ASSEMBLER_RECIPES = new RecipeMap<>("circuit_assembler", + 1, 6, 1, 1, 0, 1, 0, 0, new CircuitAssemblerRecipeBuilder()) + .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT_ASSEMBLER, ProgressWidget.MoveType.HORIZONTAL); + @ZenProperty public static final FuelRecipeMap COMBUSTION_GENERATOR_FUELS = new FuelRecipeMap("combustion_generator"); diff --git a/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java new file mode 100644 index 00000000000..4c7c9644e06 --- /dev/null +++ b/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java @@ -0,0 +1,66 @@ +package gregtech.api.recipes.builders; + +import gregtech.api.GTValues; +import gregtech.api.recipes.Recipe; +import gregtech.api.recipes.RecipeBuilder; +import gregtech.api.recipes.RecipeMap; +import gregtech.api.unification.material.Materials; +import gregtech.api.util.EnumValidationResult; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; +import gregtech.api.util.ValidationResult; + +import javax.annotation.Nonnull; + +public class CircuitAssemblerRecipeBuilder extends RecipeBuilder { + + private int solderMultiplier = 1; + + public CircuitAssemblerRecipeBuilder() { + } + + public CircuitAssemblerRecipeBuilder(Recipe recipe, RecipeMap recipeMap) { + super(recipe, recipeMap); + } + + public CircuitAssemblerRecipeBuilder(RecipeBuilder recipeBuilder) { + super(recipeBuilder); + } + + @Override + @Nonnull + public CircuitAssemblerRecipeBuilder copy() { + return new CircuitAssemblerRecipeBuilder(this); + } + + public CircuitAssemblerRecipeBuilder solderMultiplier(int multiplier) { + if (!GTUtility.isBetweenInclusive(1, 64000, (long) GTValues.L * multiplier)) { + GTLog.logger.error("Fluid multiplier cannot exceed 64000mb total. Multiplier: {}", multiplier); + GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); + recipeStatus = EnumValidationResult.INVALID; + } + this.solderMultiplier = multiplier; + return this; + } + + @Override + @Nonnull + public ValidationResult build() { + return ValidationResult.newResult(finalizeAndValidate(), + new Recipe(inputs, outputs, chancedOutputs, fluidInputs, fluidOutputs, duration, EUt, hidden)); + } + + @Override + public void buildAndRegister() { + if (fluidInputs.isEmpty()) { + recipeMap.addRecipe(this.copy() + .fluidInputs(Materials.SolderingAlloy.getFluid(Math.max(1, (GTValues.L / 2) * solderMultiplier))) + .build()); + recipeMap.addRecipe(this.copy() + .fluidInputs(Materials.Tin.getFluid(Math.max(1, GTValues.L * solderMultiplier))) + .build()); + } else { + recipeMap.addRecipe(build()); + } + } +} diff --git a/src/main/java/gregtech/api/recipes/builders/CutterRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/CutterRecipeBuilder.java index 4c590c63a3a..951b0b83ee2 100644 --- a/src/main/java/gregtech/api/recipes/builders/CutterRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/builders/CutterRecipeBuilder.java @@ -39,10 +39,10 @@ public void buildAndRegister() { .duration(duration * 2).build()); recipeMap.addRecipe(this.copy() .fluidInputs(ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * EUt / 426)))) - .duration((int) (duration * 1.3)).build()); + .duration((int) (duration * 1.5)).build()); recipeMap.addRecipe(this.copy() .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * EUt / 1280)))) - .duration(Math.max(1, duration / 2)).build()); + .duration(Math.max(1, duration)).build()); } else { recipeMap.addRecipe(build()); } diff --git a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java index fc92a945cda..2fb4187b031 100644 --- a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java +++ b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java @@ -98,6 +98,19 @@ public static class Tier { public static Material Superconductor = new Material(355, "superconductor", 0xFFFFFF, MaterialIconSet.NONE, of(), 0L, null) { }; public static Material Infinite = new MarkerMaterial("infinite"); + + public static Material UEVCircuit = new MarkerMaterial("uev"); + public static Material UIVCircuit = new MarkerMaterial("uiv"); + public static Material UMVCircuit = new MarkerMaterial("umv"); + public static Material UXVCircuit = new MarkerMaterial("uxv"); + public static Material MAXCircuit = new MarkerMaterial("max"); + } + + public static class Component { + public static Material Resistor = new MarkerMaterial("resistor"); + public static Material Transistor = new MarkerMaterial("transistor"); + public static Material Capacitor = new MarkerMaterial("capacitor"); + public static Material Diode = new MarkerMaterial("diode"); } } diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index deb175ffbaf..664464f56a2 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -212,7 +212,7 @@ public static void register() { public static DustMaterial Obsidian = new DustMaterial(171, "obsidian", 0x503264, DULL, 3, of(new MaterialStack(Magnesium, 1), new MaterialStack(Iron, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 8)), NO_SMASHING | EXCLUDE_BLOCK_CRAFTING_RECIPES); public static DustMaterial Phosphate = new DustMaterial(172, "phosphate", 0xFFFF00, DULL, 1, of(new MaterialStack(Phosphorus, 1), new MaterialStack(Oxygen, 4)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | FLAMMABLE | EXPLOSIVE); public static IngotMaterial PigIron = new IngotMaterial(173, "pig_iron", 0xC8B4B4, METALLIC, 2, of(new MaterialStack(Iron, 1)), EXT_METAL | GENERATE_RING, 6.0F, 4.0f, 384); - public static IngotMaterial Polyethylene = new IngotMaterial(174, "plastic", 0xC8C8C8, DULL, 1, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), GENERATE_PLATE | FLAMMABLE | NO_SMASHING | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION); //todo add polyethylene oredicts + public static IngotMaterial Polyethylene = new IngotMaterial(174, "plastic", 0xC8C8C8, DULL, 1, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), GENERATE_PLATE | GENERATE_FOIL | FLAMMABLE | NO_SMASHING | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION); //todo add polyethylene oredicts public static IngotMaterial Epoxy = new IngotMaterial(175, "epoxy", 0xC88C14, DULL, 1, of(new MaterialStack(Carbon, 21), new MaterialStack(Hydrogen, 25), new MaterialStack(Chlorine, 1), new MaterialStack(Oxygen, 5)), EXT2_METAL | DISABLE_DECOMPOSITION | NO_SMASHING); public static DustMaterial Polysiloxane = new DustMaterial(176, "polysiloxane", 0xDCDCDC, DULL, 1, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | FLAMMABLE | NO_SMASHING | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION); public static IngotMaterial Polycaprolactam = new IngotMaterial(177, "polycaprolactam", 0x323232, DULL, 1, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | DISABLE_DECOMPOSITION | NO_SMASHING); @@ -271,7 +271,7 @@ public static void register() { public static DustMaterial Potash = new DustMaterial(227, "potash", 0x784137, DULL, 1, of(new MaterialStack(Potassium, 2), new MaterialStack(Oxygen, 1)), 0); public static DustMaterial SodaAsh = new DustMaterial(228, "soda_ash", 0xDCDCFF, DULL, 1, of(new MaterialStack(Sodium, 2), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)), 0); public static IngotMaterial IndiumGalliumPhosphide = new IngotMaterial(229, "indium_gallium_phosphide", 0xA08CBE, DULL, 1, of(new MaterialStack(Indium, 1), new MaterialStack(Gallium, 1), new MaterialStack(Phosphorus, 1)), DECOMPOSITION_BY_CENTRIFUGING | GENERATE_PLATE); - public static IngotMaterial NickelZincFerrite = new IngotMaterial(230, "nickel_zinc_ferrite", 0x3C3C3C, METALLIC, 0, of(new MaterialStack(Nickel, 1), new MaterialStack(Zinc, 1), new MaterialStack(Iron, 4), new MaterialStack(Oxygen, 8)), EXT_METAL, null, 1500); + public static IngotMaterial NickelZincFerrite = new IngotMaterial(230, "nickel_zinc_ferrite", 0x3C3C3C, METALLIC, 0, of(new MaterialStack(Nickel, 1), new MaterialStack(Zinc, 1), new MaterialStack(Iron, 4), new MaterialStack(Oxygen, 8)), EXT_METAL | GENERATE_RING, null, 1500); public static DustMaterial SiliconDioxide = new DustMaterial(231, "silicon_dioxide", 0xC8C8C8, QUARTZ, 1, of(new MaterialStack(Silicon, 1), new MaterialStack(Oxygen, 2)), NO_SMASHING | NO_SMELTING | CRYSTALLISABLE); /** @@ -405,6 +405,20 @@ public static void register() { public static SimpleFluidMaterial OilMedium = new SimpleFluidMaterial(119, "oil_medium", 0x0A0A0A, FLUID, of(), GENERATE_FLUID_BLOCK); public static SimpleFluidMaterial OilLight = new SimpleFluidMaterial(120, "oil_light", 0x0A0A0A, FLUID, of(), GENERATE_FLUID_BLOCK); public static SimpleFluidMaterial NaturalGas = new SimpleFluidMaterial(121, "natural_gas", 0xFFFFFF, FLUID, of(), STATE_GAS | GENERATE_FLUID_BLOCK); + public static SimpleFluidMaterial DiphenylIsophtalate = new SimpleFluidMaterial(122, "diphenyl_isophthalate", 0x246E57, DULL, of(new MaterialStack(Carbon, 20), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 4)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial PhthalicAcid = new SimpleFluidMaterial(123, "phthalic_acid", 0xD1D1D1, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 4)), GENERATE_FLUID_BLOCK | DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Dimethylbenzene = new SimpleFluidMaterial(124, "dimethylbenzene", 0x669C40, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 10)), DISABLE_DECOMPOSITION).setFormula("C6H4(CH3)2"); + public static SimpleFluidMaterial Diaminobenzidine = new SimpleFluidMaterial(125, "diaminobenzidine", 0x337D59, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 14), new MaterialStack(Nitrogen, 4)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Dichlorobenzidine = new SimpleFluidMaterial(126, "dichlorobenzidine", 0xA1DEA6, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 10), new MaterialStack(Chlorine, 2), new MaterialStack(Nitrogen, 2)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Nitrochlorobenzene = new SimpleFluidMaterial(127, "nitrochlorobenzene", 0x8FB51A, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Chlorine, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 2)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Chlorobenzene = new SimpleFluidMaterial(128, "chlorobenzene", 0x326A3E, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 5), new MaterialStack(Chlorine, 1)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Iron3Chloride = new SimpleFluidMaterial(129, "iron_iii_chloride", 0x060B0B, FLUID, of(new MaterialStack(Iron, 1), new MaterialStack(Chlorine, 3)), DECOMPOSITION_BY_ELECTROLYZING); + public static SimpleFluidMaterial Bacteria = new SimpleFluidMaterial(130, "bacteria", 0x808000, FLUID, of(), 0); + public static SimpleFluidMaterial BacterialSludge = new SimpleFluidMaterial(131, "bacterial_sludge", 0x355E3B, FLUID, of(), 0); + public static SimpleFluidMaterial EnrichedBacterialSludge = new SimpleFluidMaterial(132, "enriched_bacterial_sludge", 0x7FFF00, FLUID, of(), 0); + public static SimpleFluidMaterial FermentedBacterialSludge = new SimpleFluidMaterial(133, "fermented_bacterial_sludge", 0x32CD32, FLUID, of(), 0); + public static SimpleFluidMaterial Mutagen = new SimpleFluidMaterial(134, "mutagen", 0x00FF7F, FLUID, of(), 0); + public static SimpleFluidMaterial GelatinMixture = new SimpleFluidMaterial(135, "gelatin_mixture", 0x588BAE, FLUID, of(), 0); public static SimpleDustMaterial SodiumHydroxide = new SimpleDustMaterial(1, "sodium_hydroxide", 0x003380, DULL, of(new MaterialStack(Sodium, 1), new MaterialStack(Oxygen, 1), new MaterialStack(Hydrogen, 1)), GENERATE_SMALL_TINY); public static SimpleDustMaterial MagnesiumChloride = new SimpleDustMaterial(2, "magnesium_chloride", 0xD40D5C, DULL, of(new MaterialStack(Magnesium, 1), new MaterialStack(Chlorine, 2)), GENERATE_SMALL_TINY); @@ -420,6 +434,9 @@ public static void register() { public static SimpleDustMaterial PlatinumGroupSludge = new SimpleDustMaterial(12, "platinum_group_sludge", 0x001E00, FINE, of(), DISABLE_DECOMPOSITION | GENERATE_SMALL_TINY); public static SimpleDustMaterial HydratedCoal = new SimpleDustMaterial(13, "hydrated_coal", 0x464664, ROUGH, of(new MaterialStack(Coal, 8), new MaterialStack(Water, 1)), GENERATE_SMALL_TINY); public static SimpleDustMaterial SodiumBicarbonate = new SimpleDustMaterial(14, "sodium_bicarbonate", 0x565b96, ROUGH, of(new MaterialStack(Sodium, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)), GENERATE_SMALL_TINY); + public static SimpleDustMaterial Collagen = new SimpleDustMaterial(15, "collagen", 0x80471C, ROUGH, of(), 0); + public static SimpleDustMaterial Gelatin = new SimpleDustMaterial(16, "gelatin", 0x588BAE, ROUGH, of(), 0); + public static SimpleDustMaterial Agar = new SimpleDustMaterial(17, "agar", 0x4F7942, ROUGH, of(), 0); /** * Organic chemistry @@ -484,7 +501,7 @@ public static void register() { public static IngotMaterial BlueSteel = new IngotMaterial(276, "blue_steel", 0x64648C, METALLIC, 2, of(new MaterialStack(RoseGold, 1), new MaterialStack(Brass, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4)), EXT_METAL | GENERATE_FRAME, null, 7.5F, 5.0f, 1024, 1400); public static IngotMaterial DamascusSteel = new IngotMaterial(277, "damascus_steel", 0x6E6E6E, METALLIC, 2, of(new MaterialStack(Steel, 1)), EXT_METAL, null, 8.0F, 5.0f, 1280, 1500); public static IngotMaterial TungstenSteel = new IngotMaterial(278, "tungsten_steel", 0x6464A0, METALLIC, 4, of(new MaterialStack(Steel, 1), new MaterialStack(Tungsten, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_DENSE | GENERATE_FRAME| GENERATE_SPRING, null, 8.0F, 4.0f, 2560, 3000); - public static IngotMaterial RedAlloy = new IngotMaterial(279, "red_alloy", 0xC80000, DULL, 0, of(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 1)), GENERATE_PLATE | GENERATE_FINE_WIRE); + public static IngotMaterial RedAlloy = new IngotMaterial(279, "red_alloy", 0xC80000, DULL, 0, of(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 1)), GENERATE_PLATE | GENERATE_FINE_WIRE | GENERATE_BOLT_SCREW); public static IngotMaterial CobaltBrass = new IngotMaterial(280, "cobalt_brass", 0xB4B4A0, METALLIC, 2, of(new MaterialStack(Brass, 7), new MaterialStack(Aluminium, 1), new MaterialStack(Cobalt, 1)), EXT2_METAL, null, 8.0F, 2.0f, 256); public static DustMaterial TricalciumPhosphate = new DustMaterial(281, "tricalcium_phosphate", 0xFFFF00, FLINT, 2, of(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | FLAMMABLE | EXPLOSIVE | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial Basalt = new DustMaterial(282, "basalt", 0x1E1414, ROUGH, 1, of(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), NO_SMASHING | DECOMPOSITION_BY_CENTRIFUGING); @@ -540,7 +557,7 @@ public static void register() { public static IngotMaterial NeodymiumMagnetic = new IngotMaterial(332, "neodymium_magnetic", 0x646464, MAGNETIC, 2, of(new MaterialStack(Neodymium, 1)), EXT2_METAL | GENERATE_LONG_ROD, null, 1297); public static IngotMaterial TungstenCarbide = new IngotMaterial(333, "tungsten_carbide", 0x330066, METALLIC, 4, of(new MaterialStack(Tungsten, 1), new MaterialStack(Carbon, 1)), EXT2_METAL, null, 12.0F, 4.0f, 1280, 2460); public static IngotMaterial VanadiumSteel = new IngotMaterial(334, "vanadium_steel", 0xc0c0c0, METALLIC, 3, of(new MaterialStack(Vanadium, 1), new MaterialStack(Chrome, 1), new MaterialStack(Steel, 7)), EXT2_METAL, null, 7.0F, 3.0f, 1920, 1453); - public static IngotMaterial HSSG = new IngotMaterial(335, "hssg", 0x999900, METALLIC, 3, of(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME| GENERATE_SPRING, null, 10.0F, 5.5f, 4000, 4200); + public static IngotMaterial HSSG = new IngotMaterial(335, "hssg", 0x999900, METALLIC, 3, of(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME | GENERATE_SPRING, null, 10.0F, 5.5f, 4000, 4200); public static IngotMaterial HSSE = new IngotMaterial(336, "hsse", 0x336600, METALLIC, 4, of(new MaterialStack(HSSG, 6), new MaterialStack(Cobalt, 1), new MaterialStack(Manganese, 1), new MaterialStack(Silicon, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME, null, 10.0F, 8.0f, 5120, 5000); public static IngotMaterial HSSS = new IngotMaterial(337, "hsss", 0x660033, METALLIC, 4, of(new MaterialStack(HSSG, 6), new MaterialStack(Iridium, 2), new MaterialStack(Osmium, 1)), EXT2_METAL | GENERATE_GEAR, null, 15.0F, 7.0f, 3000, 5000); public static IngotMaterial DiamericiumTitanium = new IngotMaterial(338, "diamericium_titanium", 0x755280, METALLIC, 4, of(new MaterialStack(Americium, 2), new MaterialStack(Titanium, 1)), EXT2_METAL, null, 6.0F, 6.0F, 2200, 10400); @@ -575,13 +592,6 @@ public static void register() { // TODO Put these in good places, PBI Tools public static final IngotMaterial Polybenzimidazole = new IngotMaterial(356, "polybenzimidazole", 0x2D2D2D, DULL, 0, of(new MaterialStack(Carbon, 20), new MaterialStack(Hydrogen, 12), new MaterialStack(Nitrogen, 4)), EXCLUDE_BLOCK_CRAFTING_RECIPES | SMELT_INTO_FLUID | NO_SMASHING | DISABLE_DECOMPOSITION | GENERATE_FOIL); - public static final SimpleFluidMaterial DiphenylIsophtalate = new SimpleFluidMaterial(122, "diphenyl_isophthalate", 0x246E57, DULL, of(new MaterialStack(Carbon, 20), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 4)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial PhthalicAcid = new SimpleFluidMaterial(123, "phthalic_acid", 0xD1D1D1, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 4)), GENERATE_FLUID_BLOCK | DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Dimethylbenzene = new SimpleFluidMaterial(124, "dimethylbenzene", 0x669C40, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 10)), DISABLE_DECOMPOSITION).setFormula("C6H4(CH3)2"); - public static final SimpleFluidMaterial Diaminobenzidine = new SimpleFluidMaterial(125, "diaminobenzidine", 0x337D59, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 14), new MaterialStack(Nitrogen, 4)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Dichlorobenzidine = new SimpleFluidMaterial(126, "dichlorobenzidine", 0xA1DEA6, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 10), new MaterialStack(Chlorine, 2), new MaterialStack(Nitrogen, 2)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Nitrochlorobenzene = new SimpleFluidMaterial(127, "nitrochlorobenzene", 0x8FB51A, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Chlorine, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 2)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Chlorobenzene = new SimpleFluidMaterial(128, "chlorobenzene", 0x326A3E, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 5), new MaterialStack(Chlorine, 1)), DISABLE_DECOMPOSITION); public static final SimpleDustMaterial PotassiumDichromate = new SimpleDustMaterial(845, "potassium_dichromate", 0xFF084E, DULL, of(new MaterialStack(Potassium, 2), new MaterialStack(Chrome, 2), new MaterialStack(Oxygen, 7)), GENERATE_SMALL_TINY); public static final SimpleDustMaterial ChromiumTrioxide = new SimpleDustMaterial(848, "chromium_trioxide", 0xFFE4E1, DULL, of(new MaterialStack(Chrome, 1), new MaterialStack(Oxygen, 3)), GENERATE_SMALL_TINY); @@ -915,6 +925,6 @@ public static void register() { Polyethylene.setFluidPipeProperties(350, 60, true); Polytetrafluoroethylene.setFluidPipeProperties(600, 80, true); + Polybenzimidazole.setFluidPipeProperties(1000, 100, true); } - } diff --git a/src/main/java/gregtech/api/unification/ore/OrePrefix.java b/src/main/java/gregtech/api/unification/ore/OrePrefix.java index 1960365b531..b2cb490acdb 100644 --- a/src/main/java/gregtech/api/unification/ore/OrePrefix.java +++ b/src/main/java/gregtech/api/unification/ore/OrePrefix.java @@ -168,6 +168,7 @@ public enum OrePrefix { battery("Reusable Batteries", -1, null, null, DISALLOW_RECYCLING, null), // Introduced by Calclavia circuit("Circuits", -1, null, null, ENABLE_UNIFICATION | DISALLOW_RECYCLING, null), // Introduced by Calclavia chipset("Chipsets", -1, null, null, ENABLE_UNIFICATION | DISALLOW_RECYCLING, null), // Introduced by Buildcraft + component("Components", -1, null, null, ENABLE_UNIFICATION | DISALLOW_RECYCLING, null), // Used for Gregification Addon @@ -433,9 +434,6 @@ public void processOreRegistration(@Nullable IMaterial material) { material = materialType; //append default material for self-referencing OrePrefix } if (material != null) { - if (material.getMaterialClass() == SimpleDustMaterial.class) { - GTLog.logger.info("HERE!!!!!"); - } generatedMaterials.add(material); } } diff --git a/src/main/java/gregtech/common/ClientProxy.java b/src/main/java/gregtech/common/ClientProxy.java index 862383ff7fa..2541cd446fa 100644 --- a/src/main/java/gregtech/common/ClientProxy.java +++ b/src/main/java/gregtech/common/ClientProxy.java @@ -137,34 +137,33 @@ public static void addMaterialFormulaHandler(ItemTooltipEvent event) { ItemStack itemStack = event.getItemStack(); // Handles Item tooltips - if (!(itemStack.getItem() instanceof ItemBlock)) { - String chemicalFormula = null; - - // Test for Items - UnificationEntry unificationEntry = OreDictUnifier.getUnificationEntry(itemStack); - if (unificationEntry != null && unificationEntry.material != null) { - chemicalFormula = unificationEntry.material.getChemicalFormula(); - - // Test for Fluids - } else if (ItemNBTUtils.hasTag(itemStack)) { - - // Vanilla bucket - chemicalFormula = FluidTooltipUtil.getFluidTooltip(ItemNBTUtils.getString(itemStack, "FluidName")); - - // GTCE Cells, Forestry cans, some other containers - if (chemicalFormula == null) { - NBTTagCompound compound = itemStack.getTagCompound(); - if (compound != null && compound.hasKey(FluidHandlerItemStack.FLUID_NBT_KEY, Constants.NBT.TAG_COMPOUND)) { - chemicalFormula = FluidTooltipUtil.getFluidTooltip(FluidStack.loadFluidStackFromNBT(compound.getCompoundTag(FluidHandlerItemStack.FLUID_NBT_KEY))); - } - } + String chemicalFormula = null; + + // Test for Items + UnificationEntry unificationEntry = OreDictUnifier.getUnificationEntry(itemStack); + if (unificationEntry != null && unificationEntry.material != null) { + chemicalFormula = unificationEntry.material.getChemicalFormula(); + + // Test for Fluids + } else if (ItemNBTUtils.hasTag(itemStack)) { + + // Vanilla bucket + chemicalFormula = FluidTooltipUtil.getFluidTooltip(ItemNBTUtils.getString(itemStack, "FluidName")); - // Water buckets have a separate registry name from other buckets - } else if(itemStack.getItem().equals(Items.WATER_BUCKET)) { - chemicalFormula = FluidTooltipUtil.getWaterTooltip(); + // GTCE Cells, Forestry cans, some other containers + if (chemicalFormula == null) { + NBTTagCompound compound = itemStack.getTagCompound(); + if (compound != null && compound.hasKey(FluidHandlerItemStack.FLUID_NBT_KEY, Constants.NBT.TAG_COMPOUND)) { + chemicalFormula = FluidTooltipUtil.getFluidTooltip(FluidStack.loadFluidStackFromNBT(compound.getCompoundTag(FluidHandlerItemStack.FLUID_NBT_KEY))); + } } - if (chemicalFormula != null && !chemicalFormula.isEmpty()) - event.getToolTip().add(1, ChatFormatting.GRAY.toString() + chemicalFormula); + + // Water buckets have a separate registry name from other buckets + } else if(itemStack.getItem().equals(Items.WATER_BUCKET)) { + chemicalFormula = FluidTooltipUtil.getWaterTooltip(); + } + if (chemicalFormula != null && !chemicalFormula.isEmpty()) { + event.getToolTip().add(1, ChatFormatting.YELLOW.toString() + chemicalFormula); } } diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index 2714ba839fa..62e418b798a 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -9,6 +9,7 @@ import gregtech.api.recipes.CountableIngredient; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.MarkerMaterials.Component; import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; @@ -52,6 +53,31 @@ public void registerSubItems() { FIRECLAY_BRICK = addItem(15, "brick.fireclay"); COKE_OVEN_BRICK = addItem(16, "brick.coke"); + SILICON_BOULE = addItem(20, "boule.silicon"); + GLOWSTONE_BOULE = addItem(21, "boule.glowstone"); + NAQUADAH_BOULE = addItem(22, "boule.naquadah"); + NEUTRONIUM_BOULE = addItem(23, "boule.neutronium"); + SILICON_WAFER = addItem(24, "wafer.silicon"); + GLOWSTONE_WAFER = addItem(25, "wafer.glowstone"); + NAQUADAH_WAFER = addItem(26, "wafer.naquadah"); + NEUTRONIUM_WAFER = addItem(27, "wafer.neutronium"); + + COATED_BOARD = addItem(30, "board.coated"); + PHENOLIC_BOARD = addItem(32, "board.phenolic"); + PLASTIC_BOARD = addItem(34, "board.plastic"); + EPOXY_BOARD = addItem(36, "board.epoxy"); + FIBER_BOARD = addItem(38, "board.fiber_reinforced"); + MULTILAYER_FIBER_BOARD = addItem(40, "board.multilayer.fiber_reinforced"); + WETWARE_BOARD = addItem(42, "board.wetware"); + + BASIC_CIRCUIT_BOARD = addItem(31, "circuit_board.basic"); + GOOD_CIRCUIT_BOARD = addItem(33, "circuit_board.good"); + PLASTIC_CIRCUIT_BOARD = addItem(35, "circuit_board.plastic"); + ADVANCED_CIRCUIT_BOARD = addItem(37, "circuit_board.advanced"); + EXTREME_CIRCUIT_BOARD = addItem(39, "circuit_board.extreme"); + ELITE_CIRCUIT_BOARD = addItem(41, "circuit_board.elite"); + WETWARE_CIRCUIT_BOARD = addItem(43, "circuit_board.wetware"); + BOTTLE_PURPLE_DRINK = addItem(100, "bottle.purple.drink").addComponents(new FoodStats(8, 0.2F, true, true, new ItemStack(Items.GLASS_BOTTLE), new RandomPotionEffect(MobEffects.HASTE, 800, 1, 90))); ENERGY_CRYSTAL = addItem(212, "energy_crystal").addComponents(ElectricStats.createRechargeableBattery(4000000L, GTValues.HV)).setModelAmount(8).setMaxStackSize(1); @@ -64,6 +90,7 @@ public void registerSubItems() { } PLANT_BALL = addItem(570, "plant_ball").setBurnValue(75); + BIO_CHAFF = addItem(571, "bio_chaff").setBurnValue(200); ENERGIUM_DUST = addItem(572, "energium_dust"); POWER_UNIT_LV = addItem(573, "power_unit.lv").addComponents(ElectricStats.createElectricItem(100000L, GTValues.LV)).setMaxStackSize(8); @@ -75,98 +102,117 @@ public void registerSubItems() { ENERGY_FIELD_PROJECTOR = addItem(578, "energy_field_projector").addComponents(ElectricStats.createElectricItem(16000000L, GTValues.EV)).setMaxStackSize(1); SCANNER = addItem(579, "scanner").addComponents(ElectricStats.createElectricItem(200_000L, GTValues.LV), new ScannerBehavior(50)); - CARBON_FIBERS = addItem(504, "carbon.fibers"); - CARBON_MESH = addItem(505, "carbon.mesh"); - CARBON_PLATE = addItem(506, "carbon.plate"); + INGOT_MIXED_METAL = addItem(432, "ingot.mixed_metal"); ADVANCED_ALLOY_PLATE = addItem(433, "plate.advanced_alloy"); INGOT_IRIDIUM_ALLOY = addItem(434, "ingot.iridium_alloy"); PLATE_IRIDIUM_ALLOY = addItem(435, "plate.iridium_alloy"); NEUTRON_REFLECTOR = addItem(436, "neutron_reflector"); - SILICON_BOULE = addItem(439, "boule.silicon"); - GLOWSTONE_BOULE = addItem(437, "boule.glowstone"); - NAQUADAH_BOULE = addItem(438, "boule.naquadah"); - SILICON_WAFER = addItem(440, "wafer.silicon"); - GLOWSTONE_WAFER = addItem(441, "wafer.glowstone"); - NAQUADAH_WAFER = addItem(442, "wafer.naquadah"); - - COATED_BOARD = addItem(443, "board.coated"); - EPOXY_BOARD = addItem(444, "board.epoxy"); - FIBER_BOARD = addItem(445, "board.fiber_reinforced"); - MULTILAYER_FIBER_BOARD = addItem(446, "board.multilayer.fiber_reinforced"); - PHENOLIC_BOARD = addItem(447, "board.phenolic"); - PLASTIC_BOARD = addItem(448, "board.plastic"); - WETWARE_BOARD = addItem(449, "board.wetware"); VACUUM_TUBE = addItem(450, "circuit.vacuum_tube").setUnificationData(OrePrefix.circuit, Tier.Primitive); - DIODE = addItem(451, "component.diode"); - CAPACITOR = addItem(452, "component.capacitor"); - GLASS_FIBER = addItem(453, "component.glass.fiber"); - GLASS_TUBE = addItem(454, "component.glass.tube"); - RESISTOR = addItem(455, "component.resistor"); - SMALL_COIL = addItem(456, "component.small_coil"); - SMD_DIODE = addItem(457, "component.smd.diode"); - SMD_CAPACITOR = addItem(458, "component.smd.capacitor"); - SMD_RESISTOR = addItem(459, "component.smd.resistor"); - SMD_TRANSISTOR = addItem(460, "component.smd.transistor"); - TRANSISTOR = addItem(461, "component.transistor"); - - ADVANCED_SYSTEM_ON_CHIP_WAFER = addItem(462, "wafer.advanced_system_on_chip"); - INTEGRATED_LOGIC_CIRCUIT_WAFER = addItem(463, "wafer.integrated_logic_circuit"); - CENTRAL_PROCESSING_UNIT_WAFER = addItem(464, "wafer.central_processing_unit"); - HIGH_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(465, "wafer.high_power_integrated_circuit"); - NAND_MEMORY_CHIP_WAFER = addItem(466, "wafer.nand_memory_chip"); - NANO_CENTRAL_PROCESSING_UNIT_WAFER = addItem(467, "wafer.nano_central_processing_unit"); - NOR_MEMORY_CHIP_WAFER = addItem(468, "wafer.nor_memory_chip"); - POWER_INTEGRATED_CIRCUIT_WAFER = addItem(469, "wafer.power_integrated_circuit"); - QBIT_CENTRAL_PROCESSING_UNIT_WAFER = addItem(470, "wafer.qbit_central_processing_unit"); - RANDOM_ACCESS_MEMORY_WAFER = addItem(471, "wafer.random_access_memory"); - SYSTEM_ON_CHIP_WAFER = addItem(472, "wafer.system_on_chip"); - - RAW_CRYSTAL_CHIP = addItem(473, "crystal.raw"); - CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(474, "crystal.central_processing_unit"); - CRYSTAL_SYSTEM_ON_CHIP = addItem(475, "crystal.system_on_chip"); - ADVANCED_SYSTEM_ON_CHIP = addItem(476, "plate.advanced_system_on_chip"); - INTEGRATED_LOGIC_CIRCUIT = addItem(477, "plate.integrated_logic_circuit"); - CENTRAL_PROCESSING_UNIT = addItem(478, "plate.central_processing_unit"); - HIGH_POWER_INTEGRATED_CIRCUIT = addItem(479, "plate.high_power_integrated_circuit"); - NAND_MEMORY_CHIP = addItem(480, "plate.nand_memory_chip"); - NANO_CENTRAL_PROCESSING_UNIT = addItem(481, "plate.nano_central_processing_unit"); - NOR_MEMORY_CHIP = addItem(482, "plate.nor_memory_chip"); - POWER_INTEGRATED_CIRCUIT = addItem(483, "plate.power_integrated_circuit"); - QBIT_CENTRAL_PROCESSING_UNIT = addItem(484, "plate.qbit_central_processing_unit"); - RANDOM_ACCESS_MEMORY = addItem(485, "plate.random_access_memory"); - SYSTEM_ON_CHIP = addItem(486, "plate.system_on_chip"); - - BASIC_CIRCUIT_LV = addItem(487, "circuit.basic").setUnificationData(OrePrefix.circuit, Tier.Basic); - BASIC_ELECTRONIC_CIRCUIT_LV = addItem(488, "circuit.basic_electronic").setUnificationData(OrePrefix.circuit, Tier.Basic); - ADVANCED_CIRCUIT_PARTS_LV = addItem(507, "circuit.advanced_parts").setUnificationData(OrePrefix.circuit, Tier.Basic); - - GOOD_INTEGRATED_CIRCUIT_MV = addItem(489, "circuit.good").setUnificationData(OrePrefix.circuit, Tier.Good); - ADVANCED_CIRCUIT_MV = addItem(490, "circuit.advanced").setUnificationData(OrePrefix.circuit, Tier.Good); - - PROCESSOR_ASSEMBLY_HV = addItem(491, "circuit.processor_assembly").setUnificationData(OrePrefix.circuit, Tier.Advanced); - NANO_PROCESSOR_HV = addItem(492, "circuit.nano_processor").setUnificationData(OrePrefix.circuit, Tier.Advanced); - - NANO_PROCESSOR_ASSEMBLY_EV = addItem(493, "circuit.nano_processor_assembly").setUnificationData(OrePrefix.circuit, Tier.Extreme); - QUANTUM_PROCESSOR_EV = addItem(494, "circuit.quantum_processor").setUnificationData(OrePrefix.circuit, Tier.Extreme); - - DATA_CONTROL_CIRCUIT_IV = addItem(495, "circuit.data_control").setUnificationData(OrePrefix.circuit, Tier.Elite); - CRYSTAL_PROCESSOR_IV = addItem(496, "circuit.crystal_processor").setUnificationData(OrePrefix.circuit, Tier.Elite); - - ENERGY_FLOW_CIRCUIT_LUV = addItem(497, "circuit.energy_flow").setUnificationData(OrePrefix.circuit, Tier.Master); - WETWARE_PROCESSOR_LUV = addItem(498, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); - - WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(499, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); - WETWARE_SUPER_COMPUTER_UV = addItem(500, "circuit.wetware_super_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); - WETWARE_MAINFRAME_MAX = addItem(501, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); - - ENGRAVED_CRYSTAL_CHIP = addItem(502, "engraved.crystal_chip"); - ENGRAVED_LAPOTRON_CHIP = addItem(503, "engraved.lapotron_chip"); - - TURBINE_ROTOR = addItem(508, "turbine_rotor").addComponents(new TurbineRotorBehavior()); - COVER_FACADE = addItem(509, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); + GLASS_FIBER = addItem(451, "component.glass.fiber"); + GLASS_TUBE = addItem(452, "component.glass.tube"); + SMALL_COIL = addItem(453, "component.small_coil"); + TRANSISTOR = addItem(454, "component.transistor").setUnificationData(OrePrefix.component, Component.Transistor); + RESISTOR = addItem(455, "component.resistor").setUnificationData(OrePrefix.component, Component.Resistor); + CAPACITOR = addItem(456, "component.capacitor").setUnificationData(OrePrefix.component, Component.Capacitor); + DIODE = addItem(457, "component.diode").setUnificationData(OrePrefix.component, Component.Diode); + SMD_TRANSISTOR = addItem(458, "component.smd.transistor").setUnificationData(OrePrefix.component, Component.Transistor); + SMD_RESISTOR = addItem(459, "component.smd.resistor").setUnificationData(OrePrefix.component, Component.Resistor); + SMD_CAPACITOR = addItem(460, "component.smd.capacitor").setUnificationData(OrePrefix.component, Component.Capacitor); + SMD_DIODE = addItem(461, "component.smd.diode").setUnificationData(OrePrefix.component, Component.Diode); + ADVANCED_SMD_TRANSISTOR = addItem(462, "component.advanced_smd.transistor"); + ADVANCED_SMD_RESISTOR = addItem(463, "component.advanced_smd.resistor"); + ADVANCED_SMD_CAPACITOR = addItem(464, "component.advanced_smd.capacitor"); + ADVANCED_SMD_DIODE = addItem(465, "component.advanced_smd.diode"); + + HIGHLY_ADVANCED_SOC_WAFER = addItem(466, "wafer.highly_advanced_system_on_chip"); + ADVANCED_SYSTEM_ON_CHIP_WAFER = addItem(467, "wafer.advanced_system_on_chip"); + INTEGRATED_LOGIC_CIRCUIT_WAFER = addItem(468, "wafer.integrated_logic_circuit"); + CENTRAL_PROCESSING_UNIT_WAFER = addItem(469, "wafer.central_processing_unit"); + ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(470, "wafer.ultra_low_power_integrated_circuit"); + LOW_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(471, "wafer.low_power_integrated_circuit"); + POWER_INTEGRATED_CIRCUIT_WAFER = addItem(472, "wafer.power_integrated_circuit"); + HIGH_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(473, "wafer.high_power_integrated_circuit"); + NAND_MEMORY_CHIP_WAFER = addItem(474, "wafer.nand_memory_chip"); + NANO_CENTRAL_PROCESSING_UNIT_WAFER = addItem(475, "wafer.nano_central_processing_unit"); + NOR_MEMORY_CHIP_WAFER = addItem(476, "wafer.nor_memory_chip"); + QBIT_CENTRAL_PROCESSING_UNIT_WAFER = addItem(477, "wafer.qbit_central_processing_unit"); + RANDOM_ACCESS_MEMORY_WAFER = addItem(478, "wafer.random_access_memory"); + SYSTEM_ON_CHIP_WAFER = addItem(479, "wafer.system_on_chip"); + SIMPLE_SYSTEM_ON_CHIP_WAFER = addItem(480, "wafer.simple_system_on_chip"); + + RAW_CRYSTAL_CHIP = addItem(481, "crystal.raw"); + RAW_CRYSTAL_CHIP_PART = addItem(482, "crystal.raw_chip"); + ENGRAVED_CRYSTAL_CHIP = addItem(483, "engraved.crystal_chip"); + ENGRAVED_LAPOTRON_CHIP = addItem(484, "engraved.lapotron_chip"); + CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(485, "crystal.central_processing_unit"); + CRYSTAL_SYSTEM_ON_CHIP = addItem(486, "crystal.system_on_chip"); + HIGHLY_ADVANCED_SOC = addItem(487, "plate.highly_advanced_system_on_chip"); + ADVANCED_SYSTEM_ON_CHIP = addItem(488, "plate.advanced_system_on_chip"); + INTEGRATED_LOGIC_CIRCUIT = addItem(489, "plate.integrated_logic_circuit"); + CENTRAL_PROCESSING_UNIT = addItem(490, "plate.central_processing_unit"); + ULTRA_LOW_POWER_INTEGRATED_CIRCUIT = addItem(491, "plate.ultra_low_power_integrated_circuit"); + LOW_POWER_INTEGRATED_CIRCUIT = addItem(492, "plate.low_power_integrated_circuit"); + POWER_INTEGRATED_CIRCUIT = addItem(493, "plate.power_integrated_circuit"); + HIGH_POWER_INTEGRATED_CIRCUIT = addItem(494, "plate.high_power_integrated_circuit"); + NAND_MEMORY_CHIP = addItem(495, "plate.nand_memory_chip"); + NANO_CENTRAL_PROCESSING_UNIT = addItem(496, "plate.nano_central_processing_unit"); + NOR_MEMORY_CHIP = addItem(497, "plate.nor_memory_chip"); + QBIT_CENTRAL_PROCESSING_UNIT = addItem(498, "plate.qbit_central_processing_unit"); + RANDOM_ACCESS_MEMORY = addItem(499, "plate.random_access_memory"); + SYSTEM_ON_CHIP = addItem(500, "plate.system_on_chip"); + SIMPLE_SYSTEM_ON_CHIP = addItem(501, "plate.simple_system_on_chip"); + + + // CIRCUITS + + // T1: Electronic + ELECTRONIC_CIRCUIT_LV = addItem(502, "circuit.electronic").setUnificationData(OrePrefix.circuit, Tier.Basic); + ELECTRONIC_CIRCUIT_MV = addItem(503, "circuit.good_electronic").setUnificationData(OrePrefix.circuit, Tier.Good); + + // T2: Integrated + INTEGRATED_CIRCUIT_LV = addItem(504, "circuit.basic_integrated").setUnificationData(OrePrefix.circuit, Tier.Basic); + INTEGRATED_CIRCUIT_MV = addItem(505, "circuit.good_integrated").setUnificationData(OrePrefix.circuit, Tier.Good); + INTEGRATED_CIRCUIT_HV = addItem(506, "circuit.advanced_integrated").setUnificationData(OrePrefix.circuit, Tier.Advanced); + + // Misc Unlocks + NAND_CHIP_ULV = addItem(507, "circuit.nand_chip").setUnificationData(OrePrefix.circuit, Tier.Primitive); + MICROPROCESSOR_LV = addItem(508, "circuit.microprocessor").setUnificationData(OrePrefix.circuit, Tier.Basic); + + // T3: Processor + PROCESSOR_MV = addItem(509, "circuit.processor").setUnificationData(OrePrefix.circuit, Tier.Good); + PROCESSOR_ASSEMBLY_HV = addItem(510, "circuit.assembly").setUnificationData(OrePrefix.circuit, Tier.Advanced); + WORKSTATION_EV = addItem(511, "circuit.workstation").setUnificationData(OrePrefix.circuit, Tier.Extreme); + MAINFRAME_IV = addItem(512, "circuit.mainframe").setUnificationData(OrePrefix.circuit, Tier.Elite); + + // T4: Nano + NANO_PROCESSOR_HV = addItem(513, "circuit.nano_processor").setUnificationData(OrePrefix.circuit, Tier.Advanced); + NANO_PROCESSOR_ASSEMBLY_EV = addItem(514, "circuit.nano_assembly").setUnificationData(OrePrefix.circuit, Tier.Extreme); + NANO_COMPUTER_IV = addItem(515, "circuit.nano_computer").setUnificationData(OrePrefix.circuit, Tier.Elite); + NANO_MAINFRAME_LUV = addItem(516, "circuit.nano_mainframe").setUnificationData(OrePrefix.circuit, Tier.Master); + + // T5: Quantum + QUANTUM_PROCESSOR_EV = addItem(517, "circuit.quantum_processor").setUnificationData(OrePrefix.circuit, Tier.Extreme); + QUANTUM_ASSEMBLY_IV = addItem(518, "circuit.quantum_assembly").setUnificationData(OrePrefix.circuit, Tier.Elite); + QUANTUM_COMPUTER_LUV = addItem(519, "circuit.quantum_computer").setUnificationData(OrePrefix.circuit, Tier.Master); + QUANTUM_MAINFRAME_ZPM = addItem(520, "circuit.quantum_mainframe").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + + // T6: Crystal + CRYSTAL_PROCESSOR_IV = addItem(521, "circuit.crystal_processor").setUnificationData(OrePrefix.circuit, Tier.Elite); + CRYSTAL_ASSEMBLY_LUV = addItem(522, "circuit.crystal_assembly").setUnificationData(OrePrefix.circuit, Tier.Master); + CRYSTAL_COMPUTER_ZPM = addItem(523, "circuit.crystal_computer").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + CRYSTAL_MAINFRAME_UV = addItem(524, "circuit.crystal_mainframe").setUnificationData(OrePrefix.circuit, Tier.Superconductor); + + // T7: Wetware + WETWARE_PROCESSOR_LUV = addItem(525, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); + WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(526, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + WETWARE_SUPER_COMPUTER_UV = addItem(527, "circuit.wetware_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); + WETWARE_MAINFRAME_UHV = addItem(528, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); + + TURBINE_ROTOR = addItem(529, "turbine_rotor").addComponents(new TurbineRotorBehavior()); + COVER_FACADE = addItem(530, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); FLUID_REGULATORS[0] = FLUID_REGULATOR_LV = addItem(700, "fluid.regulator.lv"); FLUID_REGULATORS[1] = FLUID_REGULATOR_MV = addItem(701, "fluid.regulator.mv"); @@ -178,18 +224,22 @@ public void registerSubItems() { FLUID_REGULATORS[7] = FLUID_REGULATOR_UV = addItem(707, "fluid.regulator.uv"); if (ConfigHolder.U.GT5u.enableZPMandUVBats) { - ENERGY_MODULE = addItem(520, "energy.module").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(10000000000L, GTValues.ZPM) }).setModelAmount(8); - ENERGY_CLUSTER = addItem(521, "energy.cluster").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(100000000000L, GTValues.UV) }).setModelAmount(8); + ENERGY_MODULE = addItem(531, "energy.module").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(10000000000L, GTValues.ZPM) }).setModelAmount(8); + ENERGY_CLUSTER = addItem(532, "energy.cluster").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(100000000000L, GTValues.UV) }).setModelAmount(8); } if (ConfigHolder.U.GT5u.replaceUVwithMAXBat) { - MAX_BATTERY = addItem(522, "max.battery").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(Long.MAX_VALUE, GTValues.MAX) }).setModelAmount(8); + MAX_BATTERY = addItem(533, "max.battery").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(Long.MAX_VALUE, GTValues.MAX) }).setModelAmount(8); MetaItems.ZPM2.setInvisible(); } - NEURO_PROCESSOR = addItem(523, "processor.neuro"); - STEM_CELLS = addItem(524, "stem_cells"); - PETRI_DISH = addItem(525, "petri_dish"); + NEURO_PROCESSOR = addItem(534, "processor.neuro"); + STEM_CELLS = addItem(535, "stem_cells"); + PETRI_DISH = addItem(536, "petri_dish"); + + CARBON_FIBERS = addItem(537, "carbon.fibers"); + CARBON_MESH = addItem(538, "carbon.mesh"); + CARBON_PLATE = addItem(539, "carbon.plate"); } public void registerRecipes() { diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index c5ded6bba22..eefca82070c 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -233,78 +233,129 @@ private MetaItems() { public static MetaItem.MetaValueItem TOOL_DATA_STICK; public static MetaItem.MetaValueItem TOOL_DATA_ORB; + public static MetaItem.MetaValueItem SILICON_BOULE; public static MetaItem.MetaValueItem GLOWSTONE_BOULE; public static MetaItem.MetaValueItem NAQUADAH_BOULE; - public static MetaItem.MetaValueItem SILICON_BOULE; + public static MetaItem.MetaValueItem NEUTRONIUM_BOULE; public static MetaItem.MetaValueItem SILICON_WAFER; public static MetaItem.MetaValueItem GLOWSTONE_WAFER; public static MetaItem.MetaValueItem NAQUADAH_WAFER; + public static MetaItem.MetaValueItem NEUTRONIUM_WAFER; + public static MetaItem.MetaValueItem HIGHLY_ADVANCED_SOC_WAFER; public static MetaItem.MetaValueItem ADVANCED_SYSTEM_ON_CHIP_WAFER; public static MetaItem.MetaValueItem INTEGRATED_LOGIC_CIRCUIT_WAFER; public static MetaItem.MetaValueItem CENTRAL_PROCESSING_UNIT_WAFER; + public static MetaItem.MetaValueItem ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER; + public static MetaItem.MetaValueItem LOW_POWER_INTEGRATED_CIRCUIT_WAFER; + public static MetaItem.MetaValueItem POWER_INTEGRATED_CIRCUIT_WAFER; public static MetaItem.MetaValueItem HIGH_POWER_INTEGRATED_CIRCUIT_WAFER; public static MetaItem.MetaValueItem NAND_MEMORY_CHIP_WAFER; public static MetaItem.MetaValueItem NANO_CENTRAL_PROCESSING_UNIT_WAFER; public static MetaItem.MetaValueItem NOR_MEMORY_CHIP_WAFER; - public static MetaItem.MetaValueItem POWER_INTEGRATED_CIRCUIT_WAFER; public static MetaItem.MetaValueItem QBIT_CENTRAL_PROCESSING_UNIT_WAFER; public static MetaItem.MetaValueItem RANDOM_ACCESS_MEMORY_WAFER; public static MetaItem.MetaValueItem SYSTEM_ON_CHIP_WAFER; + public static MetaItem.MetaValueItem SIMPLE_SYSTEM_ON_CHIP_WAFER; + public static MetaItem.MetaValueItem ENGRAVED_CRYSTAL_CHIP; public static MetaItem.MetaValueItem ENGRAVED_LAPOTRON_CHIP; + public static MetaItem.MetaValueItem HIGHLY_ADVANCED_SOC; public static MetaItem.MetaValueItem ADVANCED_SYSTEM_ON_CHIP; public static MetaItem.MetaValueItem INTEGRATED_LOGIC_CIRCUIT; public static MetaItem.MetaValueItem CENTRAL_PROCESSING_UNIT; + public static MetaItem.MetaValueItem ULTRA_LOW_POWER_INTEGRATED_CIRCUIT; + public static MetaItem.MetaValueItem LOW_POWER_INTEGRATED_CIRCUIT; + public static MetaItem.MetaValueItem POWER_INTEGRATED_CIRCUIT; public static MetaItem.MetaValueItem HIGH_POWER_INTEGRATED_CIRCUIT; public static MetaItem.MetaValueItem NAND_MEMORY_CHIP; public static MetaItem.MetaValueItem NANO_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem NOR_MEMORY_CHIP; - public static MetaItem.MetaValueItem POWER_INTEGRATED_CIRCUIT; public static MetaItem.MetaValueItem QBIT_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem RANDOM_ACCESS_MEMORY; public static MetaItem.MetaValueItem SYSTEM_ON_CHIP; + public static MetaItem.MetaValueItem SIMPLE_SYSTEM_ON_CHIP; + public static MetaItem.MetaValueItem RAW_CRYSTAL_CHIP; + public static MetaItem.MetaValueItem RAW_CRYSTAL_CHIP_PART; public static MetaItem.MetaValueItem CRYSTAL_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem CRYSTAL_SYSTEM_ON_CHIP; public static MetaItem.MetaValueItem COATED_BOARD; + public static MetaItem.MetaValueItem PHENOLIC_BOARD; + public static MetaItem.MetaValueItem PLASTIC_BOARD; public static MetaItem.MetaValueItem EPOXY_BOARD; public static MetaItem.MetaValueItem FIBER_BOARD; public static MetaItem.MetaValueItem MULTILAYER_FIBER_BOARD; - public static MetaItem.MetaValueItem PHENOLIC_BOARD; - public static MetaItem.MetaValueItem PLASTIC_BOARD; public static MetaItem.MetaValueItem WETWARE_BOARD; + public static MetaItem.MetaValueItem BASIC_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem GOOD_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem PLASTIC_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem ADVANCED_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem EXTREME_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem ELITE_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem WETWARE_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem VACUUM_TUBE; public static MetaItem.MetaValueItem GLASS_TUBE; public static MetaItem.MetaValueItem RESISTOR; public static MetaItem.MetaValueItem DIODE; public static MetaItem.MetaValueItem CAPACITOR; + public static MetaItem.MetaValueItem TRANSISTOR; public static MetaItem.MetaValueItem SMALL_COIL; public static MetaItem.MetaValueItem SMD_CAPACITOR; public static MetaItem.MetaValueItem SMD_DIODE; public static MetaItem.MetaValueItem SMD_RESISTOR; public static MetaItem.MetaValueItem SMD_TRANSISTOR; - public static MetaItem.MetaValueItem TRANSISTOR; - - public static MetaItem.MetaValueItem BASIC_CIRCUIT_LV; - public static MetaItem.MetaValueItem BASIC_ELECTRONIC_CIRCUIT_LV; - public static MetaItem.MetaValueItem ADVANCED_CIRCUIT_PARTS_LV; - public static MetaItem.MetaValueItem GOOD_INTEGRATED_CIRCUIT_MV; - public static MetaItem.MetaValueItem ADVANCED_CIRCUIT_MV; + public static MetaItem.MetaValueItem ADVANCED_SMD_CAPACITOR; + public static MetaItem.MetaValueItem ADVANCED_SMD_DIODE; + public static MetaItem.MetaValueItem ADVANCED_SMD_RESISTOR; + public static MetaItem.MetaValueItem ADVANCED_SMD_TRANSISTOR; + + // T1: Electronic + public static MetaItem.MetaValueItem ELECTRONIC_CIRCUIT_LV; + public static MetaItem.MetaValueItem ELECTRONIC_CIRCUIT_MV; + + // T2: Integrated + public static MetaItem.MetaValueItem INTEGRATED_CIRCUIT_LV; + public static MetaItem.MetaValueItem INTEGRATED_CIRCUIT_MV; + public static MetaItem.MetaValueItem INTEGRATED_CIRCUIT_HV; + + // ULV/LV easier circuits + public static MetaItem.MetaValueItem NAND_CHIP_ULV; + public static MetaItem.MetaValueItem MICROPROCESSOR_LV; + + // T3: Processor + public static MetaItem.MetaValueItem PROCESSOR_MV; public static MetaItem.MetaValueItem PROCESSOR_ASSEMBLY_HV; + public static MetaItem.MetaValueItem WORKSTATION_EV; + public static MetaItem.MetaValueItem MAINFRAME_IV; + + // T4: Nano public static MetaItem.MetaValueItem NANO_PROCESSOR_HV; public static MetaItem.MetaValueItem NANO_PROCESSOR_ASSEMBLY_EV; + public static MetaItem.MetaValueItem NANO_COMPUTER_IV; + public static MetaItem.MetaValueItem NANO_MAINFRAME_LUV; + + // T5: Quantum public static MetaItem.MetaValueItem QUANTUM_PROCESSOR_EV; - public static MetaItem.MetaValueItem DATA_CONTROL_CIRCUIT_IV; + public static MetaItem.MetaValueItem QUANTUM_ASSEMBLY_IV; + public static MetaItem.MetaValueItem QUANTUM_COMPUTER_LUV; + public static MetaItem.MetaValueItem QUANTUM_MAINFRAME_ZPM; + + // T6: Crystal public static MetaItem.MetaValueItem CRYSTAL_PROCESSOR_IV; - public static MetaItem.MetaValueItem ENERGY_FLOW_CIRCUIT_LUV; + public static MetaItem.MetaValueItem CRYSTAL_ASSEMBLY_LUV; + public static MetaItem.MetaValueItem CRYSTAL_COMPUTER_ZPM; + public static MetaItem.MetaValueItem CRYSTAL_MAINFRAME_UV; + + // T7: Wetware public static MetaItem.MetaValueItem WETWARE_PROCESSOR_LUV; public static MetaItem.MetaValueItem WETWARE_PROCESSOR_ASSEMBLY_ZPM; public static MetaItem.MetaValueItem WETWARE_SUPER_COMPUTER_UV; - public static MetaItem.MetaValueItem WETWARE_MAINFRAME_MAX; + public static MetaItem.MetaValueItem WETWARE_MAINFRAME_UHV; public static MetaItem.MetaValueItem COMPONENT_SAW_BLADE_DIAMOND; public static MetaItem.MetaValueItem COMPONENT_GRINDER_DIAMOND; @@ -406,6 +457,8 @@ private MetaItems() { public static MetaItem.MetaValueItem STEM_CELLS; public static MetaItem.MetaValueItem PETRI_DISH; + public static MetaItem.MetaValueItem BIO_CHAFF; + public static void init() { MetaItem1 first = new MetaItem1(); first.setRegistryName("meta_item_1"); diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java index 3a263865485..b0d039c17a3 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java @@ -103,6 +103,7 @@ public class MetaTileEntities { public static SimpleMachineMetaTileEntity[] THERMAL_CENTRIFUGE = new SimpleMachineMetaTileEntity[GTValues.V.length - 1]; public static SimpleMachineMetaTileEntity[] WIREMILL = new SimpleMachineMetaTileEntity[GTValues.V.length - 1]; public static SimpleMachineMetaTileEntity[] CLUSTER_MILL = new SimpleMachineMetaTileEntity[GTValues.V.length - 1]; + public static SimpleMachineMetaTileEntity[] CIRCUIT_ASSEMBLER = new SimpleMachineMetaTileEntity[GTValues.UV]; //GENERATORS SECTION public static SimpleGeneratorMetaTileEntity[] COMBUSTION_GENERATOR = new SimpleGeneratorMetaTileEntity[4]; @@ -251,7 +252,7 @@ public static void init() { // Arc Furnace, IDs 110-124 registerSimpleMetaTileEntity(ARC_FURNACE, 110, "arc_furnace", RecipeMaps.ARC_FURNACE_RECIPES, Textures.ARC_FURNACE_OVERLAY, - ConfigHolder.U.machines.midTierArcFurnaces, ConfigHolder.U.machines.highTierArcFurnaces, false); + ConfigHolder.U.machines.midTierArcFurnaces, ConfigHolder.U.machines.highTierArcFurnaces, false, false); // Assembler, IDs 125-139 registerSimpleMetaTileEntity(ASSEMBLER, 125, "assembler", RecipeMaps.ASSEMBLER_RECIPES, Textures.ASSEMBLER_OVERLAY, @@ -259,7 +260,7 @@ public static void init() { // Autoclave, IDs 140-154 registerSimpleMetaTileEntity(AUTOCLAVE, 140, "autoclave", RecipeMaps.AUTOCLAVE_RECIPES, Textures.AUTOCLAVE_OVERLAY, - ConfigHolder.U.machines.midTierAutoclaves, ConfigHolder.U.machines.highTierAutoclaves, false); + ConfigHolder.U.machines.midTierAutoclaves, ConfigHolder.U.machines.highTierAutoclaves, false, false); // Bender, IDs 155-169 registerSimpleMetaTileEntity(BENDER, 155, "bender", RecipeMaps.BENDER_RECIPES, Textures.BENDER_OVERLAY, @@ -275,7 +276,7 @@ public static void init() { // Centrifuge, IDs 200-214 registerSimpleMetaTileEntity(CENTRIFUGE, 200, "centrifuge", RecipeMaps.CENTRIFUGE_RECIPES, Textures.CENTRIFUGE_OVERLAY, - ConfigHolder.U.machines.midTierCentrifuges, ConfigHolder.U.machines.highTierCentrifuges, false); + ConfigHolder.U.machines.midTierCentrifuges, ConfigHolder.U.machines.highTierCentrifuges, false, false); // Chemical Bath, IDs 215-229 registerSimpleMetaTileEntity(CHEMICAL_BATH, 215, "chemical_bath", RecipeMaps.CHEMICAL_BATH_RECIPES, Textures.CHEMICAL_BATH_OVERLAY, @@ -299,7 +300,7 @@ public static void init() { // Electrolyzer, IDs 290-304 registerSimpleMetaTileEntity(ELECTROLYZER, 290, "electrolyzer", RecipeMaps.ELECTROLYZER_RECIPES, Textures.ELECTROLYZER_OVERLAY, - ConfigHolder.U.machines.midTierElectrolyzers, ConfigHolder.U.machines.highTierElectrolyzers, false); + ConfigHolder.U.machines.midTierElectrolyzers, ConfigHolder.U.machines.highTierElectrolyzers, false, false); // Electromagnetic Separator, IDs 305-319 registerSimpleMetaTileEntity(ELECTROMAGNETIC_SEPARATOR, 305, "electromagnetic_separator", RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES, Textures.ELECTROMAGNETIC_SEPARATOR_OVERLAY, @@ -351,7 +352,7 @@ public static void init() { // Mixer, IDs 485-499 registerSimpleMetaTileEntity(MIXER, 485, "mixer", RecipeMaps.MIXER_RECIPES, Textures.MIXER_OVERLAY, - ConfigHolder.U.machines.midTierMixers, ConfigHolder.U.machines.highTierMixers, false); + ConfigHolder.U.machines.midTierMixers, ConfigHolder.U.machines.highTierMixers, false, false); // Ore Washer, IDs 500-514 registerSimpleMetaTileEntity(ORE_WASHER, 500, "ore_washer", RecipeMaps.ORE_WASHER_RECIPES, Textures.ORE_WASHER_OVERLAY, @@ -367,7 +368,7 @@ public static void init() { // Plasma Arc Furnace, IDs 545-559 registerSimpleMetaTileEntity(PLASMA_ARC_FURNACE, 545, "plasma_arc_furnace", RecipeMaps.PLASMA_ARC_FURNACE_RECIPES, Textures.PLASMA_ARC_FURNACE_OVERLAY, - ConfigHolder.U.machines.midTierPlasmaArcFurnaces, ConfigHolder.U.machines.highTierPlasmaArcFurnaces, false); + ConfigHolder.U.machines.midTierPlasmaArcFurnaces, ConfigHolder.U.machines.highTierPlasmaArcFurnaces, false, false); // Polarizer, IDs 560-574 registerSimpleMetaTileEntity(POLARIZER, 560, "polarizer", RecipeMaps.POLARIZER_RECIPES, Textures.POLARIZER_OVERLAY, @@ -395,6 +396,10 @@ public static void init() { ConfigHolder.U.machines.midTierClusterMills, ConfigHolder.U.machines.highTierClusterMills); } + // Circuit Assembler, IDs 650-664 + registerSimpleMetaTileEntity(CIRCUIT_ASSEMBLER, 650, "circuit_assembler", RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES, Textures.ASSEMBLER_OVERLAY, + true, false, true, true); + // Some space here for more SimpleMachines // Space left for these just in case @@ -664,10 +669,13 @@ private static void registerSimpleMetaTileEntity(SimpleMachineMetaTileEntity[] m OrientedOverlayRenderer texture, boolean midTier, boolean highTier, - boolean hasFrontFacing) { + boolean hasFrontFacing, + boolean ignoreConfig) { for (int i = 0; i < machines.length - 1; i++) { - if (i > 4 && !(ConfigHolder.U.machines.midTierMachines || midTier)) continue; - if (i > 7 && !(ConfigHolder.U.machines.highTierMachines || highTier)) break; + if (!ignoreConfig) { + if (i > 4 && !(ConfigHolder.U.machines.midTierMachines || midTier)) continue; + if (i > 7 && !(ConfigHolder.U.machines.highTierMachines || highTier)) break; + } String voltageName = GTValues.VN[i + 1].toLowerCase(); machines[i] = GregTechAPI.registerMetaTileEntity(startId + i, @@ -682,7 +690,7 @@ private static void registerSimpleMetaTileEntity(SimpleMachineMetaTileEntity[] m OrientedOverlayRenderer texture, boolean midTier, boolean highTier) { - registerSimpleMetaTileEntity(machines, startId, name, map, texture, midTier, highTier, true); + registerSimpleMetaTileEntity(machines, startId, name, map, texture, midTier, highTier, true, false); } private static ResourceLocation gregtechId(String name) { diff --git a/src/main/java/gregtech/integration/jei/utils/JEIHooks.java b/src/main/java/gregtech/integration/jei/utils/JEIHooks.java index cb533119826..19f2b775a4b 100644 --- a/src/main/java/gregtech/integration/jei/utils/JEIHooks.java +++ b/src/main/java/gregtech/integration/jei/utils/JEIHooks.java @@ -21,7 +21,7 @@ public static void addFluidTooltip(List tooltip, Object ingredient) { if (ingredient instanceof FluidStack) { String formula = FluidTooltipUtil.getFluidTooltip(((FluidStack) ingredient).getFluid()); if (formula != null && !formula.isEmpty()) { - tooltip.add(1, ChatFormatting.GRAY + formula); + tooltip.add(1, ChatFormatting.YELLOW + formula); } } } diff --git a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java index cee77779af5..ff3dcbe0866 100644 --- a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java +++ b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java @@ -90,21 +90,19 @@ public static void init() { RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSE, 1), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 6), MetaItems.QUANTUM_STAR.getStackForm(4), MetaItems.EMITTER_ZPM.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.YttriumBariumCuprate, 8)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 16).fluidInputs(Materials.SolderingAlloy.getFluid(1152)).outputs(MetaItems.FIELD_GENERATOR_ZPM.getStackForm()).duration(600).EUt(245760).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Neutronium, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 6), MetaItems.GRAVI_STAR.getStackForm(), MetaItems.EMITTER_UV.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.YttriumBariumCuprate, 8)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 64).fluidInputs(Materials.SolderingAlloy.getFluid(2304)).outputs(MetaItems.FIELD_GENERATOR_UV.getStackForm()).duration(600).EUt(491520).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.WETWARE_BOARD.getStackForm(), MetaItems.STEM_CELLS.getStackForm(8), MetaItems.GLASS_TUBE.getStackForm(8), OreDictUnifier.get(OrePrefix.pipeTiny, Materials.Polyethylene, 4), OreDictUnifier.get(OrePrefix.foil, Materials.SiliconeRubber, 64)).input(OrePrefix.plate, Materials.Gold, 4).input(OrePrefix.plate, Materials.StainlessSteel, 4).fluidInputs(Materials.SterileGrowthMedium.getFluid(250), Materials.UUMatter.getFluid(100), Materials.DistilledWater.getFluid(1000)).outputs(MetaItems.NEURO_PROCESSOR.getStackForm(1)).duration(200).EUt(80000).buildAndRegister(); - ItemStack last_bat = (ConfigHolder.U.GT5u.replaceUVwithMAXBat ? MetaItems.MAX_BATTERY : MetaItems.ZPM2).getStackForm(); if (ConfigHolder.U.GT5u.enableZPMandUVBats) { RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Europium, 16), MetaItems.WETWARE_SUPER_COMPUTER_UV.getStackForm(4), MetaItems.ENERGY_LAPOTRONIC_ORB2.getStackForm(8), MetaItems.FIELD_GENERATOR_LUV.getStackForm(2), MetaItems.NANO_CENTRAL_PROCESSING_UNIT.getStackForm(64), MetaItems.NANO_CENTRAL_PROCESSING_UNIT.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(8), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.Naquadah, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(288)).outputs(MetaItems.ENERGY_MODULE.getStackForm()).duration(2000).EUt(100000).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 16), MetaItems.WETWARE_SUPER_COMPUTER_UV.getStackForm(4), MetaItems.ENERGY_MODULE.getStackForm(8), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.NaquadahAlloy, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(576)).outputs(MetaItems.ENERGY_CLUSTER.getStackForm()).duration(2000).EUt(200000).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.ENERGY_CLUSTER.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000), Materials.Naquadria.getFluid(1152)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.ENERGY_CLUSTER.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000), Materials.Naquadria.getFluid(1152)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); } else { - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.ENERGY_LAPOTRONIC_ORB2.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.ENERGY_LAPOTRONIC_ORB2.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); } RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.FUSION_COIL.getItemVariant(BlockFusionCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Plutonium241), OreDictUnifier.get(OrePrefix.plate, Materials.NetherStar), MetaItems.FIELD_GENERATOR_IV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(32), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[0].getStackForm()).duration(1000).EUt(30000).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.FUSION_COIL.getItemVariant(BlockFusionCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Europium, 4), MetaItems.FIELD_GENERATOR_LUV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(48), OreDictUnifier.get(OrePrefix.wireGtDouble, MarkerMaterials.Tier.Superconductor, 32)).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[1].getStackForm()).duration(1000).EUt(60000).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.FUSION_COIL.getItemVariant(BlockFusionCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 4), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), OreDictUnifier.get(OrePrefix.wireGtQuadruple, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[2].getStackForm()).duration(1000).EUt(90000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.FUSION_COIL.getItemVariant(BlockFusionCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 4), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(1), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(1), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(1), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(1), OreDictUnifier.get(OrePrefix.wireGtQuadruple, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[2].getStackForm()).duration(1000).EUt(90000).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index 4f68af4e8c9..53304b5de72 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -1,10 +1,9 @@ package gregtech.loaders.recipe; import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.MarkerMaterials.Color; +import gregtech.api.unification.material.MarkerMaterials.Component; import gregtech.api.unification.material.MarkerMaterials.Tier; -import gregtech.api.unification.material.type.IngotMaterial; -import gregtech.api.unification.stack.MaterialStack; +import gregtech.api.unification.material.MarkerMaterials.Color; import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; import net.minecraft.init.Items; @@ -21,11 +20,6 @@ public class CircuitRecipes { private CircuitRecipes() { } - private static final MaterialStack[] solderingList = { - new MaterialStack(Tin, 2L), - new MaterialStack(SolderingAlloy, 1L) - }; - public static void init() { waferRecipes(); componentRecipes(); @@ -51,67 +45,90 @@ private static void waferRecipes() { .blastFurnaceTemp(2484) .buildAndRegister(); - BLAST_RECIPES.recipeBuilder().duration(1500).EUt(1920) - .input(block, Silicon, 9) + BLAST_RECIPES.recipeBuilder().duration(15000).EUt(1920) + .input(block, Silicon, 16) .input(ingot, Naquadah) .fluidInputs(Argon.getFluid(8000)) .output(NAQUADAH_BOULE) .blastFurnaceTemp(5400) .buildAndRegister(); + BLAST_RECIPES.recipeBuilder().duration(18000).EUt(7680) + .input(block, Silicon, 32) + .input(ingot, Neutronium, 4) + .fluidInputs(Radon.getFluid(8000)) + .output(NEUTRONIUM_BOULE) + .blastFurnaceTemp(6484) + .buildAndRegister(); + // Boule cutting - CUTTER_RECIPES.recipeBuilder().duration(200).EUt(8) .input(SILICON_BOULE).output(SILICON_WAFER, 16).buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(400).EUt(64) .input(GLOWSTONE_BOULE).output(GLOWSTONE_WAFER, 32).buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(800).EUt(384).input(NAQUADAH_BOULE).output(NAQUADAH_WAFER, 64).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(400).EUt(16) .input(SILICON_BOULE) .output(SILICON_WAFER, 16).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(800).EUt(120) .input(GLOWSTONE_BOULE) .output(GLOWSTONE_WAFER, 32).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(1600).EUt(480) .input(NAQUADAH_BOULE) .output(NAQUADAH_WAFER, 64).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(2400).EUt(1920).input(NEUTRONIUM_BOULE).output(NEUTRONIUM_WAFER, 64).output(NEUTRONIUM_WAFER, 32).buildAndRegister(); - // Wafer engraving - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4).buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8).buildAndRegister(); + // Wafer engraving TODO ULPIC, LPIC + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 16).buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 4) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50) .EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 16) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 8) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER, 8) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 4) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50) .EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 16) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER, 4).buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER, 8) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Yellow) .output(SYSTEM_ON_CHIP_WAFER, 2) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Orange) .output(ADVANCED_SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(300).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Orange) .output(SIMPLE_SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); + + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Yellow) .output(SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Yellow) .output(SYSTEM_ON_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Yellow) .output(SYSTEM_ON_CHIP_WAFER, 8) .buildAndRegister(); + + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Orange) .output(ADVANCED_SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Orange) .output(ADVANCED_SYSTEM_ON_CHIP_WAFER, 2) .buildAndRegister(); + + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Magenta) .output(HIGHLY_ADVANCED_SOC_WAFER) .buildAndRegister(); // Wafer chemical refining recipes - CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(1920) + CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(7680) .input(POWER_INTEGRATED_CIRCUIT_WAFER) .input(dust, IndiumGalliumPhosphide, 2) - .fluidInputs(RedAlloy.getFluid(288)) + .fluidInputs(RedAlloy.getFluid(L * 2)) .output(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(400).EUt(480) + CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(1920) .input(CENTRAL_PROCESSING_UNIT_WAFER) .input(CARBON_FIBERS, 16) - .fluidInputs(Glowstone.getFluid(576)) + .fluidInputs(Glowstone.getFluid(L * 4)) .output(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(400).EUt(1920) + CHEMICAL_RECIPES.recipeBuilder().duration(900).EUt(1920) .input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .input(QUANTUM_EYE, 2) - .fluidInputs(GalliumArsenide.getFluid(288)) + .fluidInputs(GalliumArsenide.getFluid(L * 2)) .output(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(1920) + CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(1920) .input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .input(dust, IndiumGalliumPhosphide) .fluidInputs(Radon.getFluid(50)) @@ -119,114 +136,165 @@ private static void waferRecipes() { .buildAndRegister(); // Wafer cutting - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(ADVANCED_SYSTEM_ON_CHIP_WAFER) .output(ADVANCED_SYSTEM_ON_CHIP, 6) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(SYSTEM_ON_CHIP_WAFER) .output(SYSTEM_ON_CHIP, 6) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(RANDOM_ACCESS_MEMORY_WAFER) .output(RANDOM_ACCESS_MEMORY, 32) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .output(QBIT_CENTRAL_PROCESSING_UNIT, 5) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER).output(HIGH_POWER_INTEGRATED_CIRCUIT, 2).buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(NOR_MEMORY_CHIP_WAFER) .output(NOR_MEMORY_CHIP, 16) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(NAND_MEMORY_CHIP_WAFER) .output(NAND_MEMORY_CHIP, 32) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(CENTRAL_PROCESSING_UNIT_WAFER) .output(CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(INTEGRATED_LOGIC_CIRCUIT_WAFER) .output(INTEGRATED_LOGIC_CIRCUIT, 8) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .output(NANO_CENTRAL_PROCESSING_UNIT, 7) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGHLY_ADVANCED_SOC_WAFER) .output(HIGHLY_ADVANCED_SOC, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(ADVANCED_SYSTEM_ON_CHIP_WAFER) .output(ADVANCED_SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(SYSTEM_ON_CHIP_WAFER) .output(SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(SIMPLE_SYSTEM_ON_CHIP_WAFER) .output(SIMPLE_SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(96) .input(RANDOM_ACCESS_MEMORY_WAFER) .output(RANDOM_ACCESS_MEMORY, 32) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .output(QBIT_CENTRAL_PROCESSING_UNIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER).output(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT, 6).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(LOW_POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER) .output(HIGH_POWER_INTEGRATED_CIRCUIT, 2) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NOR_MEMORY_CHIP_WAFER) .output(NOR_MEMORY_CHIP, 16) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NAND_MEMORY_CHIP_WAFER) .output(NAND_MEMORY_CHIP, 32) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(CENTRAL_PROCESSING_UNIT_WAFER) .output(CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(INTEGRATED_LOGIC_CIRCUIT_WAFER) .output(INTEGRATED_LOGIC_CIRCUIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480). input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .output(NANO_CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); } private static void componentRecipes() { // Vacuum Tube - ModHandler.addShapedRecipe("vacuum_tube_wire", VACUUM_TUBE.getStackForm(), + ModHandler.addShapedRecipe("vacuum_tube", VACUUM_TUBE.getStackForm(), "PTP", "WWW", - 'P', new ItemStack(Items.PAPER), + 'P', new UnificationEntry(stick, Steel), 'T', GLASS_TUBE.getStackForm(), 'W', new UnificationEntry(wireGtSingle, Copper)); - ModHandler.addShapedRecipe("vacuum_tube_wire_fine", VACUUM_TUBE.getStackForm(), - "PTP", "WWW", - 'P', new ItemStack(Items.PAPER), - 'T', GLASS_TUBE.getStackForm(), - 'W', new UnificationEntry(wireFine, Copper)); - ASSEMBLER_RECIPES.recipeBuilder().duration(120).EUt(8) .input(GLASS_TUBE) - .inputs(new ItemStack(Items.PAPER, 2)) + .input(bolt, Steel, 2) + .input(wireGtSingle, Copper, 2) + .output(VACUUM_TUBE, 2) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(40).EUt(8) + .input(GLASS_TUBE) + .input(bolt, Steel) .input(wireGtSingle, Copper, 2) - .output(VACUUM_TUBE) + .fluidInputs(RedAlloy.getFluid(18)) + .output(VACUUM_TUBE, 4) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(120).EUt(8) .input(GLASS_TUBE) - .inputs(new ItemStack(Items.PAPER, 2)) - .input(wireFine, Copper, 2) - .output(VACUUM_TUBE) + .input(bolt, Steel, 2) + .input(wireGtSingle, AnnealedCopper, 2) + .output(VACUUM_TUBE, 4) .buildAndRegister(); - ALLOY_SMELTER_RECIPES.recipeBuilder().duration(160).EUt(8) + ASSEMBLER_RECIPES.recipeBuilder().duration(40).EUt(8) + .input(GLASS_TUBE) + .input(bolt, Steel) + .input(wireGtSingle, AnnealedCopper, 2) + .fluidInputs(RedAlloy.getFluid(18)) + .output(VACUUM_TUBE, 6) + .buildAndRegister(); + + ALLOY_SMELTER_RECIPES.recipeBuilder().duration(240).EUt(8) + .input(dust, Glass) + .notConsumable(SHAPE_MOLD_BALL) + .output(GLASS_TUBE) + .buildAndRegister(); + + FORMING_PRESS_RECIPES.recipeBuilder().duration(80).EUt(8) .input(dust, Glass) .notConsumable(SHAPE_MOLD_BALL) .output(GLASS_TUBE) .buildAndRegister(); // Resistor - ModHandler.addShapedRecipe("resistor_wire", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireGtSingle, Copper), 'C', new UnificationEntry(dust, Coal)); - ModHandler.addShapedRecipe("resistor_wire_fine", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_fine", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireFine, Copper), 'C', new UnificationEntry(dust, Coal)); - ModHandler.addShapedRecipe("resistor_wire_charcoal", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_charcoal", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireGtSingle, Copper), 'C', new UnificationEntry(dust, Charcoal)); - ModHandler.addShapedRecipe("resistor_wire_fine_charcoal", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_fine_charcoal", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireFine, Copper), 'C', new UnificationEntry(dust, Charcoal)); - ModHandler.addShapedRecipe("resistor_wire_carbon", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_carbon", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireGtSingle, Copper), 'C', new UnificationEntry(dust, Carbon)); - ModHandler.addShapedRecipe("resistor_wire_fine_carbon", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_fine_carbon", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireFine, Copper), 'C', new UnificationEntry(dust, Carbon)); ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) .input(dust, Coal) .input(wireFine, Copper, 4) - .output(RESISTOR, 12) + .output(RESISTOR, 4) + .fluidInputs(Glue.getFluid(100)) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) .input(dust, Charcoal) .input(wireFine, Copper, 4) - .output(RESISTOR, 12) + .output(RESISTOR, 4) + .fluidInputs(Glue.getFluid(100)) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) .input(dust, Carbon) .input(wireFine, Copper, 4) - .output(RESISTOR, 12) + .output(RESISTOR, 4) + .fluidInputs(Glue.getFluid(100)) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) + .input(dust, Coal) + .input(wireFine, AnnealedCopper, 4) + .output(RESISTOR, 8) + .fluidInputs(Glue.getFluid(100)) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) + .input(dust, Charcoal) + .input(wireFine, AnnealedCopper, 4) + .output(RESISTOR, 8) + .fluidInputs(Glue.getFluid(100)) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) + .input(dust, Carbon) + .input(wireFine, AnnealedCopper, 4) + .output(RESISTOR, 8) + .fluidInputs(Glue.getFluid(100)) .buildAndRegister(); // Capacitor - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(96) - .input(plate, Polyethylene) + ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(120) + .input(foil, Polyethylene) .input(foil, Aluminium, 2) - .output(CAPACITOR, 2) + .fluidInputs(Polyethylene.getFluid(L)) + .output(CAPACITOR, 8) .buildAndRegister(); // Transistor @@ -238,152 +306,133 @@ private static void componentRecipes() { .buildAndRegister(); // Diode - ModHandler.addShapedRecipe("diode", DIODE.getStackForm(), - "DG ", "TWT", "DG ", - 'D', "dyeBlack", - 'G', "paneGlass", - 'T', new UnificationEntry(wireGtSingle, Tin), - 'W', new UnificationEntry(dustSmall, GalliumArsenide)); - - ModHandler.addShapedRecipe("diode_wire", DIODE.getStackForm(), - "DG ", "TWT", "DG ", - 'D', "dyeBlack", - 'G', "paneGlass", - 'T', new UnificationEntry(wireFine, Tin), - 'W', new UnificationEntry(dustSmall, GalliumArsenide)); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(30) .input(wireFine, Copper, 4) .input(dustSmall, GalliumArsenide) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L)) .output(DIODE, 2) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(30) .input(wireFine, Copper, 4) .input(SILICON_WAFER) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L)) .output(DIODE, 4) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(30) .input(wireFine, AnnealedCopper, 4) .input(dustSmall, GalliumArsenide) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L)) .output(DIODE, 6) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(30) .input(wireFine, AnnealedCopper, 4) .input(SILICON_WAFER) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L)) .output(DIODE, 8) .buildAndRegister(); // Small Coil - ModHandler.addShapedRecipe("small_coil_copper_steel", SMALL_COIL.getStackForm(), - "WWW", "WBW", "WWW", - 'W', new UnificationEntry(wireFine, Copper), - 'B', new UnificationEntry(ring, Steel)); - - ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(60) - .input(ring, Steel) - .input(wireFine, Copper, 2) - .output(SMALL_COIL, 2) - .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(60) .input(ring, NickelZincFerrite) .input(wireFine, Copper, 2) - .output(SMALL_COIL, 4) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(60) - .input(ring, Steel) - .input(wireFine, AnnealedCopper, 2) + .fluidInputs(Polyethylene.getFluid(L / 4)) .output(SMALL_COIL, 4) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(60) .input(ring, NickelZincFerrite) .input(wireFine, AnnealedCopper, 2) + .fluidInputs(Polyethylene.getFluid(L / 4)) .output(SMALL_COIL, 8) .buildAndRegister(); // SMD Resistor - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(480) .input(dust, Carbon) .input(wireFine, Electrum, 4) - .fluidInputs(Polyethylene.getFluid(144)) - .output(SMD_RESISTOR, 24) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) - .input(dust, Carbon) - .input(wireFine, Electrum, 4) - .fluidInputs(Polybenzimidazole.getFluid(72)) - .output(SMD_RESISTOR, 48) + .fluidInputs(Polyethylene.getFluid(L * 2)) + .output(SMD_RESISTOR, 16) .buildAndRegister(); // SMD Diode - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(480) .input(dust, GalliumArsenide) .input(wireFine, Platinum, 8) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L * 2)) .output(SMD_DIODE, 32) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480) - .input(dust, GalliumArsenide) - .input(wireFine, Platinum, 8) - .fluidInputs(Polybenzimidazole.getFluid(72)) - .output(SMD_DIODE, 64) - .buildAndRegister(); - // SMD Transistor - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(120) - .input(foil, Gallium) - .input(wireFine, AnnealedCopper, 8) - .fluidInputs(Polyethylene.getFluid(288)) - .output(SMD_TRANSISTOR, 32) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(480) .input(foil, Gallium) .input(wireFine, AnnealedCopper, 8) - .fluidInputs(Polybenzimidazole.getFluid(144)) - .output(SMD_TRANSISTOR, 64) + .fluidInputs(Polyethylene.getFluid(L)) + .output(SMD_TRANSISTOR, 16) .buildAndRegister(); // SMD Capacitor - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) .input(foil, SiliconeRubber) .input(foil, Aluminium) .fluidInputs(Polyethylene.getFluid(72)) .output(SMD_CAPACITOR, 8) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) .input(foil, PolyvinylChloride, 2) .input(foil, Aluminium) .fluidInputs(Polyethylene.getFluid(72)) .output(SMD_CAPACITOR, 12) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(120).EUt(480) .input(foil, SiliconeRubber) .input(foil, Tantalum) .fluidInputs(Polyethylene.getFluid(72)) .output(SMD_CAPACITOR, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(120).EUt(480) .input(foil, PolyvinylChloride, 2) .input(foil, Tantalum) .fluidInputs(Polyethylene.getFluid(72)) .output(SMD_CAPACITOR, 24) .buildAndRegister(); - // TODO PBI SMD_CAPACITOR RECIPES + + // Advanced SMD Resistor + ASSEMBLER_RECIPES.recipeBuilder().EUt(384).duration(160) + .input(dust, Graphene) + .input(wireFine, Platinum, 4) + .fluidInputs(Polybenzimidazole.getFluid(L * 2)) + .output(ADVANCED_SMD_RESISTOR, 16) + .buildAndRegister(); + + // Advanced SMD Diode + ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(150) + .input(dustSmall, IndiumGalliumPhosphide) + .input(wireFine, NiobiumTitanium, 4) + .fluidInputs(Polybenzimidazole.getFluid(L / 2)) + .output(ADVANCED_SMD_DIODE, 16) + .buildAndRegister(); + + // Advanced SMD Transistor + ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(160) + .input(foil, VanadiumGallium) + .input(wireFine, HSSG, 8) + .fluidInputs(Polybenzimidazole.getFluid(L)) + .output(ADVANCED_SMD_TRANSISTOR, 16) + .buildAndRegister(); + + // Advanced SMD Capacitor + ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(80) + .input(foil, Polybenzimidazole, 2) + .input(foil, HSSS) + .fluidInputs(Polybenzimidazole.getFluid(L / 4)) + .output(ADVANCED_SMD_CAPACITOR, 16) + .buildAndRegister(); // Carbon Fibers if (ConfigHolder.U.GT5u.polymerCarbonFiber) { @@ -437,23 +486,18 @@ private static void componentRecipes() { .output(ENGRAVED_LAPOTRON_CHIP, 3) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(7600) + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(10000) .input(ENGRAVED_CRYSTAL_CHIP) .notConsumable(craftingLens, Color.Lime) .output(CRYSTAL_CENTRAL_PROCESSING_UNIT) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(32000) + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(40000) .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) .notConsumable(craftingLens, Color.Blue) .output(CRYSTAL_SYSTEM_ON_CHIP) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().EUt(60).duration(960) - .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) - .output(RAW_CRYSTAL_CHIP, 2) - .buildAndRegister(); - AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(320) .input(gemExquisite, Emerald) .fluidInputs(Europium.getFluid(L / 9)) @@ -466,6 +510,29 @@ private static void componentRecipes() { .chancedOutput(RAW_CRYSTAL_CHIP, 1000, 2000) .buildAndRegister(); + FORGE_HAMMER_RECIPES.recipeBuilder().EUt(480).duration(100) + .input(RAW_CRYSTAL_CHIP) + .output(RAW_CRYSTAL_CHIP_PART, 9) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(480) + .input(RAW_CRYSTAL_CHIP_PART) + .fluidInputs(Europium.getFluid(L / 9)) + .chancedOutput(RAW_CRYSTAL_CHIP, 8000, 250) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(480) + .input(RAW_CRYSTAL_CHIP_PART) + .fluidInputs(Mutagen.getFluid(250)) + .chancedOutput(RAW_CRYSTAL_CHIP, 8000, 250) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(480) + .input(RAW_CRYSTAL_CHIP_PART) + .fluidInputs(BacterialSludge.getFluid(250)) + .chancedOutput(RAW_CRYSTAL_CHIP, 8000, 250) + .buildAndRegister(); + BLAST_RECIPES.recipeBuilder().duration(900).EUt(480).blastFurnaceTemp(5000) .input(plate, Emerald) .input(RAW_CRYSTAL_CHIP) @@ -502,32 +569,65 @@ private static void componentRecipes() { // Neutron Reflector TODO Move out of here ASSEMBLER_RECIPES.recipeBuilder().duration(4000).EUt(120) .input(PLATE_IRIDIUM_ALLOY) - .input(plate, Beryllium, 32) - .input(plate, TungstenCarbide, 4) + .input(plateDouble, Beryllium, 16) + .input(plateDouble, TungstenCarbide, 2) .fluidInputs(TinAlloy.getFluid(L * 32)) .output(NEUTRON_REFLECTOR) .buildAndRegister(); - } private static void boardRecipes() { - // Coated board + // Coated Board ModHandler.addShapedRecipe("coated_board", COATED_BOARD.getStackForm(3), - " R ", "PPP", " R ", + "RRR", "PPP", "RRR", 'R', RUBBER_DROP.getStackForm(), 'P', new UnificationEntry(plate, Wood)); ModHandler.addShapelessRecipe("coated_board_1x", COATED_BOARD.getStackForm(), - RUBBER_DROP.getStackForm(), new UnificationEntry(plate, Wood), - new UnificationEntry(plate, Wood)); + RUBBER_DROP.getStackForm(), + RUBBER_DROP.getStackForm()); - ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(8) - .input(plate, Wood, 8) - .input(RUBBER_DROP) - .fluidInputs(Glue.getFluid(100)) - .output(COATED_BOARD, 8) + ModHandler.addShapedRecipe("basic_circuit_board", BASIC_CIRCUIT_BOARD.getStackForm(), + "WWW", "WBW", "WWW", + 'W', new UnificationEntry(wireGtSingle, Copper), + 'B', COATED_BOARD.getStackForm()); + + // Basic Circuit Board + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Glue.getFluid(72)) + .output(BASIC_CIRCUIT_BOARD) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Polyethylene.getFluid(36)) + .output(BASIC_CIRCUIT_BOARD, 2) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Polytetrafluoroethylene.getFluid(18)) + .output(BASIC_CIRCUIT_BOARD, 2) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Epoxy.getFluid(18)) + .output(BASIC_CIRCUIT_BOARD, 3) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Polybenzimidazole.getFluid(9)) + .output(BASIC_CIRCUIT_BOARD, 4) .buildAndRegister(); // Phenolic Board @@ -552,77 +652,163 @@ private static void boardRecipes() { .output(PHENOLIC_BOARD, 3) .buildAndRegister(); + // Good Circuit Board + ModHandler.addShapedRecipe("good_circuit_board", GOOD_CIRCUIT_BOARD.getStackForm(), + "WWW", "WBW", "WWW", + 'W', new UnificationEntry(wireGtSingle, Gold), + 'B', PHENOLIC_BOARD.getStackForm()); + + CHEMICAL_RECIPES.recipeBuilder().EUt(30).duration(300) + .input(foil, Gold, 4) + .input(PHENOLIC_BOARD) + .fluidInputs(SodiumPersulfate.getFluid(250)) + .output(GOOD_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(480).duration(75) + .input(foil, Gold, 4) + .input(PHENOLIC_BOARD) + .fluidInputs(Iron3Chloride.getFluid(125)) + .output(GOOD_CIRCUIT_BOARD) + .buildAndRegister(); + // Plastic Board - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, Polyethylene) .input(foil, Copper, 4) - .fluidInputs(SulfuricAcid.getFluid(125)) + .fluidInputs(SulfuricAcid.getFluid(250)) .output(PLASTIC_BOARD) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, PolyvinylChloride) .input(foil, Copper, 4) - .fluidInputs(SulfuricAcid.getFluid(125)) + .fluidInputs(SulfuricAcid.getFluid(250)) .output(PLASTIC_BOARD, 2) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, Polytetrafluoroethylene) .input(foil, Copper, 4) - .fluidInputs(SulfuricAcid.getFluid(125)) + .fluidInputs(SulfuricAcid.getFluid(250)) .output(PLASTIC_BOARD, 4) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, Polybenzimidazole) .input(foil, Copper, 4) - .fluidInputs(SulfuricAcid.getFluid(125)) + .fluidInputs(SulfuricAcid.getFluid(250)) .output(PLASTIC_BOARD, 8) .buildAndRegister(); + // Plastic Circuit Board + CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(30) + .input(PLASTIC_BOARD) + .input(foil, Copper, 6) + .fluidInputs(SodiumPersulfate.getFluid(500)) + .output(PLASTIC_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(150).EUt(480) + .input(PLASTIC_BOARD) + .input(foil, Copper, 6) + .fluidInputs(Iron3Chloride.getFluid(250)) + .output(PLASTIC_CIRCUIT_BOARD) + .buildAndRegister(); + // Epoxy Board - CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(30) .input(plate, Epoxy) - .input(foil, Copper) - .fluidInputs(SulfuricAcid.getFluid(125)) + .input(foil, Gold, 8) + .fluidInputs(SulfuricAcid.getFluid(500)) .output(EPOXY_BOARD) .buildAndRegister(); + // Advanced Circuit Board + CHEMICAL_RECIPES.recipeBuilder().duration(900).EUt(30) + .input(EPOXY_BOARD) + .input(foil, Electrum, 8) + .fluidInputs(SodiumPersulfate.getFluid(1000)) + .output(ADVANCED_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(225).EUt(480) + .input(EPOXY_BOARD) + .input(foil, Electrum, 8) + .fluidInputs(Iron3Chloride.getFluid(500)) + .output(ADVANCED_CIRCUIT_BOARD) + .buildAndRegister(); + // Fiber Reinforced Epoxy Board CHEMICAL_BATH_RECIPES.recipeBuilder().duration(240).EUt(16) .input(GLASS_FIBER) - .fluidInputs(Epoxy.getFluid(144)) + .fluidInputs(Epoxy.getFluid(L)) .output(plate, ReinforcedEpoxyResin) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(240).EUt(16) .input(CARBON_FIBERS) - .fluidInputs(Epoxy.getFluid(144)) + .fluidInputs(Epoxy.getFluid(L)) .output(plate, ReinforcedEpoxyResin) .buildAndRegister(); + // Borosilicate Glass Recipes EXTRUDER_RECIPES.recipeBuilder().duration(160).EUt(96) .input(ingot, BorosilicateGlass) .notConsumable(SHAPE_EXTRUDER_WIRE) .output(GLASS_FIBER, 8) .buildAndRegister(); + WIREMILL_RECIPES.recipeBuilder().duration(200).EUt(120) + .input(ingot, BorosilicateGlass) + .output(GLASS_FIBER, 8) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, ReinforcedEpoxyResin) - .input(foil, Copper) + .input(foil, AnnealedCopper, 8) .fluidInputs(SulfuricAcid.getFluid(125)) .output(FIBER_BOARD) .buildAndRegister(); - // Multi-Layer Fiber Reinforced Epoxy Board - CHEMICAL_RECIPES.recipeBuilder().duration(100).EUt(480) + // Extreme Circuit Board + CHEMICAL_RECIPES.recipeBuilder().duration(300).EUt(480) .input(FIBER_BOARD) - .input(foil, Electrum, 16) - .fluidInputs(SulfuricAcid.getFluid(250)) + .input(foil, AnnealedCopper, 12) + .fluidInputs(SodiumPersulfate.getFluid(2000)) + .output(EXTREME_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(150).EUt(1920) + .input(FIBER_BOARD) + .input(foil, AnnealedCopper, 12) + .fluidInputs(Iron3Chloride.getFluid(1000)) + .output(EXTREME_CIRCUIT_BOARD) + .buildAndRegister(); + + // Multi-Layer Fiber Reinforced Epoxy Board + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(480) + .input(FIBER_BOARD, 2) + .input(foil, Platinum, 8) + .fluidInputs(SulfuricAcid.getFluid(500)) .output(MULTILAYER_FIBER_BOARD) .buildAndRegister(); + // Elite Circuit Board + CHEMICAL_RECIPES.recipeBuilder().duration(300).EUt(1920) + .input(MULTILAYER_FIBER_BOARD) + .input(foil, Platinum, 8) + .fluidInputs(SodiumPersulfate.getFluid(4000)) + .output(ELITE_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(150).EUt(7680) + .input(MULTILAYER_FIBER_BOARD) + .input(foil, Platinum, 8) + .fluidInputs(Iron3Chloride.getFluid(2000)) + .output(ELITE_CIRCUIT_BOARD) + .buildAndRegister(); + // Wetware Board FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(160).EUt(16) .notConsumable(SHAPE_MOLD_CYLINDER) @@ -642,349 +828,613 @@ private static void boardRecipes() { .output(PETRI_DISH, 2) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480) - .input(MULTILAYER_FIBER_BOARD) - .input(circuit, Tier.Good) - .input(ELECTRIC_PUMP_LV) - .input(SENSOR_LV) + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().duration(1200).EUt(30720) + .input(MULTILAYER_FIBER_BOARD, 16) .input(PETRI_DISH) - .fluidInputs(SterileGrowthMedium.getFluid(250)) - .output(WETWARE_BOARD) + .input(ELECTRIC_PUMP_LUV) + .input(SENSOR_IV) + .input(circuit, Tier.Elite) + .input(foil, NiobiumTitanium, 16) + .fluidInputs(SterileGrowthMedium.getFluid(4000)) + .output(WETWARE_BOARD, 16) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(300).EUt(7680) + .input(WETWARE_BOARD) + .input(foil, NiobiumTitanium, 32) + .fluidInputs(SodiumPersulfate.getFluid(8000)) + .output(WETWARE_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(150).EUt(30720) + .input(WETWARE_BOARD) + .input(foil, NiobiumTitanium, 32) + .fluidInputs(Iron3Chloride.getFluid(4000)) + .output(WETWARE_CIRCUIT_BOARD) .buildAndRegister(); } private static void circuitRecipes() { - // Handcrafted Circuits - ModHandler.addShapedRecipe("basic_circuit", BASIC_CIRCUIT_LV.getStackForm(), + // T1: Electronic ============================================================================================== + + // LV + ModHandler.addShapedRecipe("electronic_circuit_lv", ELECTRONIC_CIRCUIT_LV.getStackForm(), "RPR", "VBV", "CCC", 'R', RESISTOR.getStackForm(), 'P', new UnificationEntry(plate, Steel), 'V', VACUUM_TUBE.getStackForm(), - 'B', COATED_BOARD.getStackForm(), + 'B', BASIC_CIRCUIT_BOARD.getStackForm(), 'C', new UnificationEntry(cableGtSingle, RedAlloy)); - ModHandler.addShapedRecipe("good_circuit", GOOD_INTEGRATED_CIRCUIT_MV.getStackForm(), - "RCP", "CDC", "PCR", - 'R', new UnificationEntry(cableGtSingle, RedAlloy), + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(16).duration(200) + .input(BASIC_CIRCUIT_BOARD) + .input(component, Component.Resistor, 2) + .input(wireGtSingle, RedAlloy, 2) + .input(circuit, Tier.Primitive, 2) + .output(ELECTRONIC_CIRCUIT_LV, 2) + .buildAndRegister(); + + // MV + ModHandler.addShapedRecipe("electronic_circuit_mv", ELECTRONIC_CIRCUIT_MV.getStackForm(), + "DPD", "CBC", "WWW", + 'W', new UnificationEntry(wireGtSingle, Copper), 'P', new UnificationEntry(plate, Steel), - 'C', BASIC_CIRCUIT_LV.getStackForm(), + 'C', ELECTRONIC_CIRCUIT_LV.getStackForm(), + 'B', GOOD_CIRCUIT_BOARD.getStackForm(), 'D', DIODE.getStackForm()); - //circuit assembling recipes TODO - for (MaterialStack stack : solderingList) { - IngotMaterial material = (IngotMaterial) stack.material; - int multiplier = (int) stack.amount; - - // LV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) - .input(PHENOLIC_BOARD) - .input(INTEGRATED_LOGIC_CIRCUIT) - .input(RESISTOR, 2) - .input(wireFine, Copper) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(BASIC_ELECTRONIC_CIRCUIT_LV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) - .input(PHENOLIC_BOARD) - .input(INTEGRATED_LOGIC_CIRCUIT) - .input(SMD_RESISTOR, 2) - .input(wireFine, Copper) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(BASIC_ELECTRONIC_CIRCUIT_LV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) - .input(PLASTIC_BOARD) - .input(CENTRAL_PROCESSING_UNIT, 4) - .input(RESISTOR, 4) - .input(CAPACITOR, 4) - .input(TRANSISTOR, 4) - .input(wireFine, Copper, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_PARTS_LV, 4) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) - .input(PLASTIC_BOARD) - .input(CENTRAL_PROCESSING_UNIT, 4) - .input(SMD_RESISTOR, 4) - .input(SMD_CAPACITOR, 4) - .input(SMD_TRANSISTOR, 4) - .input(wireFine, Copper, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_PARTS_LV, 4) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(600) - .input(PLASTIC_BOARD) - .input(SYSTEM_ON_CHIP, 4) - .input(wireFine, Copper, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_PARTS_LV, 4) - .buildAndRegister(); - - // MV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16) - .input(PHENOLIC_BOARD) - .input(BASIC_ELECTRONIC_CIRCUIT_LV, 3) - .input(RESISTOR, 4) - .input(wireFine, Gold, 8) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(GOOD_INTEGRATED_CIRCUIT_MV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16) - .input(PHENOLIC_BOARD) - .input(BASIC_ELECTRONIC_CIRCUIT_LV, 3) - .input(SMD_RESISTOR, 4) - .input(wireFine, Gold, 8) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(GOOD_INTEGRATED_CIRCUIT_MV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) - .input(PLASTIC_BOARD) - .input(CENTRAL_PROCESSING_UNIT) - .input(RESISTOR, 2) - .input(CAPACITOR, 2) - .input(TRANSISTOR, 2) - .input(wireFine, RedAlloy, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_MV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) - .input(PLASTIC_BOARD) - .input(CENTRAL_PROCESSING_UNIT) - .input(SMD_RESISTOR, 2) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, RedAlloy, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_MV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(2400) - .input(PLASTIC_BOARD) - .input(SYSTEM_ON_CHIP) - .input(wireFine, RedAlloy, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_MV) - .buildAndRegister(); - - // HV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) - .input(PLASTIC_BOARD) - .input(ADVANCED_CIRCUIT_MV, 2) - .input(SMALL_COIL, 4) - .input(CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, RedAlloy, 12) - .fluidInputs(material.getFluid(L * multiplier)) - .output(PROCESSOR_ASSEMBLY_HV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) - .input(PLASTIC_BOARD) - .input(ADVANCED_CIRCUIT_MV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, RedAlloy, 12) - .fluidInputs(material.getFluid(L * multiplier)) - .output(PROCESSOR_ASSEMBLY_HV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(480) - .input(EPOXY_BOARD) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(SMD_RESISTOR, 2) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, Electrum, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(NANO_PROCESSOR_HV) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(9600) - .input(EPOXY_BOARD) - .input(SYSTEM_ON_CHIP) - .input(wireFine, Electrum, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(NANO_PROCESSOR_HV) - .buildAndRegister(); - - // EV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480) - .input(EPOXY_BOARD) - .input(NANO_PROCESSOR_HV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, Electrum, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(NANO_PROCESSOR_ASSEMBLY_EV) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(30).duration(300) + .input(GOOD_CIRCUIT_BOARD) + .input(circuit, Tier.Basic, 2) + .input(component, Component.Diode, 2) + .input(wireGtSingle, Copper, 2) + .output(ELECTRONIC_CIRCUIT_MV, 2) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(1960) - .input(FIBER_BOARD) - .input(QBIT_CENTRAL_PROCESSING_UNIT) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, Platinum, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(QUANTUM_PROCESSOR_EV) - .buildAndRegister(); + // T2: Integrated ============================================================================================== - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(32000) - .input(FIBER_BOARD) - .input(ADVANCED_SYSTEM_ON_CHIP) - .input(wireFine, Platinum, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(QUANTUM_PROCESSOR_EV) - .buildAndRegister(); + // LV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(16).duration(200) + .input(BASIC_CIRCUIT_BOARD) + .input(INTEGRATED_LOGIC_CIRCUIT) + .input(component, Component.Resistor, 2) + .input(component, Component.Diode, 2) + .input(wireFine, Copper, 2) + .input(bolt, Tin, 2) + .output(INTEGRATED_CIRCUIT_LV, 2) + .buildAndRegister(); + + // MV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(24).duration(400) + .input(GOOD_CIRCUIT_BOARD) + .input(INTEGRATED_CIRCUIT_LV, 2) + .input(component, Component.Resistor, 4) + .input(component, Component.Diode, 4) + .input(wireFine, Gold, 4) + .input(bolt, Silver, 4) + .output(INTEGRATED_CIRCUIT_MV) + .buildAndRegister(); + + // HV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(30).duration(800) + .input(INTEGRATED_CIRCUIT_MV) + .input(INTEGRATED_LOGIC_CIRCUIT, 2) + .input(RANDOM_ACCESS_MEMORY, 2) + .input(component, Component.Transistor, 4) + .input(wireFine, Electrum, 8) + .input(bolt, AnnealedCopper, 8) + .output(INTEGRATED_CIRCUIT_HV) + .buildAndRegister(); + + // T2.5: Misc ================================================================================================== + + // NAND Chip ULV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(30).duration(300) + .input(GOOD_CIRCUIT_BOARD) + .input(SIMPLE_SYSTEM_ON_CHIP) + .input(bolt, RedAlloy, 2) + .input(wireFine, Tin, 2) + .output(NAND_CHIP_ULV, 8) + .buildAndRegister(); + + // Microprocessor LV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(60).duration(200) + .input(PLASTIC_CIRCUIT_BOARD) + .input(CENTRAL_PROCESSING_UNIT) + .input(component, Component.Resistor, 2) + .input(component, Component.Capacitor, 2) + .input(component, Component.Transistor, 2) + .input(wireFine, Copper, 2) + .output(MICROPROCESSOR_LV, 3) + .buildAndRegister(); - // IV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(1960) - .input(FIBER_BOARD) - .input(QUANTUM_PROCESSOR_EV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, Platinum, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(DATA_CONTROL_CIRCUIT_IV) - .buildAndRegister(); + // Microprocessor LV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(50) + .input(PLASTIC_CIRCUIT_BOARD) + .input(SYSTEM_ON_CHIP) + .input(wireFine, Copper, 2) + .input(bolt, Tin, 2) + .output(MICROPROCESSOR_LV, 6) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(7600) - .input(MULTILAYER_FIBER_BOARD) - .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, NiobiumTitanium, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(CRYSTAL_PROCESSOR_IV) - .buildAndRegister(); + // T3: Processor =============================================================================================== - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(31900) - .input(MULTILAYER_FIBER_BOARD) - .input(CRYSTAL_SYSTEM_ON_CHIP) - .input(wireFine, NiobiumTitanium, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(CRYSTAL_PROCESSOR_IV) - .buildAndRegister(); + // MV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(60).duration(200) + .input(PLASTIC_CIRCUIT_BOARD) + .input(CENTRAL_PROCESSING_UNIT) + .input(component, Component.Resistor, 4) + .input(component, Component.Capacitor, 4) + .input(component, Component.Transistor, 4) + .input(wireFine, RedAlloy, 4) + .output(PROCESSOR_MV, 2) + .buildAndRegister(); - // LuV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(7600) - .input(MULTILAYER_FIBER_BOARD) - .input(CRYSTAL_PROCESSOR_IV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, NiobiumTitanium, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(ENERGY_FLOW_CIRCUIT_LUV) - .buildAndRegister(); + // MV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(50) + .input(PLASTIC_CIRCUIT_BOARD) + .input(SYSTEM_ON_CHIP) + .input(wireFine, RedAlloy, 4) + .input(bolt, AnnealedCopper, 4) + .output(PROCESSOR_MV, 4) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(32800) - .input(WETWARE_BOARD) - .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, YttriumBariumCuprate, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(WETWARE_PROCESSOR_LUV) - .buildAndRegister(); + // HV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(120).duration(400) + .input(PLASTIC_CIRCUIT_BOARD) + .input(PROCESSOR_MV, 2) + .input(SMALL_COIL, 4) + .input(component, Component.Capacitor, 8) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, RedAlloy, 8) + .output(PROCESSOR_ASSEMBLY_HV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + // EV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(120).duration(400) + .input(PLASTIC_CIRCUIT_BOARD) + .input(PROCESSOR_ASSEMBLY_HV, 2) + .input(component, Component.Diode, 4) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, Electrum, 16) + .input(bolt, Platinum, 16) + .output(WORKSTATION_EV) + .solderMultiplier(2) + .buildAndRegister(); + + // IV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(800) + .input(frameGt, Aluminium, 2) + .input(WORKSTATION_EV, 2) + .input(SMALL_COIL, 12) + .input(component, Component.Capacitor, 16) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireGtSingle, AnnealedCopper, 16) + .output(MAINFRAME_IV) + .solderMultiplier(4) + .buildAndRegister(); - // ZPM Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(34400) - .input(WETWARE_BOARD) - .input(WETWARE_PROCESSOR_LUV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, YttriumBariumCuprate, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(WETWARE_PROCESSOR_ASSEMBLY_ZPM) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(400) + .input(frameGt, Aluminium, 2) + .input(WORKSTATION_EV, 2) + .input(SMALL_COIL, 12) + .input(ADVANCED_SMD_CAPACITOR, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireGtSingle, AnnealedCopper, 16) + .output(MAINFRAME_IV) + .solderMultiplier(4) + .buildAndRegister(); + + // T4: Nano ==================================================================================================== + + // HV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(200) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(SMD_RESISTOR, 8) + .input(SMD_CAPACITOR, 8) + .input(SMD_TRANSISTOR, 8) + .input(wireFine, Electrum, 8) + .output(NANO_PROCESSOR_HV, 2) + .buildAndRegister(); + + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(100) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(ADVANCED_SMD_RESISTOR, 2) + .input(ADVANCED_SMD_CAPACITOR, 2) + .input(ADVANCED_SMD_TRANSISTOR, 2) + .input(wireFine, Electrum, 8) + .output(NANO_PROCESSOR_HV, 2) + .buildAndRegister(); + + // HV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(50) + .input(ADVANCED_CIRCUIT_BOARD) + .input(ADVANCED_SYSTEM_ON_CHIP) + .input(wireFine, Electrum, 4) + .input(bolt, Platinum, 4) + .output(NANO_PROCESSOR_HV, 4) + .buildAndRegister(); + + // EV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(400) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_PROCESSOR_HV, 2) + .input(SMALL_COIL, 8) + .input(SMD_CAPACITOR, 8) + .input(RANDOM_ACCESS_MEMORY, 8) + .input(wireFine, Electrum, 16) + .output(NANO_PROCESSOR_ASSEMBLY_EV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(200) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_PROCESSOR_HV, 2) + .input(SMALL_COIL, 8) + .input(ADVANCED_SMD_CAPACITOR, 2) + .input(RANDOM_ACCESS_MEMORY, 8) + .input(wireFine, Electrum, 16) + .output(NANO_PROCESSOR_ASSEMBLY_EV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + // IV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(400) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_PROCESSOR_ASSEMBLY_EV, 2) + .input(SMD_DIODE, 8) + .input(NOR_MEMORY_CHIP, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireFine, Electrum, 16) + .output(NANO_COMPUTER_IV) + .solderMultiplier(2) + .buildAndRegister(); - // UV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(34400) - .input(WETWARE_BOARD, 2) - .input(WETWARE_PROCESSOR_ASSEMBLY_ZPM, 3) - .input(SMD_DIODE, 4) - .input(NOR_MEMORY_CHIP, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, YttriumBariumCuprate, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(WETWARE_SUPER_COMPUTER_UV) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(200) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_PROCESSOR_ASSEMBLY_EV, 2) + .input(ADVANCED_SMD_DIODE, 2) + .input(NOR_MEMORY_CHIP, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireFine, Electrum, 16) + .output(NANO_COMPUTER_IV) + .solderMultiplier(2) + .buildAndRegister(); - // Misc - ASSEMBLER_RECIPES.recipeBuilder().duration(512).EUt(1024) - .input(FIBER_BOARD) - .input(POWER_INTEGRATED_CIRCUIT, 4) - .input(ENGRAVED_LAPOTRON_CHIP, 18) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(wireFine, Platinum, 16) - .fluidInputs(material.getFluid(L * multiplier)) - .output(ENERGY_LAPOTRONIC_ORB) - .buildAndRegister(); + // LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(1920).duration(800) + .input(frameGt, Aluminium, 2) + .input(NANO_COMPUTER_IV, 2) + .input(SMALL_COIL, 16) + .input(SMD_CAPACITOR, 32) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireGtSingle, AnnealedCopper, 32) + .output(NANO_MAINFRAME_LUV) + .solderMultiplier(4) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(1024).EUt(4096) - .input(FIBER_BOARD) - .input(HIGH_POWER_INTEGRATED_CIRCUIT, 4) - .input(ENERGY_LAPOTRONIC_ORB, 8) - .input(QBIT_CENTRAL_PROCESSING_UNIT) - .input(wireFine, Platinum, 16) - .input(plate, Europium, 4) - .fluidInputs(material.getFluid(L * multiplier)) - .output(ENERGY_LAPOTRONIC_ORB2) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(1920).duration(400) + .input(frameGt, Aluminium, 2) + .input(NANO_COMPUTER_IV, 2) + .input(SMALL_COIL, 16) + .input(ADVANCED_SMD_CAPACITOR, 8) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireGtSingle, AnnealedCopper, 32) + .output(NANO_MAINFRAME_LUV) + .solderMultiplier(4) + .buildAndRegister(); + + // T5: Quantum ================================================================================================= + + // EV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(200) + .input(EXTREME_CIRCUIT_BOARD) + .input(QBIT_CENTRAL_PROCESSING_UNIT) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(SMD_CAPACITOR, 12) + .input(SMD_TRANSISTOR, 12) + .input(wireFine, Platinum, 12) + .output(QUANTUM_PROCESSOR_EV, 2) + .buildAndRegister(); + + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(100) + .input(EXTREME_CIRCUIT_BOARD) + .input(QBIT_CENTRAL_PROCESSING_UNIT) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(ADVANCED_SMD_CAPACITOR, 3) + .input(ADVANCED_SMD_TRANSISTOR, 3) + .input(wireFine, Platinum, 12) + .output(QUANTUM_PROCESSOR_EV, 2) + .buildAndRegister(); + + // EV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(38400).duration(50) + .input(EXTREME_CIRCUIT_BOARD) + .input(ADVANCED_SYSTEM_ON_CHIP) + .input(wireFine, Platinum, 12) + .input(bolt, NiobiumTitanium, 8) + .output(QUANTUM_PROCESSOR_EV, 4) + .buildAndRegister(); + + // IV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(400) + .input(EXTREME_CIRCUIT_BOARD) + .input(QUANTUM_PROCESSOR_EV, 2) + .input(SMALL_COIL, 12) + .input(SMD_CAPACITOR, 16) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, Platinum, 16) + .output(QUANTUM_ASSEMBLY_IV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(200) + .input(EXTREME_CIRCUIT_BOARD) + .input(QUANTUM_PROCESSOR_EV, 2) + .input(SMALL_COIL, 12) + .input(ADVANCED_SMD_CAPACITOR, 4) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, Platinum, 16) + .output(QUANTUM_ASSEMBLY_IV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + // LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(400) + .input(EXTREME_CIRCUIT_BOARD) + .input(QUANTUM_ASSEMBLY_IV, 2) + .input(SMD_DIODE, 8) + .input(NOR_MEMORY_CHIP, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireFine, Platinum, 32) + .output(QUANTUM_COMPUTER_LUV) + .solderMultiplier(2) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) - .input(PLASTIC_BOARD) - .input(ADVANCED_CIRCUIT_MV) - .input(NAND_MEMORY_CHIP, 32) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, RedAlloy, 8) - .input(plate, Polyethylene, 4) - .fluidInputs(material.getFluid(L * multiplier)) - .output(TOOL_DATA_STICK) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(200) + .input(EXTREME_CIRCUIT_BOARD) + .input(QUANTUM_ASSEMBLY_IV, 2) + .input(ADVANCED_SMD_DIODE, 2) + .input(NOR_MEMORY_CHIP, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireFine, Platinum, 32) + .output(QUANTUM_COMPUTER_LUV) + .solderMultiplier(2) + .buildAndRegister(); + + // ZPM + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(7680).duration(800) + .input(frameGt, HSSG, 2) + .input(QUANTUM_COMPUTER_LUV, 2) + .input(SMALL_COIL, 24) + .input(SMD_CAPACITOR, 48) + .input(RANDOM_ACCESS_MEMORY, 24) + .input(wireGtSingle, AnnealedCopper, 48) + .solderMultiplier(4) + .output(QUANTUM_MAINFRAME_ZPM) + .buildAndRegister(); + + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(7680).duration(400) + .input(frameGt, HSSG, 2) + .input(QUANTUM_COMPUTER_LUV, 2) + .input(SMALL_COIL, 24) + .input(ADVANCED_SMD_CAPACITOR, 12) + .input(RANDOM_ACCESS_MEMORY, 24) + .input(wireGtSingle, AnnealedCopper, 48) + .solderMultiplier(4) + .output(QUANTUM_MAINFRAME_ZPM) + .buildAndRegister(); + + // T6: Crystal ================================================================================================= + + // IV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(200) + .input(ELITE_CIRCUIT_BOARD) + .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) + .input(NANO_CENTRAL_PROCESSING_UNIT, 2) + .input(ADVANCED_SMD_CAPACITOR, 6) + .input(ADVANCED_SMD_TRANSISTOR, 6) + .input(wireFine, NiobiumTitanium, 8) + .output(CRYSTAL_PROCESSOR_IV, 2) + .buildAndRegister(); + + // IV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(86000).duration(100) + .input(ELITE_CIRCUIT_BOARD) + .input(CRYSTAL_SYSTEM_ON_CHIP) + .input(wireFine, NiobiumTitanium, 8) + .input(bolt, YttriumBariumCuprate, 8) + .output(CRYSTAL_PROCESSOR_IV, 4) + .buildAndRegister(); + + // LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(400) + .input(ELITE_CIRCUIT_BOARD) + .input(CRYSTAL_PROCESSOR_IV, 2) + .input(SMALL_COIL, 24) + .input(ADVANCED_SMD_CAPACITOR, 8) + .input(RANDOM_ACCESS_MEMORY, 24) + .input(wireFine, NiobiumTitanium, 16) + .output(CRYSTAL_ASSEMBLY_LUV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + // ZPM + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(400) + .input(ELITE_CIRCUIT_BOARD) + .input(CRYSTAL_ASSEMBLY_LUV, 2) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(NOR_MEMORY_CHIP, 32) + .input(NAND_MEMORY_CHIP, 64) + .input(wireFine, NiobiumTitanium, 32) + .solderMultiplier(2) + .output(CRYSTAL_COMPUTER_ZPM) + .buildAndRegister(); + + // UV + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(30720).duration(800) + .input(frameGt, HSSE, 2) + .input(CRYSTAL_COMPUTER_ZPM, 2) + .input(RANDOM_ACCESS_MEMORY, 32) + .input(HIGH_POWER_INTEGRATED_CIRCUIT, 2) + .input(wireGtSingle, NiobiumTitanium, 8) + .input(SMALL_COIL, 32) + .input(ADVANCED_SMD_CAPACITOR, 16) + .input(ADVANCED_SMD_DIODE, 8) + .fluidInputs(SolderingAlloy.getFluid(L * 10)) + .output(CRYSTAL_MAINFRAME_UV) + .buildAndRegister(); + + // T7: Wetware ================================================================================================= + + // Neuro Processing Unit + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(80000).duration(600) + .input(WETWARE_CIRCUIT_BOARD) + .input(STEM_CELLS, 16) + .input(pipeSmall, Polybenzimidazole, 8) + .input(plate, Electrum, 8) + .input(foil, SiliconeRubber, 16) + .input(bolt, HSSE, 8) + .fluidInputs(SterileGrowthMedium.getFluid(250)) + .output(NEURO_PROCESSOR) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(1200) - .input(EPOXY_BOARD) - .input(NANO_PROCESSOR_HV) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(NOR_MEMORY_CHIP, 32) - .input(NAND_MEMORY_CHIP, 64) - .input(wireFine, Platinum, 32) - .fluidInputs(material.getFluid(L * multiplier)) - .output(TOOL_DATA_ORB) - .buildAndRegister(); - } + // LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(38400).duration(200) + .input(NEURO_PROCESSOR) + .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(ADVANCED_SMD_CAPACITOR, 8) + .input(ADVANCED_SMD_TRANSISTOR, 8) + .input(wireFine, YttriumBariumCuprate, 8) + .output(WETWARE_PROCESSOR_LUV, 2) + .buildAndRegister(); + + // SoC LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(150000).duration(100) + .input(NEURO_PROCESSOR) + .input(HIGHLY_ADVANCED_SOC) + .input(wireFine, YttriumBariumCuprate, 8) + .input(bolt, Naquadah, 8) + .output(WETWARE_PROCESSOR_LUV, 4) + .buildAndRegister(); + + // ZPM + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(38400).duration(400) + .input(WETWARE_CIRCUIT_BOARD) + .input(WETWARE_PROCESSOR_LUV, 2) + .input(SMALL_COIL, 32) + .input(ADVANCED_SMD_CAPACITOR, 12) + .input(RANDOM_ACCESS_MEMORY, 24) + .input(wireFine, YttriumBariumCuprate, 16) + .solderMultiplier(2) + .output(WETWARE_PROCESSOR_ASSEMBLY_ZPM, 2) + .buildAndRegister(); + + // UV + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(38400).duration(400) + .input(WETWARE_CIRCUIT_BOARD) + .input(WETWARE_PROCESSOR_ASSEMBLY_ZPM, 2) + .input(ADVANCED_SMD_DIODE, 8) + .input(NOR_MEMORY_CHIP, 16) + .input(RANDOM_ACCESS_MEMORY, 32) + .input(wireFine, YttriumBariumCuprate, 24) + .input(foil, SiliconeRubber, 32) + .input(plate, Europium, 4) + .fluidInputs(SolderingAlloy.getFluid(1152)) + .output(WETWARE_SUPER_COMPUTER_UV) + .buildAndRegister(); + + // UHV + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(300000).duration(2000) + .input(frameGt, Tritanium, 2) + .input(WETWARE_SUPER_COMPUTER_UV, 2) + .input(ADVANCED_SMD_DIODE, 32) + .input(ADVANCED_SMD_CAPACITOR, 32) + .input(ADVANCED_SMD_TRANSISTOR, 32) + .input(ADVANCED_SMD_RESISTOR, 32) + .input(foil, SiliconeRubber, 64) + .input(RANDOM_ACCESS_MEMORY, 32) + .input(wireGtDouble, Tier.Superconductor, 16) + .input(plate, Europium, 8) + .fluidInputs(SolderingAlloy.getFluid(L * 20)) + .fluidInputs(Polybenzimidazole.getFluid(L * 8)) + .output(WETWARE_MAINFRAME_UHV) + .buildAndRegister(); + + // Misc ======================================================================================================== + + // Data Stick + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) + .input(PLASTIC_BOARD) + .input(CENTRAL_PROCESSING_UNIT, 2) + .input(NAND_MEMORY_CHIP, 32) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, RedAlloy, 16) + .input(plate, Polyethylene, 4) + .output(TOOL_DATA_STICK) + .solderMultiplier(2) + .buildAndRegister(); + + // Data Orb + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(1200) + .input(EPOXY_BOARD) + .input(circuit, Tier.Advanced, 2) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(NOR_MEMORY_CHIP, 32) + .input(NAND_MEMORY_CHIP, 64) + .input(wireFine, Platinum, 32) + .solderMultiplier(2) + .output(TOOL_DATA_ORB) + .buildAndRegister(); + + // Lapotronic Energy Orb + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().duration(512).EUt(1024) + .input(FIBER_BOARD) + .input(POWER_INTEGRATED_CIRCUIT, 4) + .input(ENGRAVED_LAPOTRON_CHIP, 24) + .input(NANO_CENTRAL_PROCESSING_UNIT, 2) + .input(wireFine, Platinum, 16) + .input(plate, Platinum, 8) + .output(ENERGY_LAPOTRONIC_ORB) + .solderMultiplier(2) + .buildAndRegister(); - // UHV Circuits - ASSEMBLY_LINE_RECIPES.recipeBuilder().duration(2000).EUt(300000) - .input(frameGt, Tritanium, 4) - .input(WETWARE_SUPER_COMPUTER_UV, 8) - .input(SMALL_COIL, 4) + // Lapotronic Energy Cluster + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(80000).duration(1000) + .input(MULTILAYER_FIBER_BOARD) + .input(foil, Europium, 32) + .input(circuit, Tier.Master, 4) + .input(ENGRAVED_LAPOTRON_CHIP, 36) + .input(ENGRAVED_LAPOTRON_CHIP, 36) + .input(HIGH_POWER_INTEGRATED_CIRCUIT, 64) + .input(SMD_DIODE, 32) .input(SMD_CAPACITOR, 32) .input(SMD_RESISTOR, 32) .input(SMD_TRANSISTOR, 32) - .input(SMD_DIODE, 32) - .input(RANDOM_ACCESS_MEMORY, 16) - .input(wireGtDouble, Tier.Superconductor, 16) - .input(foil, SiliconeRubber, 64) - .fluidInputs(SolderingAlloy.getFluid(L * 20)) - .fluidInputs(Polybenzimidazole.getFluid(1000)) - .output(WETWARE_MAINFRAME_MAX) + .input(wireFine, Platinum, 64) + .fluidInputs(SolderingAlloy.getFluid(L * 5)) + .output(ENERGY_LAPOTRONIC_ORB2) + .buildAndRegister(); + + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(80000).duration(500) + .input(MULTILAYER_FIBER_BOARD) + .input(foil, Europium, 32) + .input(circuit, Tier.Master, 4) + .input(ENGRAVED_LAPOTRON_CHIP, 36) + .input(ENGRAVED_LAPOTRON_CHIP, 36) + .input(HIGH_POWER_INTEGRATED_CIRCUIT, 64) + .input(ADVANCED_SMD_DIODE, 8) + .input(ADVANCED_SMD_CAPACITOR, 8) + .input(ADVANCED_SMD_RESISTOR, 8) + .input(ADVANCED_SMD_TRANSISTOR, 8) + .input(wireFine, Platinum, 64) + .fluidInputs(SolderingAlloy.getFluid(L * 5)) + .output(ENERGY_LAPOTRONIC_ORB2) .buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java index f23efe5a739..4ba09be3b74 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java @@ -147,12 +147,12 @@ public static void init() { ModHandler.addShapedRecipe("transformer_lv", MetaTileEntities.TRANSFORMER[GTValues.LV - 1].getStackForm(), " BB", "CM ", " BB", 'M', MetaTileEntities.HULL[GTValues.ULV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Lead)); ModHandler.addShapedRecipe("transformer_mv", MetaTileEntities.TRANSFORMER[GTValues.MV - 1].getStackForm(), " BB", "CM ", " BB", 'M', MetaTileEntities.HULL[GTValues.LV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin)); - ModHandler.addShapedRecipe("transformer_hv", MetaTileEntities.TRANSFORMER[GTValues.HV - 1].getStackForm(), " BB", "CM ", " BB", 'M', MetaTileEntities.HULL[GTValues.MV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper)); - ModHandler.addShapedRecipe("transformer_ev", MetaTileEntities.TRANSFORMER[GTValues.EV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.HV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'K', MetaItems.SMALL_COIL); - ModHandler.addShapedRecipe("transformer_iv", MetaTileEntities.TRANSFORMER[GTValues.IV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.EV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tungsten), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'K', MetaItems.SMALL_COIL); + ModHandler.addShapedRecipe("transformer_hv", MetaTileEntities.TRANSFORMER[GTValues.HV - 1].getStackForm(), "UBB", "CM ", "UBB", 'M', MetaTileEntities.HULL[GTValues.MV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'U', MetaItems.ULTRA_LOW_POWER_INTEGRATED_CIRCUIT); + ModHandler.addShapedRecipe("transformer_ev", MetaTileEntities.TRANSFORMER[GTValues.EV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.HV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'K', MetaItems.LOW_POWER_INTEGRATED_CIRCUIT); + ModHandler.addShapedRecipe("transformer_iv", MetaTileEntities.TRANSFORMER[GTValues.IV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.EV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tungsten), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'K', MetaItems.POWER_INTEGRATED_CIRCUIT); ModHandler.addShapedRecipe("transformer_luv", MetaTileEntities.TRANSFORMER[GTValues.LuV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.IV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.VanadiumGallium), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tungsten), 'K', MetaItems.POWER_INTEGRATED_CIRCUIT); - ModHandler.addShapedRecipe("transformer_zpm", MetaTileEntities.TRANSFORMER[GTValues.ZPM - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.LuV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Naquadah), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.VanadiumGallium), 'K', MetaItems.POWER_INTEGRATED_CIRCUIT); - ModHandler.addShapedRecipe("transformer_uv", MetaTileEntities.TRANSFORMER[GTValues.UV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.ZPM].getStackForm(), 'C', new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.NaquadahAlloy), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Naquadah), 'K', MetaItems.POWER_INTEGRATED_CIRCUIT); + ModHandler.addShapedRecipe("transformer_zpm", MetaTileEntities.TRANSFORMER[GTValues.ZPM - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.LuV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Naquadah), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.VanadiumGallium), 'K', MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT); + ModHandler.addShapedRecipe("transformer_uv", MetaTileEntities.TRANSFORMER[GTValues.UV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.ZPM].getStackForm(), 'C', new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.NaquadahAlloy), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Naquadah), 'K', MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT); ModHandler.addShapedRecipe("energy_output_hatch_ulv", MetaTileEntities.ENERGY_OUTPUT_HATCH[GTValues.ULV].getStackForm(), " MC", 'M', MetaTileEntities.HULL[GTValues.ULV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Lead)); ModHandler.addShapedRecipe("energy_output_hatch_lv", MetaTileEntities.ENERGY_OUTPUT_HATCH[GTValues.LV].getStackForm(), " MC", 'M', MetaTileEntities.HULL[GTValues.LV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin)); @@ -395,6 +395,7 @@ public static void init() { registerMachineRecipe(MetaTileEntities.ARC_FURNACE, "WGW", "CMC", "PPP", 'M', HULL, 'P', PLATE, 'C', CIRCUIT, 'W', CABLE_QUAD, 'G', new UnificationEntry(OrePrefix.ingot, Materials.Graphite)); registerMachineRecipe(MetaTileEntities.PLASMA_ARC_FURNACE, "WGW", "CMC", "TPT", 'M', HULL, 'P', PLATE, 'C', BETTER_CIRCUIT, 'W', CABLE_QUAD, 'T', PUMP, 'G', new UnificationEntry(OrePrefix.ingot, Materials.Graphite)); registerMachineRecipe(MetaTileEntities.CLUSTER_MILL, "MMM", "CHC", "MMM", 'M', MOTOR, 'C', CIRCUIT, 'H', HULL); + registerMachineRecipe(MetaTileEntities.CIRCUIT_ASSEMBLER, "RIE", "CHC", "WIW", 'R', ROBOT_ARM, 'I', BETTER_CIRCUIT, 'E', EMITTER, 'C', CONVEYOR, 'H', HULL, 'W', CABLE); registerMachineRecipe(MetaTileEntities.PUMP, "WGW", "GMG", "TGT", 'M', HULL, 'W', CIRCUIT, 'G', PUMP, 'T', PIPE_LARGE); registerMachineRecipe(MetaTileEntities.FISHER, "WTW", "PMP", "TGT", 'M', HULL, 'W', CIRCUIT, 'G', PUMP, 'T', MOTOR, 'P', PISTON); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java index c9c83e096fd..01e2ed3f698 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java @@ -21,6 +21,7 @@ public static void init() { ReactorRecipes.init(); PolymerRecipes.init(); LargeReactorRecipes.init(); + GrowthMediumRecipes.init(); // A Few Random Recipes @@ -76,11 +77,5 @@ public static void init() { .output(ingot, RedAlloy, 2) .blastFurnaceTemp(1200) .duration(884).EUt(120).buildAndRegister(); - - FLUID_HEATER_RECIPES.recipeBuilder() - .fluidInputs(RawGrowthMedium.getFluid(500)) - .circuitMeta(1) - .fluidOutputs(SterileGrowthMedium.getFluid(500)) - .duration(30).EUt(24).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java new file mode 100644 index 00000000000..8ffb72dc838 --- /dev/null +++ b/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java @@ -0,0 +1,223 @@ +package gregtech.loaders.recipe.chemistry; + +import gregtech.api.recipes.ingredients.IntCircuitIngredient; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.*; +import static gregtech.common.items.MetaItems.*; + +public class GrowthMediumRecipes { + + public static void init() { + + // Bio Chaff + MACERATOR_RECIPES.recipeBuilder().EUt(30).duration(200) + .input(PLANT_BALL, 2) + .output(BIO_CHAFF) + .output(BIO_CHAFF) + .chancedOutput(BIO_CHAFF, 5000, 0) + //.chancedOutput(BIO_CHAFF, 2500, 0) TODO Enable once macerator gets 4th slot + .buildAndRegister(); + + MACERATOR_RECIPES.recipeBuilder().EUt(2).duration(300) + .input(BIO_CHAFF) + .outputs(new ItemStack(Blocks.DIRT)) + .buildAndRegister(); + + BREWING_RECIPES.recipeBuilder().EUt(4).duration(128) + .input(BIO_CHAFF) + .fluidInputs(Water.getFluid(750)) + .fluidOutputs(Biomass.getFluid(750)) + .buildAndRegister(); + + BREWING_RECIPES.recipeBuilder().EUt(4).duration(128) + .input(BIO_CHAFF) + .fluidInputs(DistilledWater.getFluid(750)) + .fluidOutputs(Biomass.getFluid(750)) + .buildAndRegister(); + + PYROLYSE_RECIPES.recipeBuilder().EUt(10).duration(200) + .input(BIO_CHAFF) + .circuitMeta(2) + .fluidInputs(Water.getFluid(1500)) + .fluidOutputs(FermentedBiomass.getFluid(1500)) + .buildAndRegister(); + + PYROLYSE_RECIPES.recipeBuilder().EUt(10).duration(900) + .input(BIO_CHAFF, 4) + .circuitMeta(1) + .fluidInputs(Water.getFluid(4000)) + .fluidOutputs(Biomass.getFluid(5000)) + .buildAndRegister(); + + // Bacteria + MIXER_RECIPES.recipeBuilder().EUt(480).duration(300) + .input(BIO_CHAFF, 4) + .fluidInputs(DistilledWater.getFluid(4000)) + .notConsumable(new IntCircuitIngredient(1)) + .fluidOutputs(Bacteria.getFluid(2000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(1920).duration(300) + .input(dust, Vinteum) + .fluidInputs(DistilledWater.getFluid(8000)) + .notConsumable(new IntCircuitIngredient(1)) + .fluidOutputs(Bacteria.getFluid(4000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(7680).duration(300) + .input(dustTiny, Naquadria) + .fluidInputs(DistilledWater.getFluid(16000)) + .notConsumable(new IntCircuitIngredient(1)) + .fluidOutputs(Bacteria.getFluid(8000)) + .buildAndRegister(); + + // Bacterial Sludge + MIXER_RECIPES.recipeBuilder().EUt(1920).duration(600) + .input(dust, Endstone, 16) + .fluidInputs(DistilledWater.getFluid(4000)) + .notConsumable(new IntCircuitIngredient(2)) + .fluidOutputs(BacterialSludge.getFluid(1000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(7680).duration(600) + .input(dust, Vinteum) + .fluidInputs(DistilledWater.getFluid(8000)) + .notConsumable(new IntCircuitIngredient(2)) + .fluidOutputs(BacterialSludge.getFluid(2000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(30720).duration(600) + .input(dustTiny, Naquadria) + .fluidInputs(DistilledWater.getFluid(16000)) + .notConsumable(new IntCircuitIngredient(2)) + .fluidOutputs(BacterialSludge.getFluid(4000)) + .buildAndRegister(); + + // Enriched Bacterial Sludge + BREWING_RECIPES.recipeBuilder().EUt(4).duration(128) + .input(dust, Uranium238) + .fluidInputs(BacterialSludge.getFluid(750)) + .fluidOutputs(EnrichedBacterialSludge.getFluid(750)) + .buildAndRegister(); + + BREWING_RECIPES.recipeBuilder().EUt(4).duration(128) + .input(dustTiny, Uranium235) + .fluidInputs(BacterialSludge.getFluid(750)) + .fluidOutputs(EnrichedBacterialSludge.getFluid(750)) + .buildAndRegister(); + + // Fermented Bacterial Sludge + FERMENTING_RECIPES.recipeBuilder().EUt(2).duration(2400) + .fluidInputs(EnrichedBacterialSludge.getFluid(750)) + .fluidOutputs(FermentedBacterialSludge.getFluid(75)) + .buildAndRegister(); + + // Mutagen + DISTILLERY_RECIPES.recipeBuilder().EUt(1920).duration(60) + .fluidInputs(FermentedBacterialSludge.getFluid(10)) + .notConsumable(new IntCircuitIngredient(3)) + .fluidOutputs(Mutagen.getFluid(1)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(7680).duration(1200) + .input(dust, Vinteum, 4) + .fluidInputs(DistilledWater.getFluid(4000)) + .notConsumable(new IntCircuitIngredient(4)) + .fluidOutputs(Mutagen.getFluid(1000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(30720).duration(1200) + .input(dustTiny, Naquadria) + .fluidInputs(DistilledWater.getFluid(8000)) + .notConsumable(new IntCircuitIngredient(4)) + .fluidOutputs(Mutagen.getFluid(2000)) + .buildAndRegister(); + + // Collagen + CHEMICAL_RECIPES.recipeBuilder().EUt(480).duration(800) + .input(dust, Meat) + .inputs(new ItemStack(Items.DYE, 1, 15)) + .fluidInputs(SulfuricAcid.getFluid(500)) + .output(dust, Collagen) + .fluidOutputs(DilutedSulfuricAcid.getFluid(500)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(480).duration(1600) + .input(dust, Meat, 2) + .inputs(new ItemStack(Items.BONE)) + .fluidInputs(SulfuricAcid.getFluid(1000)) + .output(dust, Collagen, 2) + .fluidOutputs(DilutedSulfuricAcid.getFluid(1000)) + .buildAndRegister(); + + // Gelatin + CHEMICAL_RECIPES.recipeBuilder().EUt(480).duration(1600) + .input(dust, Collagen, 4) + .fluidInputs(PhosphoricAcid.getFluid(1000)) + .fluidInputs(Water.getFluid(3000)) + .fluidOutputs(GelatinMixture.getFluid(4000)) + .buildAndRegister(); + + CENTRIFUGE_RECIPES.recipeBuilder().EUt(480).duration(2400) + .fluidInputs(GelatinMixture.getFluid(6000)) + .output(dust, Phosphorus) + .output(dust, Gelatin, 4) + .buildAndRegister(); + + // Agar + MIXER_RECIPES.recipeBuilder().EUt(480).duration(600) + .input(dust, Gelatin) + .fluidInputs(DistilledWater.getFluid(1000)) + .output(dust, Agar) + .buildAndRegister(); + + // Raw Growth Medium + MIXER_RECIPES.recipeBuilder().EUt(7680).duration(1200) + .input(dust, Meat, 4) + .input(dust, Salt, 4) + .input(dust, Calcium, 4) + .input(dust, Agar, 4) + .fluidInputs(Bacteria.getFluid(4000)) + .fluidOutputs(RawGrowthMedium.getFluid(1000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(30720).duration(1200) + .input(dust, Meat, 8) + .input(dust, Salt, 8) + .input(dust, Calcium, 8) + .input(dust, Agar, 4) + .fluidInputs(BacterialSludge.getFluid(4000)) + .fluidOutputs(RawGrowthMedium.getFluid(2000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(122880).duration(1200) + .input(dust, Meat, 12) + .input(dust, Salt, 12) + .input(dust, Calcium, 12) + .input(dust, Agar, 4) + .fluidInputs(Mutagen.getFluid(4000)) + .fluidOutputs(RawGrowthMedium.getFluid(4000)) + .buildAndRegister(); + + // Sterile Growth Medium + FLUID_HEATER_RECIPES.recipeBuilder().EUt(7680).duration(20) + .notConsumable(new IntCircuitIngredient(1)) + .fluidInputs(RawGrowthMedium.getFluid(100)) + .fluidOutputs(SterileGrowthMedium.getFluid(100)) + .buildAndRegister(); + + // Stem Cells + CHEMICAL_RECIPES.recipeBuilder().EUt(30720).duration(300) + .input(dust, Osmiridium) + .input(dust, Vinteum, 2) + .fluidInputs(SterileGrowthMedium.getFluid(500)) + .output(STEM_CELLS, 32) + .fluidOutputs(BacterialSludge.getFluid(500)) + .buildAndRegister(); + } +} diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java index b534d2e1999..7edfba248c2 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java @@ -97,13 +97,5 @@ public static void init() { .fluidInputs(Oxygen.getFluid(7000)) .output(dust, YttriumBariumCuprate, 13) .EUt(8).duration(8000).buildAndRegister(); - - MIXER_RECIPES.recipeBuilder() - .input(dust, Sugar, 4) - .input(dust, Meat) - .input(dustTiny, Salt) - .fluidInputs(DistilledWater.getFluid(4000)) - .fluidOutputs(RawGrowthMedium.getFluid(4000)) - .duration(160).EUt(16).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index 371d60d5c2c..00b14eed532 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -245,6 +245,7 @@ public static void init() { .fluidOutputs(HydrochloricAcid.getFluid(1000)) .duration(60).EUt(8).buildAndRegister(); + // NaCl + H2SO4 -> NaHSO4 + HCl CHEMICAL_RECIPES.recipeBuilder() .input(dust, Salt, 2) .fluidInputs(SulfuricAcid.getFluid(1000)) @@ -252,6 +253,14 @@ public static void init() { .fluidOutputs(HydrochloricAcid.getFluid(1000)) .duration(60).EUt(30).buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder() + .input(dust, Iron) + .fluidInputs(Chlorine.getFluid(3000)) + .notConsumable(new IntCircuitIngredient(1)) + .fluidOutputs(Iron3Chloride.getFluid(1000)) + .duration(400).EUt(30) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder() .notConsumable(new IntCircuitIngredient(1)) .fluidInputs(Chlorine.getFluid(6000)) diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java index 9c4c87ad03d..f16ac852dc2 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java @@ -306,10 +306,10 @@ public static void init() { // Electrolyzer ELECTROLYZER_RECIPES.recipeBuilder() - .input(dust, SodiumBisulfate, 14) - .fluidOutputs(SodiumPersulfate.getFluid(1000)) - .fluidOutputs(Hydrogen.getFluid(2000)) - .duration(448).EUt(60).buildAndRegister(); + .input(dust, SodiumBisulfate, 7) + .fluidOutputs(SodiumPersulfate.getFluid(500)) + .fluidOutputs(Hydrogen.getFluid(1000)) + .duration(150).EUt(30).buildAndRegister(); ELECTROLYZER_RECIPES.recipeBuilder() .fluidInputs(SaltWater.getFluid(1000)) @@ -493,10 +493,5 @@ public static void init() { .inputs(new ItemStack(Blocks.BOOKSHELF)) .outputs(new ItemStack(Items.BOOK, 3)) .duration(300).EUt(2).buildAndRegister(); - - EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Items.EGG)) - .chancedOutput(MetaItems.STEM_CELLS.getStackForm(), 1500, 500) - .duration(600).EUt(480).buildAndRegister(); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 4eba9c92358..4144daf08b3 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -424,36 +424,74 @@ metaitem.tool.datastick.name=Data Stick metaitem.tool.datastick.tooltip=A Low Capacity Data Storage metaitem.tool.dataorb.name=Data Orb metaitem.tool.dataorb.tooltip=A High Capacity Data Storage -metaitem.circuit.integrated.name=Integrated circuit +metaitem.circuit.integrated.name=Programmed Circuit metaitem.circuit.integrated.tooltip=Use to open configuration GUI -metaitem.circuit.integrated.gui=Integrated Circuit Configuration -metaitem.circuit.integrated.jei_description=JEI is only showing recipes for the given configuration.\n\nYou can select a configuration in the Integrated circuit configuration tab. +metaitem.circuit.integrated.gui=Programmed Circuit Configuration +metaitem.circuit.integrated.jei_description=JEI is only showing recipes for the given configuration.\n\nYou can select a configuration in the Programmed Circuit configuration tab. #CIRCUITS LOCALIZATION -metaitem.boule.silicon.name=Silicon Boule -metaitem.boule.glowstone.name=Glowstone-doped Boule -metaitem.boule.naquadah.name=Naquadah-doped Boule +metaitem.boule.silicon.name=Monocrystalline Silicon Boule +metaitem.boule.silicon.tooltip=Raw Circuit +metaitem.boule.glowstone.name=Glowstone-doped Monocrystalline Silicon Boule +metaitem.boule.glowstone.tooltip=Raw Circuit +metaitem.boule.naquadah.name=Naquadah-doped Monocrystalline Silicon Boule +metaitem.boule.naquadah.tooltip=Raw Circuit +metaitem.boule.neutronium.name=Neutronium-doped Monocrystalline Silicon Boule +metaitem.boule.neutronium.tooltip=Raw Circuit metaitem.wafer.silicon.name=Silicon Wafer +metaitem.wafer.silicon.tooltip=Raw Circuit metaitem.wafer.glowstone.name=Glowstone-doped Wafer +metaitem.wafer.glowstone.tooltip=Raw Circuit metaitem.wafer.naquadah.name=Naquadah-doped Wafer +metaitem.wafer.naquadah.tooltip=Raw Circuit +metaitem.wafer.neutronium.name=Neutronium-doped Wafer +metaitem.wafer.neutronium.tooltip=Raw Circuit metaitem.board.coated.name=Coated Circuit Board +metaitem.board.coated.tooltip=A Coated Board +metaitem.board.phenolic.name=Phenolic Circuit Board +metaitem.board.phenolic.tooltip=A Good Board +metaitem.board.plastic.name=Plastic Circuit Board +metaitem.board.plastic.tooltip=A Good Board metaitem.board.epoxy.name=Epoxy Circuit Board +metaitem.board.epoxy.tooltip=An Advanced Board metaitem.board.fiber_reinforced.name=Fiber-Reinforced Circuit Board +metaitem.board.fiber_reinforced.tooltip=An Extreme Board metaitem.board.multilayer.fiber_reinforced.name=Multi-layer Fiber-Reinforced Circuit Board -metaitem.board.phenolic.name=Phenolic Circuit Board -metaitem.board.plastic.name=Plastic Circuit Board -metaitem.board.wetware.name=Wetware Circuit Board +metaitem.board.multiplayer.fiber_reinforced.name=An Elite Board +metaitem.board.wetware.name=Wetware Lifesupport Circuit Board +metaitem.board.wetware.tooltip=The Board that keeps life + +metaitem.circuit_board.basic.name=Circuit Board +metaitem.circuit_board.basic.tooltip=A Basic Circuit Board +metaitem.circuit_board.good.name=Good Circuit Board +metaitem.circuit_board.good.tooltip=A Good Circuit Board +metaitem.circuit_board.plastic.name=Plastic Circuit Board +metaitem.circuit_board.plastic.tooltip=A Good Circuit Board +metaitem.circuit_board.advanced.name=Advanced Circuit Board +metaitem.circuit_board.advanced.tooltip=An Advanced Circuit Board +metaitem.circuit_board.extreme.name=Extreme Circuit Board +metaitem.circuit_board.extreme.tooltip=A More Advanced Circuit Board +metaitem.circuit_board.elite.name=Elite Circuit Board +metaitem.circuit_board.elite.tooltip=An Elite Circuit Board +metaitem.circuit_board.wetware.name=Master Circuit Board +metaitem.circuit_board.wetware.tooltip=The Board that keeps life metaitem.circuit.vacuum_tube.name=Vacuum Tube -metaitem.circuit.vacuum_tube.description=A Simple Circuit +metaitem.circuit.vacuum_tube.tooltip=Technically a Diode/n§cULV-tier metaitem.component.diode.name=Diode +metaitem.component.diode.tooltip=Basic Electronic Component metaitem.component.resistor.name=Resistor +metaitem.component.resistor.tooltip=Basic Electronic Component metaitem.component.transistor.name=Transistor +metaitem.component.transistor.tooltip=Basic Electronic Component metaitem.component.capacitor.name=Capacitor +metaitem.component.capacitor.tooltip=Basic Electronic Component metaitem.component.glass.fiber.name=Glass Fibers +metaitem.component.glass.fiber.tooltip=§eB(SiO₂)₇ metaitem.component.glass.tube.name=Glass Tube metaitem.component.small_coil.name=Small Coil +metaitem.component.small_coil.tooltip=Basic Electronic Component metaitem.component.smd.diode.name=SMD Diode metaitem.component.smd.diode.tooltip=Electronic Component metaitem.component.smd.capacitor.name=SMD Capacitor @@ -462,18 +500,32 @@ metaitem.component.smd.transistor.name=SMD Transistor metaitem.component.smd.transistor.tooltip=Electronic Component metaitem.component.smd.resistor.name=SMD Resistor metaitem.component.smd.resistor.tooltip=Electronic Component - +metaitem.component.advanced_smd.diode.name=Advanced SMD Diode +metaitem.component.advanced_smd.diode.tooltip=Advanced Electronic Component +metaitem.component.advanced_smd.capacitor.name=Advanced SMD Capacitor +metaitem.component.advanced_smd.capacitor.tooltip=Advanced Electronic Component +metaitem.component.advanced_smd.transistor.name=Advanced SMD Transistor +metaitem.component.advanced_smd.transistor.tooltip=Advanced Electronic Component +metaitem.component.advanced_smd.resistor.name=Advanced SMD Resistor +metaitem.component.advanced_smd.resistor.tooltip=Advanced Electronic Component + +metaitem.wafer.highly_advanced_system_on_chip.name=HASoC Wafer +metaitem.wafer.highly_advanced_system_on_chip.tooltip=Raw Circuit metaitem.wafer.advanced_system_on_chip.name=ASoC Wafer metaitem.wafer.advanced_system_on_chip.tooltip=Raw Circuit -metaitem.wafer.integrated_logic_circuit.name=Integrated Circuit Wafer +metaitem.wafer.integrated_logic_circuit.name=Integrated Logic Circuit Wafer metaitem.wafer.integrated_logic_circuit.tooltip=Raw Circuit metaitem.wafer.central_processing_unit.name=CPU Wafer metaitem.wafer.central_processing_unit.tooltip=Raw Circuit -metaitem.wafer.high_power_integrated_circuit.name=High-Power IC Wafer +metaitem.wafer.high_power_integrated_circuit.name=HPIC Wafer metaitem.wafer.high_power_integrated_circuit.tooltip=Raw Circuit metaitem.wafer.nand_memory_chip.name=NAND Wafer metaitem.wafer.nand_memory_chip.tooltip=Raw Circuit -metaitem.wafer.power_integrated_circuit.name=Power IC Wafer +metaitem.wafer.ultra_low_power_integrated_circuit.name=ULPIC Wafer +metaitem.wafer.ultra_low_power_integrated_circuit.tooltip=Raw Circuit +metaitem.wafer.low_power_integrated_circuit.name=LPIC Wafer +metaitem.wafer.low_power_integrated_circuit.tooltip=Raw Circuit +metaitem.wafer.power_integrated_circuit.name=PIC Wafer metaitem.wafer.power_integrated_circuit.tooltip=Raw Circuit metaitem.wafer.nano_central_processing_unit.name=Nano CPU Wafer metaitem.wafer.nano_central_processing_unit.tooltip=Raw Circuit @@ -485,10 +537,14 @@ metaitem.wafer.random_access_memory.name=RAM Wafer metaitem.wafer.random_access_memory.tooltip=Raw Circuit metaitem.wafer.system_on_chip.name=SoC Wafer metaitem.wafer.system_on_chip.tooltip=Raw Circuit +metaitem.wafer.simple_system_on_chip.name=Simple SoC Wafer +metaitem.wafer.simple_system_on_chip.tooltip=Raw Primitive Circuit metaitem.engraved.crystal_chip.name=Engraved Crystal Chip metaitem.engraved.crystal_chip.tooltip=Needed for Circuits metaitem.crystal.raw.name=Raw Crystal Chip metaitem.crystal.raw.tooltip=Raw Crystal Processor +metaitem.crystal.raw_chip.name=Raw Crystal Chip Parts +metaitem.crystal.raw_chip.tooltip=Raw Crystal Processor Parts metaitem.engraved.lapotron_chip.name=Engraved Lapotron Crystal Chip metaitem.crystal.central_processing_unit.name=Crystal Processing Unit @@ -497,54 +553,108 @@ metaitem.crystal.system_on_chip.name=Crystal SoC metaitem.crystal.system_on_chip.tooltip=Crystal System on a Chip metaitem.plate.advanced_system_on_chip.name=ASoC metaitem.plate.advanced_system_on_chip.tooltip=Advanced System on Chip -metaitem.plate.integrated_logic_circuit.name=Integrated Circuit +metaitem.plate.highly_advanced_system_on_chip.name=HASoC +metaitem.plate.highly_advanced_system_on_chip.tooltip=Highly Advanced System on a Chip +metaitem.plate.integrated_logic_circuit.name=Integrated Logic Circuit metaitem.plate.central_processing_unit.name=Central Processing Unit -metaitem.plate.high_power_integrated_circuit.name=HPIC -metaitem.plate.high_power_integrated_circuit.tooltip=High-Power Integrated Circuit +metaitem.plate.high_power_integrated_circuit.name=High Power IC +metaitem.plate.high_power_integrated_circuit.tooltip=High Power Circuit metaitem.plate.nand_memory_chip.name=NAND Gate metaitem.plate.nano_central_processing_unit.name=Nano CPU metaitem.plate.nano_central_processing_unit.tooltip=Nano Central Processing Unit metaitem.plate.nor_memory_chip.name=NOR Gate +metaitem.plate.ultra_low_power_integrated_circuit.name=Ultra Low Power IC +metaitem.plate.ultra_low_power_integrated_circuit.tooltip=Ultra Low Power Circuit +metaitem.plate.low_power_integrated_circuit.name=Low Power IC +metaitem.plate.low_power_integrated_circuit.tooltip=Low Power Circuit metaitem.plate.power_integrated_circuit.name=Power IC metaitem.plate.power_integrated_circuit.tooltip=Power Integrated Circuit metaitem.plate.qbit_central_processing_unit.name=QBit CPU metaitem.plate.random_access_memory.name=RAM metaitem.plate.random_access_memory.tooltip=Random Access Memory metaitem.plate.system_on_chip.name=SoC -metaitem.plate.system_on_chip.tooltip=System on Chip - -metaitem.circuit.basic.name=Basic Circuit -metaitem.circuit.basic_electronic.name=Basic Electronic Circuit -metaitem.circuit.basic_electronic.tooltip=A Basic Circuit -metaitem.circuit.advanced_parts.name=Advanced Circuit Parts -metaitem.circuit.advanced_parts.tooltip=A Basic Circuit -metaitem.circuit.good.name=Good Electronic Circuit -metaitem.circuit.good.tooltip=A Good Circuit -metaitem.circuit.advanced.name=Advanced Circuit -metaitem.circuit.advanced.tooltip=A Good Circuit -metaitem.circuit.processor_assembly.name=Processor Assembly -metaitem.circuit.processor_assembly.tooltip=An Advanced Circuit +metaitem.plate.system_on_chip.tooltip=System on a Chip +metaitem.plate.simple_system_on_chip.name=Simple SoC +metaitem.plate.simple_system_on_chip.tooltip=Simple System on a Chip + + +# T1: Electronic +metaitem.circuit.electronic.name=Electronic Circuit +metaitem.circuit.electronic.tooltip=Your First Circuit/n§cLV-tier +metaitem.circuit.good_electronic.name=Good Electronic Circuit +metaitem.circuit.good_electronic.tooltip=Your Second Circuit/n§cMV-tier + +# T2: Integrated +metaitem.circuit.basic_integrated.name=Integrated Logic Circuit +metaitem.circuit.basic_integrated.tooltip=Smaller and more powerful/n§6LV-tier +metaitem.circuit.good_integrated.name=Good Integrated Circuit +metaitem.circuit.good_integrated.tooltip=Smaller and more powerful/n§6MV-tier +metaitem.circuit.advanced_integrated.name=Advanced Integrated Circuit +metaitem.circuit.advanced_integrated.tooltip=Smaller and more powerful/n§6HV-tier + +# Misc +metaitem.circuit.nand_chip.name=NAND Chip +metaitem.circuit.nand_chip.tooltip=A Superior Simple Circuit/n§6ULV-tier +metaitem.circuit.microprocessor.name=Microprocessor +metaitem.circuit.microprocessor.tooltip=A Superior Basic Circuit/n§eLV-tier + +# T3: Processor +metaitem.circuit.processor.name=Integrated Processor +metaitem.circuit.processor.tooltip=Amazing Computation Speed!/n§eMV-tier +metaitem.circuit.assembly.name=Processor Assembly +metaitem.circuit.assembly.tooltip=Amazing Computation Speed!/n§eHV-tier +metaitem.circuit.workstation.name=Workstation +metaitem.circuit.workstation.tooltip=Amazing Computation Speed!/n§eEV-tier +metaitem.circuit.mainframe.name=Mainframe +metaitem.circuit.mainframe.tooltip=Amazing Computation Speed!/n§eIV-tier + +# T4: Nano metaitem.circuit.nano_processor.name=Nanoprocessor -metaitem.circuit.nano_processor.tooltip=Smaller than ever -metaitem.circuit.nano_processor_assembly.name=Nano Processor Assembly +metaitem.circuit.nano_processor.tooltip=Smaller than ever/n§aHV-tier +metaitem.circuit.nano_assembly.name=Nanoprocessor Assembly +metaitem.circuit.nano_assembly.tooltip=Smaller than ever/n§aEV-tier +metaitem.circuit.nano_computer.name=Nano Supercomputer +metaitem.circuit.nano_computer.tooltip=Smaller than ever/n§aIV-tier +metaitem.circuit.nano_mainframe.name=Nanoprocessor Mainframe +metaitem.circuit.nano_mainframe.tooltip=Smaller than ever/n§aLuV-tier + +# T5: Quantum metaitem.circuit.quantum_processor.name=Quantumprocessor -metaitem.circuit.quantum_processor.tooltip=Quantum computing comes to life! -metaitem.circuit.data_control.name=Data Control Circuit -metaitem.circuit.crystal_processor.name=Crystalprocessor -metaitem.circuit.crystal_processor.tooltip=Taking Advantage of Crystal Engraving -metaitem.circuit.energy_flow.name=Energy Flow Circuit +metaitem.circuit.quantum_processor.tooltip=Quantum Computing comes to life!/n§bEV-tier +metaitem.circuit.quantum_assembly.name=Quantumprocessor Assembly +metaitem.circuit.quantum_assembly.tooltip=Quantum Computing comes to life!/n§bIV-tier +metaitem.circuit.quantum_computer.name=Quantum Supercomputer +metaitem.circuit.quantum_computer.tooltip=Quantum Computing comes to life!/n§bLuV-tier +metaitem.circuit.quantum_mainframe.name=Quantumprocessor Mainframe +metaitem.circuit.quantum_mainframe.tooltip=Quantum Computing comes to life!/n§bZPM-tier + +# T6: Crystal +metaitem.circuit.crystal_processor.name=Crystal Processor +metaitem.circuit.crystal_processor.tooltip=Taking Advantage of Crystal Engraving/n§9IV-tier +metaitem.circuit.crystal_assembly.name=Crystal Processor Assembly +metaitem.circuit.crystal_assembly.tooltip=Taking Advantage of Crystal Engraving/n§9LuV-tier +metaitem.circuit.crystal_computer.name=Crystal Supercomputer +metaitem.circuit.crystal_computer.tooltip=Taking Advantage of Crystal Engraving/n§9ZPM-tier +metaitem.circuit.crystal_mainframe.name=Crystal Processor Mainframe +metaitem.circuit.crystal_mainframe.tooltip=Taking Advantage of Crystal Engraving/n§9UV-tier + +# T7: Wetware metaitem.circuit.wetware_processor.name=Wetware Processor -metaitem.circuit.wetware_processor.tooltip=You have a feeling like it's watching you +metaitem.circuit.wetware_processor.tooltip=You have a feeling like it's watching you/n§5LuV-tier metaitem.circuit.wetware_assembly.name=Wetware Assembly -metaitem.circuit.wetware_assembly.tooltip=Can run Minecraft -metaitem.circuit.wetware_super_computer.name=Wetware Supercomputer +metaitem.circuit.wetware_assembly.tooltip=Can run Minecraft/n§5ZPM-tier +metaitem.circuit.wetware_computer.name=Wetware Supercomputer +metaitem.circuit.wetware_computer.tooltip=Ultimate fusion of Flesh and Machine/n§5UV-tier metaitem.circuit.wetware_mainframe.name=Wetware Mainframe +metaitem.circuit.wetware_mainframe.tooltip=The best Man has ever seen/n§5UHV-tier metaitem.stem_cells.name=Stem Cells metaitem.stem_cells.tooltip=Raw Intelligence metaitem.processor.neuro.name=Neuro Processing Unit metaitem.processor.neuro.tooltip=Neuro CPU metaitem.petri_dish.name=Petri Dish +metaitem.petri_dish.tooltip=For cultivating Cells +metaitem.bio_chaff.name=Bio Chaff metaitem.carbon.fibers.name=Raw Carbon Fibers metaitem.carbon.mesh.name=Carbon Fiber Mesh @@ -1523,6 +1633,7 @@ material.coffee=Coffee material.wheat=Wheat material.meat=Mince Meat +material.sodium_bicarbonate=Sodium Bicarbonate material.polybenzimidazole=Polybenzimidazole material.diphenyl_isophthalate=Diphenyl Isophthalate material.phthalic_acid=Phthalic Acid @@ -1533,6 +1644,20 @@ material.nitrochlorobenzene=2-Nitrochlorobenzene material.chlorobenzene=Chlorobenzene material.potassium_dichromate=Potassium Dichromate material.chromium_trioxide=Chromium Trioxide +material.iron_iii_chloride=Iron III Chloride + +material.bacteria=Bacteria +material.bacterial_sludge=Bacterial Sludge +material.enriched_bacterial_sludge=Enriched Bacterial Sludge +material.fermented_bacterial_sludge=Fermented Bacterial Sludge +material.mutagen=Mutagen +material.gelatin_mixture=Gelatin Mixture +material.collagen=Collagen +item.collagen.dust=Collagen +material.gelatin=Gelatin +item.gelatin.dust=Gelatin +material.agar=Agar +item.agar.dust=Agar item.nether_quartz.oreNetherrack=Nether Quartz Ore item.gunpowder.dustTiny=Tiny Pile of Gunpowder @@ -1807,6 +1932,7 @@ recipemap.steam_turbine.name=Steam Turbine recipemap.semi_fluid_generator.name=Semi Fluid Fuels recipemap.plasma_generator.name=Plasma Generator recipemap.cluster_mill.name=Cluster Mill +recipemap.circuit_assembler.name=Circuit Assembler behaviour.hoe=Can till dirt behaviour.soft_hammer=Activates and Deactivates Machines @@ -2785,6 +2911,16 @@ gregtech.machine.cluster_mill.uiv.name=High-Tech Cluster Mill III gregtech.machine.cluster_mill.umv.name=High-Tech Cluster Mill IV gregtech.machine.cluster_mill.uxv.name=Ultimate Cluster Mill +gregtech.machine.circuit_assembler.tooltip=Pick-n-Place all over the place + +gregtech.machine.circuit_assembler.lv.name=Basic Circuit Assembler +gregtech.machine.circuit_assembler.mv.name=Advanced Circuit Assembler +gregtech.machine.circuit_assembler.hv.name=Advanced Circuit Assembler II +gregtech.machine.circuit_assembler.ev.name=Advanced Circuit Assembler III +gregtech.machine.circuit_assembler.iv.name=Elite Circuit Assembler +gregtech.machine.circuit_assembler.luv.name=Elite Circuit Assembler II +gregtech.machine.circuit_assembler.zpm.name=Elite Circuit Assembler III + # Machine hulls gregtech.machine.hull.tooltip=§fYou just need §5I§dm§4a§cg§ei§an§ba§3t§7i§1o§5n§f to use this diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/bio_chaff.json b/src/main/resources/assets/gregtech/models/item/metaitems/bio_chaff.json new file mode 100644 index 00000000000..280d3489c75 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/bio_chaff.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/bio_chaff" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/boule.neutronium.json b/src/main/resources/assets/gregtech/models/item/metaitems/boule.neutronium.json new file mode 100644 index 00000000000..f33a149c054 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/boule.neutronium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/boule.neutronium" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced.json deleted file mode 100644 index 82937edd981..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.advanced" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_integrated.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_integrated.json new file mode 100644 index 00000000000..457acc54bac --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_integrated.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.advanced_integrated" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_parts.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_parts.json deleted file mode 100644 index 6347871ebfc..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_parts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.advanced_parts" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.assembly.json new file mode 100644 index 00000000000..0421adbe465 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.assembly" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic.json deleted file mode 100644 index ce5f6ae002f..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.basic" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_electronic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_electronic.json deleted file mode 100644 index 2b010b694be..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_electronic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.basic_electronic" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_integrated.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_integrated.json new file mode 100644 index 00000000000..f511a78e042 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_integrated.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.basic_integrated" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_assembly.json new file mode 100644 index 00000000000..306446bca20 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.crystal_assembly" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_computer.json new file mode 100644 index 00000000000..26b6a715c9f --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_computer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.crystal_computer" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_mainframe.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_mainframe.json new file mode 100644 index 00000000000..357da1aa751 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_mainframe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.crystal_mainframe" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.data_control.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.data_control.json deleted file mode 100644 index 81c657f2b69..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.data_control.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.data_control" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.electronic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.electronic.json new file mode 100644 index 00000000000..a3dbb71ac08 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.electronic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.electronic" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.energy_flow.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.energy_flow.json deleted file mode 100644 index 4dcda12bde5..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.energy_flow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.energy_flow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good.json deleted file mode 100644 index e898b3e4d07..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.good" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_electronic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_electronic.json new file mode 100644 index 00000000000..acf64484b0d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_electronic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.good_electronic" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_integrated.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_integrated.json new file mode 100644 index 00000000000..419557b0f61 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_integrated.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.good_integrated" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.integrated.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.integrated.json deleted file mode 100644 index 8240e4fdcae..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.integrated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.integrated" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.mainframe.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.mainframe.json new file mode 100644 index 00000000000..3edd262e4e2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.mainframe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.mainframe" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.microprocessor.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.microprocessor.json new file mode 100644 index 00000000000..9bca9dfd85d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.microprocessor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.microprocessor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nand_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nand_chip.json new file mode 100644 index 00000000000..7db1fe761f6 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nand_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.nand_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_assembly.json new file mode 100644 index 00000000000..cbdf360576b --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.nano_assembly" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_computer.json new file mode 100644 index 00000000000..33cdca41503 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_computer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.nano_computer" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_mainframe.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_mainframe.json new file mode 100644 index 00000000000..e798c199dd3 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_mainframe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.nano_mainframe" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_processor_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_processor_assembly.json deleted file mode 100644 index 190bf69d190..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_processor_assembly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.nano_processor_assembly" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor.json new file mode 100644 index 00000000000..e8b13cd8536 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.processor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor_assembly.json deleted file mode 100644 index a497f091a29..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor_assembly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.processor_assembly" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_assembly.json new file mode 100644 index 00000000000..c0d7c4bb7c7 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.quantum_assembly" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_computer.json new file mode 100644 index 00000000000..3ccf52bba4b --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_computer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.quantum_computer" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_mainframe.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_mainframe.json new file mode 100644 index 00000000000..7187b5848b0 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_mainframe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.quantum_mainframe" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_computer.json new file mode 100644 index 00000000000..38951c7214d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_computer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.wetware_computer" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_super_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_super_computer.json deleted file mode 100644 index 85fd106b658..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_super_computer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.wetware_super_computer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.workstation.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.workstation.json new file mode 100644 index 00000000000..e98dd30a95a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.workstation.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.workstation" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.advanced.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.advanced.json new file mode 100644 index 00000000000..3ea7d1f1a70 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.advanced.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.advanced" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.basic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.basic.json new file mode 100644 index 00000000000..62435dc5cf7 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.basic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.basic" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.elite.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.elite.json new file mode 100644 index 00000000000..c35da5d3774 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.elite.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.elite" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.extreme.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.extreme.json new file mode 100644 index 00000000000..2eea53b0b5e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.extreme.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.extreme" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.good.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.good.json new file mode 100644 index 00000000000..07407ecda9a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.good.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.good" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.plastic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.plastic.json new file mode 100644 index 00000000000..fd711793a1c --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.plastic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.plastic" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.wetware.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.wetware.json new file mode 100644 index 00000000000..fdb706b016e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.wetware.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.wetware" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.capacitor.json b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.capacitor.json new file mode 100644 index 00000000000..afa6ccc51e2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.capacitor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component.advanced_smd.capacitor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.diode.json b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.diode.json new file mode 100644 index 00000000000..9b567b0f996 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.diode.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component.advanced_smd.diode" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.resistor.json b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.resistor.json new file mode 100644 index 00000000000..e8a0268ec2e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.resistor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component.advanced_smd.resistor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.transistor.json b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.transistor.json new file mode 100644 index 00000000000..a1b89ba90e5 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.transistor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component.advanced_smd.transistor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/crystal.raw_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/crystal.raw_chip.json new file mode 100644 index 00000000000..48fa3adaac2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/crystal.raw_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/crystal.raw_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/plate.highly_advanced_system_on_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/plate.highly_advanced_system_on_chip.json new file mode 100644 index 00000000000..527d0d66fb3 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/plate.highly_advanced_system_on_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/plate.highly_advanced_system_on_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/plate.low_power_integrated_circuit.json b/src/main/resources/assets/gregtech/models/item/metaitems/plate.low_power_integrated_circuit.json new file mode 100644 index 00000000000..7f4723ced4f --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/plate.low_power_integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/plate.low_power_integrated_circuit" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/plate.simple_system_on_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/plate.simple_system_on_chip.json new file mode 100644 index 00000000000..ad4bb548b66 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/plate.simple_system_on_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/plate.simple_system_on_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/plate.ultra_low_power_integrated_circuit.json b/src/main/resources/assets/gregtech/models/item/metaitems/plate.ultra_low_power_integrated_circuit.json new file mode 100644 index 00000000000..92304e4b9c5 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/plate.ultra_low_power_integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/plate.ultra_low_power_integrated_circuit" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.highly_advanced_system_on_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.highly_advanced_system_on_chip.json new file mode 100644 index 00000000000..551f4613310 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.highly_advanced_system_on_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.highly_advanced_system_on_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.low_power_integrated_circuit.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.low_power_integrated_circuit.json new file mode 100644 index 00000000000..14f0a8b7b53 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.low_power_integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.low_power_integrated_circuit" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.neutronium.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.neutronium.json new file mode 100644 index 00000000000..b333bd3d944 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.neutronium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.neutronium" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.simple_system_on_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.simple_system_on_chip.json new file mode 100644 index 00000000000..8e130902c54 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.simple_system_on_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.simple_system_on_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.ultra_low_power_integrated_circuit.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.ultra_low_power_integrated_circuit.json new file mode 100644 index 00000000000..de0b42f85df --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.ultra_low_power_integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.ultra_low_power_integrated_circuit" + } +} diff --git a/src/main/resources/assets/gregtech/textures/gui/progress_bar/progress_bar_circuit_assembler.png b/src/main/resources/assets/gregtech/textures/gui/progress_bar/progress_bar_circuit_assembler.png new file mode 100644 index 00000000000..2edb27dafb8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/progress_bar/progress_bar_circuit_assembler.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/bio_chaff.png b/src/main/resources/assets/gregtech/textures/items/metaitems/bio_chaff.png new file mode 100644 index 00000000000..5e66a02ad09 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/bio_chaff.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/boule.neutronium.png b/src/main/resources/assets/gregtech/textures/items/metaitems/boule.neutronium.png new file mode 100644 index 00000000000..316c03a7608 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/boule.neutronium.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced_integrated.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced_integrated.png new file mode 100644 index 00000000000..cea69f31691 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced_integrated.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.processor_assembly.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.assembly.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.processor_assembly.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.assembly.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic.png deleted file mode 100644 index 2c36c985ee8..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic_electronic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic_integrated.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic_electronic.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic_integrated.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_assembly.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_assembly.png new file mode 100644 index 00000000000..3f366301b9b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_assembly.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_computer.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_computer.png new file mode 100644 index 00000000000..4cae7f4118d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_computer.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_mainframe.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_mainframe.png new file mode 100644 index 00000000000..9627adc0d2b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_mainframe.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_processor.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_processor.png index 864e1d61f5b..1491144be96 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_processor.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_processor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data_control.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data_control.png deleted file mode 100644 index 2497642c3e8..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data_control.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.electronic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.electronic.png new file mode 100644 index 00000000000..da49c1e9490 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.electronic.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.energy_flow.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.energy_flow.png deleted file mode 100644 index d6ff394c66c..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.energy_flow.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.good_electronic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.good_electronic.png new file mode 100644 index 00000000000..0084f55bf65 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.good_electronic.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.good.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.good_integrated.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.good.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.good_integrated.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.integrated.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.integrated.png deleted file mode 100644 index acefb8a3a90..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.integrated.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.mainframe.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.mainframe.png new file mode 100644 index 00000000000..7bdb5c7ac04 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.mainframe.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced_parts.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.microprocessor.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced_parts.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.microprocessor.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.primitive.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nand_chip.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.primitive.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nand_chip.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_processor_assembly.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_assembly.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_processor_assembly.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_assembly.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_computer.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_computer.png new file mode 100644 index 00000000000..7f0fcaca52f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_computer.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_mainframe.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_mainframe.png new file mode 100644 index 00000000000..f2ac9233597 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_mainframe.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.processor.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.processor.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_assembly.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_assembly.png new file mode 100644 index 00000000000..f5d5a1bc392 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_assembly.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_computer.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_computer.png new file mode 100644 index 00000000000..ea4ab6d5bcb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_computer.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_mainframe.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_mainframe.png new file mode 100644 index 00000000000..9af72bb220c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_mainframe.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.wetware_super_computer.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.wetware_computer.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.wetware_super_computer.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.wetware_computer.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.workstation.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.workstation.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.advanced.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.advanced.png new file mode 100644 index 00000000000..7108a9fbe65 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.advanced.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.basic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.basic.png new file mode 100644 index 00000000000..5930084b4c0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.basic.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.elite.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.elite.png new file mode 100644 index 00000000000..577d9a49ab1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.elite.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.extreme.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.extreme.png new file mode 100644 index 00000000000..9a4f886c0a7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.extreme.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.good.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.good.png new file mode 100644 index 00000000000..c971bfa81da Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.good.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.plastic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.plastic.png new file mode 100644 index 00000000000..d8bef2fda05 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.plastic.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.wetware.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.wetware.png new file mode 100644 index 00000000000..80d15f4d36b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.wetware.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.capacitor.png b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.capacitor.png new file mode 100644 index 00000000000..c5dedac4b53 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.capacitor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.diode.png b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.diode.png new file mode 100644 index 00000000000..fadaf89d62d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.diode.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.resistor.png b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.resistor.png new file mode 100644 index 00000000000..cf6e98f0e0a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.resistor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.transistor.png b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.transistor.png new file mode 100644 index 00000000000..6c1b5bcb8d0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.transistor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.raw_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.raw_chip.png new file mode 100644 index 00000000000..8e7cdee46ee Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.raw_chip.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.high_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.high_power_integrated_circuit.png index 4d146a95c55..95fe208307b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.high_power_integrated_circuit.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.high_power_integrated_circuit.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.highly_advanced_system_on_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.highly_advanced_system_on_chip.png new file mode 100644 index 00000000000..bcdc4fa183a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.highly_advanced_system_on_chip.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.low_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.low_power_integrated_circuit.png new file mode 100644 index 00000000000..4d146a95c55 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.low_power_integrated_circuit.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.power_integrated_circuit.png index 8a91f91e741..967943a2732 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.power_integrated_circuit.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.power_integrated_circuit.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.simple_system_on_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.simple_system_on_chip.png new file mode 100644 index 00000000000..216e6de4f64 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.simple_system_on_chip.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.ultra_low_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.ultra_low_power_integrated_circuit.png new file mode 100644 index 00000000000..8a91f91e741 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.ultra_low_power_integrated_circuit.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.high_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.high_power_integrated_circuit.png index cf0360a77c5..776233d0036 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.high_power_integrated_circuit.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.high_power_integrated_circuit.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.highly_advanced_system_on_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.highly_advanced_system_on_chip.png new file mode 100644 index 00000000000..c14b8037ca5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.highly_advanced_system_on_chip.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.low_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.low_power_integrated_circuit.png new file mode 100644 index 00000000000..cf0360a77c5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.low_power_integrated_circuit.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.neutronium.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.neutronium.png new file mode 100644 index 00000000000..272ced3b3c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.neutronium.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.power_integrated_circuit.png index 0ccd45871b9..df4434d72ef 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.power_integrated_circuit.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.power_integrated_circuit.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.simple_system_on_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.simple_system_on_chip.png new file mode 100644 index 00000000000..57185d40bf1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.simple_system_on_chip.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.ultra_low_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.ultra_low_power_integrated_circuit.png new file mode 100644 index 00000000000..0ccd45871b9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.ultra_low_power_integrated_circuit.png differ