From fafe1bcc8823158382ed9d45c1e1fc42e02fa9c5 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 21 Jun 2016 19:32:31 +0200 Subject: reverse commit --- README.md | 1 - build.gradle | 8 +- build.properties | 4 +- gradlew | 164 ++ src/main/java/gregtech/GT_Mod.java | 77 +- src/main/java/gregtech/api/GregTech_API.java | 7 +- .../java/gregtech/api/enums/ConfigCategories.java | 3 +- src/main/java/gregtech/api/enums/Element.java | 2 +- src/main/java/gregtech/api/enums/GT_Values.java | 2 +- src/main/java/gregtech/api/enums/ItemList.java | 69 +- src/main/java/gregtech/api/enums/Materials.java | 2424 ++++++++++---------- src/main/java/gregtech/api/enums/OrePrefixes.java | 19 +- src/main/java/gregtech/api/enums/TC_Aspects.java | 2 +- src/main/java/gregtech/api/enums/TextureSet.java | 4 +- src/main/java/gregtech/api/enums/Textures.java | 4 +- .../java/gregtech/api/interfaces/IToolStats.java | 8 +- .../api/interfaces/internal/IGT_RecipeAdder.java | 65 +- .../gregtech/api/items/GT_CoolantCellIC_Item.java | 1 + .../gregtech/api/items/GT_CoolantCell_Item.java | 1 + .../java/gregtech/api/items/GT_MetaBase_Item.java | 2 +- .../api/items/GT_MetaGenerated_Item_X32.java | 2 +- .../gregtech/api/items/GT_MetaGenerated_Tool.java | 96 +- .../api/items/GT_RadioactiveCellIC_Item.java | 2 +- .../api/items/GT_RadioactiveCell_Item.java | 10 +- .../api/metatileentity/BaseMetaTileEntity.java | 9 +- .../api/metatileentity/MetaPipeEntity.java | 36 - .../implementations/GT_MetaPipeEntity_Cable.java | 14 +- .../implementations/GT_MetaPipeEntity_Fluid.java | 4 +- .../implementations/GT_MetaPipeEntity_Item.java | 14 +- .../GT_MetaTileEntity_BasicBatteryBuffer.java | 9 +- .../GT_MetaTileEntity_BasicMachine.java | 3 +- .../GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 22 +- .../implementations/GT_MetaTileEntity_Buffer.java | 2 - .../implementations/GT_MetaTileEntity_Hatch.java | 2 +- .../GT_MetaTileEntity_MultiBlockBase.java | 45 +- .../java/gregtech/api/objects/GT_FluidStack.java | 4 +- src/main/java/gregtech/api/util/GT_BaseCrop.java | 138 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 7 +- .../gregtech/api/util/GT_OreDictUnificator.java | 2 +- src/main/java/gregtech/api/util/GT_Recipe.java | 11 +- .../gregtech/api/util/GT_RecipeRegistrator.java | 32 +- .../java/gregtech/api/util/GT_Shaped_Recipe.java | 3 +- src/main/java/gregtech/api/util/GT_Utility.java | 153 +- src/main/java/gregtech/common/GT_Client.java | 24 + src/main/java/gregtech/common/GT_Proxy.java | 170 +- src/main/java/gregtech/common/GT_RecipeAdder.java | 151 +- .../java/gregtech/common/GT_ThaumcraftCompat.java | 2 +- .../gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 10 +- .../java/gregtech/common/GT_Worldgenerator.java | 106 +- .../gregtech/common/blocks/GT_Block_Casings1.java | 1 - .../gregtech/common/blocks/GT_Block_Casings2.java | 2 +- .../gregtech/common/blocks/GT_Block_Casings4.java | 6 +- .../gregtech/common/blocks/GT_Block_Concretes.java | 6 +- .../gregtech/common/blocks/GT_Block_Machines.java | 14 +- .../java/gregtech/common/blocks/GT_Block_Ores.java | 17 +- .../gregtech/common/blocks/GT_Item_Casings1.java | 3 + .../common/blocks/GT_Item_Casings_Abstract.java | 1 + .../gregtech/common/blocks/GT_TileEntity_Ores.java | 13 +- .../java/gregtech/common/covers/GT_Cover_Arm.java | 2 +- .../common/covers/GT_Cover_ControlsWork.java | 3 +- .../gregtech/common/covers/GT_Cover_Conveyor.java | 5 +- .../gregtech/common/covers/GT_Cover_DoesWork.java | 3 +- .../gregtech/common/covers/GT_Cover_Drain.java | 3 +- .../gregtech/common/covers/GT_Cover_EUMeter.java | 3 +- .../gregtech/common/covers/GT_Cover_ItemMeter.java | 11 +- .../common/covers/GT_Cover_NeedMaintainance.java | 3 +- .../common/covers/GT_Cover_PlayerDetector.java | 3 +- .../java/gregtech/common/covers/GT_Cover_Pump.java | 5 +- .../common/covers/GT_Cover_RedstoneConductor.java | 3 +- .../GT_Cover_RedstoneTransmitterInternal.java | 8 +- .../gregtech/common/covers/GT_Cover_Shutter.java | 3 +- .../gregtech/common/gui/GT_Container_Filter.java | 5 +- .../common/items/GT_MetaGenerated_Item_01.java | 180 +- .../common/items/GT_MetaGenerated_Item_02.java | 25 +- .../common/items/GT_MetaGenerated_Tool_01.java | 6 +- .../items/behaviors/Behaviour_Plunger_Fluid.java | 17 +- .../items/behaviors/Behaviour_Spray_Color.java | 3 +- .../gregtech/common/render/GT_CapeRenderer.java | 17 +- .../automation/GT_MetaTileEntity_TypeFilter.java | 1 + .../boilers/GT_MetaTileEntity_Boiler.java | 6 +- .../boilers/GT_MetaTileEntity_Boiler_Bronze.java | 2 +- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 26 +- .../boilers/GT_MetaTileEntity_Boiler_Steel.java | 2 +- .../GT_MetaTileEntity_DieselGenerator.java | 2 +- .../generators/GT_MetaTileEntity_GasTurbine.java | 2 +- .../GT_MetaTileEntity_MagicEnergyConverter.java | 2 +- .../GT_MetaTileEntity_MagicalEnergyAbsorber.java | 74 +- .../generators/GT_MetaTileEntity_SteamTurbine.java | 20 +- .../basic/GT_MetaTileEntity_Disassembler.java | 5 +- .../basic/GT_MetaTileEntity_Massfabricator.java | 14 +- .../basic/GT_MetaTileEntity_MonsterRepellent.java | 2 +- .../machines/basic/GT_MetaTileEntity_Pump.java | 1 + .../machines/basic/GT_MetaTileEntity_Scanner.java | 14 - .../basic/GT_MetaTileEntity_Teleporter.java | 4 +- .../multi/GT_MetaTileEntity_AssemblyLine.java | 5 +- .../GT_MetaTileEntity_BronzeBlastFurnace.java | 8 +- .../multi/GT_MetaTileEntity_DistillationTower.java | 46 +- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 31 +- .../multi/GT_MetaTileEntity_FusionComputer.java | 26 +- .../multi/GT_MetaTileEntity_HeatExchanger.java | 17 +- .../GT_MetaTileEntity_ImplosionCompressor.java | 12 +- .../multi/GT_MetaTileEntity_LargeBoiler.java | 15 +- .../GT_MetaTileEntity_LargeBoiler_Titanium.java | 2 +- .../multi/GT_MetaTileEntity_LargeTurbine.java | 14 +- .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 18 +- .../GT_MetaTileEntity_LargeTurbine_HPSteam.java | 15 +- .../GT_MetaTileEntity_LargeTurbine_Plasma.java | 15 +- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 15 +- .../multi/GT_MetaTileEntity_MultiFurnace.java | 43 +- .../multi/GT_MetaTileEntity_ProcessingArray.java | 70 +- .../multi/GT_MetaTileEntity_VacuumFreezer.java | 12 +- .../storage/GT_MetaTileEntity_QuantumChest.java | 3 - src/main/java/gregtech/common/tools/GT_Tool.java | 8 - .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 58 +- .../java/gregtech/common/tools/GT_Tool_Sense.java | 11 +- .../gregtech/common/tools/GT_Tool_SoftHammer.java | 2 +- .../common/tools/GT_Tool_Turbine_Small.java | 1 + .../java/gregtech/common/tools/GT_Tool_Wrench.java | 16 +- .../java/gregtech/loaders/load/GT_FuelLoader.java | 5 - .../gregtech/loaders/load/GT_ItemIterator.java | 3 +- .../gregtech/loaders/misc/GT_Achievements.java | 67 +- .../loaders/oreprocessing/ProcessingBattery.java | 2 +- .../loaders/oreprocessing/ProcessingCircuit.java | 2 - .../loaders/oreprocessing/ProcessingCrafting.java | 3 +- .../loaders/oreprocessing/ProcessingDye.java | 5 +- .../loaders/oreprocessing/ProcessingLog.java | 28 +- .../loaders/oreprocessing/ProcessingNugget.java | 1 + .../loaders/oreprocessing/ProcessingPipeLarge.java | 4 +- .../oreprocessing/ProcessingPipeMedium.java | 4 +- .../loaders/oreprocessing/ProcessingPipeSmall.java | 4 +- .../loaders/oreprocessing/ProcessingPlank.java | 8 +- .../loaders/oreprocessing/ProcessingPlate1.java | 4 + .../loaders/oreprocessing/ProcessingShaping.java | 8 +- .../loaders/oreprocessing/ProcessingStone.java | 27 - .../loaders/oreprocessing/ProcessingWire01.java | 19 +- .../loaders/oreprocessing/ProcessingWire02.java | 21 +- .../loaders/oreprocessing/ProcessingWire04.java | 22 +- .../loaders/oreprocessing/ProcessingWire08.java | 22 +- .../loaders/oreprocessing/ProcessingWire12.java | 21 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 121 +- .../gregtech/loaders/postload/GT_CropLoader.java | 73 +- .../loaders/postload/GT_MachineRecipeLoader.java | 633 +++-- .../loaders/postload/GT_Worldgenloader.java | 23 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 282 +-- .../preload/GT_Loader_MetaTileEntities.java | 223 +- src/main/resources/assets/gregtech/lang/en_US.lang | 223 +- .../resources/assets/gregtech/textures/DevCape.png | Bin 0 -> 525481 bytes .../assets/gregtech/textures/DonorCape.png | Bin 0 -> 394192 bytes .../resources/assets/gregtech/textures/TecCape.png | Bin 0 -> 1576004 bytes .../blocks/fluids/fluid.wet.autogenerated.png | Bin 0 -> 21917 bytes .../fluids/fluid.wet.autogenerated.png.mcmeta | 5 + .../textures/blocks/fluids/fluid.wet.concrete.png | Bin 0 -> 7457 bytes .../blocks/fluids/fluid.wet.concrete.png.mcmeta | 5 + .../textures/blocks/iconsets/FUSIONII_1.png | Bin 822 -> 597 bytes .../textures/blocks/iconsets/FUSIONII_10.png | Bin 822 -> 592 bytes .../textures/blocks/iconsets/FUSIONII_11.png | Bin 822 -> 618 bytes .../textures/blocks/iconsets/FUSIONII_12.png | Bin 822 -> 586 bytes .../textures/blocks/iconsets/FUSIONII_2.png | Bin 822 -> 603 bytes .../textures/blocks/iconsets/FUSIONII_3.png | Bin 822 -> 535 bytes .../textures/blocks/iconsets/FUSIONII_4.png | Bin 822 -> 544 bytes .../textures/blocks/iconsets/FUSIONII_5.png | Bin 822 -> 558 bytes .../textures/blocks/iconsets/FUSIONII_6.png | Bin 822 -> 562 bytes .../textures/blocks/iconsets/FUSIONII_7.png | Bin 822 -> 488 bytes .../textures/blocks/iconsets/FUSIONII_8.png | Bin 822 -> 646 bytes .../textures/blocks/iconsets/FUSIONII_9.png | Bin 822 -> 582 bytes .../textures/blocks/iconsets/FUSIONI_1.png | Bin 822 -> 601 bytes .../textures/blocks/iconsets/FUSIONI_10.png | Bin 822 -> 595 bytes .../textures/blocks/iconsets/FUSIONI_11.png | Bin 822 -> 626 bytes .../textures/blocks/iconsets/FUSIONI_12.png | Bin 822 -> 594 bytes .../textures/blocks/iconsets/FUSIONI_2.png | Bin 822 -> 611 bytes .../textures/blocks/iconsets/FUSIONI_3.png | Bin 822 -> 542 bytes .../textures/blocks/iconsets/FUSIONI_4.png | Bin 822 -> 551 bytes .../textures/blocks/iconsets/FUSIONI_5.png | Bin 822 -> 567 bytes .../textures/blocks/iconsets/FUSIONI_6.png | Bin 822 -> 569 bytes .../textures/blocks/iconsets/FUSIONI_7.png | Bin 822 -> 495 bytes .../textures/blocks/iconsets/FUSIONI_8.png | Bin 822 -> 649 bytes .../textures/blocks/iconsets/FUSIONI_9.png | Bin 822 -> 589 bytes .../textures/blocks/iconsets/LARGETURBINE1.png | Bin 0 -> 515 bytes .../textures/blocks/iconsets/LARGETURBINE2.png | Bin 0 -> 586 bytes .../textures/blocks/iconsets/LARGETURBINE3.png | Bin 0 -> 571 bytes .../textures/blocks/iconsets/LARGETURBINE4.png | Bin 0 -> 625 bytes .../textures/blocks/iconsets/LARGETURBINE5.png | Bin 0 -> 366 bytes .../textures/blocks/iconsets/LARGETURBINE6.png | Bin 0 -> 652 bytes .../textures/blocks/iconsets/LARGETURBINE7.png | Bin 0 -> 585 bytes .../textures/blocks/iconsets/LARGETURBINE8.png | Bin 0 -> 594 bytes .../textures/blocks/iconsets/LARGETURBINE9.png | Bin 0 -> 564 bytes .../blocks/iconsets/LARGETURBINE_ACTIVE1.png | Bin 0 -> 761 bytes .../iconsets/LARGETURBINE_ACTIVE1.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE2.png | Bin 0 -> 1131 bytes .../iconsets/LARGETURBINE_ACTIVE2.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE3.png | Bin 0 -> 798 bytes .../iconsets/LARGETURBINE_ACTIVE3.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE4.png | Bin 0 -> 1347 bytes .../iconsets/LARGETURBINE_ACTIVE4.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE5.png | Bin 0 -> 949 bytes .../iconsets/LARGETURBINE_ACTIVE5.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE6.png | Bin 0 -> 1481 bytes .../iconsets/LARGETURBINE_ACTIVE6.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE7.png | Bin 0 -> 868 bytes .../iconsets/LARGETURBINE_ACTIVE7.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE8.png | Bin 0 -> 1176 bytes .../iconsets/LARGETURBINE_ACTIVE8.png.mcmeta | 3 + .../blocks/iconsets/LARGETURBINE_ACTIVE9.png | Bin 0 -> 898 bytes .../iconsets/LARGETURBINE_ACTIVE9.png.mcmeta | 3 + .../blocks/iconsets/MACHINE_CASING_DRAGONEGG.png | Bin 822 -> 472 bytes .../blocks/iconsets/MACHINE_CASING_FUSION.png | Bin 822 -> 649 bytes .../blocks/iconsets/MACHINE_CASING_FUSION_2.png | Bin 822 -> 646 bytes .../blocks/iconsets/MACHINE_CASING_FUSION_COIL.png | Bin 822 -> 549 bytes .../iconsets/MACHINE_CASING_FUSION_GLASS.png | Bin 822 -> 616 bytes .../MACHINE_CASING_FUSION_GLASS_YELLOW.png | Bin 822 -> 594 bytes .../blocks/iconsets/MACHINE_CASING_MAGIC.png | Bin 822 -> 500 bytes .../iconsets/MACHINE_CASING_MAGIC_ACTIVE.png | Bin 822 -> 500 bytes .../blocks/iconsets/MACHINE_CASING_MAGIC_FRONT.png | Bin 822 -> 330 bytes .../iconsets/MACHINE_CASING_MAGIC_FRONT_ACTIVE.png | Bin 822 -> 330 bytes .../blocks/iconsets/OVERLAY_TELEPORTER.png | Bin 822 -> 577 bytes .../blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png | Bin 822 -> 577 bytes .../textures/blocks/iconsets/VENT_ADVANCED.png | Bin 3126 -> 720 bytes .../textures/blocks/iconsets/VENT_NORMAL.png | Bin 3126 -> 606 bytes .../gregtech/textures/items/gt.metaitem.01/407.png | Bin 0 -> 2975 bytes .../gregtech/textures/items/gt.metaitem.01/408.png | Bin 0 -> 2959 bytes .../gregtech/textures/items/gt.metaitem.01/409.png | Bin 0 -> 2932 bytes .../gregtech/textures/items/gt.metaitem.01/410.png | Bin 0 -> 2917 bytes .../gregtech/textures/items/gt.metaitem.01/411.png | Bin 0 -> 2955 bytes .../gregtech/textures/items/gt.metaitem.01/412.png | Bin 0 -> 2966 bytes .../gregtech/textures/items/gt.metaitem.01/413.png | Bin 0 -> 2941 bytes src/main/resources/assets/ic2/sounds.json | 437 +++- src/main/resources/mcmod.info | 2 +- 227 files changed, 3108 insertions(+), 4187 deletions(-) create mode 100644 gradlew create mode 100644 src/main/resources/assets/gregtech/textures/DevCape.png create mode 100644 src/main/resources/assets/gregtech/textures/DonorCape.png create mode 100644 src/main/resources/assets/gregtech/textures/TecCape.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE1.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE2.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE3.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE4.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE4.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE5.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE6.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE6.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE7.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE7.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE8.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE8.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ACTIVE9.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png diff --git a/README.md b/README.md index 82ee721345..db772d4f1f 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,3 @@ Please report any issues you to find the issue tracker on this repository. Inclu ## Contribution Please do! However, please take a note of current issues and what is currently being worked on. - diff --git a/build.gradle b/build.gradle index 57760837dd..45f685aa3a 100644 --- a/build.gradle +++ b/build.gradle @@ -75,10 +75,6 @@ repositories { name 'Railcraft' artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]" } - ivy { - name 'IC2NuclearControl' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.nc.cf}/[module]-[revision].[ext]" - } } dependencies { @@ -99,7 +95,7 @@ dependencies { provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar' - provided name: 'IC2NuclearControl', version: config.nc.version, ext: 'jar' + compile files('lib/IC2NuclearControl-2.3.3a-Exist.jar') } processResources @@ -138,4 +134,4 @@ task devJar(type: Jar) { artifacts { archives devJar -} \ No newline at end of file +} diff --git a/build.properties b/build.properties index 31d72a216a..2e3c640248 100644 --- a/build.properties +++ b/build.properties @@ -1,8 +1,8 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.22 +gt.version=5.08.33.27 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 buildcraft.version=7.1.11 @@ -20,5 +20,3 @@ ic2.version=2.2.790-experimental nei.version=1.0.3.57 railcraft.cf=2219/321 railcraft.version=1.7.10-9.4.0.0 -nc.cf=2275/987 -nc.version=2.3.4a diff --git a/gradlew b/gradlew new file mode 100644 index 0000000000..91a7e269e1 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index ee06e1e955..0d088ab18b 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -1,11 +1,5 @@ package gregtech; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.PrintStream; -import java.util.*; -import java.util.Map.Entry; - import cpw.mods.fml.common.*; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.EntityRegistry; @@ -32,9 +26,7 @@ import gregtech.loaders.load.GT_FuelLoader; import gregtech.loaders.load.GT_ItemIterator; import gregtech.loaders.load.GT_SonictronLoader; import gregtech.loaders.misc.GT_Achievements; -import gregtech.loaders.misc.GT_Bees; import gregtech.loaders.misc.GT_CoverLoader; -import gregtech.loaders.misc.OreProcessingConfiguration; import gregtech.loaders.postload.*; import gregtech.loaders.preload.*; import ic2.api.recipe.IRecipeInput; @@ -56,15 +48,20 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -//import forestry.factory.recipes.ISqueezerRecipe; -//import forestry.factory.tiles.TileCentrifuge; -//import forestry.factory.tiles.TileSqueezer; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.PrintStream; +import java.util.*; +import java.util.Map.Entry; +//import forestry.factory.gadgets.MachineCentrifuge; +//import forestry.factory.gadgets.MachineCentrifuge.RecipeManager; +//import forestry.factory.gadgets.MachineSqueezer; @Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false, dependencies = "required-after:IC2; after:Forestry; after:PFAAGeologica; after:Thaumcraft; after:Railcraft; after:appliedenergistics2; after:ThermalExpansion; after:TwilightForest; after:harvestcraft; after:magicalcrops; after:BuildCraft|Transport; after:BuildCraft|Silicon; after:BuildCraft|Factory; after:BuildCraft|Energy; after:BuildCraft|Core; after:BuildCraft|Builders; after:GalacticraftCore; after:GalacticraftMars; after:GalacticraftPlanets; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; after:RedPowerCore; after:RedPowerBase; after:RedPowerMachine; after:RedPowerCompat; after:RedPowerWiring; after:RedPowerLogic; after:RedPowerLighting; after:RedPowerWorld; after:RedPowerControl;") public class GT_Mod implements IGT_Mod { - public static final int VERSION = 509; + public static final int VERSION = 508; public static final int REQUIRED_IC2 = 624; @Mod.Instance("gregtech") public static GT_Mod instance; @@ -74,7 +71,7 @@ public class GT_Mod public static GT_Achievements achievements; static { - if ((509 != GregTech_API.VERSION) || (509 != GT_ModHandler.VERSION) || (509 != GT_OreDictUnificator.VERSION) || (509 != GT_Recipe.VERSION) || (509 != GT_Utility.VERSION) || (509 != GT_RecipeRegistrator.VERSION) || (509 != Element.VERSION) || (509 != Materials.VERSION) || (509 != OrePrefixes.VERSION)) { + if ((508 != GregTech_API.VERSION) || (508 != GT_ModHandler.VERSION) || (508 != GT_OreDictUnificator.VERSION) || (508 != GT_Recipe.VERSION) || (508 != GT_Utility.VERSION) || (508 != GT_RecipeRegistrator.VERSION) || (508 != Element.VERSION) || (508 != Materials.VERSION) || (508 != OrePrefixes.VERSION)) { throw new GT_ItsNotMyFaultException("One of your Mods included GregTech-API Files inside it's download, mention this to the Mod Author, who does this bad thing, and tell him/her to use reflection. I have added a Version check, to prevent Authors from breaking my Mod that way."); } } @@ -223,34 +220,34 @@ public class GT_Mod gregtechproxy.mHungerEffect = tMainConfig.get("general", "AFK_Hunger", false).getBoolean(false); gregtechproxy.mHardRock = tMainConfig.get("general", "harderstone", false).getBoolean(false); gregtechproxy.mInventoryUnification = tMainConfig.get("general", "InventoryUnification", true).getBoolean(true); - gregtechproxy.mGTBees = tMainConfig.get("general", "GTBees", true).getBoolean(true); gregtechproxy.mCraftingUnification = tMainConfig.get("general", "CraftingUnification", true).getBoolean(true); gregtechproxy.mNerfedWoodPlank = tMainConfig.get("general", "WoodNeedsSawForCrafting", true).getBoolean(true); gregtechproxy.mNerfedVanillaTools = tMainConfig.get("general", "smallerVanillaToolDurability", true).getBoolean(true); gregtechproxy.mSortToTheEnd = tMainConfig.get("general", "EnsureToBeLoadedLast", true).getBoolean(true); - gregtechproxy.mDisableIC2Cables = tMainConfig.get("general", "DisableIC2Cables", true).getBoolean(true); + gregtechproxy.mDisableIC2Cables = tMainConfig.get("general", "DisableIC2Cables", false).getBoolean(false); gregtechproxy.mAchievements = tMainConfig.get("general", "EnableAchievements", true).getBoolean(true); - gregtechproxy.mAE2Integration = GregTech_API.sSpecialFile.get(ConfigCategories.general, "EnableAE2Integration", Loader.isModLoaded("appliedenergistics2")); - gregtechproxy.mNerfedCombs = tMainConfig.get("general", "NerfCombs", true).getBoolean(true); - gregtechproxy.mHideUnusedOres = tMainConfig.get("general", "HideUnusedOres", true).getBoolean(true); - gregtechproxy.mHideRecyclingRecipes = tMainConfig.get("general", "HideRecyclingRecipes", true).getBoolean(true); + gregtechproxy.mAE2Integration = tMainConfig.get("general", "EnableAE2Integration", Loader.isModLoaded("appliedenergistics2")).getBoolean(Loader.isModLoaded("appliedenergistics2")); - GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true); + + GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", false); GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false); GregTech_API.mEUtoRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "100EUtoRF", 360); GregTech_API.mRFtoEU = GregTech_API.sOPStuff.get(ConfigCategories.general, "100RFtoEU", 20); - GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", false); + GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", true); GregTech_API.meIOLoaded = Loader.isModLoaded("EnderIO"); gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties.get("havestLevel", "activateHarvestLevelChange", false); if(gregtechproxy.mChangeHarvestLevels){ - gregtechproxy.mGraniteHavestLevel = (int) GregTech_API.sMaterialProperties.get("havestLevel", "graniteHarvestLevel", 3); - gregtechproxy.mMaxHarvestLevel=(int) Math.min(15, GregTech_API.sMaterialProperties.get("havestLevel", "maxLevel",7)); - for(Materials tMaterial : Materials.values()){ - if(tMaterial!=null&&tMaterial.mToolQuality>0&&tMaterial.mMetaItemSubID=0){ - gregtechproxy.mHarvestLevel[tMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties.get("materialHavestLevel", tMaterial.mDefaultLocalName,tMaterial.mToolQuality); - } - }} + gregtechproxy.mGraniteHavestLevel = (int) GregTech_API.sMaterialProperties.get("havestLevel", "graniteHarvestLevel", 3); + gregtechproxy.mMaxHarvestLevel=(int) Math.min(15, GregTech_API.sMaterialProperties.get("havestLevel", "maxLevel",7)); + for(Materials tMaterial : Materials.values()){ + if(tMaterial!=null&&tMaterial.mToolQuality>0&&tMaterial.mMetaItemSubID=0){ + gregtechproxy.mHarvestLevel[tMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties.get("materialHavestLevel", tMaterial.mDefaultLocalName,tMaterial.mToolQuality); + } + } + } + + if (tMainConfig.get("general", "hardermobspawners", true).getBoolean(true)) { Blocks.mob_spawner.setHardness(500.0F).setResistance(6000000.0F); @@ -298,8 +295,6 @@ public class GT_Mod new Enchantment_EnderDamage(); new Enchantment_Radioactivity(); - new OreProcessingConfiguration(aEvent.getModConfigurationDirectory()).run(); - new GT_Loader_OreProcessing().run(); new GT_Loader_OreDictionary().run(); new GT_Loader_ItemData().run(); @@ -389,9 +384,6 @@ public class GT_Mod e.printStackTrace(GT_Log.err); } } - - new GT_Bees(); - gregtechproxy.onLoad(); if (gregtechproxy.mSortToTheEnd) { new GT_ItemIterator().run(); @@ -484,13 +476,18 @@ public class GT_Mod Map outputs = tRecipe.getAllProducts(); ItemStack[] tOutputs = new ItemStack[outputs.size()]; int[] tChances = new int[outputs.size()]; - int i = 0; + int i =0; for (Map.Entry entry : outputs.entrySet()) { - tChances[i] = (int) (entry.getValue() * 10000); + tChances[i] = (int) (entry.getValue()*10000); tOutputs[i] = entry.getKey().copy(); i++; } +// for (int i = 0; i < outputs.size(); i++) { +// tOutputs[i] = outputs.entrySet(). +// tChances[i] = (tOriginalChances[i].intValue() * 100); +// } GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(true, new ItemStack[]{tRecipe.getInput()}, tOutputs, null, tChances, null, null, 128, 5, 0); + } } catch (Throwable e) { if (GT_Values.D1) { @@ -645,7 +642,6 @@ public class GT_Mod GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{new ItemStack(Items.filled_map, 1, 32767)}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Scanned Map Data", new Object[0])}, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to", new Object[0]), null, null, 128, 32, 0); GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Orb to overwrite", new Object[0])}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Copy of the Orb", new Object[0])}, ItemList.Tool_DataOrb.getWithName(0L, "Orb to copy", new Object[0]), null, null, 512, 32, 0); GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Stick to overwrite", new Object[0])}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Copy of the Stick", new Object[0])}, ItemList.Tool_DataStick.getWithName(0L, "Stick to copy", new Object[0]), null, null, 128, 32, 0); - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Raw Prospection Data", new Object[0])}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Analyzed Prospection Data", new Object[0])}, null, null, null, 1000, 32, 0); for (Materials tMaterial : Materials.VALUES) { if ((tMaterial.mElement != null) && (!tMaterial.mElement.mIsIsotope) && (tMaterial != Materials.Magic) && (tMaterial.getMass() > 0L)) { ItemStack tOutput = ItemList.Tool_DataOrb.get(1L, new Object[0]); @@ -676,15 +672,6 @@ public class GT_Mod } } } - - if(GregTech_API.mOutputRF||GregTech_API.mInputRF){ - GT_Utility.checkAvailabilities(); - if(!GT_Utility.RF_CHECK){ - GregTech_API.mOutputRF = false; - GregTech_API.mInputRF = false; - } - } - achievements = new GT_Achievements(); Map.Entry tRecipe; GT_Log.out.println("GT_Mod: Loading finished, deallocating temporary Init Variables."); diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index d38b1c7281..bc651b138a 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -81,8 +81,7 @@ public class GregTech_API { * 9216 - 9727 are used for GregTech Automation Machines. * 9728 - 10239 are reserved for 28Smiles. * 10240 - 10751 are reserved for VirMan. - * 10752 - 11263 are reserved for Briareos81. - * 11264 - 12000 are reserved for the next one who asks me. + * 10752 - 11263 are reserved for the next one who asks me. * 9728 - 32766 are currently free. *

* Contact me if you need a free ID-Range, which doesn't conflict with other Addons. @@ -150,7 +149,7 @@ public class GregTech_API { /** * For the API Version check */ - public static volatile int VERSION = 509; + public static volatile int VERSION = 508; @Deprecated public static IGT_RecipeAdder sRecipeAdder; /** @@ -175,7 +174,7 @@ public class GregTech_API { * Initialized by the Block creation. */ public static Block sBlockMachines; - public static Block sBlockOres1, sBlockGem, sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced; + public static Block sBlockOres1; public static Block sBlockGranites, sBlockConcretes; public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4; /** diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java index 51eead9adf..1245d7ac08 100644 --- a/src/main/java/gregtech/api/enums/ConfigCategories.java +++ b/src/main/java/gregtech/api/enums/ConfigCategories.java @@ -25,8 +25,7 @@ public enum ConfigCategories { disabledrecipes, recipereplacements, storageblockcrafting, - storageblockdecrafting, - crops; + storageblockdecrafting; } public enum Machines { diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java index d9459306b8..61528a11de 100644 --- a/src/main/java/gregtech/api/enums/Element.java +++ b/src/main/java/gregtech/api/enums/Element.java @@ -263,7 +263,7 @@ public enum Element { $Ma(0, 0, -100, -1, null, "Anti-Magic", false), $Nt(0, -10000, 0, -1, null, "Anti-Neutronium", false); - public static volatile int VERSION = 509; + public static volatile int VERSION = 508; public final long mProtons, mNeutrons, mAdditionalMass, mHalfLifeSeconds; public final String mName, mDecayTo; public final boolean mIsIsotope; diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index 93c7ef73e6..85e0af4b86 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -89,7 +89,7 @@ public class GT_Values { * File Paths and Resource Paths */ public static final String - TEX_DIR = "textures/", TEX_DIR_GUI = TEX_DIR + "gui/", TEX_DIR_ITEM = TEX_DIR + "items/", TEX_DIR_BLOCK = TEX_DIR + "blocks/", TEX_DIR_ENTITY = TEX_DIR + "entity/", TEX_DIR_ASPECTS = TEX_DIR + "aspects/", RES_PATH = MOD_ID + ":" + TEX_DIR, RES_PATH_GUI = MOD_ID + ":" + TEX_DIR_GUI, RES_PATH_ITEM = MOD_ID + ":", RES_PATH_BLOCK = MOD_ID + ":", RES_PATH_ENTITY = MOD_ID + ":" + TEX_DIR_ENTITY, RES_PATH_ASPECTS = MOD_ID + ":" + TEX_DIR_ASPECTS, RES_PATH_IC2 = MOD_ID_IC2.toLowerCase() + ":", RES_PATH_MODEL = MOD_ID + ":" + TEX_DIR + "models/"; + TEX_DIR = "textures/", TEX_DIR_GUI = TEX_DIR + "gui/", TEX_DIR_ITEM = TEX_DIR + "items/", TEX_DIR_BLOCK = TEX_DIR + "blocks/", TEX_DIR_ENTITY = TEX_DIR + "entity/", TEX_DIR_ASPECTS = TEX_DIR + "aspects/", RES_PATH = MOD_ID + ":" + TEX_DIR, RES_PATH_GUI = MOD_ID + ":" + TEX_DIR_GUI, RES_PATH_ITEM = MOD_ID + ":", RES_PATH_BLOCK = MOD_ID + ":", RES_PATH_ENTITY = MOD_ID + ":" + TEX_DIR_ENTITY, RES_PATH_ASPECTS = MOD_ID + ":" + TEX_DIR_ASPECTS, RES_PATH_IC2 = MOD_ID_IC2.toLowerCase() + ":"; /** * The Mod Object itself. That is the GT_Mod-Object. It's needed to open GUI's and similar. */ diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index c1cd5ce164..cd8d39d3cc 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -194,6 +194,13 @@ public enum ItemList implements IItemContainer { Cell_Air, Large_Fluid_Cell_Steel, Large_Fluid_Cell_TungstenSteel, + Large_Fluid_Cell_Aluminium, + Large_Fluid_Cell_StainlessSteel, + Large_Fluid_Cell_Titanium, + Large_Fluid_Cell_Chrome, + Large_Fluid_Cell_Iridium, + Large_Fluid_Cell_Osmium, + Large_Fluid_Cell_Neutronium, ThermosCan_Empty, ThermosCan_Dark_Coffee, ThermosCan_Dark_Cafe_au_lait, @@ -612,37 +619,55 @@ public enum ItemList implements IItemContainer { Machine_LV_Hammer, Machine_MV_Hammer, Machine_HV_Hammer, Machine_EV_Hammer, Machine_IV_Hammer, Machine_LV_FluidHeater, Machine_MV_FluidHeater, Machine_HV_FluidHeater, Machine_EV_FluidHeater, Machine_IV_FluidHeater, + Neutron_Reflector, - Reactor_Coolant_He_1, Reactor_Coolant_He_3, Reactor_Coolant_He_6, Reactor_Coolant_NaK_1, Reactor_Coolant_NaK_3, Reactor_Coolant_NaK_6, - ThoriumCell_1, ThoriumCell_2, ThoriumCell_4, - FusionComputer_LuV, FusionComputer_ZPMV, FusionComputer_UV, - Casing_Fusion_Coil, Casing_Fusion, Casing_Fusion2, - Generator_Plasma_IV, Generator_Plasma_LuV, Generator_Plasma_ZPMV, - MagicEnergyConverter_LV, MagicEnergyConverter_MV, MagicEnergyConverter_HV, - MagicEnergyAbsorber_LV, MagicEnergyAbsorber_MV, MagicEnergyAbsorber_HV, MagicEnergyAbsorber_EV, - Depleted_Thorium_1, Depleted_Thorium_2, Depleted_Thorium_4, - Processing_Array, Distillation_Tower, Energy_LapotronicOrb2, + Reactor_Coolant_He_1, + Reactor_Coolant_He_3, + Reactor_Coolant_He_6, + Reactor_Coolant_NaK_1, + Reactor_Coolant_NaK_3, + Reactor_Coolant_NaK_6, + ThoriumCell_1, + ThoriumCell_2, + ThoriumCell_4, + FusionComputer_LuV, + FusionComputer_ZPMV, + FusionComputer_UV, + Casing_Fusion_Coil, + Casing_Fusion, + Casing_Fusion2, + Generator_Plasma_IV, + Generator_Plasma_LuV, + Generator_Plasma_ZPMV, + MagicEnergyConverter_LV, + MagicEnergyConverter_MV, + MagicEnergyConverter_HV, + MagicEnergyAbsorber_LV, + MagicEnergyAbsorber_MV, + MagicEnergyAbsorber_HV, + MagicEnergyAbsorber_EV, + Depleted_Thorium_1, + Depleted_Thorium_2, + Depleted_Thorium_4, + Processing_Array, + Distillation_Tower, + Energy_LapotronicOrb2, ZPM2, Quantum_Tank_LV, Quantum_Tank_MV, Quantum_Tank_HV, Quantum_Tank_EV, Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, NULL, Cover_RedstoneTransmitterExternal, Cover_RedstoneTransmitterInternal, Cover_RedstoneReceiverExternal, Cover_RedstoneReceiverInternal, - LargeSteamTurbine, LargeGasTurbine, LargeHPSteamTurbine, LargePlasmaTurbine, + LargeSteamTurbine, Ingot_Heavy1, Ingot_Heavy2, Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, - Teleporter, Cover_NeedsMaintainance, Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3, Casing_EngineIntake, - MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, Cover_PlayerDetector, Machine_Multi_HeatExchanger, - Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced, - Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, OilDrill, AdvancedMiner2, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite, - Battery_Charger_4by4_ULV, Battery_Charger_4by4_LV, Battery_Charger_4by4_MV, Battery_Charger_4by4_HV, Battery_Charger_4by4_EV, Battery_Charger_4by4_IV, Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, Battery_Charger_4by4_MAX, - MicroTransmitter_HV, MicroTransmitter_EV, MicroTransmitter_IV, MicroTransmitter_LUV, MicroTransmitter_ZPM, - Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4, - ModularBasicHelmet, ModularBasicChestplate, ModularBasicLeggings, ModularBasicBoots, - ModularElectric1Helmet, ModularElectric1Chestplate, ModularElectric1Leggings, ModularElectric1Boots, - ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene, - FluidRegulator_LV, FluidRegulator_MV, FluidRegulator_HV, FluidRegulator_EV, FluidRegulator_IV, FluidFilter, CuringOven, Machine_Multi_Assemblyline, Machine_Multi_DieselEngine; + Teleporter, + Cover_NeedsMaintainance, + Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3, + MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, LargeGasTurbine, LargeHPSteamTurbine, LargePlasmaTurbine, Cover_PlayerDetector, Machine_Multi_HeatExchanger, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4, + Machine_Multi_Assemblyline; + 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}; - public static Fluid sOilExtraHeavy, sEpichlorhydrin, sDrillingFluid, sNitricAcid, sBlueVitriol, sNickelSulfate, sToluene, sNitrationMixture; + public static Fluid sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas; private ItemStack mStack; private boolean mHasNotBeenSet = true; diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 7be109fad2..cdfbf198fd 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -24,1218 +24,1215 @@ import static gregtech.api.enums.GT_Values.MOD_ID_TC; * This List contains every Material I know about, and is used to determine Recipes for the */ public enum Materials implements IColorModulationContainer, ISubTagContainer { - /** - * This is the Default Material returned in case no Material has been found or a NullPointer has been inserted at a location where it shouldn't happen. - * - * Mainly for preventing NullPointer Exceptions and providing Default Values. - */ - _NULL ( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "NULL" , 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL , Element._NULL , Arrays.asList(new TC_AspectStack(TC_Aspects.VACUOS, 1))), - - /** - * Direct Elements - */ - Aluminium ( 19, TextureSet.SET_DULL , 10.0F, 128, 2, 1|2 |8 |32|64|128 , 128, 200, 240, 0, "Aluminium" , 0, 0, 933, 1700, true, false, 3, 1, 1, Dyes.dyeLightBlue , Element.Al , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.VOLATUS, 1))), - Americium ( 103, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 |8 |32 , 200, 200, 200, 0, "Americium" , 0, 0, 1449, 0, false, false, 3, 1, 1, Dyes.dyeLightGray , Element.Am , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Antimony ( 58, TextureSet.SET_SHINY , 1.0F, 0, 2, 1|2 |8 |32 , 220, 220, 240, 0, "Antimony" , 0, 0, 903, 0, false, false, 2, 1, 1, Dyes.dyeLightGray , Element.Sb , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.AQUA, 1))), - Argon ( 24, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 0, 255, 0, 240, "Argon" , 0, 0, 83, 0, false, true, 5, 1, 1, Dyes.dyeGreen , Element.Ar , Arrays.asList(new TC_AspectStack(TC_Aspects.AER, 2))), - Arsenic ( 39, TextureSet.SET_DULL , 1.0F, 0, 2, 1|2 |8|16|32 , 255, 255, 255, 0, "Arsenic" , 0, 0, 1090, 0, false, false, 3, 1, 1, Dyes.dyeOrange , Element.As , Arrays.asList(new TC_AspectStack(TC_Aspects.VENENUM, 3))), - Barium ( 63, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |8 |32 , 255, 255, 255, 0, "Barium" , 0, 0, 1000, 0, false, false, 1, 1, 1, Dyes._NULL , Element.Ba , Arrays.asList(new TC_AspectStack(TC_Aspects.VINCULUM, 3))), - Beryllium ( 8, TextureSet.SET_METALLIC , 14.0F, 64, 2, 1|2 |8 |32|64 , 100, 180, 100, 0, "Beryllium" , 0, 0, 1560, 0, false, false, 6, 1, 1, Dyes.dyeGreen , Element.Be , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.LUCRUM, 1))), - Bismuth ( 90, TextureSet.SET_METALLIC , 6.0F, 64, 1, 1|2 |8 |32|64|128 , 100, 160, 160, 0, "Bismuth" , 0, 0, 544, 0, false, false, 2, 1, 1, Dyes.dyeCyan , Element.Bi , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1))), - Boron ( 9, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 |32 , 250, 250, 250, 0, "Boron" , 0, 0, 2349, 0, false, false, 1, 1, 1, Dyes.dyeWhite , Element.B , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 3))), - Caesium ( 62, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Caesium" , 0, 0, 301, 0, false, false, 4, 1, 1, Dyes._NULL , Element.Cs , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Calcium ( 26, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |32 , 255, 245, 245, 0, "Calcium" , 0, 0, 1115, 0, false, false, 4, 1, 1, Dyes.dyePink , Element.Ca , Arrays.asList(new TC_AspectStack(TC_Aspects.SANO, 1), new TC_AspectStack(TC_Aspects.TUTAMEN, 1))), - Carbon ( 10, TextureSet.SET_DULL , 1.0F, 64, 2, 1|2 |32|64|128 , 20, 20, 20, 0, "Carbon" , 0, 0, 3800, 0, false, false, 2, 1, 1, Dyes.dyeBlack , Element.C , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.IGNIS, 1))), - Cadmium ( 55, TextureSet.SET_SHINY , 1.0F, 0, 2, 1 |8 |32 , 50, 50, 60, 0, "Cadmium" , 0, 0, 594, 0, false, false, 3, 1, 1, Dyes.dyeGray , Element.Cd , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_AspectStack(TC_Aspects.VENENUM, 1))), - Cerium ( 65, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Cerium" , 0, 0, 1068, 1068, true, false, 4, 1, 1, Dyes._NULL , Element.Ce , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Chlorine ( 23, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 255, 255, 255, 0, "Chlorine" , 0, 0, 171, 0, false, false, 2, 1, 1, Dyes.dyeCyan , Element.Cl , Arrays.asList(new TC_AspectStack(TC_Aspects.AQUA, 2), new TC_AspectStack(TC_Aspects.PANNUS, 1))), - Chrome ( 30, TextureSet.SET_SHINY , 11.0F, 256, 3, 1|2 |8 |32|64|128 , 255, 230, 230, 0, "Chrome" , 0, 0, 2180, 1700, true, false, 5, 1, 1, Dyes.dyePink , Element.Cr , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MACHINA, 1))), - Cobalt ( 33, TextureSet.SET_METALLIC , 8.0F, 512, 3, 1|2 |8 |32|64 , 80, 80, 250, 0, "Cobalt" , 0, 0, 1768, 0, false, false, 3, 1, 1, Dyes.dyeBlue , Element.Co , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1))), - Copper ( 35, TextureSet.SET_SHINY , 1.0F, 0, 1, 1|2 |8 |32 |128 , 255, 100, 0, 0, "Copper" , 0, 0, 1357, 0, false, false, 3, 1, 1, Dyes.dyeOrange , Element.Cu , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.PERMUTATIO, 1))), - Deuterium ( 2, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 255, 255, 0, 240, "Deuterium" , 0, 0, 14, 0, false, true, 10, 1, 1, Dyes.dyeYellow , Element.D , Arrays.asList(new TC_AspectStack(TC_Aspects.AQUA, 3))), - Dysprosium ( 73, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Dysprosium" , 0, 0, 1680, 1680, true, false, 4, 1, 1, Dyes._NULL , Element.Dy , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 3))), - Empty ( 0, TextureSet.SET_NONE , 1.0F, 0, 2, 256/*Only for Prefixes which need it*/, 255, 255, 255, 255, "Empty" , 0, 0, -1, 0, false, true, 1, 1, 1, Dyes._NULL , Element._NULL , Arrays.asList(new TC_AspectStack(TC_Aspects.VACUOS, 2))), - Erbium ( 75, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Erbium" , 0, 0, 1802, 1802, true, false, 4, 1, 1, Dyes._NULL , Element.Er , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Europium ( 70, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Europium" , 0, 0, 1099, 1099, true, false, 4, 1, 1, Dyes._NULL , Element.Eu , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Fluorine ( 14, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 255, 255, 255, 127, "Fluorine" , 0, 0, 53, 0, false, true, 2, 1, 1, Dyes.dyeGreen , Element.F , Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 2))), - Gadolinium ( 71, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Gadolinium" , 0, 0, 1585, 1585, true, false, 4, 1, 1, Dyes._NULL , Element.Gd , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Gallium ( 37, TextureSet.SET_SHINY , 1.0F, 64, 2, 1|2 |8 |32 , 220, 220, 255, 0, "Gallium" , 0, 0, 302, 0, false, false, 5, 1, 1, Dyes.dyeLightGray , Element.Ga , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ELECTRUM, 1))), - Gold ( 86, TextureSet.SET_SHINY , 12.0F, 64, 2, 1|2 |8 |32|64|128 , 255, 255, 30, 0, "Gold" , 0, 0, 1337, 0, false, false, 4, 1, 1, Dyes.dyeYellow , Element.Au , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.LUCRUM, 2))), - Holmium ( 74, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Holmium" , 0, 0, 1734, 1734, true, false, 4, 1, 1, Dyes._NULL , Element.Ho , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Hydrogen ( 1, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 0, 0, 255, 240, "Hydrogen" , 1, 15, 14, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Element.H , Arrays.asList(new TC_AspectStack(TC_Aspects.AQUA, 1))), - Helium ( 4, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 255, 255, 0, 240, "Helium" , 0, 0, 1, 0, false, true, 5, 1, 1, Dyes.dyeYellow , Element.He , Arrays.asList(new TC_AspectStack(TC_Aspects.AER, 2))), - Helium_3 ( 5, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 255, 255, 0, 240, "Helium-3" , 0, 0, 1, 0, false, true, 10, 1, 1, Dyes.dyeYellow , Element.He_3 , Arrays.asList(new TC_AspectStack(TC_Aspects.AER, 3))), - Indium ( 56, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 64, 0, 128, 0, "Indium" , 0, 0, 429, 0, false, false, 4, 1, 1, Dyes.dyeGray , Element.In , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Iridium ( 84, TextureSet.SET_DULL , 6.0F, 2560, 3, 1|2 |8 |32|64|128 , 240, 240, 245, 0, "Iridium" , 0, 0, 2719, 2719, true, false, 10, 1, 1, Dyes.dyeWhite , Element.Ir , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MACHINA, 1))), - Iron ( 32, TextureSet.SET_METALLIC , 6.0F, 256, 2, 1|2 |8 |32|64|128 , 200, 200, 200, 0, "Iron" , 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray , Element.Fe , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 3))), - Lanthanum ( 64, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Lanthanum" , 0, 0, 1193, 1193, true, false, 4, 1, 1, Dyes._NULL , Element.La , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Lead ( 89, TextureSet.SET_DULL , 8.0F, 64, 1, 1|2 |8 |32|64|128 , 140, 100, 140, 0, "Lead" , 0, 0, 600, 0, false, false, 3, 1, 1, Dyes.dyePurple , Element.Pb , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ORDO, 1))), - Lithium ( 6, TextureSet.SET_DULL , 1.0F, 0, 2, 1|2 |8 |32 , 225, 220, 255, 0, "Lithium" , 0, 0, 454, 0, false, false, 4, 1, 1, Dyes.dyeLightBlue , Element.Li , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.POTENTIA, 2))), - Lutetium ( 78, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Lutetium" , 0, 0, 1925, 1925, true, false, 4, 1, 1, Dyes._NULL , Element.Lu , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Magic (-128, TextureSet.SET_SHINY , 8.0F, 5120, 5, 1|2|4|8|16|32|64|128 , 100, 0, 200, 0, "Magic" , 5, 32, 5000, 0, false, false, 7, 1, 1, Dyes.dyePurple , Element.Ma , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 4))), - Magnesium ( 18, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 200, 200, 0, "Magnesium" , 0, 0, 923, 0, false, false, 3,