aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-24 23:05:18 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-24 23:05:18 +0100
commitfed8109b17fd2b41de17ceef92f37e39dc1ffc53 (patch)
tree9806dc7273bfc03fbb7a6eff1f6d0f98ce3a5bc3 /src
parent291839871e1233ba0c72e48cf16847246a1ccc7c (diff)
parent380211de8a2aaeaa6b24bbde34625bba4e626d79 (diff)
downloadGT5-Unofficial-fed8109b17fd2b41de17ceef92f37e39dc1ffc53.tar.gz
GT5-Unofficial-fed8109b17fd2b41de17ceef92f37e39dc1ffc53.tar.bz2
GT5-Unofficial-fed8109b17fd2b41de17ceef92f37e39dc1ffc53.zip
Update with exp changes
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/GT_Mod.java290
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java71
-rw-r--r--src/main/java/gregtech/api/enums/Dyes.java2
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java4
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java11
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java2
-rw-r--r--src/main/java/gregtech/api/enums/TextureSet.java258
-rw-r--r--src/main/java/gregtech/api/gui/GT_Container.java11
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java2
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java6
-rw-r--r--src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java7
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaBase_Item.java89
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java17
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java13
-rw-r--r--src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java3
-rw-r--r--src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java225
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java507
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java4
-rw-r--r--src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java3
-rw-r--r--src/main/java/gregtech/api/metatileentity/MetaTileEntity.java3
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java7
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java4
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java3
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java7
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java11
-rw-r--r--src/main/java/gregtech/api/objects/ElementStack.java4
-rw-r--r--src/main/java/gregtech/api/objects/GT_ArrayList.java9
-rw-r--r--src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java2
-rw-r--r--src/main/java/gregtech/api/objects/GT_FluidStack.java27
-rw-r--r--src/main/java/gregtech/api/objects/GT_ItemStack.java6
-rw-r--r--src/main/java/gregtech/api/objects/GT_RenderedTexture.java35
-rw-r--r--src/main/java/gregtech/api/objects/GT_SidedTexture.java53
-rw-r--r--src/main/java/gregtech/api/objects/ItemData.java12
-rw-r--r--src/main/java/gregtech/api/objects/MaterialStack.java12
-rw-r--r--src/main/java/gregtech/api/objects/XSTR.java255
-rw-r--r--src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java4
-rw-r--r--src/main/java/gregtech/api/util/GT_BaseCrop.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_LanguageManager.java4
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java296
-rw-r--r--src/main/java/gregtech/api/util/GT_OreDictUnificator.java17
-rw-r--r--src/main/java/gregtech/api/util/GT_PlayedSound.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java4
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeRegistrator.java71
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java50
-rw-r--r--src/main/java/gregtech/api/world/GT_Worldgen.java4
-rw-r--r--src/main/java/gregtech/api/world/GT_Worldgen_Boulder.java56
-rw-r--r--src/main/java/gregtech/api/world/GT_Worldgen_Ore.java11
-rw-r--r--src/main/java/gregtech/api/world/GT_Worldgen_Ore_Normal.java55
-rw-r--r--src/main/java/gregtech/common/GT_Client.java92
-rw-r--r--src/main/java/gregtech/common/GT_MinableOreGenerator.java61
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java880
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java6
-rw-r--r--src/main/java/gregtech/common/GT_ThaumcraftCompat.java43
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java12
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java23
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_Stone.java58
-rw-r--r--src/main/java/gregtech/common/GT_Worldgenerator.java23
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Machines.java30
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java49
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_GC.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Stones.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Machines.java65
-rw-r--r--src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java2
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Drain.java2
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java4
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Pump.java4
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java4
-rw-r--r--src/main/java/gregtech/common/entities/GT_Entity_Arrow.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Boiler.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Regulator.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java18
-rw-r--r--src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java60
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java139
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java164
-rw-r--r--src/main/java/gregtech/common/items/GT_SensorCard_Item.java4
-rw-r--r--src/main/java/gregtech/common/items/armor/ArmorCalculation.java5
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java2
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java4
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java4
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java3
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java3
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java3
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java2
-rw-r--r--src/main/java/gregtech/common/render/GT_CapeRenderer.java50
-rw-r--r--src/main/java/gregtech/common/render/GT_MetaGenerated_Item_Renderer.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java17
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java24
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java67
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java9
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java9
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java7
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java12
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java9
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java9
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java9
-rw-r--r--