aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorKiwi <42833050+Kiwi233@users.noreply.github.com>2020-05-22 20:23:55 +0800
committerGitHub <noreply@github.com>2020-05-22 20:23:55 +0800
commit56689ec7b67c46c882d49da4742770e3397a4e9f (patch)
tree879a3372906ec2c5f2a53a4ac46f7dde860a654f /src/main
parentbc19f3ab32c9bccbf936bbeffcc8ddad967ffffd (diff)
parent306a0822c27c59cdbd0a61698939a2dfc02068d2 (diff)
downloadGT5-Unofficial-56689ec7b67c46c882d49da4742770e3397a4e9f.tar.gz
GT5-Unofficial-56689ec7b67c46c882d49da4742770e3397a4e9f.tar.bz2
GT5-Unofficial-56689ec7b67c46c882d49da4742770e3397a4e9f.zip
Merge pull request #1 from kekzdealer/master
5/22
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/blocks/Block_ControlRod.java30
-rw-r--r--src/main/java/blocks/Block_GDCUnit.java31
-rw-r--r--src/main/java/blocks/Block_ItemProxyCable.java45
-rw-r--r--src/main/java/blocks/Block_ItemProxyEndpoint.java69
-rw-r--r--src/main/java/blocks/Block_ItemProxySource.java69
-rw-r--r--src/main/java/blocks/Block_ItemServerIOPort.java41
-rw-r--r--src/main/java/blocks/Block_ItemServerRackCasing.java33
-rw-r--r--src/main/java/blocks/Block_TFFTCasing.java31
-rw-r--r--src/main/java/blocks/Block_TFFTMultiHatch.java40
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java37
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java36
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java36
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java36
-rw-r--r--src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java36
-rw-r--r--src/main/java/blocks/Block_YSZUnit.java31
-rw-r--r--src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java (renamed from src/main/java/container/GUIContainer_ModularNuclearReactor.java)3
-rw-r--r--src/main/java/client/gui/Gui_ItemProxyEndpoint.java (renamed from src/main/java/container/Gui_ItemProxyEndpoint.java)5
-rw-r--r--src/main/java/client/gui/Gui_ItemProxySource.java (renamed from src/main/java/container/Gui_ItemProxySource.java)3
-rw-r--r--src/main/java/client/renderer/ConduitRenderer.java93
-rw-r--r--src/main/java/client/renderer/TESR_SECapacitor.java74
-rw-r--r--src/main/java/client/renderer/TESR_SETether.java76
-rw-r--r--src/main/java/common/Blocks.java104
-rw-r--r--src/main/java/common/Recipes.java622
-rw-r--r--src/main/java/common/Researches.java60
-rw-r--r--src/main/java/common/blocks/BaseGTUpdateableBlock.java58
-rw-r--r--src/main/java/common/blocks/Block_ControlRod.java28
-rw-r--r--src/main/java/common/blocks/Block_GDCUnit.java28
-rw-r--r--src/main/java/common/blocks/Block_IchorJar.java222
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyCable.java66
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyEndpoint.java61
-rw-r--r--src/main/java/common/blocks/Block_ItemProxySource.java61
-rw-r--r--src/main/java/common/blocks/Block_ItemServerDrive.java (renamed from src/main/java/blocks/Block_ItemServerDrive.java)25
-rw-r--r--src/main/java/common/blocks/Block_ItemServerIOPort.java43
-rw-r--r--src/main/java/common/blocks/Block_ItemServerRackCasing.java30
-rw-r--r--src/main/java/common/blocks/Block_LapotronicEnergyUnit.java93
-rw-r--r--src/main/java/common/blocks/Block_ReactorChamber_OFF.java (renamed from src/main/java/blocks/Block_ReactorChamber_OFF.java)24
-rw-r--r--src/main/java/common/blocks/Block_ReactorChamber_ON.java (renamed from src/main/java/blocks/Block_ReactorChamber_ON.java)24
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevator.java61
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java80
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevatorTether.java70
-rw-r--r--src/main/java/common/blocks/Block_TFFTCasing.java28
-rw-r--r--src/main/java/common/blocks/Block_TFFTMultiHatch.java65
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java38
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java37
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java37
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java37
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java37
-rw-r--r--src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java244
-rw-r--r--src/main/java/common/blocks/Block_YSZUnit.java28
-rw-r--r--src/main/java/common/container/Container_ItemProxyEndpoint.java (renamed from src/main/java/container/Container_ItemProxyEndpoint.java)2
-rw-r--r--src/main/java/common/container/Container_ItemProxySource.java (renamed from src/main/java/container/Container_ItemProxySource.java)2
-rw-r--r--src/main/java/common/container/Container_ModularNuclearReactor.java (renamed from src/main/java/container/Container_ModularNuclearReactor.java)39
-rw-r--r--src/main/java/common/itemBlocks/IB_IchorJar.java26
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxyCable.java (renamed from src/main/java/itemBlocks/IB_ItemProxyCable.java)8
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java (renamed from src/main/java/itemBlocks/IB_ItemProxyEndpoint.java)9
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxySource.java (renamed from src/main/java/itemBlocks/IB_ItemProxySource.java)11
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemServerDrive.java (renamed from src/main/java/itemBlocks/IB_ItemServerDrive.java)7
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemServerIOPort.java (renamed from src/main/java/itemBlocks/IB_ItemServerIOPort.java)7
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java (renamed from src/main/java/itemBlocks/IB_ItemServerRackCasing.java)7
-rw-r--r--src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java44
-rw-r--r--src/main/java/common/itemBlocks/IB_SpaceElevator.java35
-rw-r--r--src/main/java/common/itemBlocks/IB_SpaceElevatorCapacitor.java22
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java25
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java)11
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java)11
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java)11
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java)11
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java (renamed from src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java)11
-rw-r--r--src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java25
-rw-r--r--src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java (renamed from src/main/java/tileentities/GTMTE_FluidMultiStorage.java)369
-rw-r--r--src/main/java/common/tileentities/GTMTE_ItemServer.java (renamed from src/main/java/tileentities/GTMTE_ItemServer.java)160
-rw-r--r--src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java558
-rw-r--r--src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java (renamed from src/main/java/tileentities/GTMTE_ModularNuclearReactor.java)15
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java (renamed from src/main/java/tileentities/GTMTE_SOFuelCellMK1.java)25
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java (renamed from src/main/java/tileentities/GTMTE_SOFuelCellMK2.java)25
-rw-r--r--src/main/java/common/tileentities/GTMTE_SpaceElevator.java265
-rw-r--r--src/main/java/common/tileentities/TE_IchorJar.java10
-rw-r--r--src/main/java/common/tileentities/TE_IchorVoidJar.java10
-rw-r--r--src/main/java/common/tileentities/TE_ItemProxyCable.java121
-rw-r--r--src/main/java/common/tileentities/TE_ItemProxyEndpoint.java (renamed from src/main/java/tileentities/TE_ItemProxyEndpoint.java)119
-rw-r--r--src/main/java/common/tileentities/TE_ItemProxySource.java (renamed from src/main/java/tileentities/TE_ItemProxySource.java)25
-rw-r--r--src/main/java/common/tileentities/TE_ItemServerIOPort.java (renamed from src/main/java/tileentities/TE_ItemServerIOPort.java)77
-rw-r--r--src/main/java/common/tileentities/TE_SpaceElevatorCapacitor.java54
-rw-r--r--src/main/java/common/tileentities/TE_SpaceElevatorTether.java23
-rw-r--r--src/main/java/common/tileentities/TE_TFFTMultiHatch.java222
-rw-r--r--src/main/java/common/tileentities/TE_ThaumiumReinforcedJar.java10
-rw-r--r--src/main/java/common/tileentities/TE_ThaumiumReinforcedVoidJar.java10
-rw-r--r--src/main/java/itemBlocks/IB_TFFTMultiHatch.java22
-rw-r--r--src/main/java/items/Item_Configurator.java43
-rw-r--r--src/main/java/kekztech/GuiHandler.java8
-rw-r--r--src/main/java/kekztech/KekzCore.java417
-rw-r--r--src/main/java/kekztech/MultiFluidHandler.java79
-rw-r--r--src/main/java/kekztech/MultiItemHandler.java132
-rw-r--r--src/main/java/render/ConduitRenderer.java83
-rw-r--r--src/main/java/tileentities/TE_ItemProxyCable.java77
-rw-r--r--src/main/java/tileentities/TE_TFFTMultiHatch.java120
-rw-r--r--src/main/java/util/MultiBlockTooltipBuilder.java57
-rw-r--r--src/main/resources/assets/kekztech/lang/en_US.lang108
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/CoilHolder.pngbin0 -> 228 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/ItemServer3.pngbin903 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/ItemServer3_BOTTOM.pngbin477 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/ItemServer3_TOP.pngbin680 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LSCBase_side.pngbin0 -> 251 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LSCBase_top.pngbin0 -> 266 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_side.pngbin0 -> 279 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_top.pngbin0 -> 296 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_side.pngbin0 -> 279 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_top.pngbin0 -> 295 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_side.pngbin0 -> 279 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_top.pngbin0 -> 296 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_side.pngbin0 -> 280 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_top.pngbin0 -> 296 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_side.pngbin0 -> 275 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_top.pngbin0 -> 259 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_side.pngbin0 -> 242 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_top.pngbin0 -> 203 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_0.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_fullbase.pngbin0 -> 183 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_renderbase.pngbin0 -> 171 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_top_fullbase.pngbin0 -> 213 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock6.pngbin1862 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock7.pngbin1857 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock8.pngbin1856 -> 0 bytes
-rw-r--r--