aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-29 05:09:01 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-29 05:09:01 +0000
commit6205a2088bbbc31a09d0a2a3d460add1a7622801 (patch)
tree497380cea05b2a394fe303e8fcc2d688bed6f6d1 /src
parent7f2c38ccc6fb2734ac6655b9dd7003c4b6dee4a3 (diff)
downloadGT5-Unofficial-6205a2088bbbc31a09d0a2a3d460add1a7622801.tar.gz
GT5-Unofficial-6205a2088bbbc31a09d0a2a3d460add1a7622801.tar.bz2
GT5-Unofficial-6205a2088bbbc31a09d0a2a3d460add1a7622801.zip
+ Added recipe for heating Titanium Ingots, required for Krypton processing.
+ Added custom GT TextureSets. $ Lots of small fixes to Material, Material Generation & Recipe Generation. $ Lots of small fixes to Fluids, Fluid Generation and Fluid Cell Generation. $ Fixed Creative Tabs. $ Possibly fixed issue where tickable items would instantly tick to 0. $ Fixed display names of Throwable Potions. $ Fixed NPE in removeCrudeTurbineRotors(). % Adjusted lots of textures. % Adjusted handling of Thermal Foundation Fluids. % Moved Furnace/EBF and Maceration recipes out of BaseItemDust.java. % Made Tooltips of GT++ Material Blocks, Frames and ores more informational. % Made Bromine a Fluid Material, this will remove all Bromine solid material items from the world. (Ingots, Blocks, etc.) % Increased cost of GT++ Ores in processing. - Broke lots of recipes. > EBF/ABS & All Table Crafting. TBA~
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/api/objects/data/TypeCounter.java178
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java39
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java2
-rw-r--r--src/Java/gtPlusPlus/core/client/CustomTextureSet.java27
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java10
-rw-r--r--src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java15
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java12
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java3
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java3
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java3
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java3
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java45
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java89
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java15
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java258
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java70
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java57
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemCreativeTab.java59
-rw-r--r--src/Java/gtPlusPlus/core/item/materials/DustDecayable.java13
-rw-r--r--src/Java/gtPlusPlus/core/material/ELEMENT.java77
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java341
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialGenerator.java60
-rw-r--r--src/Java/gtPlusPlus/core/material/NONMATERIAL.java22
-rw-r--r--src/Java/gtPlusPlus/core/material/ORES.java28
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java293
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java10
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java41
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java12
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java30
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java88
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java26
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block1.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block2.pngbin0 -> 620 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block3.pngbin0 -> 642 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block4.pngbin0 -> 655 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block5.pngbin0 -> 427 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block6.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/foil.pngbin0 -> 368 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/frameGt.pngbin0 -> 441 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore .pngbin0 -> 271 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/oreSmall.pngbin0 -> 339 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.pngbin0 -> 646 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png.mcmeta6
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeHuge.pngbin0 -> 348 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeLarge.pngbin0 -> 446 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeMedium.pngbin0 -> 442 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSide.pngbin0 -> 401 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSmall.pngbin0 -> 429 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeTiny.pngbin0 -> 418 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/void.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/wire.pngbin0 -> 513 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block1.pngbin0 -> 642 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block2.pngbin0 -> 620 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block3.pngbin0 -> 642 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block4.pngbin0 -> 655 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block5.pngbin0 -> 427 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block6.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/foil.pngbin0 -> 368 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/frameGt.pngbin0 -> 441 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/ore.pngbin0 -> 280 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/oreSmall.pngbin0 -> 339 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeHuge.pngbin0 -> 348 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeLarge.pngbin0 -> 446 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeMedium.pngbin0 -> 442 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSide.pngbin0 -> 401 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSmall.pngbin0 -> 429 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeTiny.pngbin0 -> 418 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/void.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/wire.pngbin0 -> 513 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block1.pngbin0 -> 684 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block2.pngbin0 -> 620 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block3.pngbin0 -> 642 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block4.pngbin0 -> 655 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block5.pngbin0 -> 427 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block6.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/foil.pngbin0 -> 368 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/frameGt.pngbin0 -> 441 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/ore.pngbin0 -> 647 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/oreSmall.pngbin0 -> 339 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeHuge.pngbin0 -> 500 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeLarge.pngbin0 -> 555 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeMedium.pngbin0 -> 569 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSide.pngbin0 -> 540 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSmall.pngbin0 -> 545 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeTiny.pngbin0 -> 560 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/void.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/wire.pngbin0 -> 513 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE.pngbin0 -> 1238 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic.pngbin0 -> 291 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic_OVERLAY.pngbin0 -> 289 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood.pngbin0 -> 291 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood_OVERLAY.pngbin0 -> 302 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt.pngbin0 -> 161 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt_OVERLAY.pngbin0 -> 206 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell.pngbin0 -> 328 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma.pngbin0 -> 328 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma_OVERLAY.pngbin0 -> 290 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell_OVERLAY.pngbin0 -> 309 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust.pngbin0 -> 370 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust_OVERLAY.pngbin0 -> 506 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem.pngbin0 -> 401 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem_OVERLAY.pngbin0 -> 526 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot.pngbin0 -> 380 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot_OVERLAY.pngbin0 -> 517 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate.pngbin0 -> 455 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate_OVERLAY.pngbin0 -> 449 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed.pngbin0 -> 506 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged.pngbin0 -> 561 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged_OVERLAY.pngbin0 -> 430 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified.pngbin0 -> 603 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified_OVERLAY.pngbin0 -> 583 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed_OVERLAY.pngbin0 -> 426 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust.pngbin0 -> 312 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure.pngbin0 -> 312 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure_OVERLAY.pngbin0 -> 415 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure.pngbin0 -> 312 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure_OVERLAY.pngbin0 -> 383 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall.pngbin0 -> 286 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall_OVERLAY.pngbin0 -> 252 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny.pngbin0 -> 221 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny_OVERLAY.pngbin0 -> 221 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust_OVERLAY.pngbin0 -> 222 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil.pngbin0 -> 475 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil_OVERLAY.pngbin0 -> 539 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt.pngbin0 -> 434 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall.pngbin0 -> 563 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall_OVERLAY.pngbin0 -> 365 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt_OVERLAY.pngbin0 -> 503 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem.pngbin0 -> 451 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped.pngbin0 -> 575 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped_OVERLAY.pngbin0 -> 465 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite.pngbin0 -> 619 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite_OVERLAY.pngbin0 -> 613 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed_OVERLAY.pngbin0 -> 487 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless.pngbin0 -> 691 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless_OVERLAY.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem_OVERLAY.pngbin0 -> 465 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet.pngbin0 -> 2909 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot.pngbin0 -> 344 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.pngbin0 -> 403 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.pngbin0 -> 419 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot.pngbin0 -> 335 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot_OVERLAY.pngbin0 -> 309 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingo