aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-05-25 13:34:56 +0100
committerRaven Szewczyk <git@eigenraven.me>2024-05-25 13:34:56 +0100
commit991c62f552f30c3916ecee191f41acfb8e06fd34 (patch)
tree31c990b183a0c291898809c337ec1b5a9da5ee13
parent9bdc1ec39b62c303d6bb295f2cfc565b85c7db77 (diff)
parent609aae0684909d782d087ebbb26933866b8f04d1 (diff)
downloadGT5-Unofficial-991c62f552f30c3916ecee191f41acfb8e06fd34.tar.gz
GT5-Unofficial-991c62f552f30c3916ecee191f41acfb8e06fd34.tar.bz2
GT5-Unofficial-991c62f552f30c3916ecee191f41acfb8e06fd34.zip
Merge in KekzTech with history
git-subtree-dir: kekztech git-subtree-mainline: 9bdc1ec39b62c303d6bb295f2cfc565b85c7db77 git-subtree-split: 609aae0684909d782d087ebbb26933866b8f04d1
-rw-r--r--kekztech/.editorconfig19
-rw-r--r--kekztech/.git-blame-ignore-revs2
-rw-r--r--kekztech/.gitattributes44
-rw-r--r--kekztech/.github/workflows/build-and-test.yml13
-rw-r--r--kekztech/.github/workflows/release-tags.yml14
-rw-r--r--kekztech/.gitignore38
-rw-r--r--kekztech/CODEOWNERS3
-rw-r--r--kekztech/LICENSE21
-rw-r--r--kekztech/README.md11
-rw-r--r--kekztech/build.gradle5
-rw-r--r--kekztech/dependencies.gradle7
-rw-r--r--kekztech/gradle.properties192
-rw-r--r--kekztech/gradle/wrapper/gradle-wrapper.jarbin0 -> 43453 bytes
-rw-r--r--kekztech/gradle/wrapper/gradle-wrapper.properties7
-rwxr-xr-xkekztech/gradlew249
-rw-r--r--kekztech/gradlew.bat92
-rw-r--r--kekztech/jitpack.yml2
-rw-r--r--kekztech/repositories.gradle4
-rw-r--r--kekztech/screenshots/SOFC_Display.jpegbin0 -> 109788 bytes
-rw-r--r--kekztech/screenshots/TFFT_Display.jpegbin0 -> 94414 bytes
-rw-r--r--kekztech/settings.gradle23
-rw-r--r--kekztech/src/main/java/client/ClientProxy.java19
-rw-r--r--kekztech/src/main/java/client/gui/KT_UITextures.java17
-rw-r--r--kekztech/src/main/java/common/Blocks.java59
-rw-r--r--kekztech/src/main/java/common/CommonProxy.java42
-rw-r--r--kekztech/src/main/java/common/Recipes.java141
-rw-r--r--kekztech/src/main/java/common/Researches.java71
-rw-r--r--kekztech/src/main/java/common/TileEntities.java43
-rw-r--r--kekztech/src/main/java/common/blocks/BaseGTUpdateableBlock.java57
-rw-r--r--kekztech/src/main/java/common/blocks/Block_GDCUnit.java29
-rw-r--r--kekztech/src/main/java/common/blocks/Block_IchorJar.java230
-rw-r--r--kekztech/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java173
-rw-r--r--kekztech/src/main/java/common/blocks/Block_LargeHexPlate.java65
-rw-r--r--kekztech/src/main/java/common/blocks/Block_TFFTStorageField.java92
-rw-r--r--kekztech/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java252
-rw-r--r--kekztech/src/main/java/common/blocks/Block_YSZUnit.java29
-rw-r--r--kekztech/src/main/java/common/itemBlocks/IB_IchorJar.java27
-rw-r--r--kekztech/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java190
-rw-r--r--kekztech/src/main/java/common/itemBlocks/IB_TFFTStorageField.java63
-rw-r--r--kekztech/src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java27
-rw-r--r--kekztech/src/main/java/common/items/ErrorItem.java48
-rw-r--r--kekztech/src/main/java/common/items/MetaItem_CraftingComponent.java89
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/AlloySmelter.java32
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/Assembler.java295
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/AssemblyLine.java227
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/ChemicalReactor.java30
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/Crafting.java72
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/FormingPress.java29
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/Mixer.java48
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java137
-rw-r--r--kekztech/src/main/java/common/recipeLoaders/Unpackager.java200
-rw-r--r--kekztech/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java1189
-rw-r--r--kekztech/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java221
-rw-r--r--kekztech/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java222
-rw-r--r--kekztech/src/main/java/common/tileentities/GTMTE_TFFT.java787
-rw-r--r--kekztech/src/main/java/common/tileentities/GTMTE_TFFTHatch.java271
-rw-r--r--kekztech/src/main/java/common/tileentities/TE_IchorJar.java10
-rw-r--r--kekztech/src/main/java/common/tileentities/TE_IchorVoidJar.java10
-rw-r--r--kekztech/src/main/java/common/tileentities/TE_ThaumiumReinforcedJar.java10
-rw-r--r--kekztech/src/main/java/common/tileentities/TE_ThaumiumReinforcedVoidJar.java10
-rw-r--r--kekztech/src/main/java/kekztech/Items.java70
-rw-r--r--kekztech/src/main/java/kekztech/KekzCore.java83
-rw-r--r--kekztech/src/main/java/kekztech/ServerProxy.java6
-rw-r--r--kekztech/src/main/java/util/Util.java93
-rw-r--r--kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT.pngbin0 -> 238 bytes
-rw-r--r--kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.pngbin0 -> 412 bytes
-rw-r--r--kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png.mcmeta5
-rw-r--r--kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.pngbin0 -> 255 bytes
-rw-r--r--kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png.mcmeta6
-rw-r--r--kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_HATCH.pngbin0 -> 113 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/lang/en_US.lang109
-rw-r--r--kekztech/src/main/resources/assets/kekztech/lang/zh_CN.lang93
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/GDCCeramicElectrolyteUnit.pngbin0 -> 425 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/InsanelyUltimateEnergyUnit_side.pngbin0 -> 448 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/InsanelyUltimateEnergyUnit_top.pngbin0 -> 277 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LSCBase_side.pngbin0 -> 251 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LSCBase_top.pngbin0 -> 266 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_side.pngbin0 -> 279 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_top.pngbin0 -> 296 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_side.pngbin0 -> 280 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_top.pngbin0 -> 296 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_side.pngbin0 -> 279 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_top.pngbin0 -> 295 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_side.pngbin0 -> 279 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_top.pngbin0 -> 296 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit6_side.pngbin0 -> 279 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit6_top.pngbin0 -> 259 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit7_side.pngbin0 -> 279 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit7_top.pngbin0 -> 276 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.pngbin0 -> 212902 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.pngbin0 -> 194679 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.pngbin0 -> 188252 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.pngbin0 -> 202085 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.pngbin0 -> 203604 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.pngbin0 -> 202723 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.pngbin0 -> 184021 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.pngbin0 -> 185686 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.pngbin0 -> 183484 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.pngbin0 -> 189460 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.pngbin0 -> 205600 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.pngbin0 -> 197674 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.pngbin0 -> 193911 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.pngbin0 -> 205189 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.pngbin0 -> 198508 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.pngbin0 -> 202600 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/MegaUltimateEnergyUnit_side.pngbin0 -> 492 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/MegaUltimateEnergyUnit_top.pngbin0 -> 243 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_side.pngbin0 -> 488 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_top.pngbin0 -> 227 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTCasing.pngbin0 -> 320 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock1.pngbin0 -> 156 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.pngbin0 -> 887 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png.mcmeta45
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock2.pngbin0 -> 156 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock3.pngbin0 -> 156 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock4.pngbin0 -> 156 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock5.pngbin0 -> 156 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock6.pngbin0 -> 156 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock7.pngbin0 -> 161 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock8.pngbin0 -> 156 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock9.pngbin0 -> 156 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/UltimateEnergyUnit_side.pngbin0 -> 274 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/UltimateEnergyUnit_top.pngbin0 -> 241 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/YSZCeramicElectrolyteUnit.pngbin0 -> 423 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_bottom.pngbin0 -> 384 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side.pngbin0 -> 465 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side_void.pngbin0 -> 467 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top.pngbin0 -> 547 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top_void.pngbin0 -> 560 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_bottom.pngbin0 -> 566 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_side.pngbin0 -> 718 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_side_void.pngbin0 -> 717 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_top.pngbin0 -> 670 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_top_void.pngbin0 -> 669 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_off.pngbin0 -> 703 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_off_disabled.pngbin0 -> 743 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_on.pngbin0 -> 644 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/items/CeriaDust.pngbin0 -> 263 bytes
-rw-r--r--kekztech/src/main/resources/assets/kekztech/textures/items/Error.pngbin0 -> 6206 bytes
-rw-r--r--