From 2855aaffb538f5dae1fcbbbd051bfb4e3a5951c8 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Thu, 1 Nov 2018 14:58:08 +0000 Subject: + Added new Radioactive ore. + Added Custom Nuclear Texture Set. % More material work. $ Fixed issue allowing Multiblocks to have > 1 Control Core Hatch. $ Fixed Broken Ore texture for ENRICHED TextureSet. $ Fixed a few fluid recipes broken in the refactor. --- src/Java/gtPlusPlus/GTplusplus.java | 27 + .../gtPlusPlus/core/block/base/BasicBlock.java | 4 +- .../core/block/base/BlockBaseModular.java | 8 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 7 +- .../gtPlusPlus/core/client/CustomTextureSet.java | 3 +- src/Java/gtPlusPlus/core/item/ModItems.java | 4 +- .../core/item/base/BaseItemComponent.java | 8 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 108 ++-- .../core/item/base/itemblock/ItemBlockOre.java | 26 +- src/Java/gtPlusPlus/core/material/ALLOY.java | 42 +- src/Java/gtPlusPlus/core/material/ELEMENT.java | 55 +- src/Java/gtPlusPlus/core/material/Material.java | 221 ++++--- src/Java/gtPlusPlus/core/material/ORES.java | 509 +++++++++------ .../core/material/nuclear/FLUORIDES.java | 148 +++-- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 30 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 20 +- src/Java/gtPlusPlus/core/util/Utils.java | 28 +- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 270 ++++++-- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 13 + .../core/util/minecraft/MaterialUtils.java | 270 ++++++-- .../everglades/GTplusplus_Everglades.java | 1 + .../base/GregtechMeta_MultiBlockBase.java | 23 +- .../multi/misc/GregtechMTE_TeslaTower.java | 2 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 6 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 6 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 2 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 2 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 2 +- .../multi/production/GT4Entity_AutoCrafter.java | 16 +- .../GregtechMetaTileEntity_SolarTower.java | 2 +- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 3 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 3 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 2 +- ...chMetaTileEntity_PowerSubStationController.java | 2 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 3 + .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 11 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 470 +++++++------- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 704 +++++++++++---------- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 26 +- .../blocks/materialicons/ENRICHED/ore .png | Bin 271 -> 0 bytes .../textures/blocks/materialicons/ENRICHED/ore.png | Bin 0 -> 271 bytes .../blocks/materialicons/NUCLEAR/block1.png | Bin 0 -> 504 bytes .../blocks/materialicons/NUCLEAR/block2.png | Bin 0 -> 620 bytes .../blocks/materialicons/NUCLEAR/block3.png | Bin 0 -> 642 bytes .../blocks/materialicons/NUCLEAR/block4.png | Bin 0 -> 655 bytes .../blocks/materialicons/NUCLEAR/block5.png | Bin 0 -> 427 bytes .../blocks/materialicons/NUCLEAR/block6.png | Bin 0 -> 504 bytes .../textures/blocks/materialicons/NUCLEAR/foil.png | Bin 0 -> 368 bytes .../blocks/materialicons/NUCLEAR/frameGt.png | Bin 0 -> 441 bytes .../textures/blocks/materialicons/NUCLEAR/ore.png | Bin 0 -> 665 bytes .../blocks/materialicons/NUCLEAR/ore.png.mcmeta | 6 + .../blocks/materialicons/NUCLEAR/oreSmall.png | Bin 0 -> 339 bytes .../blocks/materialicons/NUCLEAR/pipeHuge.png | Bin 0 -> 348 bytes .../blocks/materialicons/NUCLEAR/pipeLarge.png | Bin 0 -> 446 bytes .../blocks/materialicons/NUCLEAR/pipeMedium.png | Bin 0 -> 442 bytes .../blocks/materialicons/NUCLEAR/pipeSide.png | Bin 0 -> 401 bytes .../blocks/materialicons/NUCLEAR/pipeSmall.png | Bin 0 -> 429 bytes .../blocks/materialicons/NUCLEAR/pipeTiny.png | Bin 0 -> 418 bytes .../textures/blocks/materialicons/NUCLEAR/void.png | Bin 0 -> 143 bytes .../textures/blocks/materialicons/NUCLEAR/wire.png | Bin 0 -> 513 bytes .../items/materialicons/NUCLEAR/Fiery/cell.png | Bin 0 -> 328 bytes .../materialicons/NUCLEAR/Fiery/cellPlasma.png | Bin 0 -> 328 bytes .../NUCLEAR/Fiery/cellPlasma_OVERLAY.png | Bin 0 -> 290 bytes .../materialicons/NUCLEAR/Fiery/cell_OVERLAY.png | Bin 0 -> 309 bytes .../materialicons/NUCLEAR/Fiery/crateGtDust.png | Bin 0 -> 370 bytes .../NUCLEAR/Fiery/crateGtDust_OVERLAY.png | Bin 0 -> 506 bytes .../materialicons/NUCLEAR/Fiery/crateGtGem.png | Bin 0 -> 401 bytes .../NUCLEAR/Fiery/crateGtGem_OVERLAY.png | Bin 0 -> 526 bytes .../materialicons/NUCLEAR/Fiery/crateGtIngot.png | Bin 0 -> 380 bytes .../NUCLEAR/Fiery/crateGtIngot_OVERLAY.png | Bin 0 -> 517 bytes .../materialicons/NUCLEAR/Fiery/crateGtPlate.png | Bin 0 -> 455 bytes .../NUCLEAR/Fiery/crateGtPlate_OVERLAY.png | Bin 0 -> 449 bytes .../NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.png | Bin 0 -> 430 bytes .../NUCLEAR/Fiery/crushedPurified_OVERLAY.png | Bin 0 -> 583 bytes .../NUCLEAR/Fiery/crushed_OVERLAY.png | Bin 0 -> 426 bytes .../NUCLEAR/Fiery/dustTiny_OVERLAY.png | Bin 0 -> 221 bytes .../materialicons/NUCLEAR/Fiery/dust_OVERLAY.png | Bin 0 -> 222 bytes .../materialicons/NUCLEAR/Fiery/foil_OVERLAY.png | Bin 0 -> 539 bytes .../NUCLEAR/Fiery/gearGtSmall_OVERLAY.png | Bin 0 -> 365 bytes .../materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.png | Bin 0 -> 503 bytes .../NUCLEAR/Fiery/gemChipped_OVERLAY.png | Bin 0 -> 465 bytes .../NUCLEAR/Fiery/gemExquisite_OVERLAY.png | Bin 0 -> 613 bytes .../NUCLEAR/Fiery/gemFlawed_OVERLAY.png | Bin 0 -> 487 bytes .../NUCLEAR/Fiery/gemFlawless_OVERLAY.png | Bin 0 -> 504 bytes .../materialicons/NUCLEAR/Fiery/gem_OVERLAY.png | Bin 0 -> 465 bytes .../NUCLEAR/Fiery/ingotDouble_OVERLAY.png | Bin 0 -> 419 bytes .../NUCLEAR/Fiery/ingotHot_OVERLAY.png | Bin 0 -> 309 bytes .../NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png | Bin 0 -> 379 bytes .../NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png | Bin 0 -> 362 bytes .../NUCLEAR/Fiery/ingotTriple_OVERLAY.png | Bin 0 -> 395 bytes .../materialicons/NUCLEAR/Fiery/ingot_OVERLAY.png | Bin 0 -> 365 bytes .../items/materialicons/NUCLEAR/Fiery/lens.png | Bin 0 -> 296 bytes .../materialicons/NUCLEAR/Fiery/lens_OVERLAY.png | Bin 0 -> 594 bytes .../materialicons/NUCLEAR/Fiery/nugget_OVERLAY.png | Bin 0 -> 261 bytes .../NUCLEAR/Fiery/plateDense_OVERLAY.png | Bin 0 -> 322 bytes .../NUCLEAR/Fiery/plateDouble_OVERLAY.png | Bin 0 -> 338 bytes .../NUCLEAR/Fiery/plateQuadruple_OVERLAY.png | Bin 0 -> 372 bytes .../NUCLEAR/Fiery/plateQuintuple_OVERLAY.png | Bin 0 -> 380 bytes .../NUCLEAR/Fiery/plateTriple_OVERLAY.png | Bin 0 -> 360 bytes .../materialicons/NUCLEAR/Fiery/plate_OVERLAY.png | Bin 0 -> 300 bytes .../materialicons/NUCLEAR/Fiery/ring_OVERLAY.png | Bin 0 -> 413 bytes .../materialicons/NUCLEAR/Fiery/rotor_OVERLAY.png | Bin 0 -> 470 bytes .../materialicons/NUCLEAR/Fiery/round_OVERLAY.png | Bin 0 -> 205 bytes .../materialicons/NUCLEAR/Fiery/screw_OVERLAY.png | Bin 0 -> 226 bytes .../NUCLEAR/Fiery/springSmall_OVERLAY.png | Bin 0 -> 283 bytes .../materialicons/NUCLEAR/Fiery/spring_OVERLAY.png | Bin 0 -> 304 bytes .../NUCLEAR/Fiery/stickLong_OVERLAY.png | Bin 0 -> 217 bytes .../materialicons/NUCLEAR/Fiery/stick_OVERLAY.png | Bin 0 -> 248 bytes .../items/materialicons/NUCLEAR/Fiery/wireFine.png | Bin 0 -> 481 bytes .../NUCLEAR/Fiery/wireFine_OVERLAY.png | Bin 0 -> 458 bytes .../items/materialicons/NUCLEAR/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../NUCLEAR/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/arrowGtPlastic.png | Bin 0 -> 297 bytes .../NUCLEAR/arrowGtPlastic_OVERLAY.png | Bin 0 -> 283 bytes .../items/materialicons/NUCLEAR/arrowGtWood.png | Bin 0 -> 297 bytes .../materialicons/NUCLEAR/arrowGtWood_OVERLAY.png | Bin 0 -> 294 bytes .../textures/items/materialicons/NUCLEAR/bolt.png | Bin 0 -> 161 bytes .../items/materialicons/NUCLEAR/bolt_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/materialicons/NUCLEAR/cell.png | Bin 0 -> 328 bytes .../items/materialicons/NUCLEAR/cellPlasma.png | Bin 0 -> 328 bytes .../materialicons/NUCLEAR/cellPlasma_OVERLAY.png | Bin 0 -> 290 bytes .../items/materialicons/NUCLEAR/cell_OVERLAY.png | Bin 0 -> 309 bytes .../items/materialicons/NUCLEAR/crateGtDust.png | Bin 0 -> 370 bytes .../materialicons/NUCLEAR/crateGtDust_OVERLAY.png | Bin 0 -> 506 bytes .../items/materialicons/NUCLEAR/crateGtGem.png | Bin 0 -> 401 bytes .../materialicons/NUCLEAR/crateGtGem_OVERLAY.png | Bin 0 -> 526 bytes .../items/materialicons/NUCLEAR/crateGtIngot.png | Bin 0 -> 380 bytes .../materialicons/NUCLEAR/crateGtIngot_OVERLAY.png | Bin 0 -> 517 bytes .../items/materialicons/NUCLEAR/crateGtPlate.png | Bin 0 -> 455 bytes .../materialicons/NUCLEAR/crateGtPlate_OVERLAY.png | Bin 0 -> 449 bytes .../items/materialicons/NUCLEAR/crushed.png | Bin 0 -> 462 bytes .../materialicons/NUCLEAR/crushedCentrifuged.png | Bin 0 -> 561 bytes .../NUCLEAR/crushedCentrifuged_OVERLAY.png | Bin 0 -> 393 bytes .../materialicons/NUCLEAR/crushedPurified.png | Bin 0 -> 603 bytes .../NUCLEAR/crushedPurified_OVERLAY.png | Bin 0 -> 538 bytes .../materialicons/NUCLEAR/crushed_OVERLAY.png | Bin 0 -> 539 bytes .../textures/items/materialicons/NUCLEAR/dust.png | Bin 0 -> 312 bytes .../items/materialicons/NUCLEAR/dustImpure.png | Bin 0 -> 312 bytes .../materialicons/NUCLEAR/dustImpure_OVERLAY.png | Bin 0 -> 430 bytes .../items/materialicons/NUCLEAR/dustPure.png | Bin 0 -> 312 bytes .../materialicons/NUCLEAR/dustPure_OVERLAY.png | Bin 0 -> 424 bytes .../items/materialicons/NUCLEAR/dustSmall.png | Bin 0 -> 286 bytes .../materialicons/NUCLEAR/dustSmall_OVERLAY.png | Bin 0 -> 256 bytes .../items/materialicons/NUCLEAR/dustTiny.png | Bin 0 -> 221 bytes .../materialicons/NUCLEAR/dustTiny_OVERLAY.png | Bin 0 -> 251 bytes .../items/materialicons/NUCLEAR/dust_OVERLAY.png | Bin 0 -> 281 bytes .../textures/items/materialicons/NUCLEAR/foil.png | Bin 0 -> 475 bytes .../items/materialicons/NUCLEAR/foil_OVERLAY.png | Bin 0 -> 568 bytes .../items/materialicons/NUCLEAR/gearGt.png | Bin 0 -> 434 bytes .../items/materialicons/NUCLEAR/gearGtSmall.png | Bin 0 -> 563 bytes .../materialicons/NUCLEAR/gearGtSmall_OVERLAY.png | Bin 0 -> 312 bytes .../items/materialicons/NUCLEAR/gearGt_OVERLAY.png | Bin 0 -> 172 bytes .../textures/items/materialicons/NUCLEAR/gem.png | Bin 0 -> 451 bytes .../items/materialicons/NUCLEAR/gemChipped.png | Bin 0 -> 575 bytes .../materialicons/NUCLEAR/gemChipped_OVERLAY.png | Bin 0 -> 511 bytes .../items/materialicons/NUCLEAR/gemExquisite.png | Bin 0 -> 619 bytes .../materialicons/NUCLEAR/gemExquisite_OVERLAY.png | Bin 0 -> 552 bytes .../items/materialicons/NUCLEAR/gemFlawed.png | Bin 0 -> 504 bytes .../materialicons/NUCLEAR/gemFlawed_OVERLAY.png | Bin 0 -> 543 bytes .../items/materialicons/NUCLEAR/gemFlawless.png | Bin 0 -> 691 bytes .../materialicons/NUCLEAR/gemFlawless_OVERLAY.png | Bin 0 -> 516 bytes .../items/materialicons/NUCLEAR/gem_OVERLAY.png | Bin 0 -> 437 bytes .../items/materialicons/NUCLEAR/handleMallet.png | Bin 0 -> 2909 bytes .../materialicons/NUCLEAR/handleMallet_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/materialicons/NUCLEAR/ingot.png | Bin 0 -> 344 bytes .../items/materialicons/NUCLEAR/ingotDouble.png | Bin 0 -> 403 bytes .../materialicons/NUCLEAR/ingotDouble_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/ingotHot.png | Bin 0 -> 335 bytes .../materialicons/NUCLEAR/ingotHot_OVERLAY.png | Bin 0 -> 309 bytes .../items/materialicons/NUCLEAR/ingotQuadruple.png | Bin 0 -> 375 bytes .../NUCLEAR/ingotQuadruple_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/ingotQuintuple.png | Bin 0 -> 358 bytes .../NUCLEAR/ingotQuintuple_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/ingotTriple.png | Bin 0 -> 388 bytes .../materialicons/NUCLEAR/ingotTriple_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/ingot_OVERLAY.png | Bin 0 -> 333 bytes .../textures/items/materialicons/NUCLEAR/lens.png | Bin 0 -> 296 bytes .../items/materialicons/NUCLEAR/lens_OVERLAY.png | Bin 0 -> 567 bytes .../items/materialicons/NUCLEAR/nugget.png | Bin 0 -> 250 bytes .../items/materialicons/NUCLEAR/nugget_OVERLAY.png | Bin 0 -> 286 bytes .../textures/items/materialicons/NUCLEAR/plate.png | Bin 0 -> 275 bytes .../items/materialicons/NUCLEAR/plateDense.png | Bin 0 -> 298 bytes .../materialicons/NUCLEAR/plateDense_OVERLAY.png | Bin 0 -> 310 bytes .../items/materialicons/NUCLEAR/plateDouble.png | Bin 0 -> 297 bytes .../materialicons/NUCLEAR/plateDouble_OVERLAY.png | Bin 0 -> 319 bytes .../items/materialicons/NUCLEAR/plateQuadruple.png | Bin 0 -> 310 bytes .../NUCLEAR/plateQuadruple_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/plateQuintuple.png | Bin 0 -> 312 bytes .../NUCLEAR/plateQuintuple_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/plateTriple.png | Bin 0 -> 304 bytes .../materialicons/NUCLEAR/plateTriple_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/plate_OVERLAY.png | Bin 0 -> 290 bytes .../textures/items/materialicons/NUCLEAR/ring.png | Bin 0 -> 311 bytes .../items/materialicons/NUCLEAR/ring_OVERLAY.png | Bin 0 -> 174 bytes .../textures/items/materialicons/NUCLEAR/rotor.png | Bin 0 -> 452 bytes .../items/materialicons/NUCLEAR/rotor_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/materialicons/NUCLEAR/round.png | Bin 0 -> 200 bytes .../items/materialicons/NUCLEAR/round_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/materialicons/NUCLEAR/screw.png | Bin 0 -> 199 bytes .../items/materialicons/NUCLEAR/screw_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/spring.png | Bin 0 -> 276 bytes .../items/materialicons/NUCLEAR/springSmall.png | Bin 0 -> 317 bytes .../materialicons/NUCLEAR/springSmall_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/spring_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/materialicons/NUCLEAR/stick.png | Bin 0 -> 230 bytes .../items/materialicons/NUCLEAR/stickLong.png | Bin 0 -> 246 bytes .../materialicons/NUCLEAR/stickLong_OVERLAY.png | Bin 0 -> 305 bytes .../items/materialicons/NUCLEAR/stick_OVERLAY.png | Bin 0 -> 314 bytes .../items/materialicons/NUCLEAR/toolHeadArrow.png | Bin 0 -> 399 bytes .../NUCLEAR/toolHeadArrow_OVERLAY.png | Bin 0 -> 183 bytes .../items/materialicons/NUCLEAR/toolHeadAxe.png | Bin 0 -> 255 bytes .../materialicons/NUCLEAR/toolHeadAxe_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/NUCLEAR/toolHeadBuzzSaw.png | Bin 0 -> 533 bytes .../NUCLEAR/toolHeadBuzzSaw_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/NUCLEAR/toolHeadChainsaw.png | Bin 0 -> 531 bytes .../NUCLEAR/toolHeadChainsaw_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadDrill.png | Bin 0 -> 525 bytes .../NUCLEAR/toolHeadDrill_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadFile.png | Bin 0 -> 257 bytes .../materialicons/NUCLEAR/toolHeadFile_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadHammer.png | Bin 0 -> 235 bytes .../NUCLEAR/toolHeadHammer_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadHoe.png | Bin 0 -> 230 bytes .../materialicons/NUCLEAR/toolHeadHoe_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadMallet.png | Bin 0 -> 2891 bytes .../NUCLEAR/toolHeadMallet_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/NUCLEAR/toolHeadPickaxe.png | Bin 0 -> 241 bytes .../NUCLEAR/toolHeadPickaxe_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadPlow.png | Bin 0 -> 268 bytes .../materialicons/NUCLEAR/toolHeadPlow_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadSaw.png | Bin 0 -> 258 bytes .../materialicons/NUCLEAR/toolHeadSaw_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/NUCLEAR/toolHeadScrewdriver.png | Bin 0 -> 178 bytes .../NUCLEAR/toolHeadScrewdriver_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadSense.png | Bin 0 -> 259 bytes .../NUCLEAR/toolHeadSense_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadShovel.png | Bin 0 -> 251 bytes .../NUCLEAR/toolHeadShovel_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/NUCLEAR/toolHeadSoldering.png | Bin 0 -> 1158 bytes .../NUCLEAR/toolHeadSoldering_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadSword.png | Bin 0 -> 269 bytes .../NUCLEAR/toolHeadSword_OVERLAY.png | Bin 0 -> 143 bytes .../NUCLEAR/toolHeadUniversalSpade.png | Bin 0 -> 254 bytes .../NUCLEAR/toolHeadUniversalSpade_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/toolHeadWrench.png | Bin 0 -> 517 bytes .../NUCLEAR/toolHeadWrench_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/turbineBlade.png | Bin 0 -> 1238 bytes .../materialicons/NUCLEAR/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/materialicons/NUCLEAR/void.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/void_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NUCLEAR/wireFine.png | Bin 0 -> 481 bytes .../materialicons/NUCLEAR/wireFine_OVERLAY.png | Bin 0 -> 271 bytes 252 files changed, 1898 insertions(+), 1195 deletions(-) delete mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore .png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedPurified_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushed_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dustTiny_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dust_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/foil_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGtSmall_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemChipped_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemExquisite_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawed_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawless_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gem_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotHot_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingot_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/nugget_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDense_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDouble_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuadruple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuintuple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateTriple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plate_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ring_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/rotor_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/round_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/screw_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/springSmall_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/spring_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stickLong_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stick_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void_OVERLAY.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine.png create mode 100644 src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine_OVERLAY.png (limited to 'src') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index a664555cf2..92c7a9a049 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -57,6 +57,29 @@ import net.minecraftforge.oredict.OreDictionary; @Mod(modid = CORE.MODID, name = CORE.name, version = CORE.VERSION, dependencies = "required-after:Forge; after:TConstruct; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO; after:tectech; after:GTRedtech; after:beyondrealitycore; after:OpenBlocks; after:IC2NuclearControl; after:TGregworks; after:StevesCarts;") public class GTplusplus implements ActionListener { + public static enum INIT_PHASE { + SUPER(null), + PRE_INIT(SUPER), + INIT(PRE_INIT), + POST_INIT(INIT); + protected boolean mIsPhaseActive = false; + private final INIT_PHASE mPrev; + + private INIT_PHASE(INIT_PHASE aPreviousPhase) { + mPrev = aPreviousPhase; + } + + public synchronized final boolean isPhaseActive() { + return mIsPhaseActive; + } + public synchronized final void setPhaseActive(boolean aIsPhaseActive) { + if (mPrev != null && mPrev.isPhaseActive()) { + mPrev.setPhaseActive(false); + } + mIsPhaseActive = aIsPhaseActive; + } + } + //Mod Instance @Mod.Instance(CORE.MODID) public static GTplusplus instance; @@ -87,12 +110,14 @@ public class GTplusplus implements ActionListener { public GTplusplus() { super(); + INIT_PHASE.SUPER.setPhaseActive(true); mChunkLoading = new ChunkLoading(); } // Pre-Init @Mod.EventHandler public void preInit(final FMLPreInitializationEvent event) { + INIT_PHASE.PRE_INIT.setPhaseActive(true); Logger.INFO("Loading " + CORE.name + " "+CORE.VERSION+" on Gregtech "+Utils.getGregtechVersionAsString()); //Load all class objects within the plugin package. Core_Manager.veryEarlyInit(); @@ -133,6 +158,7 @@ public class GTplusplus implements ActionListener { // Init @Mod.EventHandler public void init(final FMLInitializationEvent event) { + INIT_PHASE.INIT.setPhaseActive(true); mChunkLoading.init(event); proxy.init(event); proxy.registerNetworkStuff(); @@ -154,6 +180,7 @@ public class GTplusplus implements ActionListener { // Post-Init @Mod.EventHandler public void postInit(final FMLPostInitializationEvent event) { + INIT_PHASE.POST_INIT.setPhaseActive(true); mChunkLoading.postInit(event); proxy.postInit(event); BookHandler.runLater(); diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java index 34da346ff2..6014388cda 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -29,10 +29,10 @@ public class BasicBlock extends BlockContainer { this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); } - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setHardness(2.0F); + this.setCreativeTab(AddToCreativeTab.tabBlock); this.setResistance(6.0F); this.setLightLevel(0.0F); + this.setHardness(1.0f*harvestLevel); this.setHarvestLevel("pickaxe", harvestLevel); this.setStepSound(soundTypeMetal); } diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index 634dc4c022..b089688193 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -32,14 +32,14 @@ public class BlockBaseModular extends BasicBlock { public BlockBaseModular(final Material material, final BlockTypes blockType, final int colour) { this(material.getUnlocalizedName(), material.getLocalizedName(), net.minecraft.block.material.Material.iron, - blockType, colour, Math.min(Math.max(material.vTier, 1), 5)); + blockType, colour, Math.min(Math.max(material.vTier, 1), 6)); blockMaterial = material; } protected BlockBaseModular(final String unlocalizedName, final String blockMaterial, final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour, final int miningLevel) { - super(unlocalizedName, vanillaMaterial); + super(blockType, unlocalizedName, vanillaMaterial, miningLevel); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture()); this.blockColour = colour; @@ -130,8 +130,8 @@ public class BlockBaseModular extends BasicBlock { } metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType); int tier = this.blockMaterial.vTier; - String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier < 3 ? "block1" : tier < 6 ? "block6" : "block5"); - this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/"+ "METALLIC" +"/" + aType); + String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier <= 4 ? "block1" : "block5"); + this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/"+ metType +"/" + aType); } @Override diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index 526f2b245c..4d7478dbdd 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -30,12 +30,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { private final Material blockMaterial; public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) { - super(blockType, Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock); + super(blockType, Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock, Math.min(Math.max(material.vTier, 1), 6)); + int aMaterialTierForMining = Math.min(Math.max(material.vTier, 1), 6); this.blockMaterial = material; - this.setHardness(2.0f); + this.setHardness(1.0f*aMaterialTierForMining); this.setResistance(6.0F); this.setLightLevel(0.0F); - this.setHarvestLevel("pickaxe", Math.min(Math.max(material.vTier, 1), 5)); + this.setHarvestLevel("pickaxe", aMaterialTierForMining); this.setStepSound(soundTypeStone); this.setBlockName("Ore"+Utils.sanitizeString(Utils.sanitizeString(material.getUnlocalizedName()))); this.setBlockTextureName("stone"); diff --git a/src/Java/gtPlusPlus/core/client/CustomTextureSet.java b/src/Java/gtPlusPlus/core/client/CustomTextureSet.java index d7bbecd6c7..400503b2fa 100644 --- a/src/Java/gtPlusPlus/core/client/CustomTextureSet.java +++ b/src/Java/gtPlusPlus/core/client/CustomTextureSet.java @@ -8,7 +8,8 @@ public class CustomTextureSet extends TextureSet { REFINED(), GEM_A(), - ENRICHED(); + ENRICHED(), + NUCLEAR; private final CustomTextureSet A; diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 0e21e9b154..c86c10bb53 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -280,6 +280,8 @@ public final class ModItems { public static ItemStack itemHotTitaniumIngot; + public static Fluid fluidZrF4; + static { Logger.INFO("Items!"); //Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is called upon. @@ -621,7 +623,7 @@ public final class ModItems { //Zirconium Tetrafluoride GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1)); GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); - FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride + fluidZrF4 = FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride //Coolant Salt //NaBF4 - NaF - 621C diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index ea0a2bb5eb..b07815fa60 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -97,14 +97,14 @@ public class BaseItemComponent extends Item{ return false; } //Register Component - Map aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName()); + Map aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName()); if (aMap == null) { - aMap = new HashMap(); + aMap = new HashMap(); } String aKey = componentType.getGtOrePrefix().name(); - BaseItemComponent x = aMap.get(aKey); + ItemStack x = aMap.get(aKey); if (x == null) { - aMap.put(aKey, this); + aMap.put(aKey, ItemUtils.getSimpleStack(this)); Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap); return true; } diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index 56d2aabdba..517e3f7c1f 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java @@ -18,12 +18,12 @@ import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; -public class ItemBlockGtBlock extends ItemBlock{ +public class ItemBlockGtBlock extends ItemBlock { protected final int blockColour; - protected final int sRadiation; + private int sRadiation; - private final Material mMaterial; + private Material mMaterial; private final Block thisBlock; private boolean isOre = false; @@ -32,46 +32,23 @@ public class ItemBlockGtBlock extends ItemBlock{ public ItemBlockGtBlock(final Block block) { super(block); this.thisBlock = block; - if (block instanceof BlockBaseOre){ + if (block instanceof BlockBaseOre) { this.isOre = true; - } - else if (block instanceof BlockBaseModular) { + } else if (block instanceof BlockBaseModular) { this.isModular = true; } - else { - - } - if (!isModular && !isOre) { - mMaterial = null; - } - else { - if (isOre) { - mMaterial = ((BlockBaseOre) block).getMaterialEx(); - } - else { - mMaterial = ((BlockBaseModular) block).getMaterialEx(); - } - } - final BlockBaseModular baseBlock = (BlockBaseModular) block; if (isModular) { this.blockColour = baseBlock.getRenderColor(0); - } - else if (isOre) { + } else if (isOre) { this.blockColour = block.getBlockColor(); - } - else { + } else { this.blockColour = block.getBlockColor(); } - if (this.mMaterial != null) { - this.sRadiation = mMaterial.vRadiationLevel; - } - else { - this.sRadiation = 0; - } - - - //GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), ItemUtils.getSimpleStack(this)); + // GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block", + // "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block", + // "").replace("-", "").replace("_", "").replace(" ", ""), + // ItemUtils.getSimpleStack(this)); } public int getRenderColor(final int aMeta) { @@ -80,45 +57,66 @@ public class ItemBlockGtBlock extends ItemBlock{ @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - - if (this.mMaterial != null){ - list.add(this.mMaterial.vChemicalFormula); - } - - if (this.sRadiation > 0){ - list.add(CORE.GT_Tooltip_Radioactive); + + if (this.mMaterial != null) { + list.add(this.mMaterial.vChemicalFormula); + if (this.mMaterial.vRadiationLevel > 0) { + list.add(CORE.GT_Tooltip_Radioactive); + } + } else { + list.add("Material is Null."); } - + if (KeyboardUtils.isCtrlKeyDown()) { Block b = Block.getBlockFromItem(stack.getItem()); if (b != null) { - + String aTool = b.getHarvestTool(stack.getItemDamage()); int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage()); - list.add("Mining Level: "+Math.min(Math.max(aMiningLevel1, 0), 5)); - + list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5)); + if (this.mMaterial != null) { - list.add("Ore contains: "); + list.add("Ore contains: "); if (mMaterial.getComposites().isEmpty()) { - list.add("- "+mMaterial.getLocalizedName()); - } - else { + list.add("- " + mMaterial.getLocalizedName()); + } else { for (MaterialStack m : mMaterial.getComposites()) { - list.add("- "+m.getStackMaterial().getLocalizedName()+" x"+m.getPartsPerOneHundred()); + list.add("- " + m.getStackMaterial().getLocalizedName() + " x" + m.getPartsPerOneHundred()); } } } } - } - else { - list.add(EnumChatFormatting.DARK_GRAY+"Hold Ctrl to show additional info."); + } else { + list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info."); } super.addInformation(stack, aPlayer, list, bool); } @Override - public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { - EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding); + public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, + final boolean p_77663_5_) { + + if (!isModular && !isOre) { + mMaterial = null; + } else { + if (this.mMaterial == null) { + Block b = Block.getBlockFromItem(iStack.getItem()); + if (isOre) { + mMaterial = ((BlockBaseOre) b).getMaterialEx(); + } else { + mMaterial = ((BlockBaseModular) b).getMaterialEx(); + } + if (mMaterial != null) { + this.sRadiation = mMaterial.vRadiationLevel; + } else { + this.sRadiation = 0; + } + } + if (this.sRadiation > 0) { + EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding); + } + } + } } diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index 791d861414..e4079521d4 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -57,12 +57,7 @@ public class ItemBlockOre extends ItemBlock{ @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - if (!mInitOres_Everglades || mMapOreBlockItemToDimName.size() == 0 || (aPlayer != null ? aPlayer.worldObj.getWorldTime() % 200 == 0 : false)) { - - //mMapOreBlockItemToDimName.clear(); - mDimsForThisOre.clear(); - - + if (!mInitOres_Everglades) { for (WorldGen_GT_Ore_Layer f : gtPlusPlus.everglades.gen.gt.WorldGen_Ores.validOreveins.values()) { Material[] m2 = new Material[] {f.mPrimary, f.mSecondary, f.mBetween, f.mSporadic}; for (Material m1 : m2) { @@ -70,8 +65,9 @@ public class ItemBlockOre extends ItemBlock{ if (aMap == null) { aMap = new AutoMap(); } - if (!aMap.containsValue("Everglades")) { - aMap.put("Everglades"); + String aDimName = "Everglades"; + if (!aMap.containsValue(aDimName)) { + aMap.put(aDimName); } mMapOreBlockItemToDimName.put(m1.getUnlocalizedName().toLowerCase(), aMap); } @@ -120,21 +116,21 @@ public class ItemBlockOre extends ItemBlock{ } if (mDimsForThisOre.isEmpty()) { - AutoMap A = mMapOreBlockItemToDimName.get(this.mThisMaterial.getUnlocalizedName().toLowerCase()); + AutoMap A = mMapOreBlockItemToDimName.get(this.mThisMaterial.getUnlocalizedName().toLowerCase()); if (A != null) { mDimsForThisOre = A; - } - else { - mDimsForThisOre.put("Unknown"); - } + } } - + + list.add("Found: "); if (!mDimsForThisOre.isEmpty()) { - list.add("Found: "); for (String m : mDimsForThisOre) { list.add("- "+m); } } + else { + list.add("- Unknown"); + } } else { diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index 53f778455c..f52856b824 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -212,7 +212,7 @@ public final class ALLOY { public static final Material MARAGING250 = new Material( "Maraging Steel 250", //Material Name MaterialState.SOLID, //State - new short[]{140, 140, 140, 0}, //Material Colour + null, //Material Colour 2413, //Melting Point in C 4555, -1, @@ -230,7 +230,7 @@ public final class ALLOY { public static final Material MARAGING300 = new Material( "Maraging Steel 300", //Material Name MaterialState.SOLID, //State - new short[]{150, 150, 150, 0}, //Material Colour + null, //Material Colour 2413, //Melting Point in C 4555, -1, @@ -248,7 +248,7 @@ public final class ALLOY { public static final Material MARAGING350 = new Material( "Maraging Steel 350", //Material Name MaterialState.SOLID, //State - new short[]{160, 160, 160, 0}, //Material Colour + null, //Material Colour 2413, //Melting Point in C 4555, -1, @@ -266,7 +266,7 @@ public final class ALLOY { public static final Material STELLITE = new Material( "Stellite", //Material Name MaterialState.SOLID, //State - new short[]{129, 75, 120, 0}, //Material Colour + null, //Material Colour 4310, //Melting Point in C 6250, -1, @@ -283,7 +283,7 @@ public final class ALLOY { public static final Material TALONITE = new Material( "Talonite", //Material Name MaterialState.SOLID, //State - new short[]{228, 75, 120, 0}, //Material Colour + null, //Material Colour 3454, //Melting Point in C 5500, -1, @@ -300,7 +300,7 @@ public final class ALLOY { public static final Material HASTELLOY_W = new Material( "Hastelloy-W", //Material Name MaterialState.SOLID, //State - new short[]{218, 165, 32, 0}, //Material Colour + null, //Material Colour 3350, //Melting Point in C 5755, -1, @@ -318,7 +318,7 @@ public final class ALLOY { public static final Material HASTELLOY_X = new Material( "Hastelloy-X", //Material Name MaterialState.SOLID, //State - new short[]{255, 193, 37, 0}, //Material Colour + null, //Material Colour 3350, //Melting Point in C 5755, -1, @@ -337,7 +337,7 @@ public final class ALLOY { public static final Material HASTELLOY_N = new Material( "Hastelloy-N", //Material Name MaterialState.SOLID, //State - new short[]{236, 213, 48, 0}, //Material Colour + null, //Material Colour 4350, //Melting Point in C 6875, -1, @@ -355,7 +355,7 @@ public final class ALLOY { public static final Material HASTELLOY_C276 = new Material( "Hastelloy-C276", //Material Name MaterialState.SOLID, //State - new short[]{238, 180, 34, 0}, //Material Colour + null, //Material Colour 4350, //Melting Point in C 6520, -1, @@ -374,7 +374,7 @@ public final class ALLOY { public static final Material INCOLOY_020 = new Material( "Incoloy-020", //Material Name MaterialState.SOLID, //State - new short[]{101, 81, 71, 0}, //Material Colour + null, //Material Colour 3425, //Melting Point in C 5420, -1, @@ -391,7 +391,7 @@ public final class ALLOY { public static final Material INCOLOY_DS = new Material( "Incoloy-DS", //Material Name MaterialState.SOLID, //State - new short[]{71, 101, 81, 0}, //Material Colour + null, //Material Colour 3425, //Melting Point in C 5420, -1, @@ -408,7 +408,7 @@ public final class ALLOY { public static final Material INCOLOY_MA956 = new Material( "Incoloy-MA956", //Material Name MaterialState.SOLID, //State - new short[]{81, 71, 101, 0}, //Material Colour + null, //Material Colour 4425, //Melting Point in C 6875, -1, @@ -523,7 +523,7 @@ public final class ALLOY { public static final Material EGLIN_STEEL_BASE = new Material( "Eglin Steel Base Compound", //Material Name MaterialState.SOLID, //State - new short[]{139,69,19, 0}, //Material Colour + null, //Material Colour -1, //Melting Point in C -1, //Boiling Point in C -1, @@ -579,7 +579,7 @@ public final class ALLOY { public static final Material TRINIUM_TITANIUM = new Material( "Trinium Titanium Alloy", //Material Name MaterialState.SOLID, //State - new short[]{239,210,200, 0}, //Material Colour + null, //Material Colour 3750, //Melting Point in C 7210, //Boiling Point in C -1, @@ -592,7 +592,7 @@ public final class ALLOY { public static final Material TRINIUM_NAQUADAH = new Material( "Trinium Naquadah Alloy", //Material Name MaterialState.SOLID, //State - new short[]{255, 243, 117, 0}, //Material Colour + null, //Material Colour 4200, //Melting Point in C 7400, //Boiling Point in C -1, @@ -605,7 +605,7 @@ public final class ALLOY { public static final Material TRINIUM_NAQUADAH_CARBON = new Material( "Trinium Naquadah Carbonite", //Material Name MaterialState.SOLID, //State - new short[]{255, 233, 0, 0}, //Material Colour + null, //Material Colour 6500, //Melting Point in C 9000, //Boiling Point in C -1, @@ -645,7 +645,7 @@ public final class ALLOY { public static final Material LAFIUM = new Material( "Lafium Compound", //Material Name MaterialState.SOLID, //State - new short[]{75,180,255, 0}, //Material Colour + null, //Material Colour 6750, //Melting Point in C 9865, //Boiling Point in C -1, @@ -667,7 +667,7 @@ public final class ALLOY { public static final Material CINOBITE = new Material( "Cinobite A243", //Material Name MaterialState.SOLID, //State - new short[]{255,75,45, 0}, //Material Colour + null, //Material Colour 7350, //Melting Point in C 12565, //Boiling Point in C -1, @@ -689,7 +689,7 @@ public final class ALLOY { public static final Material PIKYONIUM = new Material( "Pikyonium 64B", //Material Name MaterialState.SOLID, //State - new short[]{110,255,20, 0}, //Material Colour + null, //Material Colour 7850, //Melting Point in C 11765, //Boiling Point in C -1, @@ -711,7 +711,7 @@ public final class ALLOY { public static final Material ABYSSAL = new Material( "Abyssal Alloy", //Material Name MaterialState.SOLID, //State - new short[]{85,0,85, 0}, //Material Colour + null, //Material Colour 9650, //Melting Point in C 13765, //Boiling Point in C -1, @@ -733,7 +733,7 @@ public final class ALLOY { public static final Material QUANTUM = new Material( "Quantum", //Material Name MaterialStat