aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-04-27 17:06:22 +0200
committerTechnus <daniel112092@gmail.com>2017-04-27 17:06:22 +0200
commit929073a7aea2ff925aa04403be746398b1fc57e7 (patch)
tree8f162d84344aeadbef04b3e313fdd8e5438130c0 /src/main/java/gregtech/common
parent2ee3b7e712413604549af3097fda93cbb22a262e (diff)
parentf5e078aa1eb2da76585d620afa91903f0dbdd031 (diff)
downloadGT5-Unofficial-929073a7aea2ff925aa04403be746398b1fc57e7.tar.gz
GT5-Unofficial-929073a7aea2ff925aa04403be746398b1fc57e7.tar.bz2
GT5-Unofficial-929073a7aea2ff925aa04403be746398b1fc57e7.zip
Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)
# Conflicts: # build.properties # src/main/java/gregtech/GT_Mod.java # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/enums/Materials.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/enums/Tier.java # src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java # src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/api/util/GT_ModHandler.java # src/main/java/gregtech/api/util/GT_Recipe.java # src/main/java/gregtech/api/util/GT_RecipeRegistrator.java # src/main/java/gregtech/api/util/GT_Utility.java # src/main/java/gregtech/common/GT_Client.java # src/main/java/gregtech/common/GT_Pollution.java # src/main/java/gregtech/common/GT_Proxy.java # src/main/java/gregtech/common/GT_RecipeAdder.java # src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java # src/main/java/gregtech/common/GT_Worldgenerator.java # src/main/java/gregtech/common/blocks/GT_Block_Casings3.java # src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java # src/main/java/gregtech/common/blocks/GT_Block_Machines.java # src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java # src/main/java/gregtech/common/blocks/GT_Item_Machines.java # src/main/java/gregtech/common/blocks/GT_Item_Ores.java # src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java # src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java # src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java # src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java # src/main/java/gregtech/common/gui/GT_Container_Regulator.java # src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java # src/main/java/gregtech/common/items/armor/ArmorData.java # src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java # src/main/java/gregtech/common/items/armor/ModularArmor_Item.java # src/main/java/gregtech/common/items/armor/Values.java # src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java # src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java # src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java # src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java # src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java # src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java # src/main/java/gregtech/common/tools/GT_Tool_Scoop.java # src/main/java/gregtech/loaders/load/GT_FuelLoader.java # src/main/java/gregtech/loaders/misc/GT_Achievements.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingDustSmall.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingDustTiny.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingGemExquisite.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingGemFlawless.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate3.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate4.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate5.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadBuzzSaw.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadChainsaw.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadDrill.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadFile.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadWrench.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire16.java # src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java # src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java # src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java # src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png # src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png # src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png # src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png # src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png # src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_Client.java90
-rw-r--r--src/main/java/gregtech/common/GT_DummyWorld.java264
-rw-r--r--src/main/java/gregtech/common/GT_IteratorRandom.java32
-rw-r--r--src/main/java/gregtech/common/GT_MinableOreGenerator.java162
-rw-r--r--src/main/java/gregtech/common/GT_Network.java180
-rw-r--r--src/main/java/gregtech/common/GT_PlayerActivityLogger.java62
-rw-r--r--src/main/java/gregtech/common/GT_Pollution.java165
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java228
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java74
-rw-r--r--src/main/java/gregtech/common/GT_Server.java62
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java43
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java124
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_Stone.java180
-rw-r--r--src/main/java/gregtech/common/GT_Worldgenerator.java83
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings1.java166
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings2.java190
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings6.java99
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Concretes.java190
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Granites.java144
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Machines.java32
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores.java22
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_GC.java47
-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_Casings1.java54
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings2.java44
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings3.java20
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings4.java20
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings5.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings6.java10
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java92
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Concretes.java44
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Granites.java20
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Machines.java51
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java74
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Material_Casings.java36
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Material_Machines.java36
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Packet_Ores.java120
-rw-r--r--src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java32
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Arm.java190
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Blastproof.java42
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java146
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java192
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Crafting.java52
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java146
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Drain.java170
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java288
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java166
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java60
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java26
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Lens.java34
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java22
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Pump.java278
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java132
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java40
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java38
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java132
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java40
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java48
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java162
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Screen.java130
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Shutter.java134
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java59
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Vent.java68
-rw-r--r--src/main/java/gregtech/common/entities/GT_Entity_Arrow.java688
-rw-r--r--src/main/java/gregtech/common/entities/GT_Entity_Arrow_Potion.java120
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Boiler.java166
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_BronzeBlastFurnace.java58
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java154
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Filter.java255
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java144
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java218
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java82
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java54
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java38
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java38
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java1
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java62
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java38
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java1
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_TypeFilter.java38
-rw-r--r--src/main/java/gregtech/common/items/GT_FluidDisplayItem.java184
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java1769
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java24
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java82
-rw-r--r--src/main/java/gregtech/common/items/GT_SensorCard_Item.java186
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java2
-rw-r--r--src/main/java/gregtech/common/items/armor/ArmorData.java676
-rw-r--r--src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java299
-rw-r--r--src/main/java/gregtech/common/items/armor/Vector3.java11
-rw-r--r--src/main/java/gregtech/common/items/armor/gui/ContainerModularArmor.java2
-rw-r--r--src/main/java/gregtech/common/items/armor/gui/FluidSync.java9
-rw-r--r--src/main/java/gregtech/common/items/armor/gui/FluidSync2.java10
-rw-r--r--src/main/java/gregtech/common/items/armor/gui/SlotFluid.java7
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java224
-rw-r--r--