From 4e043f617b729fec6e011b0840657da434cafd27 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Tue, 28 Feb 2017 02:04:47 +0100 Subject: [PATCH] Circuit changes --- build.properties | 2 +- src/main/java/gregtech/GT_Mod.java | 3 +- .../java/gregtech/api/enums/ItemList.java | 10 +- .../java/gregtech/api/enums/Materials.java | 10 +- .../java/gregtech/api/enums/OrePrefixes.java | 6 +- src/main/java/gregtech/api/enums/Tier.java | 14 +- .../interfaces/internal/IGT_RecipeAdder.java | 25 ++- .../GT_MetaTileEntity_BasicMachine.java | 8 + .../java/gregtech/api/util/GT_Recipe.java | 3 +- .../java/gregtech/api/util/GT_Utility.java | 8 +- .../java/gregtech/common/GT_Pollution.java | 2 +- src/main/java/gregtech/common/GT_Proxy.java | 3 +- .../java/gregtech/common/GT_RecipeAdder.java | 26 ++- .../items/GT_IntegratedCircuit_Item.java | 2 +- .../items/GT_MetaGenerated_Item_01.java | 37 ++-- .../items/GT_MetaGenerated_Item_03.java | 174 +++++++++++++++++ ...T_MetaTileEntity_AdvSeismicProspector.java | 10 +- .../basic/GT_MetaTileEntity_Disassembler.java | 14 +- .../multi/GT_MetaTileEntity_Cleanroom.java | 18 +- .../oreprocessing/ProcessingCircuit.java | 23 ++- .../oreprocessing/ProcessingCrafting.java | 29 ++- .../loaders/oreprocessing/ProcessingGem.java | 2 +- .../loaders/oreprocessing/ProcessingLens.java | 3 +- .../oreprocessing/ProcessingPlate.java | 2 + .../postload/GT_CraftingRecipeLoader.java | 2 +- .../postload/GT_MachineRecipeLoader.java | 182 +++++++++++++++--- .../preload/GT_Loader_MetaTileEntities.java | 11 ++ .../gregtech/nei/GT_NEI_DefaultHandler.java | 10 +- .../circuitassembler/OVERLAY_BOTTOM.png | Bin 0 -> 143 bytes .../OVERLAY_BOTTOM_ACTIVE.png | Bin 0 -> 143 bytes .../circuitassembler/OVERLAY_FRONT.png | Bin 0 -> 319 bytes .../circuitassembler/OVERLAY_FRONT_ACTIVE.png | Bin 0 -> 329 bytes .../circuitassembler/OVERLAY_SIDE.png | Bin 0 -> 143 bytes .../circuitassembler/OVERLAY_SIDE_ACTIVE.png | Bin 0 -> 143 bytes .../circuitassembler/OVERLAY_TOP.png | Bin 0 -> 311 bytes .../circuitassembler/OVERLAY_TOP_ACTIVE.png | Bin 0 -> 311 bytes .../gui/basicmachines/CircuitAssembler.png | Bin 0 -> 2437 bytes .../textures/items/gt.metaitem.01/700.png | Bin 231 -> 1378 bytes .../textures/items/gt.metaitem.01/703.png | Bin 319 -> 356 bytes .../textures/items/gt.metaitem.01/705.png | Bin 348 -> 4051 bytes .../textures/items/gt.metaitem.01/706.png | Bin 364 -> 4039 bytes .../textures/items/gt.metaitem.01/710.png | Bin 223 -> 773 bytes .../textures/items/gt.metaitem.01/711.png | Bin 223 -> 736 bytes .../textures/items/gt.metaitem.01/712.png | Bin 252 -> 750 bytes .../textures/items/gt.metaitem.01/715.png | Bin 273 -> 555 bytes .../textures/items/gt.metaitem.01/716.png | Bin 441 -> 663 bytes .../textures/items/gt.metaitem.01/717.png | Bin 450 -> 997 bytes .../textures/items/gt.metaitem.01/718.png | Bin 520 -> 1064 bytes .../textures/items/gt.metaitem.01/719.png | Bin 277 -> 738 bytes .../textures/items/gt.metaitem.01/720.png | Bin 331 -> 708 bytes .../textures/items/gt.metaitem.03/1.png | Bin 0 -> 773 bytes .../textures/items/gt.metaitem.03/10.png | Bin 0 -> 663 bytes .../textures/items/gt.metaitem.03/11.png | Bin 0 -> 1155 bytes .../textures/items/gt.metaitem.03/12.png | Bin 0 -> 1403 bytes .../textures/items/gt.metaitem.03/13.png | Bin 0 -> 1378 bytes .../textures/items/gt.metaitem.03/14.png | Bin 0 -> 1067 bytes .../textures/items/gt.metaitem.03/15.png | Bin 0 -> 555 bytes .../textures/items/gt.metaitem.03/16.png | Bin 0 -> 1127 bytes .../textures/items/gt.metaitem.03/17.png | Bin 0 -> 997 bytes .../textures/items/gt.metaitem.03/18.png | Bin 0 -> 1150 bytes .../textures/items/gt.metaitem.03/19.png | Bin 0 -> 1064 bytes .../textures/items/gt.metaitem.03/2.png | Bin 0 -> 736 bytes .../textures/items/gt.metaitem.03/20.png | Bin 0 -> 1175 bytes .../textures/items/gt.metaitem.03/3.png | Bin 0 -> 750 bytes .../textures/items/gt.metaitem.03/30.png | Bin 0 -> 985 bytes .../textures/items/gt.metaitem.03/31.png | Bin 0 -> 1098 bytes .../textures/items/gt.metaitem.03/32.png | Bin 0 -> 1070 bytes .../textures/items/gt.metaitem.03/33.png | Bin 0 -> 1182 bytes .../textures/items/gt.metaitem.03/34.png | Bin 0 -> 1275 bytes .../textures/items/gt.metaitem.03/35.png | Bin 0 -> 1269 bytes .../textures/items/gt.metaitem.03/36.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/37.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/38.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/39.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/4.png | Bin 0 -> 738 bytes .../textures/items/gt.metaitem.03/40.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/41.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/42.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/43.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/44.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/45.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/46.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/47.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/48.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/49.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/5.png | Bin 0 -> 708 bytes .../textures/items/gt.metaitem.03/50.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/51.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/52.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/53.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/54.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/55.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/56.png | Bin 0 -> 1501 bytes .../textures/items/gt.metaitem.03/57.png | Bin 0 -> 1178 bytes .../textures/items/gt.metaitem.03/6.png | Bin 0 -> 764 bytes .../textures/items/gt.metaitem.03/69.png | Bin 0 -> 435 bytes .../textures/items/gt.metaitem.03/70.png | Bin 0 -> 435 bytes .../textures/items/gt.metaitem.03/700.png | Bin 0 -> 231 bytes .../textures/items/gt.metaitem.03/701.png | Bin 0 -> 292 bytes .../textures/items/gt.metaitem.03/703.png | Bin 0 -> 319 bytes .../textures/items/gt.metaitem.03/704.png | Bin 0 -> 315 bytes .../textures/items/gt.metaitem.03/705.png | Bin 0 -> 348 bytes .../textures/items/gt.metaitem.03/707.png | Bin 0 -> 375 bytes .../textures/items/gt.metaitem.03/708.png | Bin 0 -> 338 bytes .../textures/items/gt.metaitem.03/71.png | Bin 0 -> 461 bytes .../textures/items/gt.metaitem.03/710.png | Bin 0 -> 223 bytes .../textures/items/gt.metaitem.03/711.png | Bin 0 -> 223 bytes .../textures/items/gt.metaitem.03/712.png | Bin 0 -> 252 bytes .../textures/items/gt.metaitem.03/713.png | Bin 0 -> 435 bytes .../textures/items/gt.metaitem.03/714.png | Bin 0 -> 461 bytes .../textures/items/gt.metaitem.03/715.png | Bin 0 -> 273 bytes .../textures/items/gt.metaitem.03/716.png | Bin 0 -> 441 bytes .../textures/items/gt.metaitem.03/717.png | Bin 0 -> 450 bytes .../textures/items/gt.metaitem.03/718.png | Bin 0 -> 520 bytes .../textures/items/gt.metaitem.03/719.png | Bin 0 -> 277 bytes .../textures/items/gt.metaitem.03/72.png | Bin 0 -> 252 bytes .../textures/items/gt.metaitem.03/720.png | Bin 0 -> 331 bytes .../textures/items/gt.metaitem.03/73.png | Bin 0 -> 9505 bytes .../textures/items/gt.metaitem.03/79.png | Bin 0 -> 321 bytes .../textures/items/gt.metaitem.03/80.png | Bin 0 -> 319 bytes .../textures/items/gt.metaitem.03/82.png | Bin 0 -> 323 bytes .../textures/items/gt.metaitem.03/83.png | Bin 0 -> 358 bytes .../textures/items/gt.metaitem.03/85.png | Bin 0 -> 319 bytes .../textures/items/gt.metaitem.03/86.png | Bin 0 -> 348 bytes .../textures/items/gt.metaitem.03/88.png | Bin 0 -> 4043 bytes .../textures/items/gt.metaitem.03/89.png | Bin 0 -> 325 bytes .../textures/items/gt.metaitem.03/90.png | Bin 0 -> 364 bytes .../textures/items/gt.metaitem.03/91.png | Bin 0 -> 4059 bytes .../textures/items/gt.metaitem.03/92.png | Bin 0 -> 320 bytes .../textures/items/gt.metaitem.03/93.png | Bin 0 -> 350 bytes .../textures/items/gt.metaitem.03/95.png | Bin 0 -> 4062 bytes 131 files changed, 537 insertions(+), 102 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_BOTTOM.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_BOTTOM_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_FRONT_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_SIDE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_SIDE_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_TOP.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_TOP_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/10.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/11.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/12.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/13.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/14.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/15.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/16.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/17.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/18.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/19.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/20.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/3.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/30.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/31.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/32.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/33.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/34.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/35.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/4.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/5.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/6.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/700.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/701.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/703.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/704.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/705.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/707.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/708.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/710.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/711.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/712.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/713.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/714.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/715.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/716.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/717.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/718.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/719.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/72.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/720.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/73.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/80.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/82.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/83.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/85.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/86.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/89.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/91.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/92.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/93.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/95.png diff --git a/build.properties b/build.properties index ea38d5b8..65af08ac 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.28pre3 +gt.version=5.09.28pre5 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index ef0635bc..734c6b5c 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -254,7 +254,8 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.mExplosionItemDrop = tMainConfig.get("general", "ExplosionItemDrops", false).getBoolean(false); gregtechproxy.mAddGTRecipesToIC2Machines = tMainConfig.get("general", "AddGTRecipesToIC2Machines", true).getBoolean(true); gregtechproxy.mUndergroundOil.getConfig(tMainConfig, "undergroundfluid"); - + gregtechproxy.mLowGravProcessing = Loader.isModLoaded(GT_Values.MOD_ID_GC_CORE) && tMainConfig.get("general", "LowGravProcessing", true).getBoolean(true); + GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true); GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false); GregTech_API.mEUtoRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "100EUtoRF", 360); diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 734e68f7..e093815b 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -640,7 +640,15 @@ public enum ItemList implements IItemContainer { ModularElectric1Helmet, ModularElectric1Chestplate, ModularElectric1Leggings, ModularElectric1Boots, ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene, FluidRegulator_LV, FluidRegulator_MV, FluidRegulator_HV, FluidRegulator_EV, FluidRegulator_IV, FluidRegulator_LuV, FluidRegulator_ZPM, FluidRegulator_UV, FluidFilter, CuringOven, Machine_Multi_Assemblyline, Machine_Multi_DieselEngine, QuantumEye, QuantumStar, Gravistar, Block_SSFUEL, Block_MSSFUEL, SFMixture, MSFMixture, Depleted_Naquadah_1, Depleted_Naquadah_2, Depleted_Naquadah_4, NaquadahCell_1, NaquadahCell_2, NaquadahCell_4, Hatch_AutoMaintenance, - Machine_Multi_Cleanroom; + Machine_Multi_Cleanroom, Circuit_Board_Coated, Circuit_Board_Phenolic, Circuit_Board_Epoxy, Circuit_Board_Fiberglass, Circuit_Board_Multifiberglass, Circuit_Board_Wetware, + Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Vacuum_Tube, Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD, + Circuit_Silicon_Ingot, Circuit_Silicon_Ingot2, Circuit_Silicon_Ingot3, Circuit_Silicon_Wafer, Circuit_Silicon_Wafer2, Circuit_Silicon_Wafer3, Circuit_Wafer_ILC, Circuit_Chip_ILC, Circuit_Wafer_Ram, Circuit_Chip_Ram, + Circuit_Wafer_NAND, Circuit_Chip_NAND, Circuit_Wafer_NOR, Circuit_Chip_NOR, Circuit_Wafer_CPU, Circuit_Chip_CPU, Circuit_Wafer_SoC, Circuit_Chip_SoC, Circuit_Wafer_SoC2, Circuit_Chip_SoC2, Circuit_Wafer_PIC, Circuit_Chip_PIC, + Circuit_Wafer_HPIC, Circuit_Chip_HPIC, Circuit_Wafer_NanoCPU, Circuit_Chip_NanoCPU, Circuit_Wafer_QuantumCPU, Circuit_Chip_QuantumCPU, + Circuit_Chip_CrystalCPU, Circuit_Chip_CrystalSoC, Circuit_Chip_NeuroCPU, Circuit_Chip_Stemcell, + Circuit_Processor, Circuit_Computer, Circuit_Nanoprocessor, Circuit_Nanocomputer, Circuit_Elitenanocomputer, Circuit_Quantumprocessor, Circuit_Quantumcomputer, Circuit_Masterquantumcomputer, + Circuit_Quantummainframe, Circuit_Crystalprocessor, Circuit_Crystalcomputer, Circuit_Crystalmainframe, Circuit_Neuroprocessor, Circuit_Wetwarecomputer, Circuit_Wetwaresupercomputer, Circuit_Wetwaremainframe, Circuit_Parts_RawCrystalChip, + Machine_LV_CircuitAssembler, Machine_MV_CircuitAssembler, Machine_HV_CircuitAssembler, Machine_EV_CircuitAssembler, Machine_IV_CircuitAssembler, Machine_LuV_CircuitAssembler, Machine_ZPM_CircuitAssembler, Machine_UV_CircuitAssembler, Circuit_Integrated_Good; public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15}, SPRAY_CAN_DYES = {Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15}, SPRAY_CAN_DYES_USED = {Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, Spray_Color_Used_08, Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, Spray_Color_Used_12, Spray_Color_Used_13, Spray_Color_Used_14, Spray_Color_Used_15}, TRANSFORMERS = {Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV}, MACHINE_HULLS = {Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX}, HATCHES_DYNAMO = {Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX}, HATCHES_ENERGY = {Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX}, HATCHES_INPUT = {Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX}, HATCHES_INPUT_BUS = {Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX}, HATCHES_OUTPUT = {Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX}, HATCHES_OUTPUT_BUS = {Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX}, HATCHES_MUFFLER = {Hatch_Muffler_LV, Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, Hatch_Muffler_EV, Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, Hatch_Muffler_MAX}; diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 85b91300..6c2135ee 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -103,7 +103,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Rubidium = new Materials(43, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|32, 240, 30, 30, 0, "Rubidium", "Rubidium", 0, 0, 312, 0, false, false, 4, 1, 1, Dyes.dyeRed, Element.Rb, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.VITREUS, 1))); public static Materials Samarium = new Materials(69, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|32, 255, 255, 255, 0, "Samarium", "Samarium", 0, 0, 1345, 1345, true, false, 4, 1, 1, Dyes._NULL, Element.Sm, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))); public static Materials Scandium = new Materials(27, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|32, 255, 255, 255, 0, "Scandium", "Scandium", 0, 0, 1814, 1814, true, false, 2, 1, 1, Dyes.dyeYellow, Element.Sc, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))); - public static Materials Silicon = new Materials(20, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|32, 60, 60, 80, 0, "Silicon", "Silicon", 0, 0, 1687, 1687, true, false, 1, 1, 1, Dyes.dyeBlack, Element.Si, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.TENEBRAE, 1))); + public static Materials Silicon = new Materials(20, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|32, 60, 60, 80, 0, "Silicon", "Silicon", 0, 0, 1687, 1687, false, false, 1, 1, 1, Dyes.dyeBlack, Element.Si, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.TENEBRAE, 1))); public static Materials Silver = new Materials(54, TextureSet.SET_SHINY, 10.0F, 64, 2, 1|2|8|32|64|128, 220, 220, 255, 0, "Silver", "Silver", 0, 0, 1234, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Ag, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.LUCRUM, 1))); public static Materials Sodium = new Materials(17, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1 |32, 0, 0, 150, 0, "Sodium", "Sodium", 0, 0, 370, 0, false, false, 1, 1, 1, Dyes.dyeBlue, Element.Na, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_AspectStack(TC_Aspects.LUX, 1))); public static Materials Strontium = new Materials(44, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|32, 200, 200, 200, 0, "Strontium", "Strontium", 0, 0, 1050, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Element.Sr, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.STRONTIO, 1))); @@ -946,14 +946,16 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Tungstate .addOreByProducts(Manganese , Silver , Lithium ); Bauxite .addOreByProducts(Grossular , Rutile , Gallium ); QuartzSand .addOreByProducts(CertusQuartz , Quartzite , Barite ); - Quartzite .addOreByProducts(CertusQuartz , Barite ); - CertusQuartz .addOreByProducts(Quartzite , Barite ); Redstone .addOreByProducts(Cinnabar , RareEarth , Glowstone ); Monazite .addOreByProducts(Thorium , Neodymium , RareEarth ); Forcicium .addOreByProducts(Thorium , Neodymium , RareEarth ); Forcillium .addOreByProducts(Thorium , Neodymium , RareEarth ); Malachite .addOreByProducts(Copper , BrownLimonite , Calcite ); YellowLimonite .addOreByProducts(Nickel , BrownLimonite , Cobalt ); + Lepidolite .addOreByProducts(Lithium , Caesium , Boron ); + Andradite .addOreByProducts(GarnetYellow , Iron , Boron ); + Quartzite .addOreByProducts(CertusQuartz , Barite ); + CertusQuartz .addOreByProducts(Quartzite , Barite ); BrownLimonite .addOreByProducts(Malachite , YellowLimonite ); Neodymium .addOreByProducts(Monazite , RareEarth ); Bastnasite .addOreByProducts(Neodymium , RareEarth ); @@ -962,7 +964,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Tungsten .addOreByProducts(Manganese , Molybdenum ); Diatomite .addOreByProducts(BandedIron , Sapphire ); Iron .addOreByProducts(Nickel , Tin ); - Lepidolite .addOreByProducts(Lithium , Caesium ); Gold .addOreByProducts(Copper , Nickel ); Tin .addOreByProducts(Iron , Zinc ); Antimony .addOreByProducts(Zinc , Iron ); @@ -999,7 +1000,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Pyrope .addOreByProducts(GarnetRed , Magnesium ); Almandine .addOreByProducts(GarnetRed , Aluminium ); Spessartine .addOreByProducts(GarnetRed , Manganese ); - Andradite .addOreByProducts(GarnetYellow , Iron ); Grossular .addOreByProducts(GarnetYellow , Calcium ); Uvarovite .addOreByProducts(GarnetYellow , Chrome ); Calcite .addOreByProducts(Andradite , Malachite ); diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index e8cf57ff..0577754f 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -697,11 +697,13 @@ public enum OrePrefixes { if (!enableUnusedFoil && !(aMaterial == Materials.Zinc || aMaterial == Materials.Aluminium || aMaterial == Materials.Silicon || aMaterial == Materials.Gold || aMaterial == Materials.Electrum || aMaterial == Materials.Platinum || aMaterial == Materials.Osmiridium || aMaterial == Materials.Osmium || aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Steel || aMaterial == Materials.Copper || aMaterial == Materials.YttriumBariumCuprate - || aMaterial == Materials.VanadiumGallium || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.Naquadah)) + || aMaterial == Materials.VanadiumGallium || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.Naquadah || aMaterial == Materials.Manganese || + aMaterial == Materials.Plastic || aMaterial == Materials.Silicone)) foil.mDisabledItems.add(aMaterial); //Fine Wire if (!enableUnusedFineWires && !(aMaterial == Materials.Steel || aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Platinum || aMaterial == Materials.Osmium || - aMaterial == Materials.Tin || aMaterial == Materials.Lead || aMaterial == Materials.SolderingAlloy)) + aMaterial == Materials.Tin || aMaterial == Materials.Lead || aMaterial == Materials.SolderingAlloy || aMaterial == Materials.Copper || aMaterial == Materials.Electrum || + aMaterial == Materials.Gold || aMaterial == Materials.RedAlloy || aMaterial == Materials.Graphene || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.YttriumBariumCuprate )) wireFine.mDisabledItems.add(aMaterial); //Gears if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium || aMaterial == Materials.Iron || aMaterial == Materials.Copper || diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java index 265d2866..c40a4d8e 100644 --- a/src/main/java/gregtech/api/enums/Tier.java +++ b/src/main/java/gregtech/api/enums/Tier.java @@ -9,13 +9,13 @@ public class Tier { new Tier(SubTag.ENERGY_ELECTRICITY, 0, 8, 1, 1, 1, Materials.WroughtIron, ItemList.Hull_ULV, OrePrefixes.cableGt01.get(Materials.Lead), OrePrefixes.cableGt04.get(Materials.Lead), OrePrefixes.circuit.get(Materials.Primitive), OrePrefixes.circuit.get(Materials.Basic)), new Tier(SubTag.ENERGY_ELECTRICITY, 1, 32, 1, 1, 1, Materials.Steel, ItemList.Hull_LV, OrePrefixes.cableGt01.get(Materials.Tin), OrePrefixes.cableGt04.get(Materials.Tin), OrePrefixes.circuit.get(Materials.Basic), OrePrefixes.circuit.get(Materials.Good)), new Tier(SubTag.ENERGY_ELECTRICITY, 2, 128, 1, 1, 1, Materials.Aluminium, ItemList.Hull_MV, OrePrefixes.cableGt01.get(Materials.AnyCopper), OrePrefixes.cableGt04.get(Materials.AnyCopper), OrePrefixes.circuit.get(Materials.Good), OrePrefixes.circuit.get(Materials.Advanced)), - new Tier(SubTag.ENERGY_ELECTRICITY, 3, 512, 1, 1, 1, Materials.StainlessSteel, ItemList.Hull_HV, OrePrefixes.cableGt01.get(Materials.Gold), OrePrefixes.cableGt04.get(Materials.Gold), OrePrefixes.circuit.get(Materials.Advanced), OrePrefixes.circuit.get(Materials.Elite)), - new Tier(SubTag.ENERGY_ELECTRICITY, 4, 2048, 1, 1, 1, Materials.Titanium, ItemList.Hull_EV, OrePrefixes.cableGt01.get(Materials.Aluminium), OrePrefixes.cableGt04.get(Materials.Aluminium), OrePrefixes.circuit.get(Materials.Elite), OrePrefixes.circuit.get(Materials.Master)), - new Tier(SubTag.ENERGY_ELECTRICITY, 5, 8192, 1, 1, 1, Materials.TungstenSteel, ItemList.Hull_IV, OrePrefixes.cableGt01.get(Materials.Platinum), OrePrefixes.cableGt04.get(Materials.Platinum), OrePrefixes.circuit.get(Materials.Master), OrePrefixes.circuit.get(Materials.Ultimate)), - new Tier(SubTag.ENERGY_ELECTRICITY, 6, 32768, 1, 1, 1, Materials.Chrome, ItemList.Hull_LuV, OrePrefixes.cableGt01.get(Materials.NiobiumTitanium), OrePrefixes.cableGt04.get(Materials.NiobiumTitanium), OrePrefixes.circuit.get(Materials.Ultimate), OrePrefixes.circuit.get(Materials.Ultimate)), - new Tier(SubTag.ENERGY_ELECTRICITY, 7, 131072, 1, 1, 1, Materials.Iridium, ItemList.Hull_ZPM, OrePrefixes.cableGt01.get(Materials.Naquadah), OrePrefixes.cableGt04.get(Materials.Naquadah), OrePrefixes.circuit.get(Materials.Ultimate), OrePrefixes.circuit.get(Materials.Ultimate)), - new Tier(SubTag.ENERGY_ELECTRICITY, 8, 524288, 1, 1, 1, Materials.Osmium, ItemList.Hull_UV, OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), OrePrefixes.cableGt01.get(Materials.Superconductor), OrePrefixes.circuit.get(Materials.Ultimate), OrePrefixes.circuit.get(Materials.Ultimate)), - new Tier(SubTag.ENERGY_ELECTRICITY, 9, Integer.MAX_VALUE, 1, 1, 1, Materials.Neutronium, ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.Superconductor), OrePrefixes.wireGt04.get(Materials.Superconductor), OrePrefixes.circuit.get(Materials.Ultimate), OrePrefixes.circuit.get(Materials.Ultimate)), + new Tier(SubTag.ENERGY_ELECTRICITY, 3, 512, 1, 1, 1, Materials.StainlessSteel, ItemList.Hull_HV, OrePrefixes.cableGt01.get(Materials.Gold), OrePrefixes.cableGt04.get(Materials.Gold), OrePrefixes.circuit.get(Materials.Advanced), OrePrefixes.circuit.get(Materials.Data)), + new Tier(SubTag.ENERGY_ELECTRICITY, 4, 2048, 1, 1, 1, Materials.Titanium, ItemList.Hull_EV, OrePrefixes.cableGt01.get(Materials.Aluminium), OrePrefixes.cableGt04.get(Materials.Aluminium), OrePrefixes.circuit.get(Materials.Data), OrePrefixes.circuit.get(Materials.Elite)), + new Tier(SubTag.ENERGY_ELECTRICITY, 5, 8192, 1, 1, 1, Materials.TungstenSteel, ItemList.Hull_IV, OrePrefixes.cableGt01.get(Materials.Platinum), OrePrefixes.cableGt04.get(Materials.Platinum), OrePrefixes.circuit.get(Materials.Elite), OrePrefixes.circuit.get(Materials.Master)), + new Tier(SubTag.ENERGY_ELECTRICITY, 6, 32768, 1, 1, 1, Materials.Chrome, ItemList.Hull_LuV, OrePrefixes.cableGt01.get(Materials.NiobiumTitanium), OrePrefixes.cableGt04.get(Materials.NiobiumTitanium), OrePrefixes.circuit.get(Materials.Master), OrePrefixes.circuit.get(Materials.Ultimate)), + new Tier(SubTag.ENERGY_ELECTRICITY, 7, 131072, 1, 1, 1, Materials.Iridium, ItemList.Hull_ZPM, OrePrefixes.cableGt01.get(Materials.Naquadah), OrePrefixes.cableGt04.get(Materials.Naquadah), OrePrefixes.circuit.get(Materials.Ultimate), OrePrefixes.circuit.get(Materials.Superconductor)), + new Tier(SubTag.ENERGY_ELECTRICITY, 8, 524288, 1, 1, 1, Materials.Osmium, ItemList.Hull_UV, OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), OrePrefixes.cableGt01.get(Materials.Superconductor), OrePrefixes.circuit.get(Materials.Superconductor), OrePrefixes.circuit.get(Materials.Infinite)), + new Tier(SubTag.ENERGY_ELECTRICITY, 9, Integer.MAX_VALUE, 1, 1, 1, Materials.Neutronium, ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.Superconductor), OrePrefixes.wireGt04.get(Materials.Superconductor), OrePrefixes.circuit.get(Materials.Infinite), OrePrefixes.circuit.get(Materials.Infinite)), }, ROTATIONAL = new Tier[]{ new Tier(SubTag.ENERGY_ROTATIONAL, 1, 32, 1, 1, 1, Materials.Wood, OrePrefixes.frameGt.get(Materials.Wood), OrePrefixes.stick.get(Materials.Wood), OrePrefixes.ingot.get(Materials.Wood), OrePrefixes.gearGt.get(Materials.Wood), OrePrefixes.gearGt.get(Materials.Stone)), new Tier(SubTag.ENERGY_ROTATIONAL, 1, 32, 1, 2, 2, Materials.WoodSealed, OrePrefixes.frameGt.get(Materials.WoodSealed), OrePrefixes.stick.get(Materials.WoodSealed), OrePrefixes.ingot.get(Materials.WoodSealed), OrePrefixes.gearGt.get(Materials.WoodSealed), OrePrefixes.gearGt.get(Materials.Stone)), diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index 0d50ae77..480cde54 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -182,7 +182,7 @@ public interface IGT_RecipeAdder { public boolean addCNCRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt); /** - * Adds a Circuit Assembler Recipe + * Adds a Assembler Recipe * * @param aInput1 must be != null * @param aOutput1 must be != null @@ -192,7 +192,7 @@ public interface IGT_RecipeAdder { public boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt); /** - * Adds a Circuit Assembler Recipe + * Adds a Assembler Recipe * * @param aInput1 must be != null * @param aOutput1 must be != null @@ -201,6 +201,18 @@ public interface IGT_RecipeAdder { */ public boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); + + /** + * Adds a Assembler Recipe + * + * @param aInputs must be 1-6 ItemStacks + * @param aFluidInput 0-1 fluids + * @param aOutput must be != null + * @param aDuration must be > 0 + * @param aEUt should be > 0 + */ + public boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput, int aDuration, int aEUt); + /** * Adds a Assemblyline Recipe * @@ -458,6 +470,11 @@ public interface IGT_RecipeAdder { */ public boolean addAutoclaveRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt); + /** + * Adds a Recipe for the Autoclave + */ + public boolean addAutoclaveRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom); + /** * Adds a Recipe for the Mixer */ @@ -467,6 +484,10 @@ public interface IGT_RecipeAdder { * Adds a Recipe for the Laser Engraver */ public boolean addLaserEngraverRecipe(ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt); + /** + * Adds a Recipe for the Laser Engraver + */ + public boolean addLaserEngraverRecipe(ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt, boolean aCleanroom); /** * Adds a Recipe for the Forming Press diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index 6da78e18..d82d1214 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -1,5 +1,6 @@ package gregtech.api.metatileentity.implementations; +import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; @@ -47,6 +48,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B public int mMainFacing = -1, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mOutputBlocked = 0; public FluidStack mOutputFluid; public String mGUIName = "", mNEIName = ""; + public GT_MetaTileEntity_MultiBlockBase mCleanroom; /** * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have been buffered */ @@ -730,6 +732,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B if (tMap == null) return DID_NOT_FIND_RECIPE; GT_Recipe tRecipe = tMap.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[mTier], new FluidStack[]{getFillableStack()}, getSpecialSlot(), getAllInputs()); if (tRecipe == null) return DID_NOT_FIND_RECIPE; + if (GT_Mod.gregtechproxy.mLowGravProcessing && tRecipe.mSpecialValue == -100 && getBaseMetaTileEntity().getWorld().provider.dimensionId == -27)return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe; if (!canOutput(tRecipe)) { mOutputBlocked++; @@ -741,6 +744,11 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B for (int i = 0; i < mOutputItems.length; i++) if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(i)) mOutputItems[i] = tRecipe.getOutput(i); + if(tRecipe.mSpecialValue == -200){ + if(mCleanroom==null)return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; + if (mOutputItems[0]==null || getBaseMetaTileEntity().getRandomNumber(10000) > mCleanroom.mEfficiency) + mOutputItems[0] = null; + } mOutputFluid = tRecipe.getFluidOutput(0); calculateOverclockedNess(tRecipe); return FOUND_AND_SUCCESSFULLY_USED_RECIPE; diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 755315e1..d509e6af 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -491,7 +491,8 @@ public class GT_Recipe { public static final GT_Recipe_Map sBenderRecipes = new GT_Recipe_Map(new HashSet(400), "gt.recipe.metalbender", "Metal Bender", null, RES_PATH_GUI + "basicmachines/Bender", 2, 1, 2, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sAlloySmelterRecipes = new GT_Recipe_Map(new HashSet(3000), "gt.recipe.alloysmelter", "Alloy Smelter", null, RES_PATH_GUI + "basicmachines/AlloySmelter", 2, 1, 2, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sAssemblerRecipes = new GT_Recipe_Map_Assembler(new HashSet(300), "gt.recipe.assembler", "Assembler", null, RES_PATH_GUI + "basicmachines/Assembler", 2, 1, 1, 0, 1, E, 1, E, true, true); - public static final GT_Recipe_Map sCannerRecipes = new GT_Recipe_Map(new HashSet(300), "gt.recipe.canner", "Canning Machine", null, RES_PATH_GUI + "basicmachines/Canner", 2, 2, 1, 0, 1, E, 1, E, true, true); + public static final GT_Recipe_Map sCircuitAssemblerRecipes = new GT_Recipe_Map_Assembler(new HashSet(300), "gt.recipe.circuitassembler", "Circuit Assembler", null, RES_PATH_GUI + "basicmachines/CircuitAssembler", 6, 1, 1, 0, 1, E, 1, E, true, true); + public static final GT_Recipe_Map sCannerRecipes = new GT_Recipe_Map(new HashSet(300), "gt.recipe.canner", "Canning Machine", null, RES_PATH_GUI + "basicmachines/Canner", 2, 2, 1, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sCNCRecipes = new GT_Recipe_Map(new HashSet(100), "gt.recipe.cncmachine", "CNC Machine", null, RES_PATH_GUI + "basicmachines/Default", 2, 1, 2, 1, 1, E, 1, E, true, true); public static final GT_Recipe_Map sLatheRecipes = new GT_Recipe_Map(new HashSet(400), "gt.recipe.lathe", "Lathe", null, RES_PATH_GUI + "basicmachines/Lathe", 1, 2, 1, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sCutterRecipes = new GT_Recipe_Map(new HashSet(200), "gt.recipe.cuttingsaw", "Cutting Saw", null, RES_PATH_GUI + "basicmachines/Cutter", 1, 2, 1, 1, 1, E, 1, E, true, true); diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index cf70f210..3d151175 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1520,7 +1520,7 @@ public class GT_Utility { return false; } - public static int getScaleСoordinates(double aValue, int aScale) { + public static int getScaleCoordinates(double aValue, int aScale) { return (int)Math.floor(aValue / aScale); } @@ -1533,7 +1533,7 @@ public class GT_Utility { if (GT_Mod.gregtechproxy.mUndergroundOil.CheckBlackList(aWorld.provider.dimensionId)) return null; - Random tRandom = new Random((aWorld.getSeed() + aWorld.provider.dimensionId * 2 + (getScaleСoordinates(aX,96)) + (7 * (getScaleСoordinates(aZ,96))))); + Random tRandom = new Random((aWorld.getSeed() + aWorld.provider.dimensionId * 2 + (getScaleCoordinates(aX,96)) + (7 * (getScaleCoordinates(aZ,96))))); int tAmount = 0; int tFluidId = 0; int tDecreasePerOperationAmount = 5; @@ -1556,7 +1556,7 @@ public class GT_Utility { tFluidId = 0; } - ChunkPosition tPos = new ChunkPosition(getScaleСoordinates(aX,16), aWorld.provider.dimensionId, getScaleСoordinates(aZ,16)); + ChunkPosition tPos = new ChunkPosition(getScaleCoordinates(aX,16), aWorld.provider.dimensionId, getScaleCoordinates(aZ,16)); int[] tInts = new int[0]; if(GT_Proxy.chunkData.containsKey(tPos)){ tInts = GT_Proxy.chunkData.get(tPos); @@ -1778,7 +1778,7 @@ public class GT_Utility { tList.add("Oil in Chunk: " + tFluid.amount + " " + tFluid.getLocalizedName()); } // if(aPlayer.capabilities.isCreativeMode){ - ChunkPosition tPos = new ChunkPosition(getScaleСoordinates(aX,16), aWorld.provider.dimensionId, getScaleСoordinates(aZ,16)); + ChunkPosition tPos = new ChunkPosition(getScaleCoordinates(aX,16), aWorld.provider.dimensionId, getScaleCoordinates(aZ,16)); if(GT_Proxy.chunkData.containsKey(tPos)){ int[] tPollution = GT_Proxy.chunkData.get(tPos); if(tPollution.length>1){ diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java index e57c4404..1fae98a2 100644 --- a/src/main/java/gregtech/common/GT_Pollution.java +++ b/src/main/java/gregtech/common/GT_Pollution.java @@ -192,7 +192,7 @@ public class GT_Pollution { public static void addPollution(World aWorld, ChunkPosition aPos, int aPollution){ if(!GT_Mod.gregtechproxy.mPollution)return; try{ - ChunkPosition tPos = new ChunkPosition(GT_Utility.getScaleСoordinates(aPos.chunkPosX,16), aWorld.provider.dimensionId, GT_Utility.getScaleСoordinates(aPos.chunkPosZ,16)); // OLD in coordinate -1 -1 chunk 0 0 + ChunkPosition tPos = new ChunkPosition(GT_Utility.getScaleCoordinates(aPos.chunkPosX,16), aWorld.provider.dimensionId, GT_Utility.getScaleCoordinates(aPos.chunkPosZ,16)); // OLD in coordinate -1 -1 chunk 0 0 // System.out.println("add pollution dim: "+aWorld.provider.dimensionId+" x: "+ tPos.chunkPosX +" z: " + tPos.chunkPosZ +" poll: "+aPollution); int[] tData = new int[2]; if(GT_Proxy.chunkData.containsKey(tPos)){ diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 1639007c..3d873bbb 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -193,7 +193,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public boolean mEnableAllMaterials = false; public boolean mEnableAllComponents = false; public boolean mAddGTRecipesToIC2Machines = true; - + public boolean mLowGravProcessing = true; + public GT_Proxy() { GameRegistry.registerFuelHandler(this); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 470cc665..bbcaf07f 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -610,15 +610,18 @@ public class GT_RecipeAdder GT_Recipe.GT_Recipe_Map.sPrinterRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, aSpecialSlot, null, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0); return true; } - public boolean addAutoclaveRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt) { + return addAutoclaveRecipe(aInput, aFluid, aOutput, aChance, aDuration, aEUt, false); + } + + public boolean addAutoclaveRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom) { if ((aInput == null) || (aFluid == null) || (aOutput == null)) { return false; } if ((aDuration = GregTech_API.sRecipeFile.get("autoclave", aInput, aDuration)) <= 0) { return false; } - GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluid}, null, aDuration, aEUt, aCleanroom ? -100 : 0); return true; } @@ -635,15 +638,18 @@ public class GT_RecipeAdder GT_Recipe.GT_Recipe_Map.sMixerRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2, aInput3, aInput4}, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); return true; } - public boolean addLaserEngraverRecipe(ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt) { + return addLaserEngraverRecipe( aItemToEngrave, aLens, aEngravedItem, aDuration, aEUt, false); + } + + public boolean addLaserEngraverRecipe(ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt, boolean aCleanroom) { if ((aItemToEngrave == null) || (aLens == null) || (aEngravedItem == null)) { return false; } if ((aDuration = GregTech_API.sRecipeFile.get("laserengraving", aEngravedItem, aDuration)) <= 0) { return false; } - GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes.addRecipe(true, new ItemStack[]{aItemToEngrave, aLens}, new ItemStack[]{aEngravedItem}, null, null, null, aDuration, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes.addRecipe(true, new ItemStack[]{aItemToEngrave, aLens}, new ItemStack[]{aEngravedItem}, null, null, null, aDuration, aEUt, aCleanroom ? -200 : 0); return true; } @@ -835,6 +841,18 @@ public class GT_RecipeAdder return true; } + @Override + public boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput, int aDuration, int aEUt) { + if ((aInputs == null) || (aOutput == null) || aInputs.length>6 || aInputs.length<1) { + return false; + } + if ((aDuration = GregTech_API.sRecipeFile.get("circuitassembler", aOutput, aDuration)) <= 0) { + return false; + } + GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, null, aDuration, aEUt, 0); + return true; + } + diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 73d3ec8c..bb11224f 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -21,7 +21,7 @@ import java.util.List; public class GT_IntegratedCircuit_Item extends GT_Generic_Item { private final static String aTextEmptyRow = " "; public GT_IntegratedCircuit_Item() { - super("integrated_circuit", "Integrated Circuit", ""); + super("integrated_circuit", "Programmed Circuit", ""); setHasSubtypes(true); setMaxDamage(0); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 44c875f0..143fa32b 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -616,31 +616,32 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addCraftingRecipe(ItemList.Sensor_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.EnderPearl), 'S', OrePrefixes.stick.get(Materials.Platinum), 'P', OrePrefixes.plate.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Elite)}); GT_ModHandler.addCraftingRecipe(ItemList.Sensor_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S', OrePrefixes.stick.get(Materials.Osmium), 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master)}); - ItemList.Circuit_Primitive.set(addItem(tLastID = 700, "NAND Chip", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)})); - ItemList.Circuit_Basic.set(addItem(tLastID = 701, "Basic Electronic Circuit", "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)})); - ItemList.Circuit_Good.set(addItem(tLastID = 702, "Good Electronic Circuit", "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good)})); - ItemList.Circuit_Advanced.set(addItem(tLastID = 703, "Advanced Circuit", "An advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced)})); - ItemList.Circuit_Data.set(addItem(tLastID = 704, "Data Storage Circuit", "A Data Storage Chip", new Object[]{OrePrefixes.circuit.get(Materials.Data)})); - ItemList.Circuit_Elite.set(addItem(tLastID = 705, "Data Control Circuit", "A Processor", new Object[]{OrePrefixes.circuit.get(Materials.Elite)})); - ItemList.Circuit_Master.set(addItem(tLastID = 706, "Energy Flow Circuit", "A High Voltage Processor", new Object[]{OrePrefixes.circuit.get(Materials.Master)})); + ItemList.Circuit_Primitive.set(addItem(tLastID = 700, "Vacuum Tube", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Parts_Vacuum_Tube.set(ItemList.Circuit_Primitive.get(1,new Object[0])); + ItemList.Circuit_Basic.set(addItem(tLastID = 701, "Integrated Logic Circuit", "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Good.set(addItem(tLastID = 702, "Good Electronic Circuit", "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Advanced.set(addItem(tLastID = 703, "Processor Assembly", "An advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Computer.set(ItemList.Circuit_Advanced.get(1,new Object[0])); + ItemList.Circuit_Data.set(addItem(tLastID = 704, "Workstation", "A extreme Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Elite.set(addItem(tLastID = 705, "Mainframe", "A elite Processor", new Object[]{OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Master.set(addItem(tLastID = 706, "Nanoprocessor Mainframe", "A master Processor", new Object[]{OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION})); ItemList.Tool_DataOrb.set(addItem(tLastID = 707, "Data Orb", "A High Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, new Behaviour_DataOrb()})); ItemList.Circuit_Ultimate.set(ItemList.Tool_DataOrb.get(1L, new Object[0])); GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataOrb.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataOrb.get(1L, new Object[0])}); ItemList.Tool_DataStick.set(addItem(tLastID = 708, "Data Stick", "A Low Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()})); GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataStick.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataStick.get(1L, new Object[0])}); - - - ItemList.Circuit_Board_Basic.set(addItem(tLastID = 710, "Basic Circuit Board", "A basic Board", new Object[0])); - ItemList.Circuit_Board_Advanced.set(addItem(tLastID = 711, "Advanced Circuit Board", "An advanced Board", new Object[0])); - ItemList.Circuit_Board_Elite.set(addItem(tLastID = 712, "Processor Board", "A Processor Board", new Object[0])); + + ItemList.Circuit_Board_Basic.set(addItem(tLastID = 710, "Coated Circuit Board", "A basic Board", new Object[0])); ItemList.Circuit_Board_Coated.set(ItemList.Circuit_Board_Basic.get(1,new Object[0])); + ItemList.Circuit_Board_Advanced.set(addItem(tLastID = 711, "Epoxy Circuit Board", "An advanced Board", new Object[0])); ItemList.Circuit_Board_Epoxy.set(ItemList.Circuit_Board_Advanced.get(1,new Object[0])); + ItemList.Circuit_Board_Elite.set(addItem(tLastID = 712, "Multilayer Fiberglass Circuit Board", "A elite Board", new Object[0])); ItemList.Circuit_Board_Multifiberglass.set(ItemList.Circuit_Board_Elite.get(1,new Object[0])); ItemList.Circuit_Parts_Crystal_Chip_Elite.set(addItem(tLastID = 713, "Engraved Crystal Chip", "Needed for Circuits", new Object[0])); ItemList.Circuit_Parts_Crystal_Chip_Master.set(addItem(tLastID = 714, "Engraved Lapotron Chip", "Needed for Circuits", new Object[0])); - ItemList.Circuit_Parts_Advanced.set(addItem(tLastID = 715, "Advanced Circuit Parts", "Advanced Circuit Parts", new Object[0])); - ItemList.Circuit_Parts_Wiring_Basic.set(addItem(tLastID = 716, "Etched Medium Voltage Wiring", "Part of Circuit Boards", new Object[0])); - ItemList.Circuit_Parts_Wiring_Advanced.set(addItem(tLastID = 717, "Etched High Voltage Wiring", "Part of Circuit Boards", new Object[0])); - ItemList.Circuit_Parts_Wiring_Elite.set(addItem(tLastID = 718, "Etched Extreme Voltage Wiring", "Part of Circuit Boards", new Object[0])); - ItemList.Empty_Board_Basic.set(addItem(tLastID = 719, "Empty Circuit Board", "A Board Part", new Object[0])); - ItemList.Empty_Board_Elite.set(addItem(tLastID = 720, "Empty Processor Board", "A Processor Board Part", new Object[0])); + ItemList.Circuit_Parts_Advanced.set(addItem(tLastID = 715, "Diode", "Basic Electronic Component", new Object[0])); ItemList.Circuit_Parts_Diode.set(ItemList.Circuit_Parts_Advanced.get(1,new Object[0])); + ItemList.Circuit_Parts_Wiring_Basic.set(addItem(tLastID = 716, "Resistor", "Basic Electronic Component", new Object[0])); ItemList.Circuit_Parts_Resistor.set(ItemList.Circuit_Parts_Wiring_Basic.get(1,new Object[0])); + ItemList.Circuit_Parts_Wiring_Advanced.set(addItem(tLastID = 717, "Transistor", "Basic Electronic Component", new Object[0])); ItemList.Circuit_Parts_Transistor.set(ItemList.Circuit_Parts_Wiring_Advanced.get(1,new Object[0])); + ItemList.Circuit_Parts_Wiring_Elite.set(addItem(tLastID = 718, "Capacitor", "Electronic Component", new Object[0])); ItemList.Circuit_Parts_Capacitor.set(ItemList.Circuit_Parts_Wiring_Elite.get(1,new Object[0])); + ItemList.Empty_Board_Basic.set(addItem(tLastID = 719, "Phenolic Circuit Board", "A good Board", new Object[0])); ItemList.Circuit_Board_Phenolic.set(ItemList.Empty_Board_Basic.get(1,new Object[0])); + ItemList.Empty_Board_Elite.set(addItem(tLastID = 720, "Fiberglass Circuit Board", "An advanced Board", new Object[0])); ItemList.Circuit_Board_Fiberglass.set(ItemList.Empty_Board_Elite.get(1,new Object[0])); ItemList.Component_Sawblade_Diamond.set(addItem(tLastID = 721, "Diamond Sawblade", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4L), OreDictNames.craftingDiamondBlade})); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index c1da435e..27c7f2b8 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -1,8 +1,20 @@ package gregtech.common.items; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; import gregtech.api.items.GT_MetaGenerated_Item_X32; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import ic2.core.IC2; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { @@ -11,6 +23,168 @@ public class GT_MetaGenerated_Item_03 public GT_MetaGenerated_Item_03() { super("metaitem.03", new OrePrefixes[]{OrePrefixes.crateGtDust, OrePrefixes.crateGtIngot, OrePrefixes.crateGtGem, OrePrefixes.crateGtPlate}); INSTANCE = this; + int tLastID = 0; + Object[] o = new Object[0]; + + /** + * circuit boards tier 1-7: + * coated circuit board / wood plate + resin + * phenolic circuit board /carton+glue+chemical bath + * epoxy circuit board /epoxy plate + copper foil + sulfuric acid + * fiberglass circuit board (simple + multilayer) / glass + plastic + electrum foil + sulfurci acid + * wetware lifesupport board / fiberglass CB + teflon + + */ +// ItemList.Circuit_Board_Coated.set(addItem(tLastID = 1, "Coated Circuit Board", "A basic Board", o)); +// ItemList.Circuit_Board_Phenolic.set(addItem(tLastID = 2, "Phenolic Circuit Board", "A good Board", o)); +// ItemList.Circuit_Board_Epoxy.set(addItem(tLastID = 3, "Epoxy Circuit Board", "An advanced Board", o)); +// ItemList.Circuit_Board_Fiberglass.set(addItem(tLastID = 4, "Fiberglass Circuit Board", "An advanced Board", o)); +// ItemList.Circuit_Board_Multifiberglass.set(addItem(tLastID = 5, "Multilayer Fiberglass Circuit Board", "A elite Board", o)); + ItemList.Circuit_Board_Wetware.set(addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); + + /** + * electronic components: + * vacuum tube (glass tube + red alloy cables) + * basic electronic circuits normal+smd + * coils + * diodes normal+smd + * transistors normal+smd + * capacitors normal+smd + */ +// ItemList.Circuit_Parts_Resistor.set(addItem(tLastID = 10, "Resistor", "Basic Electronic Component", o)); //wiring mv + ItemList.Circuit_Parts_ResistorSMD.set(addItem(tLastID = 11, "SMD Resistor", "Electronic Component", o)); + ItemList.Circuit_Parts_Glass_Tube.set(addItem(tLastID = 12, "Glass Tube", "", o)); +// ItemList.Circuit_Parts_Vacuum_Tube.set(addItem(tLastID = 13, "Vacuum Tube", "Basic Electronic Component", o)); //Circuit_Primitive + ItemList.Circuit_Parts_Coil.set(addItem(tLastID = 14, "Small Coil", "Basic Electronic Component", o)); +// ItemList.Circuit_Parts_Diode.set(addItem(tLastID = 15, "Diode", "Basic Electronic Component", o)); + ItemList.Circuit_Parts_DiodeSMD.set(addItem(tLastID = 16, "SMD Diode", "Electronic Component", o)); +// ItemList.Circuit_Parts_Transistor.set(addItem(tLastID = 17, "Transistor", "Basic Electronic Component", o)); //wiring hv + ItemList.Circuit_Parts_TransistorSMD.set(addItem(tLastID = 18, "SMD Transistor", "Electronic Component", o)); +// ItemList.Circuit_Parts_Capacitor.set(addItem(tLastID = 19, "Capacitor", "Electronic Component", o)); //wiring ev + ItemList.Circuit_Parts_CapacitorSMD.set(addItem(tLastID = 20, "SMD Capacitor", "Electronic Component", o)); + + + /** + * ICs + * Lenses made from perfect crystals first instead of plates + * Monocrystalline silicon ingot (normal+glowstone+naquadah) EBF, normal silicon no EBF need anymore + * wafer(normal+glowstone+naquadah) cut mono silicon ingot in cutting machine + * + * Integrated Logic Circuit(8bit DIP) + * RAM + * NAND Memory + * NOR Memory + * CPU (4 sizes) + * SoCs(2 sizes, high tier cheap low tech component) + * Power IC/High Power IC + * + * nanotube interconnected circuit (H-IC + nanotubes) + * + * quantum chips + */ + ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Ingot", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot2.set(addItem(tLastID = 31, "Glowstone doted Monocrystalline Silicon Ingot", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot3.set(addItem(tLastID = 32, "Naquadah doted Monocrystalline Silicon Ingot", "Raw Circuit", o)); + + ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Glowstone doted Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer3.set(addItem(tLastID = 35, "Naquadah doted Wafer", "Raw Circuit", o)); + + ItemList.Circuit_Wafer_ILC.set(addItem(tLastID = 36, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_ILC.set(addItem(tLastID = 37, "Integrated Logic Circuit", "Integrated Circuit", o)); + + ItemList.Circuit_Wafer_Ram.set(addItem(tLastID = 38, "Random Access Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_Ram.set(addItem(tLastID = 39, "Random Access Memory Chip", "Integrated Circuit", o)); + + ItemList.Circuit_Wafer_NAND.set(addItem(tLastID = 40, "NAND Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_NAND.set(addItem(tLastID = 41, "NAND Memory Chip", "Integrated Circuit", o)); + + ItemList.Circuit_Wafer_NOR.set(addItem(tLastID = 42, "NOR Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_NOR.set(addItem(tLastID = 43, "NOR Memory Chip", "Integrated Circuit", o)); + + ItemList.Circuit_Wafer_CPU.set(addItem(tLastID = 44, "Central Processing Unit (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_CPU.set(addItem(tLastID = 45, "Central Processing Unit", "Integrated Circuit", o)); + + ItemList.Circuit_Wafer_SoC.set(addItem(tLastID = 46, "SoC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_SoC.set(addItem(tLastID = 47, "SoC", "System on a Chip", o)); + + ItemList.Circuit_Wafer_SoC2.set(addItem(tLastID = 48, "ASoC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_SoC2.set(addItem(tLastID = 49, "ASoC", "Advanced System on a Chip", o)); + + ItemList.Circuit_Wafer_PIC.set(addItem(tLastID = 50, "PIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_PIC.set(addItem(tLastID = 51, "Power IC", "Power Circuit", o)); + + ItemList.Circuit_Wafer_HPIC.set(addItem(tLastID = 52, "HPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_HPIC.set(addItem(tLastID = 53, "High Power IC", "High Power Circuit", o)); + + ItemList.Circuit_Wafer_NanoCPU.set(addItem(tLastID = 54, "NanoCPU Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_NanoCPU.set(addItem(tLastID = 55, "Nanocomponent Central Processing Unit", "Power Circuit", o)); + + ItemList.Circuit_Wafer_QuantumCPU.set(addItem(tLastID = 56, "QBit Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_QuantumCPU.set(addItem(tLastID = 57, "QBit Processing Unit", "Quantum CPU", o)); + + /** + * Engraved Crystal Chip + * Engraved Lapotron Chip + * Crystal CPU + * SoCrystal + * stem cells (disassemble eggs) + */ + ItemList.Circuit_Parts_RawCrystalChip.set(addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o)); + ItemList.Circuit_Chip_CrystalCPU.set(addItem(tLastID = 70, "Crystal Processing Unit", "Crystal CPU", o)); //Crystal chip elite part + ItemList.Circuit_Chip_CrystalSoC.set(addItem(tLastID = 71, "Crystal SoC", "Crystal System on a Chip", o)); + ItemList.Circuit_Chip_NeuroCPU.set(addItem(tLastID = 72, "Neuro Processing Unit", "Neuro CPU", o)); + ItemList.Circuit_Chip_Stemcell.set(addItem(tLastID = 73, "Stemcells", "Raw Intiligence (Disassembled Eggs)", o)); + + //Vacuum Tube Item01 + //Basic Circuit IC2 + //Good Circuit Item01 + + //Integrated Logic Circuit Item01 + ItemList.Circuit_Integrated_Good.set(addItem(tLastID = 79, "Good Integrated Circuit", "Good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION})); + //Good Integrated Circuit Item01 + //Advanced Circuit IC2 + + ItemList.Circuit_Processor.set(addItem(tLastID = 80, "Integrated Processor", "Good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION})); +// ItemList.Circuit_Computer.set(addItem(tLastID = 81, "Processor Assembly", "Advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION})); + //Workstation/DataStick Item01 Datacircuit + //Mainframe Item01 DataProcessor + + ItemList.Circuit_Nanoprocessor.set(addItem(tLastID = 82, "Nanoprocessor", "Advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Nanocomputer.set(addItem(tLastID = 83, "Nanoprocessor Assembly", "Extreme Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Elitenanocomputer.set(addItem(tLastID = 84, "Elite Nanocomputer", "Elite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION})); + //Nanoprocessor Mainframe Item01 Energy Flow Circuit + + ItemList.Circuit_Quantumprocessor.set(addItem(tLastID = 85, "Quantumprocessor", "Extreme Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Quantumcomputer.set(addItem(tLastID = 86, "Quantumprocessor Assembly", "Elite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Masterquantumcomputer.set(addItem(tLastID = 87, "Master Quantumcomputer", "Master Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Quantummainframe.set(addItem(tLastID = 88, "Quantumprocessor Mainframe", "Ultimate Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION})); + + ItemList.Circuit_Crystalprocessor.set(addItem(tLastID = 89, "Crystalprocessor", "Elite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION})); + //Dataorb Dataorb + ItemList.Circuit_Crystalcomputer.set(addItem(tLastID = 90, "Crystalprocessor Assembly", "Ultimate Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Crystalmainframe.set(addItem(tLastID = 91, "Crystalprocessor Mainframe", "Super Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION})); + + ItemList.Circuit_Neuroprocessor.set(addItem(tLastID = 92, "Wetwareprocessor", "Master Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Wetwarecomputer.set(addItem(tLastID = 93, "Wetwareprocessor Assembly", "Ultimate Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Wetwaresupercomputer.set(addItem(tLastID = 94, "Wetware Supercomputer", "Super Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Wetwaremainframe.set(addItem(tLastID = 95, "Wetware Mainframe", "Infinite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION})); + +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Processor.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Computer.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Nanoprocessor.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Nanocomputer.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Elitenanocomputer.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Quantumprocessor.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Quantumcomputer.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Masterquantumcomputer.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Quantummainframe.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Crystalprocessor.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Crystalcomputer.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Crystalmainframe.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Neuroprocessor.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Wetwarecomputer.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Wetwaresupercomputer.get(1, o)); +// GT_OreDictUnificator.addToBlacklist(ItemList.Circuit_Wetwaremainframe.get(1, o)); } public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java index de3dcbb4..13796543 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java @@ -126,11 +126,11 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba private void prospectOils(HashMap aOils) { - int tLeftXBound = GT_Utility.getScaleСoordinates(this.getBaseMetaTileEntity().getXCoord() - radius, 16); - int tRightXBound = GT_Utility.getScaleСoordinates(this.getBaseMetaTileEntity().getXCoord() + radius, 16); + int tLeftXBound = GT_Utility.getScaleCoordinates(this.getBaseMetaTileEntity().getXCoord() - radius, 16); + int tRightXBound = GT_Utility.getScaleCoordinates(this.getBaseMetaTileEntity().getXCoord() + radius, 16); - int tLeftZBound = GT_Utility.getScaleСoordinates(this.getBaseMetaTileEntity().getZCoord() - radius, 16); - int tRightZBound = GT_Utility.getScaleСoordinates(this.getBaseMetaTileEntity().getZCoord() + radius, 16); + int tLeftZBound = GT_Utility.getScaleCoordinates(this.getBaseMetaTileEntity().getZCoord() - radius, 16); + int tRightZBound = GT_Utility.getScaleCoordinates(this.getBaseMetaTileEntity().getZCoord() + radius, 16); HashMap tFluids = new HashMap(); @@ -138,7 +138,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba for (int x = tLeftXBound; x <= tRightXBound; ++x) for (int z = tLeftZBound; z <= tRightZBound; ++z) { - ChunkPosition tPos = new ChunkPosition(GT_Utility.getScaleСoordinates(x*16,96), 0, GT_Utility.getScaleСoordinates(z*16,96)); + ChunkPosition tPos = new ChunkPosition(GT_Utility.getScaleCoordinates(x*16,96), 0, GT_Utility.getScaleCoordinates(z*16,96)); FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), x*16, z*16); if (tFluid != null) if (tFluids.containsKey(tPos)) diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java index 9c35e87e..a63a2498 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java @@ -1,5 +1,6 @@ package gregtech.common.tileentities.machines.basic; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -7,6 +8,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -26,6 +28,16 @@ public class GT_MetaTileEntity_Disassembler public int checkRecipe() { if ((getInputAt(0) != null) && (isOutputEmpty())) { + if(GT_Utility.areStacksEqual(getInputAt(0), new ItemStack(Items.egg))){ + getInputAt(0).stackSize -= 1; + this.mEUt = (16 * (1 << this.mTier - 1) * (1 << this.mTier - 1)); + this.mMaxProgresstime = 2400; + this.mMaxProgresstime = this.mMaxProgresstime >> (mTier); + if (getBaseMetaTileEntity().getRandomNumber(100) < (this.mTier+1)) { + this.mOutputItems[0] = ItemList.Circuit_Chip_Stemcell.get(1, new Object[0]); + } + return 2; + } NBTTagCompound tNBT = getInputAt(0).getTagCompound(); if (tNBT != null) { tNBT = tNBT.getCompoundTag("GT.CraftingComponents"); @@ -55,6 +67,6 @@ public class GT_MetaTileEntity_Disassembler } public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (aStack.getTagCompound() != null) && (aStack.getTagCompound().getCompoundTag("GT.CraftingComponents") != null); + return (aIndex == 4 && GT_Utility.areStacksEqual(aStack, new ItemStack(Items.egg))) || (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (aStack.getTagCompound() != null) && (aStack.getTagCompound().getCompoundTag("GT.CraftingComponents") != null); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java index 35ea5cdb..0ba05cab 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java @@ -11,6 +11,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; @@ -52,7 +53,7 @@ return new String[]{ } public boolean checkRecipe(ItemStack aStack) { - this.mEfficiencyIncrease = 1; + this.mEfficiencyIncrease = 100; this.mMaxProgresstime = 100; this.mEUt = 4; return true; @@ -122,7 +123,20 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a } } } - if(mMaintenanceHatches.size()!=1||mEnergyHatches.size()!=1||mDoorCount!=2&&mHullCount<=10){return false;} + if(mMaintenanceHatches.size()!=1||mEnergyHatches.size()!=1||mDoorCount!=2||mHullCount>10){return false;} + for(int dX=-x+1;dX=y+1;dY--){ + IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(dX, dY, dZ); + if(tTileEntity!=null){ + IMetaTileEntity aMetaTileEntity = tTileEntity.getMetaTileEntity(); + if (aMetaTileEntity != null && aMetaTileEntity instanceof GT_MetaTileEntity_BasicMachine_GT_Recipe){ + ((GT_MetaTileEntity_BasicMachine_GT_Recipe)aMetaTileEntity).mCleanroom = this; + } + } + } + } + } return true; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index fa1ca07b..5d55f759 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -1,10 +1,12 @@ package gregtech.loaders.oreprocessing; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.item.ItemStack; public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -13,27 +15,32 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi } public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + if(gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack)&&aModName.equals("gregtech"))return; switch (aMaterial.mName) { case "Good": - case "Advanced": case "Data": case "Elite": case "Master": case "Ultimate": - if (!gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack)) + if (!gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack)&&!aModName.equals("gregtech")) GT_ModHandler.removeRecipeByOutput(aStack); break; case "Primitive": GT_ModHandler.removeRecipeByOutput(aStack); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Circuit_Primitive.get(1L, new Object[0]), new Object[]{GT_ModHandler.getIC2Item("casingadviron", 1L), OrePrefixes.wireGt01.get(Materials.RedAlloy), OrePrefixes.wireGt01.get(Materials.RedAlloy), OrePrefixes.wireGt01.get(Materials.Tin)}); - break; + break; case "Basic": GT_ModHandler.removeRecipeByOutput(aStack); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Basic.get(1L, new Object[0]), new Object[]{"WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Basic.get(1L, new Object[0]), new Object[]{"WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Basic.get(1L, new Object[0]), new Object[]{"WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Basic.get(1L, new Object[0]), new Object[]{"WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(aStack, new Object[]{"RIR","VBV","CCC",'R',ItemList.Circuit_Parts_Resistor.get(1,new Object[0]),'C',GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1),'V', ItemList.Circuit_Parts_Vacuum_Tube.get(1,new Object[0]),'B',ItemList.Circuit_Board_Coated.get(1,new Object[0]),'I',ItemList.IC2_Item_Casing_Steel.get(1,new Object[0])}); GT_ModHandler.addShapelessCraftingRecipe(ItemList.Circuit_Basic.get(1L, new Object[0]), new Object[]{ItemList.Circuit_Integrated.getWildcard(1L, new Object[0])}); + break; + case "Advanced": + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_Transistor.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.SolderingAlloy.getMolten(72), aStack, 800, 28); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_TransistorSMD.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.SolderingAlloy.getMolten(72), aStack, 800, 28); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_Transistor.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.Tin.getMolten(144), aStack, 800, 28); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_TransistorSMD.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.Tin.getMolten(144), aStack, 800, 28); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_Transistor.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.Lead.getMolten(288), aStack, 800, 28); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_TransistorSMD.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.Lead.getMolten(288), aStack, 800, 28); + break; } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 939d45d2..8487f103 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -26,28 +26,36 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg case "craftingLensBlue": GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe(ItemList.IC2_LapotronCrystal.getWildcard(1L, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]), 256, 480); + GT_Values.RA.addLaserEngraverRecipe(ItemList.IC2_LapotronCrystal.getWildcard(1L, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]), 256, 480,true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_PIC.get(1, new Object[0]), 500, 480,false); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_PIC.get(4, new Object[0]), 200, 1920,true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Chip_CrystalCPU.get(1L, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Chip_CrystalSoC.get(1, new Object[0]), 100, 40000,true); break; case "craftingLensYellow": GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), 2000, 1920); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_SoC.get(1, new Object[0]), 200, 1920,true); break; + case "craftingLensOrange": + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_SoC2.get(1, new Object[0]), 200, 1920,true); + + break; case "craftingLensCyan": GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), 2000, 1920); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_Ram.get(1, new Object[0]), 900, 120,false); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_Ram.get(4, new Object[0]), 500, 480,true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_Ram.get(8, new Object[0]), 200, 1920,true); + break; case "craftingLensRed": GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), 50, 120); - - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Wiring_Basic.get(1L, new Object[0]), 64, 30); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.AnnealedCopper, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Wiring_Basic.get(1L, new Object[0]), 64, 30); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]), 64, 120); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]), 64, 120); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Wiring_Elite.get(1L, new Object[0]), 64, 480); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_ILC.get(1, new Object[0]), 900, 120,false); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_ILC.get(4, new Object[0]), 500, 480,true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_ILC.get(8, new Object[0]), 200, 1920,true); break; case "craftingLensGreen": - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Olivine, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), 256, 480); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Emerald, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), 256, 480); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Chip_CrystalCPU.get(1, new Object[0]), 100, 10000,true); break; case "craftingLensWhite": GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19), 2000, 1920); @@ -57,6 +65,9 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe(new ItemStack(Blocks.stone, 1, 0), GT_Utility.copyAmount(0L, new Object[]{aStack}), new ItemStack(Blocks.stonebrick, 1, 3), 50, 16); GT_Values.RA.addLaserEngraverRecipe(new ItemStack(Blocks.quartz_block, 1, 0), GT_Utility.copyAmount(0L, new Object[]{aStack}), new ItemStack(Blocks.quartz_block, 1, 1), 50, 16); GT_Values.RA.addLaserEngraverRecipe(GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartz", 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1L), 50, 16); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_CPU.get(1, new Object[0]), 900, 120,true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_CPU.get(4, new Object[0]), 500, 480,true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_CPU.get(8, new Object[0]), 200, 1920,true); break; } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 682d09bb..df2e6ccb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -88,7 +88,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra if (aFuelPower) GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, aMaterial.mFuelPower * 8, aMaterial.mFuelType); if (!aNoWorking) { - GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 3L), GT_OreDictUnificator.getDust(aMaterial, aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount * 3L), (int) Math.max(aMaterialMass * 10L, 1L), 16); +// GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 3L), GT_OreDictUnificator.getDust(aMaterial, aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount * 3L), (int) Math.max(aMaterialMass * 10L, 1L), 16); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), GT_Proxy.tBits, new Object[]{"X", "m", Character.valueOf('X'), OrePrefixes.gemExquisite.get(aMaterial)}); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index f6dea49e..d6db04fe 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -16,7 +16,8 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr } public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_Values.RA.addLatheRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), (int) Math.max(aMaterial.getMass() / 2L, 1L), 16); + GT_Values.RA.addLatheRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), (int) Math.max(aMaterial.getMass() / 2L, 1L), 480); + GT_Values.RA.addLatheRecipe(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), (int) Math.max(aMaterial.getMass() , 1L), 24); GregTech_API.registerCover(aStack, new GT_MultiTexture(new gregtech.api.interfaces.ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[2][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false)}), new gregtech.common.covers.GT_Cover_Lens(aMaterial.mColor.mIndex)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 317c9ebf..2e00133a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -86,6 +86,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, aMaterial.mFuelPower, aMaterial.mFuelType); GT_Utility.removeSimpleIC2MachineRecipe(GT_Utility.copyAmount(9L, new Object[]{aStack}), GT_ModHandler.getCompressorRecipeList(), GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)); GT_Values.RA.addImplosionRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), 2, GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), GT_Proxy.tBits, new Object[]{"hX", 'X', OrePrefixes.plate.get(aMaterial)}); + if (aMaterial == Materials.Paper) GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(GregTech_API.sRecipeFile.get(gregtech.api.enums.ConfigCategories.Recipes.harderrecipes, aStack, true) ? 2L : 3L, new Object[]{aStack}), new Object[]{"XXX", 'X', new ItemStack(net.minecraft.init.Items.reeds, 1, 32767)}); diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 6fa9a345..66d870cc 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -403,7 +403,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"NPT", "CCC", "HPT", 'H', OrePrefixes.cell.get(Materials.Helium), 'N', OrePrefixes.cell.get(Materials.Nitrogen), 'T', OrePrefixes.pipeTiny.get(Materials.TungstenSteel), 'P', ItemList.Electric_Pump_LV, 'C', OrePrefixes.wireGt01.get(Materials.NiobiumTitanium)}); GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"NPT", "CCC", "HPT", 'H', OrePrefixes.cell.get(Materials.Helium), 'N', OrePrefixes.cell.get(Materials.Nitrogen), 'T', OrePrefixes.pipeTiny.get(Materials.TungstenSteel), 'P', ItemList.Electric_Pump_LV, 'C', OrePrefixes.wireGt01.get(Materials.VanadiumGallium)}); GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"NPT", "CCC", "NPT", 'N', OrePrefixes.cell.get(Materials.Nitrogen), 'T', OrePrefixes.pipeTiny.get(Materials.TungstenSteel), 'P', ItemList.Electric_Pump_LV, 'C', OrePrefixes.wireGt01.get(Materials.YttriumBariumCuprate)}); - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"NPT", "CCC", "NPT", 'N', OrePrefixes.cell.get(Materials.Nitrogen), 'T', OrePrefixes.pipeTiny.get(Materials.TungstenSteel), 'P', ItemList.Electric_Pump_LV, 'C', OrePrefixes.wireGt01.get(Materials.HSSG)}); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"NPT", "CCC", "NPT", 'N', OrePrefixes.cell.get(Materials.Nitrogen), 'T', OrePrefixes.pipeTiny.get(Materials.TungstenSteel), 'P', ItemList.Electric_Pump_LV, 'C', OrePrefixes.wireGt01.get(Materials.Naquadah)}); GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{OrePrefixes.stick.get(Materials.AnyIron), OrePrefixes.dust.get(Materials.Redstone), OrePrefixes.dust.get(Materials.Redstone), OrePrefixes.dust.get(Materials.Redstone), OrePrefixes.dust.get(Materials.Redstone)}); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 33f99d52..f80c4659 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -8,8 +8,10 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.*; import gregtech.common.GT_DummyWorld; import gregtech.common.items.GT_MetaGenerated_Item_03; +import ic2.api.item.IC2Items; import ic2.api.recipe.ILiquidHeatExchangerManager.HeatExchangeProperty; import ic2.api.recipe.Recipes; +import ic2.core.Ic2Items; import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; import mods.railcraft.common.items.RailcraftToolItems; import net.minecraft.init.Blocks; @@ -411,10 +413,109 @@ if(Loader.isModLoaded("Railcraft")){ GT_Values.RA.addSlicerRecipe(ItemList.Food_Baked_Bun.get(1L, new Object[0]), ItemList.Shape_Slicer_Flat.get(0L, new Object[0]), ItemList.Food_Sliced_Bun.get(2L, new Object[0]), 128, 4); GT_Values.RA.addSlicerRecipe(ItemList.Food_Baked_Bread.get(1L, new Object[0]), ItemList.Shape_Slicer_Flat.get(0L, new Object[0]), ItemList.Food_Sliced_Bread.get(2L, new Object[0]), 128, 4); GT_Values.RA.addSlicerRecipe(ItemList.Food_Baked_Baguette.get(1L, new Object[0]), ItemList.Shape_Slicer_Flat.get(0L, new Object[0]), ItemList.Food_Sliced_Baguette.get(2L, new Object[0]), 128, 4); +//Circuit Recipes!!! + Object[] o = new Object[0]; + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Coated.get(3, o), new Object[]{" R ","PPP"," R ",'P',GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1),'R',ItemList.IC2_Resin.get(1, o)}); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Phenolic.get(8, o), new Object[]{"PRP","PPP","PPP",'P',GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1),'R',GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1)}); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Epoxid, 1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, 1), Materials.SulfuricAcid.getFluid(125), null, ItemList.Circuit_Board_Epoxy.get(1, o), 500, 10); + GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1), Materials.Electrum.getMolten(16), null, ItemList.Circuit_Board_Fiberglass.get(16, o), null, 80, 48, 2600); + GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Board_Fiberglass.get(1, o), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 16), Materials.SulfuricAcid.getFluid(250), null, ItemList.Circuit_Board_Multifiberglass.get(1, o), 100, 480); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Wetware.get(1, o), new Object[]{"DLD","PBP","TPT",'T',GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1),'L',ItemList.Electric_Pump_LV.get(1,o),'P',GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silicone, 1),'D',ItemList.Bottle_Dragon_Blood.get(1, o),'B',ItemList.Circuit_Board_Multifiberglass.get(1, o)}); + + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Resistor.get(3, o), new Object[]{" P ","FCF"," P ",'P',new ItemStack(Items.paper),'F',OrePrefixes.wireGt01.get(Materials.Copper),'C',OrePrefixes.dust.get(Materials.Coal)}); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Resistor.get(3, o), new Object[]{" P ","FCF"," P ",'P',new ItemStack(Items.paper),'F',OrePrefixes.wireFine.get(Materials.Copper),'C',OrePrefixes.dust.get(Materials.Coal)}); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4), ItemList.Circuit_Parts_Resistor.get(12, o), 160, 6); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 4),Materials.Plastic.getMolten(144), ItemList.Circuit_Parts_ResistorSMD.get(24, o), 80, 96); + GT_Values.RA.addAlloySmelterRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1), ItemList.Shape_Mold_Ball.get(0, o), ItemList.Circuit_Parts_Glass_Tube.get(1,o), 240, 8); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Vacuum_Tube.get(1, o), new Object[]{"PGP","FFF",'G',ItemList.Circuit_Parts_Glass_Tube,'P',new ItemStack(Items.paper),'F',OrePrefixes.wireFine.get(Materials.Copper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Vacuum_Tube.get(1, o), new Object[]{"PGP","FFF",'G',ItemList.Circuit_Parts_Glass_Tube,'P',new ItemStack(Items.paper),'F',OrePrefixes.wireGt01.get(Materials.Copper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Diode.get(1,o), new Object[]{"BG ","WDW","BG ",'B',OrePrefixes.dye.get(Materials.Black),'G',new ItemStack(Blocks.glass_pane),'D',OrePrefixes.dust.get(Materials.Gallium),'W',OrePrefixes.wireGt01.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Diode.get(1,o), new Object[]{"BG ","WDW","BG ",'B',OrePrefixes.dye.get(Materials.Black),'G',new ItemStack(Blocks.glass_pane),'D',OrePrefixes.dust.get(Materials.Gallium),'W',OrePrefixes.wireFine.get(Materials.Tin)}); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 4), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), Materials.Glass.getMolten(288), ItemList.Circuit_Parts_Diode.get(16, o), 400, 48); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 4), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), Materials.Glass.getMolten(288), ItemList.Circuit_Parts_DiodeSMD.get(32, o), 400, 192); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Coil.get(1,o), new Object[]{"WWW","WDW","WWW",'G',new ItemStack(Blocks.glass_pane),'D',ItemList.IC2_Item_Casing_Steel.get(1,o),'W',OrePrefixes.wireFine.get(Materials.Copper)}); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tin, 6),Materials.Plastic.getMolten(144), ItemList.Circuit_Parts_Transistor.get(8, o), 80, 24); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gallium, 1), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 6),Materials.Plastic.getMolten(288), ItemList.Circuit_Parts_TransistorSMD.get(32, o), 80, 96); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Plastic, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1), ItemList.Circuit_Parts_Capacitor.get(2, o), 80, 96); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1),Materials.Plastic.getMolten(72), ItemList.Circuit_Parts_CapacitorSMD.get(4, o), 100, 480); + + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1, new Object[0]), GT_Utility.copyAmount(0,GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)), ItemList.Circuit_Wafer_NAND.get(1, new Object[0]), 500, 480, true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0,GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)), ItemList.Circuit_Wafer_NAND.get(4, new Object[0]), 200, 1920, true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1, new Object[0]), GT_Utility.copyAmount(0,GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderEye, 1)), ItemList.Circuit_Wafer_NOR.get(1, new Object[0]), 500, 480, true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0,GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderEye, 1)), ItemList.Circuit_Wafer_NOR.get(4, new Object[0]), 200, 1920, true); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_ILC.get(1, o), ItemList.Circuit_Chip_ILC.get(8,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_Ram.get(1, o), ItemList.Circuit_Chip_Ram.get(32,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_NAND.get(1, o), ItemList.Circuit_Chip_NAND.get(32,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_NOR.get(1, o), ItemList.Circuit_Chip_NOR.get(16,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_CPU.get(1, o), ItemList.Circuit_Chip_CPU.get(8,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_SoC.get(1, o), ItemList.Circuit_Chip_SoC.get(6,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_SoC2.get(1, o), ItemList.Circuit_Chip_SoC2.get(6,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_PIC.get(1, o), ItemList.Circuit_Chip_PIC.get(4,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_HPIC.get(1, o), ItemList.Circuit_Chip_HPIC.get(2,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_NanoCPU.get(1, o), ItemList.Circuit_Chip_NanoCPU.get(7,o), null, 600, 48); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Wafer_QuantumCPU.get(1, o), ItemList.Circuit_Chip_QuantumCPU.get(5,o), null, 600, 48); + GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Wafer_PIC.get(1, o), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 2), Materials.RedstoneAlloy.getMolten(288), null, ItemList.Circuit_Wafer_HPIC.get(1, o), 1200, 1920); + GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Wafer_CPU.get(1, o), GT_Utility.copyAmount(16, ic2.core.Ic2Items.carbonFiber), Materials.Glowstone.getMolten(576), null, ItemList.Circuit_Wafer_NanoCPU.get(1, o), 400, 1920); + GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Wafer_NanoCPU.get(1, o), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1), Materials.NaquadahAlloy.getMolten(288), null, ItemList.Circuit_Wafer_QuantumCPU.get(1, o), 600, 1920); + GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Wafer_NanoCPU.get(1, o), ItemList.QuantumEye.get(1, o), Materials.Europium.getMolten(288), null, ItemList.Circuit_Wafer_QuantumCPU.get(1, o), 400, 1920); + + GT_Values.RA.addAutoclaveRecipe(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Emerald, 1), Materials.Europium.getMolten(16), ItemList.Circuit_Parts_RawCrystalChip.get(1,o), 1000, 12000, 320, true); + GT_Values.RA.addAutoclaveRecipe(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Olivine, 1), Materials.Europium.getMolten(16), ItemList.Circuit_Parts_RawCrystalChip.get(1,o), 1000, 12000, 320, true); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Circuit_Parts_RawCrystalChip.get(9,o), new Object[]{ItemList.Circuit_Chip_CrystalCPU.get(1,o)}); + GT_Values.RA.addBlastRecipe(ItemList.Circuit_Parts_RawCrystalChip.get(1,o), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Emerald, 1), Materials.Helium.getGas(1000), null, ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1,o), null, 900, 480, 5000); + GT_Values.RA.addBlastRecipe(ItemList.Circuit_Parts_RawCrystalChip.get(1,o), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Olivine, 1), Materials.Helium.getGas(1000), null, ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1,o), null, 900, 480, 5000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Circuit_Crystalmainframe.get(1,o), 72000, new ItemStack[]{ + ItemList.Circuit_Board_Wetware.get(1,o), + ItemList.Circuit_Chip_Stemcell.get(8,o), + ItemList.Circuit_Parts_Glass_Tube.get(8,o), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Plastic, 4), + ItemList.IC2_Item_Casing_Gold.get(8,o), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 64), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), + }, new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("ic2biomass"), 250), + Materials.UUMatter.getFluid(100), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000), + }, ItemList.Circuit_Chip_NeuroCPU.get(1,o), 200, 80000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Circuit_Wetwaresupercomputer.get(1,o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 4), + ItemList.Circuit_Wetwaresupercomputer.get(8,o), + ItemList.Circuit_Parts_Coil.get(4,o), + ItemList.Circuit_Parts_CapacitorSMD.get(24,o), + ItemList.Circuit_Parts_ResistorSMD.get(64,o), + ItemList.Circuit_Parts_TransistorSMD.get(32,o), + ItemList.Circuit_Parts_DiodeSMD.get(16,o), + ItemList.Circuit_Chip_Ram.get(16,o),GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 64) + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000), + }, ItemList.Circuit_Wetwaremainframe.get(1,o), 2000, 300000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1,o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), + ItemList.Field_Generator_UV.get(2,o), + ItemList.Circuit_Wafer_HPIC.get(64,o), + ItemList.Circuit_Wafer_HPIC.get(64,o), + ItemList.Circuit_Parts_DiodeSMD.get(16,o), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), + }, ItemList.ZPM2.get(1,o), 2000, 300000); + + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), GT_Values.NF, ItemList.ZPM2.get(1L, new Object[0]), 32768, 4096); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1L), ItemList.Empty_Board_Basic.get(1, new Object[0]), 32, 16); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), ItemList.Empty_Board_Elite.get(1, new Object[0]), 32, 256); - + + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Good.get(1,o), new Object[]{"IVC","VDV","CVI",'D',ItemList.Circuit_Parts_Diode.get(1,o),'C',GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1),'V', Ic2Items.electronicCircuit ,'I',ItemList.IC2_Item_Casing_Steel.get(1,o)}); + GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), 100, 120); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), 100, 120); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 2), 200, 120); @@ -427,26 +528,56 @@ if(Loader.isModLoaded("Railcraft")){ GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 0L, 14), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 1L, 17), 200, 16); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 0L, 15), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 1L, 18), 200, 16); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 0L, 19), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 1L, 20), 200, 16); - GT_Values.RA.addFormingPressRecipe(ItemList.Empty_Board_Basic.get(1, new Object[0]), ItemList.Circuit_Parts_Wiring_Basic.get(4L, new Object[0]), ItemList.Circuit_Board_Basic.get(1L, new Object[0]), 32, 16); - GT_Values.RA.addFormingPressRecipe(ItemList.Empty_Board_Basic.get(1, new Object[0]), ItemList.Circuit_Parts_Wiring_Advanced.get(4L, new Object[0]), ItemList.Circuit_Board_Advanced.get(1L, new Object[0]), 32, 64); - GT_Values.RA.addFormingPressRecipe(ItemList.Empty_Board_Elite.get(1, new Object[0]), ItemList.Circuit_Parts_Wiring_Elite.get(4L, new Object[0]), ItemList.Circuit_Board_Elite.get(1L, new Object[0]), 32, 256); - GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), ItemList.Circuit_Parts_Advanced.get(2L, new Object[0]), 32, 64); - GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), ItemList.Circuit_Parts_Advanced.get(2L, new Object[0]), 32, 64); + GT_Values.RA.addFormingPressRecipe(ItemList.Food_Dough_Sugar.get(4L, new Object[0]), ItemList.Shape_Mold_Cylinder.get(0L, new Object[0]), ItemList.Food_Raw_Cake.get(1L, new Object[0]), 384, 4); GT_Values.RA.addFormingPressRecipe(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L, new Object[0]), ItemList.Arrow_Head_Glass_Emtpy.get(1L, new Object[0]), 64, 4); for (Materials tMat : Materials.values()) { if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) { int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; - - GT_Values.RA.addAssemblerRecipe(ItemList.IC2_Item_Casing_Steel.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 2L), tMat.getMolten(144L * tMultiplier / 8L), ItemList.Circuit_Primitive.get(1L, new Object[0]), 16, 8); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L), tMat.getMolten(144L * tMultiplier / 8L), ItemList.Circuit_Primitive.get(1L, new Object[0]), 16, 8); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Board_Basic.get(1L, new Object[0]), ItemList.Circuit_Primitive.get(2L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), ItemList.Circuit_Basic.get(1L, new Object[0]), 32, 16); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Basic.get(1L, new Object[0]), ItemList.Circuit_Primitive.get(2L, new Object[0]), tMat.getMolten(144L * tMultiplier / 4L), ItemList.Circuit_Good.get(1L, new Object[0]), 32, 16); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Board_Advanced.get(1L, new Object[0]), ItemList.Circuit_Parts_Advanced.get(2L, new Object[0]), tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Advanced.get(1L, new Object[0]), 32, 64); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Board_Advanced.get(1L, new Object[0]), ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Data.get(1L, new Object[0]), 32, 64); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Board_Elite.get(1L, new Object[0]), ItemList.Circuit_Data.get(3L, new Object[0]), tMat.getMolten(144L * tMultiplier / 1L), ItemList.Circuit_Elite.get(1L, new Object[0]), 32, 256); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Board_Elite.get(1L, new Object[0]), ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]), tMat.getMolten(144L * tMultiplier / 1L), ItemList.Circuit_Master.get(1L, new Object[0]), 32, 256); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Data.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 2L), tMat.getMolten(144L * tMultiplier / 2L), ItemList.Tool_DataStick.get(1L, new Object[0]), 128, 64); + //Circuit soldering + //Integraded Circuits + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(1,o),ItemList.Circuit_Parts_Resistor.get(2,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Basic.get(1,o), 200, 8); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(1,o),ItemList.Circuit_Parts_ResistorSMD.get(2,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Basic.get(1,o), 200, 8); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(3,o),ItemList.Circuit_Parts_Resistor.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 8)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Integrated_Good.get(1,o), 400, 16); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(3,o),ItemList.Circuit_Parts_ResistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 8)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Integrated_Good.get(1,o), 400, 16); + //Highly Integrated Circuits + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Chip_CPU.get(1,o),ItemList.Circuit_Parts_Resistor.get(4,o),ItemList.Circuit_Parts_Capacitor.get(4,o),ItemList.Circuit_Parts_Transistor.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.RedAlloy, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Processor.get(1,o), 200, 140); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Processor.get(3,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_Capacitor.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.RedAlloy, 12)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Computer.get(1,o), 400, 160); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Chip_CPU.get(1,o),ItemList.Circuit_Chip_NAND.get(32,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.RedAlloy, 8),GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 4)},tMat.getMolten(144L * tMultiplier), ItemList.Tool_DataStick.get(1,o), 400, 160); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),ItemList.Circuit_Computer.get(8,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_Capacitor.get(24,o),ItemList.Circuit_Chip_Ram.get(16,o),GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 12)},tMat.getMolten(144L * tMultiplier*2), ItemList.Circuit_Elite.get(1,o), 1600, 480); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Chip_CPU.get(1,o),ItemList.Circuit_Parts_ResistorSMD.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Parts_TransistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.RedAlloy, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Processor.get(1,o), 200, 140); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Processor.get(3,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.RedAlloy, 12)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Computer.get(1,o), 400, 160); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),ItemList.Circuit_Computer.get(8,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(24,o),ItemList.Circuit_Chip_Ram.get(16,o),GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 12)},tMat.getMolten(144L * tMultiplier*2), ItemList.Circuit_Elite.get(1,o), 1600, 480); + //Nanotech Circuits + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Fiberglass.get(1,o),ItemList.Circuit_Chip_NanoCPU.get(1,o),ItemList.Circuit_Parts_ResistorSMD.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Parts_TransistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 2)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Nanoprocessor.get(1,o), 200, 600); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Fiberglass.get(1,o),ItemList.Circuit_Nanoprocessor.get(3,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 6)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Nanocomputer.get(1,o), 400, 600); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Fiberglass.get(2,o),ItemList.Circuit_Nanocomputer.get(2,o),ItemList.Circuit_Parts_DiodeSMD.get(4,o),ItemList.Circuit_Chip_NOR.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 6)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Elitenanocomputer.get(1,o), 400, 600); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),ItemList.Circuit_Elitenanocomputer.get(8,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(24,o),ItemList.Circuit_Chip_Ram.get(16,o),GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 12)},tMat.getMolten(144L * tMultiplier*2), ItemList.Circuit_Master.get(1,o), 1600, 1920); + //Quantum Circuits + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(1,o),ItemList.Circuit_Chip_QuantumCPU.get(1,o),ItemList.Circuit_Chip_NanoCPU.get(1,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Parts_TransistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 2)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Quantumprocessor.get(1,o), 200, 2400); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(1,o),ItemList.Circuit_Quantumprocessor.get(3,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 6)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Quantumcomputer.get(1,o), 400, 2400); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(2,o),ItemList.Circuit_Quantumcomputer.get(2,o),ItemList.Circuit_Parts_DiodeSMD.get(4,o),ItemList.Circuit_Chip_NOR.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 6)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Masterquantumcomputer.get(1,o), 400, 2400); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),ItemList.Circuit_Masterquantumcomputer.get(8,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(24,o),ItemList.Circuit_Chip_Ram.get(16,o),GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 12)},tMat.getMolten(144L * tMultiplier*2), ItemList.Circuit_Quantummainframe.get(1,o), 1600, 7680); + //Crystallized Circuits + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(1,o),ItemList.Circuit_Chip_CrystalCPU.get(1,o),ItemList.Circuit_Chip_NanoCPU.get(1,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Parts_TransistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 2)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Crystalprocessor.get(1,o), 200, 9600); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(1,o),ItemList.Circuit_Crystalprocessor.get(3,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 6)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Crystalcomputer.get(1,o), 400, 9600); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(1,o),ItemList.Circuit_Crystalprocessor.get(1,o),ItemList.Circuit_Chip_Ram.get(4,o),ItemList.Circuit_Chip_NOR.get(32,o),ItemList.Circuit_Chip_NAND.get(64,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 32)},tMat.getMolten(144L * tMultiplier), ItemList.Tool_DataOrb.get(1,o), 400, 9600); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),ItemList.Circuit_Crystalcomputer.get(16,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(24,o),ItemList.Circuit_Chip_Ram.get(16,o),GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 12)},tMat.getMolten(144L * tMultiplier*2), ItemList.Circuit_Crystalmainframe.get(1,o), 1600, 30720); + //Wetware Circuits + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Wetware.get(1,o),ItemList.Circuit_Chip_NeuroCPU.get(1,o),ItemList.Circuit_Chip_CrystalCPU.get(1,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Parts_TransistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.YttriumBariumCuprate, 2)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Neuroprocessor.get(1,o), 200, 38400); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Wetware.get(1,o),ItemList.Circuit_Neuroprocessor.get(3,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_CapacitorSMD.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.YttriumBariumCuprate, 6)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Wetwarecomputer.get(1,o), 400, 38400); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Wetware.get(2,o),ItemList.Circuit_Wetwarecomputer.get(2,o),ItemList.Circuit_Parts_DiodeSMD.get(4,o),ItemList.Circuit_Chip_NOR.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.YttriumBariumCuprate, 6)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Wetwaresupercomputer.get(1,o), 400, 38400); + + //SoC + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Chip_SoC.get(1,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.RedAlloy, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Basic.get(1,o), 50, 600); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Chip_SoC.get(1,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Processor.get(1,o), 50, 2400); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Fiberglass.get(1,o),ItemList.Circuit_Chip_SoC2.get(1,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Nanoprocessor.get(1,o), 50, 9600); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Fiberglass.get(1,o),ItemList.Circuit_Chip_SoC2.get(1,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Quantumprocessor.get(1,o), 50, 38400); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(1,o),ItemList.Circuit_Chip_CrystalSoC.get(1,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.YttriumBariumCuprate, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Crystalprocessor.get(1,o), 50, 153600); + + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(1,o),ItemList.Circuit_Chip_PIC.get(4,o), ItemList.Circuit_Parts_Crystal_Chip_Master.get(18L,o),ItemList.Circuit_Chip_NanoCPU.get(1,o), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 16)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Basic.get(1,o), 512, 1024); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Multifiberglass.get(1,o),ItemList.Circuit_Chip_HPIC.get(4,o), ItemList.Energy_LapotronicOrb.get(8L,o),ItemList.Circuit_Chip_QuantumCPU.get(1,o), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 16),GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 4L)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Basic.get(1,o), 512, 1024); + for (ItemStack tPlate : new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L)}) { GT_Values.RA.addAssemblerRecipe(new ItemStack(Blocks.lever, 1, 32767), tPlate, tMat.getMolten(144L * tMultiplier / 2L), ItemList.Cover_Controller.get(1L, new Object[0]), 800, 16); GT_Values.RA.addAssemblerRecipe(new ItemStack(Blocks.redstone_torch, 1, 32767), tPlate, tMat.getMolten(144L * tMultiplier / 2L), ItemList.Cover_ActivityDetector.get(1L, new Object[0]), 800, 16); @@ -456,14 +587,19 @@ if(Loader.isModLoaded("Railcraft")){ } } } + + GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 32), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gallium, 1), null, null, ItemList.Circuit_Silicon_Ingot.get(1, new Object[0]), null, 9000, 120, 1784); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot.get(1, new Object[0]), ItemList.Circuit_Silicon_Wafer.get(16, new Object[0]),null, 200, 8); + GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 64), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 8), Materials.Nitrogen.getGas(8000), null, ItemList.Circuit_Silicon_Ingot2.get(1, new Object[0]), null, 12000, 480, 2484); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot2.get(1, new Object[0]), ItemList.Circuit_Silicon_Wafer2.get(32, new Object[0]),null, 400, 64); + GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Silicon, 16), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), Materials.Argon.getGas(8000), null, ItemList.Circuit_Silicon_Ingot3.get(1, new Object[0]), null, 1500, 1920, 4484); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot3.get(1, new Object[0]), ItemList.Circuit_Silicon_Wafer3.get(64, new Object[0]),null, 800, 384); + + GT_Values.RA.addAssemblerRecipe(new ItemStack(Blocks.redstone_torch, 2, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), Materials.Concrete.getMolten(144L), new ItemStack(Items.repeater, 1, 0), 800, 1); GT_Values.RA.addAssemblerRecipe(new ItemStack(Items.leather, 1, 32767), new ItemStack(Items.lead, 1, 32767), Materials.Glue.getFluid(50L), new ItemStack(Items.name_tag, 1, 0), 100, 8); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 8L), new ItemStack(Items.compass, 1, 32767), GT_Values.NF, new ItemStack(Items.map, 1, 0), 100, 8); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tantalum, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Manganese, 1L), Materials.Plastic.getMolten(144L), ItemList.Battery_RE_ULV_Tantalum.get(1L, new Object[0]), 100, 4); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Elite.get(2L, new Object[0]), ItemList.Circuit_Parts_Crystal_Chip_Elite.get(18L, new Object[0]), GT_Values.NF, ItemList.Tool_DataOrb.get(1L, new Object[0]), 512, 256); - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Master.get(2L, new Object[0]), ItemList.Circuit_Parts_Crystal_Chip_Master.get(18L, new Object[0]), GT_Values.NF, ItemList.Energy_LapotronicOrb.get(1L, new Object[0]), 512, 1024); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 4L), ItemList.Energy_LapotronicOrb.get(8L, new Object[0]), GT_Values.NF, ItemList.Energy_LapotronicOrb2.get(1L, new Object[0]), 2048, 4096); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), GT_Values.NF, ItemList.ZPM2.get(1L, new Object[0]), 32768, 4096); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tantalum, 1L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Manganese, 1L), Materials.Plastic.getMolten(144L), ItemList.Battery_RE_ULV_Tantalum.get(8L, new Object[0]), 100, 4); GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife1", 4L, 0), ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), GT_Values.NF, GT_ModHandler.getModItem("TwilightForest", "item.charmOfLife2", 1L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping1", 4L, 0), ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), GT_Values.NF, GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 1L, 0), 100, 8); GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping2", 4L, 0), ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), GT_Values.NF, GT_ModHandler.getModItem("TwilightForest", "item.charmOfKeeping3", 1L, 0), 100, 8); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 2c598a14..51186561 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -71,6 +71,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Titanium.get(1L, new Object[0]), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Titanium), 'G', OrePrefixes.gearGt.get(Materials.Titanium)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_TungstenSteel.get(1L, new Object[0]), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'G', ItemList.Robot_Arm_IV}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Grate.get(1L, new Object[0]), bits, new Object[]{"PVP", "PFP", aTextPlateMotor, 'P', new ItemStack(Blocks.iron_bars,1), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'M', ItemList.Electric_Motor_MV, 'V', OrePrefixes.rotor.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Vent.get(1L, new Object[0]), bits, new Object[]{"PPP", "SSS", "MFV", 'P', new ItemStack(Blocks.iron_bars,1), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'M', ItemList.Electric_Motor_MV, 'V', OrePrefixes.rotor.get(Materials.Steel),'S',ItemList.Component_Filter}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Assembler.get(1L, new Object[0]), bits, new Object[]{"PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.Data), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'V', OrePrefixes.circuit.get(Materials.Master)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Bronze.get(1L, new Object[0]), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OrePrefixes.frameGt.get(Materials.Bronze), 'S', OrePrefixes.stick.get(Materials.Bronze)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Steel.get(1L, new Object[0]), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'S', OrePrefixes.stick.get(Materials.Steel)}); @@ -1241,6 +1242,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { ItemList.Machine_Multi_Cleanroom.set(new GT_MetaTileEntity_Cleanroom(1172, "multimachine.cleanroom", "Cleanroom Controller").getStackForm(1)); GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Cleanroom.get(1L, new Object[0]), bitsd, new Object[]{"FFF", "RMR", "MCM", 'M', ItemList.Hull_HV, 'F', ItemList.Component_Filter, 'R', OrePrefixes.rotor.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced)}); + + ItemList.Machine_LV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1180, "basicmachine.circuitassembler.tier.01", "Basic Circuit Assembling Machine", 1, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); + ItemList.Machine_MV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1181, "basicmachine.circuitassembler.tier.02", "Advanced Circuit Assembling Machine", 2, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); + ItemList.Machine_HV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1182, "basicmachine.circuitassembler.tier.03", "Advanced Circuit Assembling Machine II", 3, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); + ItemList.Machine_EV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1183, "basicmachine.circuitassembler.tier.04", "Advanced Circuit Assembling Machine III", 4, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); + ItemList.Machine_IV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1184, "basicmachine.circuitassembler.tier.05", "Advanced Circuit Assembling Machine IV", 5, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); + ItemList.Machine_LuV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(1185, "basicmachine.circuitassembler.tier.06", "Advanced Circuit Assembling Machine V", 6, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); + ItemList.Machine_ZPM_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(1186, "basicmachine.circuitassembler.tier.07", "Advanced Circuit Assembling Machine VI", 7, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); + ItemList.Machine_UV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1187, "basicmachine.circuitassembler.tier.08", "Advanced Circuit Assembling Machine VII", 8, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); + } private static void run4() { diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index 35b71b24..247a7df4 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -10,6 +10,7 @@ import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; import cpw.mods.fml.common.event.FMLInterModComms; +import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.OrePrefixes; import gregtech.api.gui.GT_GUIContainer_BasicMachine; @@ -209,8 +210,13 @@ public class GT_NEI_DefaultHandler if (tDuration > 0) { drawText(10, 113, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216); } - if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { - drawText(10, 123, this.mRecipeMap.mNEISpecialValuePre + ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier + this.mRecipeMap.mNEISpecialValuePost, -16777216); + int tSpecial = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue; + if(tSpecial == -100 && GT_Mod.gregtechproxy.mLowGravProcessing){ + drawText(10, 123, "Needs Low Gravity", -16777216); + }else if(tSpecial == -200){ + drawText(10, 123, "Needs Cleanroom", -16777216); + }else if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { + drawText(10, 123, this.mRecipeMap.mNEISpecialValuePre + tSpecial * this.mRecipeMap.mNEISpecialValueMultiplier + this.mRecipeMap.mNEISpecialValuePost, -16777216); } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_BOTTOM.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7e63b92493ad4724bb39f3b4f2661895e9a9f0 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE%y{W;-5;PJdx@v7EBierE%y{W;-5;PJdx@v7EBierE)^mS#w$0ETi%w9atQx_<7#?!?y#NzbP$$NQQ40u}i&xv4K zvVp~D8f(tZ^z*Kqd&e22q6v~t4xxgAS2AxkZ+^rPdepN0 z6?fCBRo6DV>y(|FJ9~$OG5fKAH#Q!c28H~ucFo)KJ%NXzbt_M8K10_g8y)X6x!)5s z{cP{upDox{Xmi5u^_-X`>DTf%e0*?uQKHQCwwrbzH#hD7dyM@yXUfJZ*?X^m{$lWS L^>bP0l+XkKGd_H+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_FRONT_ACTIVE.png new file mode 100644 index 0000000000000000000000000000000000000000..9e46f30b5b1d3207e51c16cd784b440a56d11a91 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKR%Tu~UKJdTU5oe#6==kGs9Bbf}ITs(P-AqZmaW^qhQt%<4+z!rpbCzXp znj)dhkRZYKt^4umoO6~849w1<-JwhGeZ3i9wCBv317=3aJs;%x-`j4vR`GD}{pP(7 zT14LLwa;4=ViesevSzEDUqVl#A=_h%d0_`mH|O5YYkDqlA+r12t+#hOI9ymXRT)o& zaXNM?D=jJAd477R*2cPB>9Lnz_M7+%@BSnlIg54am6r==IG%y{W;-5;PJdx@v7EBierE%y{W;-5;PJdx@v7EBierE%y{W;-5;PJdx@v7EBifGW?pUm*JqY60fmlux;TbdoIW~vFK@GffZKfKWe!}y zGOVn&K9hBtT(%in-w_cJnO0sfYX*bUj1Hyi5!>EBzgxSFQ?cM^Ud)!9otd-JS|9Iq z4?X)Wud?no+wHOgw-|5pF?5`ei3l@I4Sl~oVXY~HP2=_S)}28`Y)V3VzF%PGU(kNi z^3x)YY2wWXQoh7O{U^6GnEd`lPZjR_J03I-XB^C@!PF5Hv#>_;OXk;vd$@?2>>0N BbQAyp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_TOP_ACTIVE.png new file mode 100644 index 0000000000000000000000000000000000000000..9c0b2e3454b7f430b39bb8174e3979ca075579fa GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE%y{W;-5;PJdx@v7EBifGW?pUiv!YYh0fmlux;TbdoIW~vFK@GffZKfKWe!}y zGOVn&K9hBtT(%in-w_cJnO0sfYX*bUj1Hyi5!>EBzgxSFQ?cM^Ud)!9otd-JS|9Iq z4?X)Wud?no+wHOgw-|5pF?5`ei3l@I4Sl~oVXY~HP2=_S)}28`Y)V3VzF%PGU(kNi z^3x)YY2wWXQoh7O{U^6GnEd`lPZjR_J03I-XB^C@!PF5Hv#>_;OXk;vd$@?2>{%0 BbISk# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png new file mode 100644 index 0000000000000000000000000000000000000000..ee6b08274e6ba3e077f2b5068f153fda7695f919 GIT binary patch literal 2437 zcmaJ?3pCX07XSWZW@1p3DUHWWbW16ZoK!O&qd4SQC@M_RQIW^e7_Qe0wN6gS z)2)+2M#yA@iJ0G1ugbeB*C>TM961NT%9mdcblq^J zmRz}lyx+xc#V44SGS+CaMfJ7(+v@$cHlESF!jDfPK0D~H7zhk*d~KP&!XY{P?C6m0 z`K@lxD<==u2l$xW&vYJw-~1=t$>G_+;liIU6Wy6ZYbDhV<#$h^Dyhq&8y#6WZ+Pcu z>UiC>*L^aD3#?S!R;yD$I;xNlhkA^zrYKtLBoeYd#gZOWLCVhAsUycME1 z{!B%)>l`CrbaohpAKkY0Q~2%+YPCa5z(lsa!?0tjs>wy=oDf2I$|Ju4&kHniYVQ6vs9?@*?xjVZn~ zad#2J*+8E<8##{Ln7QSlP9onYA=Lb~)B4`In`P3)T#AkuTO)1Kz+HdjtMtsrsBSX) z`89geaLKIc8G7;aA!2`Pg7@o=r5CpWRF1Zlq!V0dd6(iFFRq0=mVXCeV zjS9L~gBsWnsieC1=CV|`wT2O=_8zn|ARN4*HI?YR30{nBYr=p*K7T8O2FF#|81}vV z)QRCsY(DoKxYnbdoP9n~S3#Zve`$>pAizu;T4kKY#UYV`!)oxz=)mj8It_U(=mb3V zO)xOosB;vU*gS}X(Ui=FFAwg;9e~&iElz0=Ax7~b>U%GSpHNSKUF^`k1Grnb?&;KB zxZU#LEfRaV-MFHF$Kw@$3>8%uwbU61RF-k=rqWz78+E+2$97qv^5gi_L`pX$OZwK* z+S*>0I6v7NY~>$2;Uj%BEw+|nGSXz`5}p;}^rA{R%erifWmP>Tpo*Olt4Kwp#y^i$h5z| zzc!TlE|r33281+fd~cq=WwuQs@~4FWJH; zqKT8r$tO5k!k6U%_PF5hwD@%%{0~#gRWP=_oI7vg2(UAo7b*NSoy4-M@dOH7LPyaT z5HE`duTcE^p6I9V{D0FwdxHk_<<6Yb|6@MG`;tmb*C)Vk!M+hQar3TqkPuavquu*x z9Mw#O4lKd^yJrs*o(R3O%@IE$@^2BV0V|jqV8eUR-h>|JKI#~%nct1>{%@J^V$VCW zOx|I(?N*S3-Gl*nYv-SK5JvDMcrfTJk&^MtGc128m9Zom)Wbz7)Dp*AMw$-27$N8TYHD8+09@?| znT2Q8ynj+~=tb2C5t}b80Jy!go}`Ma+^qRsk1=zL@ty`Bj(Hq_h=KV!)dENA)mb(^(*2`|Vt9i}oH*`ZqNN8aV&} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/700.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/700.png index e10815677ab71dbfd8300a264960f55d28a7c5bf..5af04ce86a4dceb4eb54d93a402dfde886fb7683 100644 GIT binary patch literal 1378 zcmV-o1)chdP)&03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00hQKL_t(o!^Kz4i&s?` zexBz&R}gAZj5U2NY=&r~GLFgo0g{6RhLTh`hLDSb2$CQ$(M2R~>ZgnHV>5{biXRkN zLn*XqRZJ~H$I4txuKa`up=Rcu7U$#M`}59BIg1Wlxc8oW-uF4rdEV#T11z8&+P@cv z_U&Cr2)Km|mJB5RKLD;MKx#n%8uj4Om1SwDeDTo9}NCIQONKnf6p`RcGs_PvU zV}=;teEZ`p48-6dK>~tmfYOB+yh>j6Rf#CZSZN~Zd9Edh$p==hfG6S065f|6XFLuZ zKJ5PswVO6)~A0Iuj5ddU@lhtNlG2F_4x<7;bBo1 z5jvO*rV!W6;LNo!5No=j1BTK9fYr;--9J9D?key`WW+%-oS%GwlmqaR2ap*_0GwQ` zx_PU>MGZ84Ko%GnpICQOvOI7_-$@Su6IVtefK+-eSAk`ds{2atjM+6HNA_$iTo8pLzfo8#{}^RYSPh-mSL zf{i^P1(yZ4Yp%7j`!%W~erK@?(jHLxOPdBn zCMp;J-rw!<-tKDBon6z_{m#Gg{k|Qy(b;jk@&R)(Rsdr0f8q`R&MY%va^cx3+7BKY z^~PGcQ5f0$DmtAbS#&AsyLM6B4|J3VkuCGW;s5{u07*qoM6N<$f|Pu1z5oCK literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRR}v?drptML?kvPZ!4!i_>p|H}Wexng(8 zZ%;(uOJQ4PHsk3_go4<`lqx-yw9ACN4*BTJ=y}f>ra!aT?AVrT0ohA4r(Jod6X4~^ zVAUc}BKG2DzDmw+3#sd?C7WI^Smq<+t8h}aelP2!&q8~o_6GME?ozoY_47Yd-tEQS V`>$V*z6rFS!PC{xWt~$(696yHPS^kd diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/703.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/703.png index ec3c0358a12cf9e04d453bf8bf257135a70ae09c..cb9ada097b1bcb817e008704b773a6eab834852f 100644 GIT binary patch delta 323 zcmV-J0lfad0^|aaDu4d~{{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G` z2jK!703`zeIar+l008kxL_t(I%dL|!io!q`g};#;AkDT@iJMLc*mwl1oFwHQz)n(# zuwaujc#IGc0_ld7f1}-cgIHw$phnq*>}%%1&->@S$Bf|@QGXQG^n{2|6omos?gyLg zHvr`+W4>5Yo-%-z&lgMb(y?2AwHi-EYJfP70hoS#GF>%8J(au4N6v}5r~y1{t$B{% zD*vVREdK%1aMevjq}FXipt_C&SNY9Ne?WDe4uaX0U}j#5T;+2(^3NSG5}gQrJ9rzR zZwGHn?Aw9rCOp23$8=0(002ovPDHLkV1nW8j^6+P delta 286 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 FV1l`~n0o*K literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRTnE71eH)Z9t)yo-U3d7N^%vHsm_wAmAFWvNS#7 z(ozwz9G#q^#*%wVOW6&kPUR|_r|`hiMS$sLP~;ibOGm843Y#`{asEn7O!%?6UT(J> z|Ixxb7lM_X<~^5d_6Sg#U8hiNEU7K1_NLGiAwDv1(q=#mwKN o_Fc&=DG(~TxOQvvyv=pbtzDyfr^sZy0C}3h)78&qol`;+038^NV*mgE diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/706.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/706.png index d6ff394c66ccb992281a3e9fb060e7c29522f700..f2ac92335973c67816ba7808fbee2ff381b03cbd 100644 GIT binary patch literal 4039 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 DHZ?pv literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRToJcCT&GQ9z*_PZ!4!i_=dhU*tSsz~OR!lIfzopr0FaDKM*si- diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/711.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/711.png index 6614c152a6db0a1e547cbb61e866fe0300e0033f..6c6d9c620d39ddb4ab0b9bca490cbdd0f32cb898 100644 GIT binary patch literal 736 zcmV<60w4W}P)WFU8GbZ8()Nlj2>E@cM*00KlwL_t(o!|hfvP6I&< zoU!r)Br4uR&rf&?KcVLvbO_#Jie1~|y%230kWj9OZgYEQdpw?5;CB7-MP0nTzW8qh zeSCV(xTp2u-Tebdf*?SGMBM`*}8YutqXAA@qQ`kjXzZ z$w-H?CiW1Zz(^1*OTZiH1=py9IbS>1rDI-_lyZ`mdS zSwR-hOiTkSFEn}3lX#{RQpQ zxgaBY0G%Km<2@3hWy{uQ3IQpFE%&M?*O72QSRa*nR$*zdcbH44P^t>-3z5z_rLSyq zT=g6jQc-9lxvK*LDFlH=CiMtvQq~a?JsAAjwn#{%+ijslw zCcV`~&T<40K||JB`IZ-;Ob8xINTCqt2Mcn`RbJ2 zH4j$3qlBg1-JmEYl&mI%b~2LF$l4HYAs`Sof-NT?52IAap7cH-sF+ z;*dd4cx^dwY9NRdcgfb)?U+#;Azv(ZfmcZz&jk5#Ao0eRiwS%#=l0w6@2_vU(IAe( SGuP_?0000%y{W;-5;PJdx@v7EBierR(>tky^FccfkHW+E{-7WFU8GbZ8()Nlj2>E@cM*00L4;L_t(o!|hf}t`k8F ztg_yU3$W%4+<=3#2Z=Q|Vf7@lXn$%voxElP5_%&gnWWS0a@npL;Qji?7xl}R&ma76 z1pWHsSH*pqi=RFcAV3l%Kst!H2jVxZ-^^DAMi78SO2+(Laf}X-FaqCxzFy+p0OVm6 zFoRzJunDBY(4b%e7!JZ~6S-&OWml7Yft~SMz~F zx+ee{B10y&!O}X%kRTWE0|2Ae3_523boO0)26JBfiZ$%ZumK<&gHB3a=3xxf2Jf~g z+LcKM&wGGHM^fKGS%8$OVnf#So>7J~0F>a65@>VEXqq%E5Vhy{A0@H3dLU=H4(y@> zmLR>f018GLC28-^LjYMb$Ov5xmSL z@gO~a*l~>-RT)#bApRkJU#>GPh2o4k3h*1gBSjX5u)()C*^DH>WNjsk+R_Y~c>FJWd=>v(-doz^o18A+w zZaw^=!LK(z)B!kXX*ND6kArYmxyz_UU=s_zfPMzP%{=U! zBIG}5661>%0z%HQqAz!?zN@gYC9}YVRlHF2QEAwx$LiXCHi4n(%4u%dx{Ob*H(&nw z%g{z&d-~&r*KeMYS#a%^{+_pWyW3lteUv7-s2F-YQ8WHrk=t_OZxdtuC;3NwY?ixL ruR4GF*8g8(%nj?}yd*bul-4m!Eh+P9vethDbQFW9tDnm{r-UW|dAeIA diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/715.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/715.png index cffad53f13d2168cd36e5c0900e4cc072ec963ea..4e2edfeca74d5427ff4ba5afae6d20251f3cfec9 100644 GIT binary patch literal 555 zcmV+`0@VG9P)WFU8GbZ8()Nlj2>E@cM*00EClL_t(o!^KxSPQySD zeedl~?m(Lpn$CD5VQXtu!e!ty5 zFo*#{6exHx5rTgcf`1q%K}rcEAqiv!f#zDyK$ryU^<9w!GlN-%l;QixNTysHcb`M_lCyCAGJ|+c8`Onyi z6+mSoECud<4Smq>ykQ{_KodhW0N^I?Kew3f_hi!#$9O2~b171Oc<(k|!O<=R-NZ9G3fMRLVEXWmf%p0J^RN t%7OsCx()?P0{H4s%4JCgK2c^$@B_T!HexQl;O+nb002ovPDHLkV1nYd(P{ty literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRPC^*6%Hj7l1WFU8GbZ8()Nlj2>E@cM*00H|+L_t(o!^M}qZq+~# zg}<4xuboJtqNkt>Ac+hx@xa+}qVU@95U)>>ilGYy!Hz$IRyw(04Nnh`z^X zb)a8hz8(bk>b>{wxiA&m&2Y1u*lKKMygxX#CJvYzuixy{D4H<-yO++A=UrSAfV|W#C$Xg|~Dd$jp_5 zst#m@GQ4Z+z{|(q89K2wz}5(lhGc83*MoR<_^cs>6|it49Kuy%gD`LhYdQ@*`1b3? z%@C0PL-^bOv=rdvlt_7}5M9TGjiwGn1k*HC@JiC8mg4Gyw=BhG&gIijbPz&I}0 z7zZ{s7L4P-=CI)8<90&`>(`kX?%?%oW_VpKo2~`!j(+ZNo^Z};El?>0EH;}82&O3! zWe;!{zU$a5+D^kMr)S(x~!+tu=1j+yIP&Se&f|pqn^RQ>0lM&k;Z| zS%A`16HCwo zVgsHAZ0p$vkkqL0EIO|jnkxhTm4Iz(H+oK|EqxvFe!n02BV6x0$`gyrwLI&9R69+~ zN|NnHdM%q0w2XWART~@po@#aSWFU8GbZ8()Nlj2>E@cM*00T)$L_t(o!^Ky*jucT0 zESqVh4M9r;h=70)fspnWkRXMBB7~4XARs{kBq9Prj+h+&07zh~2%i0p?w(`WfR#qQ z)1LM#m&->3=lFa6>tSI)z#~@(`#*PBeC;_T74h*Hch*ppJfmkPr+YoUx<7fnqYk6&uwmW-9~k z0YDH@B28fh?O>)MD6e#55NZ==VF}=V1`s7SM#n~fvQQ6H(M$f8nEke;h{OR5gi0&& zh@?b~A+IgEP<=00akyqmYA@Ih05G>%1Q9JdXC1&&0m+0G>FX;Y8`Pk?wJNAiXCi7s zQ|%L#snZ?=msbP;?5qNZ!K!eyC^dF~FxEO$JLiz108I)W4DU<LcL$_R%}$XTry_RzGzG94MiXm2Be+c@_l>FgAa8g&~~7%GKzbSF^gfMJxY z*pHvTVwYfh@E+Nm+N=mclj!+$}X`7P<@M`1V|56s!vh8)c|;V(o>b{t)BIeUaBM! zDcx5A7>!2YAv;FmU{)XmD9h4j&s8FL5;s?0_13y}?=-cWwK*QD7in}SV6^eDN)`f; zogi^@R@C{0FWN_Af5Ma4nvRrUO9Bz|Bwq z_lowx@;vXdm`;{X5v diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/718.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/718.png index 6f8d8bdde5f09fbf129c710971b2d6b07ab91555..1bcfb2d95ecfceae972a2893cceb6b65e09b16f9 100644 GIT binary patch literal 1064 zcmV+@1lRkCP)WFU8GbZ8()Nlj2>E@cM*00WFkL_t(o!^Ky<$}B|? zJ*Rr+Lri>tPZI@=eGUZ^6X6Os)7+=Hp+<5e13|>d7rCi{20nrag5KS(V^G!I)AN11 z3*QJX471ZeRj2Bls-6K3{9bb;$nB!ol2YRwdeyFQ(G4SFh$}{ z$bssD*I`iG=<3LT#K?pzGp7uK8?Xw&7Ty40NJD@s(-3;vyK(I@kQ6EDs1tQDXBIlR zOhJ}i6V2dN;i!&u)~a-}5npZ3%;(J-DN6EI8PbNrn+BvXCXGytw72L7-%6nlEk%}$ z4>K?UV2K9OMKzV$7MLcG9a!@3T`w9MsF{K56hyb{PSgycr@uwr(i~zPLfh&kvNWo} zOfc%22t%n|!L8<#!%j!Sy<-EUos?JmK-0ifc1_`xQzMEsoZEE; zutS6u4`ZWWB}{3B!`=*8U>b4!CVvTn!~#Wz>Wae87WpKM-7~%3JvIBm%BB^cLc!Q zI>ZIw{_PK@`JaFK0U+?nr=L9ne(Ab6m;qemQL2#ZB6!>A=ZOH8t3o=RPK5L*g1dE1 zapJ$z!2WkWohXO^{ISnABaTwAgy1fG{+-XKw i0IwcWkR^OW1OEcjzxDk{vsEns0000aR>X z7q5lMC!-IN&jFAxIR5!YVe%;H#k;0sh6kIaZ%Ihv_u!qEv2(ADC010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Q|;C1~8HYdd&a;03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00KryL_t(o!|hi=k`yrv zlN1j8fUoe8eI*~^1AB)XynxGAEr-Oh>}=J93mn+4n(9t>Dt07U@c{4FKfdULuTP&| z|3=WyUw-bmANt21AAbQ7B!VQ!v7QGgg3`QG5Ctml?GG1sSPZ|pbH8l+f@WX?lK`wT?nC@k!Vn- zmUyE9hctF1PX1M4uY8Zx#@3N+Lv!8*0&C*p&36Q-1knzb5NAb%ShXulx)5OzSSUH5 zw_Us9wSq^*=qTGn^r8w_jb`)C25V@9mGAOf!KIzd1p;G>28YQALh=p`%xS9SSgNE} z&P5q^4o5?TdvWa~{n@^Y0LEkxmqt`M_Fyp{$)^bs&9Vat3EL^}5C}0z)n1#z`9`ge z&wrDE3A>6r^04qkK(`w3W7d4W-2F7HXTx?(C5^(L7*W8egywwPN>?BqEg6sbZ}o||wPN){WOXtu;>`PDp0OGQ_T` z0Hp_vI`6HRdA-!SXO;J8jqH6-sCp#RIE|AKY^{3{Z}RSC`!Io*=Wp+S*Z!~TH=8LG UMU``+){$DbPcMI-6D&{fw<>$JqgJAAVTVX^$}F{&QVczh zXP9y*PT@TBCcvm>>ddbUtE~1*uE=5v%Dr)SezPSLWFU8GbZ8()Nlj2>E@cM*00JmUL_t(o!|hf#w!d@0Ohbp&acf&ZB4TNbJW~QpzmSx#4;Q9RHhyLg5x0jF4 zaQf@}+v)eqW%ux;^&Xw#oYyf1c1x9q%=+d z2SE}d0b=cu%bDyq*Et?*E%u-*8y5f>!FCeHEi%dt$A5u`MNMqR0@ynL7y#pCZfDxj zw&)6=4F+)rfS9(FHU|utb7~vN)G(qx^$?)V$v(e;BuI_`Fhv8Sf9b;aXoek7GKCPP zrQ;!hbQn==LmqvLTn3mX#-4%^1EOj)jNEz|I@Pw`K$i7mr~$|$bk$eqm3r?RsU3ee zN_UWgn#1~=Sz4+kTd4O2724sn3{~mWDL||1-Js-7yd#p$P68bEfh{T$z%sbX&`UF; zI#XlKtMn7=BeNovd+a%gaUaMMGovlva;HEUJPD??_n8QJBQV^q zd+rNJOJ&ZBu?W!&Wp$j<({nCMS84<{h|X%7ijd~;GT{sy)BqN+UL`{Yq}E2^)cR;; zxr`)J$mvNIHZ=hNzgV=9dlgmoiR&3pQTB!z171d~RJ$=XXQXT7zFI~%qS`z>_pKKg zAXx9HlM`oZW*R_7u6_YIZYE#v{jT@|hEoRmP-)YzwOgrPVn~7!L>bY4qk*n)V+1mt q&}TxTgPz5V(8_s<_o-4WXPrWm{c0000?0`^}$ zLS+Z^R(|&BSk8PzPxz7g2H#gZqf)nR)M)&E*z8!*R=M=QGtAsvdcM5gHIJnz;(30} Xl`_j(>na diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/1.png new file mode 100644 index 0000000000000000000000000000000000000000..556ef01bec9021f8b586bf64ed1532018610c9de GIT binary patch literal 773 zcmV+g1N!`lP)WFU8GbZ8()Nlj2>E@cM*00L=AL_t(o!|hkgZCgPQ z8Bvqt_0M22)yHA1E7v~TQczBYvdc)z6+_l-~>mR=`KYV+7 zeEW!^&)< z#YF?MIE;h=@&{L88Gu+zqhJIK@fivrh~G;WHZB0XEBS-y1&ypCsP1GWyhEtjP_h^6 zG1u_`Ku`s#AIPSAfr%oca7i-0A`1D z3IW#v5)^0zZZZSNP{kWauDJ_9Y%2Q>XJ!<}xHuS5+-nV{V|2c@$?`4K+4g1Pl6TjsbW_i1}Y_xL)cp4JWLjgfkmrblpzKprHw@ zumXbiDM)a$p6VH-&TQz)b;_9O7ac$vfG`qp6wX^}k(BtG9qT)d za5}N!RKHqu+-6&Q#Y9p+U+7hCXfuH8?IP76&lDU#xoIO@2GdbvgO?I zDjULzr60Z@Kn9RzXVVEmskYHLAgvqK6k`bXCE{bC`by^x5(N=sqAi*AOMjk|Kw<*jj&h#?8O9bNOjGo<00000NkvXXu0mjf DHZ?pv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/10.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/10.png new file mode 100644 index 0000000000000000000000000000000000000000..c62b2370041979947ac22abefae5cbbb10a551fe GIT binary patch literal 663 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/14.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/14.png new file mode 100644 index 0000000000000000000000000000000000000000..71cfbbfac7663bec02dabc031ac7ebe0021510cb GIT binary patch literal 1067 zcmV+`1l0S9P)WFU8GbZ8()Nlj2>E@cM*00WOnL_t(o!^Ky<%49_l zJ*WEK4>9opJ~vU&*ym6%F7S}obxu{^0d{;|y?BmSKRn-K0?VGmW(6evKLE?Rg0x)#Cj7sA|DgcF z3Q!7QIf@Z1f*HrWVcute74~^6gcYG!t}U@v3h>ESZ@XVR#bZS<6G(sr%m^}^n*qig zX_zEv0F7gwfSFJj^DNC4?ohVOoQA_Mzg-{!^$7S8s5Qq?s1;EE-JXQExhi-C{`p(* z%J`k<9(@{MC!eQ;kN^};H%KN04)wyC)~wh z2#{w)4tN?>10!sJaRN~*Vnr{P<7*|Hjsiu$b*KuiC!ICfFTJMUIAc8Lx3vN5PI6Xah+r!DN@o=C+cF& zEOc<5f-Jixn!&5WQ61^5Rp~^t7F+=&&-Fc0l;pKCqz#2P4M<^38krbrZ_y9Fl|mg_ ziYyuLW?%xq5)Gt_YAUrYFijvku;kynUNkgNGXs|?h;G-Ns2M^}e~Y@MIm9}Iw$)2y zX;g!mVALfMhEltNTg@kjot73|jY?5QzpWC_su&r_wtT4(vG)Pp>3~t1TW+H_cuk-! zQ<|M_wbZKYya@AR=_yxqu%?Hqp^4fA*D|9`H}p;K*Z^ra<;6bGG%%H2Q+Vanh++>h zwd)Gtq&vDA1ySl(%kZz?9ae&~QUJDleE|xA^1-;3rcAV+g)H(fZ1dS?bfHs^$$bfSxIbU*$0Qn5vN^7K3Y`N!)p2#dZ> zf;PSzBgEU=&+=@zc=GfaAM{SREV0Z)O*0s6avHu|Iyt`imxccAmdIsz~1;@kt lFC@JI@cJ$VS;AK|@Gt9T`2T(c5N!Ye002ovPDHLkV1mV+(u@EA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/15.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/15.png new file mode 100644 index 0000000000000000000000000000000000000000..4e2edfeca74d5427ff4ba5afae6d20251f3cfec9 GIT binary patch literal 555 zcmV+`0@VG9P)WFU8GbZ8()Nlj2>E@cM*00EClL_t(o!^KxSPQySD zeedl~?m(Lpn$CD5VQXtu!e!ty5 zFo*#{6exHx5rTgcf`1q%K}rcEAqiv!f#zDyK$ryU^<9w!GlN-%l;QixNTysHcb`M_lCyCAGJ|+c8`Onyi z6+mSoECud<4Smq>ykQ{_KodhW0N^I?Kew3f_hi!#$9O2~b171Oc<(k|!O<=R-NZ9G3fMRLVEXWmf%p0J^RN t%7OsCx()?P0{H4s%4JCgK2c^$@B_T!HexQl;O+nb002ovPDHLkV1nYd(P{ty literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/16.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/16.png new file mode 100644 index 0000000000000000000000000000000000000000..2f900ccc472ff22dfe7e22f557ddffdd6441553c GIT binary patch literal 1127 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 SGuP_?0000A2s<|y*^K}I03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00a9;L_t(o!^M}quH8fw zg}=3C?2v*26smwIC@2vKDUU!TkZ1@(ya5#z9WRg)%Dh1egcK6Ou0l zV2A&W*RFv;5|WWYGL}HXHp+2J$R7XuxDZA@xF_eFeU1k|{dR(ZoE!-Wj5mOmA36ED z_&T;OBrE4yHnLn_6oOp*?RVZHB%(DU8tqB+a|0_?y~k%k zi!-iXz1l&X0ij(E?s0c zQo$~HUjtwVS#qu}Vv(B?u*sYOpq2t0s2m|TZ1dxTf0CdAO#P<`Vg^kpuY(Dgx%JT_ ztPW%+)P>r^es+0;ZK}&=_bbCk8SvqQ7(1{GTtS)$I^`TtE-Imw9p`+- zb;Ny`5jw7cWk`#oN!U-4ftBJV42p@+JmRkAYa(&K%3OkOlT%zOMPEZTV@tvrXN(-%(|y$K}`+p zeZa*Tf`S&MYeKQn0;@KpiHMn!zR^u;>nq-5)iDj2kuv?IZZyP9FeA+ntKh`6``^P< z)3DMt2eS;JpVWX8;exo7Zm)fjc^BtlMob;pMxaGbAE-NDSy(v1fHqF(UKi4!;DsST zcG*z7`eXHm?gQPDtIMb>+w*w_RI;Jat|lz$wB7YK12|AW)GkaHihC9;HDL9ZV;ZPQ z6&!RqS!_~((lnILChvD)Vb0=KQUjY!ancDrI-sTFF&b46%_!F0?sI>s0ht*w_1aQ4 zrFw+dr$y*pAzILOF@5^U!>;PQ9yMRil-u?JB@N802+20>6a%%CUHUD0aHf;xUA^yh zKAV!Il9ulOwmJwEiq>MZ?F)`}#fQgt_wJ4c^XB`v`0LN#M=XE+`Iph4zI)>a*f<$` z>E-L(zjt?x-~8a?|Mp!l&C@DK;QFg?jCn5J{}dkbz* zdIJ1KcEw}+S=Jj3o&0ROX#6=CFvmXsdW<>wZTPhD pXJtUL;&=$^C|buuaPjzZ{0l7-%=AWfXuALa002ovPDHLkV1kr<8KeLJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/3.png new file mode 100644 index 0000000000000000000000000000000000000000..c3fb13ee925766cc6c016b0b8de6fca08ab5a1be GIT binary patch literal 750 zcmVWFU8GbZ8()Nlj2>E@cM*00L4;L_t(o!|hf}t`k8F ztg_yU3$W%4+<=3#2Z=Q|Vf7@lXn$%voxElP5_%&gnWWS0a@npL;Qji?7xl}R&ma76 z1pWHsSH*pqi=RFcAV3l%Kst!H2jVxZ-^^DAMi78SO2+(Laf}X-FaqCxzFy+p0OVm6 zFoRzJunDBY(4b%e7!JZ~6S-&OWml7Yft~SMz~F zx+ee{B10y&!O}X%kRTWE0|2Ae3_523boO0)26JBfiZ$%ZumK<&gHB3a=3xxf2Jf~g z+LcKM&wGGHM^fKGS%8$OVnf#So>7J~0F>a65@>VEXqq%E5Vhy{A0@H3dLU=H4(y@> zmLR>f018GLC28-^LjYMb$Ov5xmSL z@gO~a*l~>-RT)#bApRkJU#>GPh2o4k3h*1gBSjX5u)()C*^DH>WNjsk+R_Y~c>FJWd=>v(-doz^o18A+w zZaw^=!LK(z)B!kXX*ND6kArYmxyz_UU=s_zfPMTxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;HI44%wCY%5O17=A? zK~z}7&6ZDZ97Pbtf7M>w5%%nc1Hx-_KoGEnl5XF0L&tEg=cHzLRuCa@>U^Tw)*q z!d*DvE{=|l-oJV4ds0g5yndNxZ5_!$`c#yUoF4J}0`QU0RIaz`Smsfag zdxy#7A|6ag(wirFU>U~BpU0)9KQ|LKf~sO!y*t;nw# zwZbOj3GNxQ1Trw8!o_rB3;1>zA22iKd0xx1h*NmZ#V0aYz{+_ZC0X`8H3I@Xd)%@! zri?{}bUor+<>cIp+g96SJI#qF)^PnL$$fV(h@8>={AP^~WglFm&Rr+MB>;XTW+x?Th~ zy7=XmMk)fW`A?R5wd0-u{2ySVGRsLor z|K7_3o)CZ+nydU{s<+MwBe<;OUUb$yNEvz=M6y@sOT}=klw18;x8Ib9Vql@@(876< zEz(kgXD_B{16pw~+%=qPGJekUg{cC9)8QD18>WTxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;HIvPBO2oC@N1J_AJ zK~z}7&6dw^R8<_sKi}7BOKhjD3$;I77%34$X^2r0P|yNuwGlKd{1e>h+KoFGZd|$0 ztqWI1jnT%6)T$|oXh<*!3MKfXfDkc4r=^{ybHB&My>Di^ks*DFzDXu8FE{s|d%ov; z&KLgU$68r*@c9GrMe)xeL+SwDMcOCyqQr4YTR^7}2pOXD^QqbDzwKRW38n;QxID*E zy8ph-Gpnnsqn9qvcS+2EMkM{3gOm{X>aDiUT0LLx=|ybn-1KIt)V`~?x38|mgOFsFY;Qom3~Apl&yOY*lRF|of7$w7`JE?)edYkyt=V0ice%nXluc~8zAg#fs5 zeRRH$x-Ir6gbEUd`p%4H)Ox4j~vCxEBF`G_Bv55fS@(uzx7l*NnWwdV6|t513^j0~1PI4D=5HKNjNy zW=1X4^0rLk6dpqIi2xR1jqNVQmQ3q54gh%Kk>l}}2~Y?D1W)chfn3ok(=$C=jlf*R zl)yt^`rC(N&2b>Z3_LhTjy*&qU3Cp02p+I3D+YitP&`^ekOgos8UbY~S7kIZpam;# zjR6mh4b8v>20;#q`k;7wOY1Ysiqk-zZn*%*_nc&WtQ*`Tx>PTz|&?@p7(J$ zdv5G>9#~O`iZz)0dV6si0GK$?hr8E-Ai;K(l-N%;NFr4+*TIE9e9|sz7EdKY;KL9%#TvotF QCjbBd07*qoM6N<$f)|$gBLDyZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/32.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/32.png new file mode 100644 index 0000000000000000000000000000000000000000..78ba24aad1ddf55e7619b0fa8252453e13276de0 GIT binary patch literal 1070 zcmV+}1kwA6P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;HI~FV|b!7km1G`B? zK~z}7&6eA1TvZgtf9oWZX-#ILf|!e-w2^2tiLKFM2^0)I_$0phSNNa!?6VL3AL@ey zydZ6emo}-SjkTJ#R&1f2$!$Vrug{0Q&s<*YDLJ5LU^pB$dwuKjecyur_^~2~KKl5B z_@emdkRgo#Umz_DeIjv1((9n>2!sq#{qpj+?SH#_xDZSU%y4;*WBAl-r&kUS4;Sv; z-yW4%0W~Du$w5j8{P1a4XGP=7J-vt%)f1l$4_7XXk3T;;G&F=HN-eYiS(0GAbwE*J}fjT*M~7LM=oyvwne2f z!dzp4Q~{GD7cN#gB;GpQu- z)5%|OiJP}JdGzov04`o!&P#UwpuK;)6ae+wIL%g*R;x*Cr$uXLhuz&4Z|%Lo-rg=p zoxtka)vl}@v=3;v52#kEPrbX44%EhK)W&Mue{iq+ZSv(Qa>~_fb?Rfas1Snb$yX5Y zXW#kb2@#RkQxns%zh>kN8?TS!9x%&51}2nhF*z{}te2w$W=1D;a$2V06dpp-i2xR1 zeG{%kN~Uwi2LOB>uEs1Apb!EGzR!L@uBephS>l}t%vDYcJOq|lj6KJJ3^VZHyyxeL zMOSwQ5CjicmX!lQ7$}BT5M%)yjGjSR@>Ll<4=5nT#VX*TccB@$z#zyWl|CqDZ|Qty zS)myy2tb&{j3sBaat(lY59f3DMbf}_aTGd*2CN_rlOrbi%>%n~Mi^Nd(7gYdW#!p1 zvHJsHl)ywfhAucP?hLDyYXi(Uo*B8K0Oi5s#)EKvJb5EGtT>2@eOPQa%F_XWwdw}$ z-UX5aJ9luV517TB(Tj=DGqGT?J(m=b6o5!g&r(pwx`UWks3akZy|%votM9#o<>PM# z62ZNY20W7&MCS`h1$dv1~TRj0Q zYc0=RaihL9kYNPj-8Ok}=9)9*Rlq$U)V0_~a|Tap;(r#sB{K2WgiPN{8|d5dZ)H07*qoM6N<$f)tkLu>b%7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/33.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/33.png new file mode 100644 index 0000000000000000000000000000000000000000..5e3fbb8a9233baee0df3df9d710640d2d0741489 GIT binary patch literal 1182 zcmV;P1Y!G$P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I04GBLBt8HD1S?5I zK~z}7%~#J)TxAqJ=S)G3rVDXhV+}Dlv#J>+vDPj?%f@t76T=_SxB&kZSQ$5L+(-ht z8?>mMLMtK4PDw;WUh92Fwy1BLR{i2ny~@{{uh~1b0X-oPBEegBzdS`S$=i z-OdGr%@e#xy48X}x>pl`3XpIwZO|}xr@yuRj{$VLoofI-0x;w@L}tLfmOS@HNeBd( zfdh|7&TM?OxpZm(oo@RYfRDWu5QOBGD;gIFKmr(|5>vwjIHl#CTVH&=^iTlpZuuz ziu4d9he*sY9IW7XTq>=%@xndj` z0mXP#faS*JYQ{&%86!B`n1W8XJxOXTdX*WYP-8`(Q8-QcxtBvYdm2kUjH2=y@YY?CAz6)_63GilF2KLlzBJm<8)onIZy5 zd`~`c9IpW&Fj_S(2f1K(DLkl@X9*gif{-Ey5dcT)0K}1UW5*l?t|8?*iA=UW2NO)^ zQS`>WQjXLB1PK+Ziv#hJC#rcHwLkM1Dfe05K#=Py2}vA8ff17jF3av5iI$~9bh7NF z+382tGXnTLy~05Q0PZ5P9=;O7S=j~+72;D{kTK_n5kPKNQfX~xU!xR)|dD3y4TnZCoXlrC;ikD%S#~5 z(Ue&@16f1vv#yzU!bnRWApkp{e)9RtjlF=x0`o5CSxv}kISE=WERJAFHooCjXJ{OUT%i^Wh;>3Y#4R^~zGhWrQ@)X%NoSXo(p{ls}d;v9veLTsR7$_Y&; zpAm9JN@XZt)^Y<0Iajk+eX#!J=C;6@vZrT4lUE9Jp~^%I)lvlr%q%bWwoe>L!g25J z{&z3Dcy5Q}Rf?_J*q!wRsZ53PVZ}W=68Y}R%4*|Ks^g~On>TJR5u6~nL8P{;T6e58 zB5&Mpy(w~HdAYarNFOFsS1!E|;=0&+iH(YfLW%+V!OT89JiNbntN-o&NB%TB`s=}> z!4{u*^6AT@ra*fIzH;!(e6viMOV%zyR+3a*zJQ761F=Z;5NYhOo<+=Kufz07*qoM6N<$f|}_N0{{R3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/34.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/34.png new file mode 100644 index 0000000000000000000000000000000000000000..4ce59d721c923c3d34839b8e39f8aeed8e9865bd GIT binary patch literal 1275 zcmVTxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I0tP)_R^k8v1c*sQ zK~z}7%~#E9oOKX>o=F=Or3X{53dJDl?r9~#k7%nVwGj=amBg4srSwoMB>pSODS8Q^ z1x=($LCPkW9<~ilNSj!Svc;H+X;D0+xfF{8c0A1Q>)qXaXbZZKyt^;+{^psPXP%iC z_>Vu_jZycp4*R0^uL1z7_PnYnw4w@CRRXF|!2QE?@#?l`@7WbhRe;2u-+u1^*+rm@ zU^B@kk|428as}j~0LA_Lo|!d#mB*8Td~5EE0s{nFNPr{=f&#nJ{Q;m51j{6c_dV4( z^4-j}e-9wvnlC7Hh+sQu)&c=(k46AhK>Tl!IVuLPl@^z`@*&$e?*XvjofCj~XC%&k zvKpO2f^&iUEd+sfk_+u`z0&iKGLUc0^#B+*3rn|%nTv%FQVf*90f@HFd39NOuUwv= z*f9gS)?5MLd5=#>h&T|8X-@CEv_MFl`nYVsysfh#dH!(6>xCTw5ExSEUVor-VbQth z#nr?+INg6c*p7XD(Ch*+1L(aZhN}HFRI?qxS&v@C*ZU5ZZZ(C-Z5<$1gvx-PkGv1EfR;4*kg3i!Kig(S>|v0A-zv^^AR|IU_hww*>jtTn8yF zp@kA>6l5Y2mwF*_s;}&zS!n_gPs~8l0Iuao*P)IY03z%P^>PkBJ-O=IDmwJc76?FM zZ2X|(LClLr8Zv=!0yXurc+Crob@fYWs9coE>9!ZKVI#1a2N&vaHd1!0%~r~7YPgkrjnOv=;2<6_QCM6)^3eZ#=J z=qcVIS84%(i;^5Z`c+FJE=XETGCkgR;$~DwNkEa9`nD}2XbffMVl4n+kx9*?!$jRO zf@Hjzm@4=*g<7We+27%Nu?E26)umaI<*eAav74wP#4Daef_e6f*&hGkdS+^-N=c%8 zacX9^?kpfN%w)+SFGTq=h$*)M@SVZwxQtC z%xkVR+$1@;tCj4~JFoVD9M5Wh)xsHwn$-v-ApKx+Jn5aBoSxX#Qd+t^KS8pWVdtg(@y3Ti8%ilioMuCK_TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I0T}FkI6?pb1cFIK zK~z}7%~#z|Ty+pVXBM!CHmS4^7!|Eq8?u`|(10~kTNP?~F+Rb+(AWh0SK!I`!gEQA zzCj~R+)`UYEb+mL5&WW9ODx@xYJqOD(}($e-Q6uk+eDYJ_wMf8J7;FjoS6&!$1m>1 z=);ft?L_UZ3IM8hy{ag*stQ$A0;*8Jy^uhhl%^JSy)5$=wr*Kw*5rSPLKoSH&fgS1o0Z<5nOC-nlx3+xx<;AQ2 z9ze0D*sahpf_j|Sok2tKnWaxXzQHUmSy6~olKQ$R0YE75nSnbO5?jS>JbRl4Drm5M2`29ME?Q+5*tBagfRlEvK<|O=YMF6 z7CwB%nxi{CX%OXhGP>g?a$OX(ly~4ik0D2$J#U z;K~7?rcle&KKnVGPuBrhn7ckpaw#h|ZtN!N2=R(1kzk(vVz#$my%WnsW|We|(ifj! zoNYJ@NQ^U?a>i;C8*$^7>WJzI#~NWG@#5+szm{Yow|zp!cijixKK14t$-c}|QL}OZ zs2@Nzf+Q~Nn=h@S^Y;#Ke`RWF=ESc1fCxt^sQ4Rh9=VsUSi$j~*UOn5AyuTHkj3jG&_DUIi3tpP0dX1X(=sTx;9C2m}DhkZao<1 zI4#B6%jx|%DD>{rWc>+!DQgf zJD-3!E6g2X1I4prlwv@CRMpSQ<+~G?OV{r{@uOK~XKO;C6VL2xJ4MO>sK)>t7Rn25 zV=Y7RQ?4nu*wWH6ySBDkiu)U$!m}a3Y8BYJ|5r&>O8}_Vs?7)}RFxp{!N3_Pz}1_- f(LK20fB$+2#VzMUv``?800000NkvXXu0mjf;y^>O literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/4.png new file mode 100644 index 0000000000000000000000000000000000000000..7d45cae3c0585109743c4581c5fb1b88a091a910 GIT binary patch literal 738 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 DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/5.png new file mode 100644 index 0000000000000000000000000000000000000000..1f933fbbca968905c229b0d439d9d0fab92f0d3f GIT binary patch literal 708 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 DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed583664d3ae0a5292ef3ddae0f814769f75bc0 GIT binary patch literal 1501 zcmV<31tR*1P)TxXSo0X010qNS#tmY1-bwL1-bzn?TyI*000McNliru;Q|;I2MyQydoKV01!_q| zK~z}7&6mq>8`l-af8XJo6lvL#EErw8g(0mH$cYg(X<;X@H$~8e{V#as82wMOO3_Wa z=*9w)W~UT&kob|-5D@+;7gn z|M;h62L0y48_|u6P9cDE(R}C3;X>zd&N+c|IEYVtx&P$MwbM(%bPgoG|KZ0QNVf!6 zg)U24lZ1pP=>^h(!Tx$>uhmvp%T9BCl(X{C^BJ0KggsChx8Agj_^DrD>x#FFtUq9Ph6vq|^-?|O%0k{m)Yz4=H z8$y`CG?T~7eKIx-{0Hw|zjk{m2DWy#-Vk~QE(5|W$&zE)n~a1R;(LqPAOWRg@{EMu z{^sGg&(CB)@Ug>XkfsYN&g>|76eJUlNrz)3NR5YR6hs6J2ZTW%Nlf}a<9-iGnbDy4 z^_dcE?`+)#b}iA?Vn!1%C$1-{o|j-YG2z0na{cBn@1DiLJ;{y&#g%PS9%2^al_%*e zVI~)W%@v|UB2_4nE|xHiT(L}UrHl!R<#Pz#TL@r#XX{2Kle$t)N5M)4MT^qNDa0WRp{f<7iO>Gv4>JtPSH4nenrB>YYbzumm@!L9dh%mFadttnkL zi|~lYS=w!eywi38r^qxLYsLxfYA-x;xxtLVjFg!gOqk9dnN2p2VmnM1O4C}&mdaBJ zi0b`!tVL^3+fI-O=6q|5UFOlyl+oRwhKG;~_EpF;bIxodM07-E275(bP? znJBm*%;d1dP;!M>bCE8TrtgAWsf;XwTPUv*8)r;=w53-stVc4<*40cFUY-eAH%2Bh zlM$)OFtXcG0K)*2a6zBRz(+Cdqkb332zng`ofeYlcbfFtO(ey%dmz!Q*JyfGWOxez z=*2?1?6{dMLGR+qKR)WkoCHD#<5Xrhq0}V?Bd}Z{u|zV3m8r+)R>}y&1f|OAbO)7J zFHG;x$FxggZT({MJ~>!ag!}1)b_tDw=v9gcgFfNFM+T#QmyzFzOs3mm&~1T?Ub{)R z)qt4xcEdvkje3oSS49$D?T}ja6_WPn031B|?xBNVo<>_JfgSsw*YAk(}{zANK#Om65Bn_~>u^AhYxVU)< zlkT6{54`iMx1LDa4Ff;IR9s=?cLB(+R3d``ij`ITb`yZg`8C>&sIbqkZP4(l0IY3X z#H$_xaB=ezb+6if{P_8~Gy4HEeI#SFu<~ce>6C8nH2I{_#>VEam+A@MyMFC9(u0$o zkTl~)ZdLAOo6(?US66;-<=+6|9( z-NPgrUX^<75R>q#uc#irM1ohZe#E4O!A}JM@XcSp-OI0>dsFD?BHB+irQ^~(yL9Pi zZ+`aK{@zdeG<*N%yY~@yO{rfTmw=h8P2~dj59iz;8jbp=j~{(kKWlAU2EZuje>xoa zZ#fr!*l9MZopz%G?l7SpRIMGpoOoWfn$PEdTdP&Cd0y?0p>wZIaJg?oP#8kr?> zeh#SBtYfJ(;HZ05DV5@b_iy4r|N8eo6@R$$fB*XrVd~}0KEs$H00000NkvXXu0mjf DCtA_# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png new file mode 100644 index 0000000000000000000000000000000000000000..e9314c6ec5791b4e4d6a257461d534f90ed403ce GIT binary patch literal 1178 zcmV;L1ZDe)P) z07s@KHBneyyseB_9Ukv91q46b{iJf(SdNUfk@$?Ne;h1e&Uze zuq%w0W{LyB%C#CsG1@+5A)jD~Y%<0sBLvR)+&}y36I}~|&8@p0td<9dwS|ze;yMVk z!o6g#l6~=vGF{;klJWDS9bL|WBHCy?K_RlBFr@fb#!{v#MJV2h>nliD+?En!fSg{p zKjZ6YJdFDd$Xe|=@#Hc3>g-D#DD%6ryu$Ixpn?r?HatmS4SXP}1SIl&9QFVv@OXR~ z&@2Mhj9&=~%e{UAd38W2IARr)*akWh^G>=}#jUvxY;N5(Oc5bV+)_chTA3Ac6p^F) ztpqt)#VG}+OGNK|^Tn(KW{T>T@}bvVBGEn;+c(Nw1q5OR5F-YWDJQccRS7BGg_-7Y zz-s)E#Od$^QyK;{>{n6|s0GSHR1zkyQdg!)Nt#m!${0&8dflbC>HOlXf<2NoIW+lQ z3F$N!mQ{O-5UXHj9I!%QAVi)B5>b>Y1gKYkdK1ZDN?k7`hNCInPOC;lOA=7!5pX5y zRXURzNm7BpA_r`ytW(%SrOZP>MZ0gvY9+VSHBZ$-4OLeZDldl!x{FphZ_INbShNJ5 z$Z#sA=lKYQMo?Y1!U>P|u)lfDKC6PCvYqK0~^t`4g2UC5ecnHsBv$u1?K zdn6r#_CjaQa5RnvB$2z3nMa>< z92Q|Tb7f%yj#F|8qhh1#E@rWMkT@NV;#|@6pwW(1BV-)8Y#~nNN~E?dPillL5viAM zR7%;^^FSpui3<57cEZ}!Lo&Ki36V%i3H@#-PSFvzcTL4#Zhy+?^evs`KId@d64)y_9Tffcz>s>6%bmz{;{^G^+xdZ6Ge>Mc=IX*l)L76$g;LRbHwE*Yv sU=L*(_qOl51JD2bLsSp2&j0!KH?g$^l{hB}3;+NC07*qoM6N<$f-!FvwEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/6.png new file mode 100644 index 0000000000000000000000000000000000000000..498da22fca4391fac41357b8883a9b4a446aa4cc GIT binary patch literal 764 zcmVl03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Ll1L_t(o!|hiwuGK&c z9M5dWA*eY4cjSVIl7gCw1_YlX-t~C%q~u8mD1M|!+2kd*XU5}w!0YjkkMPBtcb{MW zM$m5`->$f0fB5qC142YlAaz_zh`c5Tg3R^2SI;A_Nr56D*>mB`r}r)1DS;JSLa;uL znGowacqGKU2NKjk1Q8;jnJn|WJfU$)fE18bGYo;q;L-}XKAH$Y9&A*?hT>%c3+^aL zK}UlKjfC10I!=m-77>hEX93pM!xNSs(sUbvrFMsv-gXs?J1r6zJW+vLBJ?0F znXv>lE2VwBJb=YLcOBeFU@&boiqLx`x=IZ>LPp7?Jh( z!}S0ehXBPB1(QOmL>TcT0?h~9QghD3+O+$Ar>=FvbpmW=M02&(S}}h!s%w1jU{qmG z=-LN{Rb~nwCBUG7m_eckv&s2rDBaM2Z@Fe4vok|tCQZnxiI_(8{RRTs_W-h)!0i2AIW`N1 uZQ~-!pe`xc_w9e?_?hRA*S~`Q-|-udw;c6Bk~up70000+$KUq&pL;x6%#{l$_2T1DC#92K7iY@tOVktajSq8eR(Ou2=owj*c`?%F< znw}@1*uu{rbRvHTQ~Uh&2%E-jOAIL*F3~3_ zwue6Nw4G=b)EWuC?n}kvwW6&Q;747{M^kmSjq_?rzL}7&dgP-i>8j`D`Dl95M$6>B d?@MHU=YOENt+0nD!Dj#f002ovPDHLkV1gfEy1oDa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png new file mode 100644 index 0000000000000000000000000000000000000000..7da7ab1e690ac37950e47e15e0e6200f211a2564 GIT binary patch literal 435 zcmV;k0ZjghP)+$KUq&pL;x6%#{l$_2T1DC#92K7iY@tOVktajSq8eR(Ou2=owj*c`?%F< znw}@1*uu{rbRvHTQ~Uh&2%E-jOAIL*F3~3_ zwue6Nw4G=b)EWuC?n}kvwW6&Q;747{M^kmSjq_?rzL}7&dgP-i>8j`D`Dl95M$6>B d?@MHU=YOENt+0nD!Dj#f002ovPDHLkV1gfEy1oDa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/700.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/700.png new file mode 100644 index 0000000000000000000000000000000000000000..e10815677ab71dbfd8300a264960f55d28a7c5bf GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRR}v?drptML?kvPZ!4!i_>p|H}Wexng(8 zZ%;(uOJQ4PHsk3_go4<`lqx-yw9ACN4*BTJ=y}f>ra!aT?AVrT0ohA4r(Jod6X4~^ zVAUc}BKG2DzDmw+3#sd?C7WI^Smq<+t8h}aelP2!&q8~o_6GME?ozoY_47Yd-tEQS V`>$V*z6rFS!PC{xWt~$(696yHPS^kd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/701.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/701.png new file mode 100644 index 0000000000000000000000000000000000000000..661cd148173f948d1d3744b1da098578d55ac933 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRR~adFPxrZ9t)oo-U3d7N_?HZ{%fGa9bJ zPpntl`6TuGz4EjAsyBt7*zR3!T+Dh@BC*XnWx@2~b-Q++UOdAH)H7kBLSi>DkI9+a^*lwaErrmJ+c zoZ~~Mm9H?vg3<)NGe^^zUut?Vun2G-$opEWAIcWyc<`Fdnmb}SKM(KtxIuS^K(_K{ zg?W7&djM)e$(O_)J^t6$J%^OnPAy)xdB4Mt<#C|~`9F1KPfP~-i^0>? K&t;ucLK6V|S$SCi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/704.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/704.png new file mode 100644 index 0000000000000000000000000000000000000000..daace0f92a6fe6465b9e6e9f04fa3b98963c58a7 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRTn!hLry%N3`p=0ijisr68ZKm;(*Y3Yg`~kFNlhqZ6nm<22*3WqP zYgw3tAFq#YVnRxaOQ8D=R*!_gZ{$i!uXMUi+S9PEFGYWXScmq01A{d`xehL2d(_!& zuJG|)&&%`@af3zaYRSpTdv=ptDnm{r-UW|!c26D literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/705.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/705.png new file mode 100644 index 0000000000000000000000000000000000000000..f5d5a1bc39280d5aa0bfdbea50f66aba4920bb8a GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRTnE71eH)Z9t)yo-U3d7N^%vHsm_wAmAFWvNS#7 z(ozwz9G#q^#*%wVOW6&kPUR|_r|`hiMS$sLP~;ibOGm843Y#`{asEn7O!%?6UT(J> z|Ixxb7lM_X<~^5d_6Sg#U8hiNEU7K1_NLGiAwDv1(q=#mwKN o_Fc&=DG(~TxOQvvyv=pbtzDyfr^sZy0C}3h)78&qol`;+038^NV*mgE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/707.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/707.png new file mode 100644 index 0000000000000000000000000000000000000000..9f03d572b76f76e60c4c88df6508c18e54f8139c GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggqW;q@PH9ywoEes5dES@foAr`0CPTrWs{tiiv35%XH95&mpDa{c T|K0%@LJSO^u6{1-oD!M_VQ}IkQ0Ts=i(`nz>8+D(xehr9wC?9E z6JpvXwc!)Py(5>HImFDG5|T5Ya<0jB5xBx!!FjqtAu?n`*bx_r)e1i&7q5u7JhP`Z zzudi(!*kEwc{*8Fi&mv2E(p{0KDqH}6?e+&{-jr%&n)M5ln`Q3-2Q>@K+0A>P7$6% zkKXbzSd3c~(igw&dc*v;T;n=WdUuCINQaV+`0VFj-uTpp zbbj4iBp}U_P^Wlv`s)KOml}^w-_tkY;Cbag7Z1LX+5I<${iMI}-fB6mZ0YvLna@7) h-17Z8?SQ%s!_=fK)|ZjH_<>$!@O1TaS?83{1OQFkgFFBL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png new file mode 100644 index 0000000000000000000000000000000000000000..56da7e8d0d9ee4ede11234711c934cd916146e13 GIT binary patch literal 461 zcmV;;0W$uHP)5ej{Sjt(6} z8W6I%*x`q|m?0T-5NtY_|7uJu?SV@!C;$2H$+^TJf#W#*6-p^4lL-LD{TKHS&j9$| zh*rCU?~MSYZ?!v&{V7j(H=-#jr2y#n`vA-rr!<;f<_l;vy9u}LU*4c(zKaV0)3Piq z%hKW)h@&uwfmB6d5TCb+*WZ^hfYxOk3_VyapyA^Q%Sa7vWhJy00000NkvXXu0mjf D8MDH} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/710.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/710.png new file mode 100644 index 0000000000000000000000000000000000000000..6f403c14f531e44d998c6c29f34c30ac87cb3464 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRToJcCT&GQ9z*_PZ!4!i_=dhU*tSsz~OR!lIfzopr0FaDKM*si- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/711.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/711.png new file mode 100644 index 0000000000000000000000000000000000000000..6614c152a6db0a1e547cbb61e866fe0300e0033f GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE%y{W;-5;PJdx@v7EBierR(>tky^FccfkHW+E{-7zP%{=U! zBIG}5661>%0z%HQqAz!?zN@gYC9}YVRlHF2QEAwx$LiXCHi4n(%4u%dx{Ob*H(&nw z%g{z&d-~&r*KeMYS#a%^{+_pWyW3lteUv7-s2F-YQ8WHrk=t_OZxdtuC;3NwY?ixL ruR4GF*8g8(%nj?}yd*bul-4m!Eh+P9vethDbQFW9tDnm{r-UW|dAeIA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/713.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/713.png new file mode 100644 index 0000000000000000000000000000000000000000..7da7ab1e690ac37950e47e15e0e6200f211a2564 GIT binary patch literal 435 zcmV;k0ZjghP)+$KUq&pL;x6%#{l$_2T1DC#92K7iY@tOVktajSq8eR(Ou2=owj*c`?%F< znw}@1*uu{rbRvHTQ~Uh&2%E-jOAIL*F3~3_ zwue6Nw4G=b)EWuC?n}kvwW6&Q;747{M^kmSjq_?rzL}7&dgP-i>8j`D`Dl95M$6>B d?@MHU=YOENt+0nD!Dj#f002ovPDHLkV1gfEy1oDa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/714.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/714.png new file mode 100644 index 0000000000000000000000000000000000000000..56da7e8d0d9ee4ede11234711c934cd916146e13 GIT binary patch literal 461 zcmV;;0W$uHP)5ej{Sjt(6} z8W6I%*x`q|m?0T-5NtY_|7uJu?SV@!C;$2H$+^TJf#W#*6-p^4lL-LD{TKHS&j9$| zh*rCU?~MSYZ?!v&{V7j(H=-#jr2y#n`vA-rr!<;f<_l;vy9u}LU*4c(zKaV0)3Piq z%hKW)h@&uwfmB6d5TCb+*WZ^hfYxOk3_VyapyA^Q%Sa7vWhJy00000NkvXXu0mjf D8MDH} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/715.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/715.png new file mode 100644 index 0000000000000000000000000000000000000000..cffad53f13d2168cd36e5c0900e4cc072ec963ea GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRPC^*6%Hj7l1)S(x~!+tu=1j+yIP&Se&f|pqn^RQ>0lM&k;Z| zS%A`16HCwo zVgsHAZ0p$vkkqL0EIO|jnkxhTm4Iz(H+oK|EqxvFe!n02BV6x0$`gyrwLI&9R69+~ zN|NnHdM%q0w2XWART~@po@#aSfh@E+Nm+N=mclj!+$}X`7P<@M`1V|56s!vh8)c|;V(o>b{t)BIeUaBM! zDcx5A7>!2YAv;FmU{)XmD9h4j&s8FL5;s?0_13y}?=-cWwK*QD7in}SV6^eDN)`f; zogi^@R@C{0FWN_Af5Ma4nvRrUO9Bz|Bwq z_lowx@;vXdm`;{X5v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/718.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/718.png new file mode 100644 index 0000000000000000000000000000000000000000..6f8d8bdde5f09fbf129c710971b2d6b07ab91555 GIT binary patch literal 520 zcmV+j0{8uiP)aR>X z7q5lMC!-IN&jFAxIR5!YVe%;H#k;0sh6kIaZ%Ihv_u!qMU``+){$DbPcMI-6D&{fw<>$JqgJAAVTVX^$}F{&QVczh zXP9y*PT@TBCcvm>>ddbUtE~1*uE=5v%Dr)SezPSLzP%{=U! zBIG}5661>%0z%HQqAz!?zN@gYC9}YVRlHF2QEAwx$LiXCHi4n(%4u%dx{Ob*H(&nw z%g{z&d-~&r*KeMYS#a%^{+_pWyW3lteUv7-s2F-YQ8WHrk=t_OZxdtuC;3NwY?ixL ruR4GF*8g8(%nj?}yd*bul-4m!Eh+P9vethDbQFW9tDnm{r-UW|dAeIA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/720.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/720.png new file mode 100644 index 0000000000000000000000000000000000000000..00900203dcb058403f0c6bdc94ec45553b4a4924 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPgg~E=CbG23E(?0`^}$ zLS+Z^R(|&BSk8PzPxz7g2H#gZqf)nR)M)&E*z8!*R=M=QGtAsvdcM5gHIJnz;(30} Xl`_j(>na literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/73.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/73.png new file mode 100644 index 0000000000000000000000000000000000000000..c568b54d85ce0aa93bd93f7bc93fe2bf77b89a0d GIT binary patch literal 9505 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 Nc)I$ztaD0e0szxueUbnG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/80.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/80.png new file mode 100644 index 0000000000000000000000000000000000000000..ec3c0358a12cf9e04d453bf8bf257135a70ae09c GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(`%6c&wfK15kvsz$3Dl zfq`2Hgc&d0t@{HMWH0gbb!ETD#LBO1=zG=WG*IY_r;B5V#p%71&+;}K@U+ek^xwOI z(RqWTmE#U0mer=h7kG_Y%pY7@U9G`;%)%*jshy^mi0#kk#Y}%RHi;V^TQzg$#NvB* zV`b*oOy2TQ#@j0*NGpABwCO6F#AlOg>++UOdAH)H7kBLSi>DkI9+a^*lwaErrmJ+c zoZ~~Mm9H?vg3<)NGe^^zUut?Vun2G-$opEWAIcWyc<`Fdnmb}SKM(KtxIuS^K(_K{ zg?W7&djM)e$(O_)J^t6$J%^OnPAy)xdB4Mt<#C|~`9F1KPfP~-i^0>? K&t;ucLK6V|S$SCi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/82.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/82.png new file mode 100644 index 0000000000000000000000000000000000000000..711716b2385948fdc21e8299bdd9ff5d2a0d4e15 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggQCK(1f)pu=15kR2}o-U3d7N@sPHsotI;Bl=NP;Q#q zxwYDF60<_zfrYE&6x2`NyDFS5P;Di$=E{sqt5%6G`tT+9KmURL)F-XQ?*!D8S_IR@f`aAqpS3Rh{k2WGFZ{)>b8F;O7&2aS71mzAcC~o> zlo_`FVdQ&MBb@0PGNglK=n! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/83.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/83.png new file mode 100644 index 0000000000000000000000000000000000000000..13274dc9fb07a9540438206ec073470d22b4c852 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggQCK(1bIS--qcA(H_PZ!4!i_>c-Z|pkcAkenIqS54A z(OI)=?E)JN_!W1Gd#YYbDxcc%%S+mkV~KaFp#uB928EW08Jy2uRUQAQvA5-an?FCc zJt$E^%w$T(1eH$a2mf;a=v-r1VtqP6V!}Hehfw}D#@i;zmh;1Uw3S#LL|hqaYQH7? zseSt@@>*ri%)fG1T^S!pCC~Y<{bb|b?7h41Gs`iYDs@?MAv1SL%vndd+n<&_4_Y_v z;Bk!yCS32FDsvRA_gFH=h2*v_leCFhn90WPoHMJjNH)1=@#R|{JEt4(DBR#{oOZME zU)s?pZ!X?nllSW6&DEAG*8JXg|CQzI@_h`7igTiJ=4bi=z0ct3>gTe~DWM4fpTUq4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/85.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/85.png new file mode 100644 index 0000000000000000000000000000000000000000..1491144be967dad73b49f9ad28564aa7a8d24d40 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggQCK(2K)-#`#F9LlX5Iw5TSvYoTs&xw{hX8-*bUUu%{%~*v$!TgIQ3i_uQWH|!;#o+1c K=d#Wzp$PzL4|{ z|Ixxb7lM_X<~^5d_6Sg#U8hiNEU7K1_NLGiAwDv1(q=#mwKN o_Fc&=DG(~TxOQvvyv=pbtzDyfr^sZy0C}3h)78&qol`;+038^NV*mgE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.png new file mode 100644 index 0000000000000000000000000000000000000000..9627adc0d2bb81885e53658fe88e718beb980c29 GIT binary patch literal 4043 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/89.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/89.png new file mode 100644 index 0000000000000000000000000000000000000000..d2b7719d7e9c9ad7cb11ebc0158f61f4c2d2446f GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggQCK(2KWx0RLbbvyaJY5_^EKctY-pF~_Kwyvg%e{@= zCI@>D-aEj|Qpa%q!AheBh3XR%)RuUD6h1QH-{m7t)9xE8PGDa6-16N&e~ur5Q_N;m zPSsKRaPNGTb@TH3Gt$J8OZXNSFYJ3S5@|B8%cH=4dZ@zOyz(_4*YK2_eH(aPqOI`^ zkJ{CJ?-?0(3O>^is&EaQ@bb`^TTH)nv~wG8X3la8H})vp6PNIG;-MHt+5OB7+Y@#< z3Cxh1?-X+N=)2kHXBfB7>JZzbGfyGxJzuqP|CH?&T-q-s?p5FV#obc>h;`zuq8&dT S-s1)Oj=|H_&t;ucLK6UJHiQrW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ff394c66ccb992281a3e9fb060e7c29522f700 GIT binary patch literal 364 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 N002ovPDHLkV1f$}t=0el literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/92.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/92.png new file mode 100644 index 0000000000000000000000000000000000000000..b8db181cbebb1d5e944fac6f766bda94c321af17 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggQCK(0=#>oz6zW{~Kdb&7$#HOfh zMuu9~GYUdG6D2gfH?YizoW6~JdHB48Gfw1oaVYGb^C~c^v}M!ZIwq!=W4V17gaSiv zD{q;%F}=@DaP1Dgw+d(L=9~+)^~&4Ier(3s&~NuHFW>L*WBFdj&yVw_E`R#n1n4ma MPgg&ebxsLQ0G+~sxc~qF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/93.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/93.png new file mode 100644 index 0000000000000000000000000000000000000000..c04431f175315b108cbd37fb3efb66e64e2d86a8 GIT binary patch literal 350 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 Ql>h($07*qoM6N<$f>n2`G5`Po literal 0 HcmV?d00001