From e6ddc31395e2f53e4b08fc4cf7091cf2744a23e2 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 25 May 2024 13:42:15 +0100 Subject: Move kekztech sources --- kekztech/src/main/java/client/ClientProxy.java | 19 - .../src/main/java/client/gui/KT_UITextures.java | 17 - kekztech/src/main/java/common/Blocks.java | 59 - kekztech/src/main/java/common/CommonProxy.java | 42 - kekztech/src/main/java/common/Recipes.java | 141 --- kekztech/src/main/java/common/Researches.java | 71 -- kekztech/src/main/java/common/TileEntities.java | 43 - .../java/common/blocks/BaseGTUpdateableBlock.java | 57 - .../src/main/java/common/blocks/Block_GDCUnit.java | 29 - .../main/java/common/blocks/Block_IchorJar.java | 230 ---- .../common/blocks/Block_LapotronicEnergyUnit.java | 173 --- .../java/common/blocks/Block_LargeHexPlate.java | 65 -- .../java/common/blocks/Block_TFFTStorageField.java | 92 -- .../common/blocks/Block_ThaumiumReinforcedJar.java | 252 ----- .../src/main/java/common/blocks/Block_YSZUnit.java | 29 - .../main/java/common/itemBlocks/IB_IchorJar.java | 27 - .../common/itemBlocks/IB_LapotronicEnergyUnit.java | 190 ---- .../common/itemBlocks/IB_TFFTStorageField.java | 63 -- .../itemBlocks/IB_ThaumiumReinforcedJar.java | 27 - kekztech/src/main/java/common/items/ErrorItem.java | 48 - .../common/items/MetaItem_CraftingComponent.java | 89 -- .../java/common/recipeLoaders/AlloySmelter.java | 32 - .../main/java/common/recipeLoaders/Assembler.java | 295 ----- .../java/common/recipeLoaders/AssemblyLine.java | 227 ---- .../java/common/recipeLoaders/ChemicalReactor.java | 30 - .../main/java/common/recipeLoaders/Crafting.java | 72 -- .../java/common/recipeLoaders/FormingPress.java | 29 - .../src/main/java/common/recipeLoaders/Mixer.java | 48 - .../recipeLoaders/ResearchableAssemblyLine.java | 137 --- .../main/java/common/recipeLoaders/Unpackager.java | 200 ---- .../GTMTE_LapotronicSuperCapacitor.java | 1189 -------------------- .../common/tileentities/GTMTE_SOFuelCellMK1.java | 221 ---- .../common/tileentities/GTMTE_SOFuelCellMK2.java | 222 ---- .../main/java/common/tileentities/GTMTE_TFFT.java | 787 ------------- .../java/common/tileentities/GTMTE_TFFTHatch.java | 271 ----- .../main/java/common/tileentities/TE_IchorJar.java | 10 - .../java/common/tileentities/TE_IchorVoidJar.java | 10 - .../tileentities/TE_ThaumiumReinforcedJar.java | 10 - .../tileentities/TE_ThaumiumReinforcedVoidJar.java | 10 - kekztech/src/main/java/kekztech/Items.java | 70 -- kekztech/src/main/java/kekztech/KekzCore.java | 83 -- kekztech/src/main/java/kekztech/ServerProxy.java | 6 - kekztech/src/main/java/util/Util.java | 93 -- .../gregtech/textures/blocks/iconsets/TFFT.png | Bin 238 -> 0 bytes .../textures/blocks/iconsets/TFFT_ACTIVE.png | Bin 412 -> 0 bytes .../blocks/iconsets/TFFT_ACTIVE.png.mcmeta | 5 - .../textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png | Bin 255 -> 0 bytes .../blocks/iconsets/TFFT_ACTIVE_GLOW.png.mcmeta | 6 - .../textures/blocks/iconsets/TFFT_HATCH.png | Bin 113 -> 0 bytes .../main/resources/assets/kekztech/lang/en_US.lang | 109 -- .../main/resources/assets/kekztech/lang/zh_CN.lang | 93 -- .../textures/blocks/GDCCeramicElectrolyteUnit.png | Bin 425 -> 0 bytes .../blocks/InsanelyUltimateEnergyUnit_side.png | Bin 448 -> 0 bytes .../blocks/InsanelyUltimateEnergyUnit_top.png | Bin 277 -> 0 bytes .../kekztech/textures/blocks/LSCBase_side.png | Bin 251 -> 0 bytes .../kekztech/textures/blocks/LSCBase_top.png | Bin 266 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit1_side.png | Bin 279 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit1_top.png | Bin 296 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit2_side.png | Bin 280 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit2_top.png | Bin 296 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit3_side.png | Bin 279 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit3_top.png | Bin 295 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit4_side.png | Bin 279 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit4_top.png | Bin 296 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit6_side.png | Bin 279 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit6_top.png | Bin 259 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit7_side.png | Bin 279 -> 0 bytes .../textures/blocks/LapotronicEnergyUnit7_top.png | Bin 276 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_0_0.png | Bin 212902 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_0_1.png | Bin 194679 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_0_2.png | Bin 188252 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_0_3.png | Bin 202085 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_1_0.png | Bin 203604 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_1_1.png | Bin 202723 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_1_2.png | Bin 184021 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_1_3.png | Bin 185686 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_2_0.png | Bin 183484 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_2_1.png | Bin 189460 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_2_2.png | Bin 205600 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_2_3.png | Bin 197674 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_3_0.png | Bin 193911 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_3_1.png | Bin 205189 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_3_2.png | Bin 198508 -> 0 bytes .../kekztech/textures/blocks/LargeHexTile_3_3.png | Bin 202600 -> 0 bytes .../blocks/MegaUltimateEnergyUnit_side.png | Bin 492 -> 0 bytes .../textures/blocks/MegaUltimateEnergyUnit_top.png | Bin 243 -> 0 bytes .../blocks/ReallyUltimateEnergyUnit_side.png | Bin 488 -> 0 bytes .../blocks/ReallyUltimateEnergyUnit_top.png | Bin 227 -> 0 bytes .../assets/kekztech/textures/blocks/TFFTCasing.png | Bin 320 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock1.png | Bin 156 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock10.png | Bin 887 -> 0 bytes .../blocks/TFFTStorageFieldBlock10.png.mcmeta | 45 - .../textures/blocks/TFFTStorageFieldBlock2.png | Bin 156 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock3.png | Bin 156 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock4.png | Bin 156 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock5.png | Bin 156 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock6.png | Bin 156 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock7.png | Bin 161 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock8.png | Bin 156 -> 0 bytes .../textures/blocks/TFFTStorageFieldBlock9.png | Bin 156 -> 0 bytes .../textures/blocks/UltimateEnergyUnit_side.png | Bin 274 -> 0 bytes .../textures/blocks/UltimateEnergyUnit_top.png | Bin 241 -> 0 bytes .../textures/blocks/YSZCeramicElectrolyteUnit.png | Bin 423 -> 0 bytes .../kekztech/textures/blocks/ichor_jar_bottom.png | Bin 384 -> 0 bytes .../kekztech/textures/blocks/ichor_jar_side.png | Bin 465 -> 0 bytes .../textures/blocks/ichor_jar_side_void.png | Bin 467 -> 0 bytes .../kekztech/textures/blocks/ichor_jar_top.png | Bin 547 -> 0 bytes .../textures/blocks/ichor_jar_top_void.png | Bin 560 -> 0 bytes .../textures/blocks/thaumreinforced_jar_bottom.png | Bin 566 -> 0 bytes .../textures/blocks/thaumreinforced_jar_side.png | Bin 718 -> 0 bytes .../blocks/thaumreinforced_jar_side_void.png | Bin 717 -> 0 bytes .../textures/blocks/thaumreinforced_jar_top.png | Bin 670 -> 0 bytes .../blocks/thaumreinforced_jar_top_void.png | Bin 669 -> 0 bytes .../textures/gui/overlay_button/wireless_off.png | Bin 703 -> 0 bytes .../gui/overlay_button/wireless_off_disabled.png | Bin 743 -> 0 bytes .../textures/gui/overlay_button/wireless_on.png | Bin 644 -> 0 bytes .../assets/kekztech/textures/items/CeriaDust.png | Bin 263 -> 0 bytes .../assets/kekztech/textures/items/Error.png | Bin 6206 -> 0 bytes .../kekztech/textures/items/GDCCeramicDust.png | Bin 254 -> 0 bytes .../kekztech/textures/items/GDCCeramicPlate.png | Bin 281 -> 0 bytes .../kekztech/textures/items/YSZCeramicDust.png | Bin 254 -> 0 bytes .../kekztech/textures/items/YSZCeramicPlate.png | Bin 277 -> 0 bytes .../assets/kekztech/textures/items/YttriaDust.png | Bin 252 -> 0 bytes .../kekztech/textures/items/ZirconiaDust.png | Bin 253 -> 0 bytes src/main/java/client/ClientProxy.java | 19 + src/main/java/client/gui/KT_UITextures.java | 17 + src/main/java/common/Blocks.java | 59 + src/main/java/common/CommonProxy.java | 42 + src/main/java/common/Recipes.java | 141 +++ src/main/java/common/Researches.java | 71 ++ src/main/java/common/TileEntities.java | 43 + .../java/common/blocks/BaseGTUpdateableBlock.java | 57 + src/main/java/common/blocks/Block_GDCUnit.java | 29 + src/main/java/common/blocks/Block_IchorJar.java | 230 ++++ .../common/blocks/Block_LapotronicEnergyUnit.java | 173 +++ .../java/common/blocks/Block_LargeHexPlate.java | 65 ++ .../java/common/blocks/Block_TFFTStorageField.java | 92 ++ .../common/blocks/Block_ThaumiumReinforcedJar.java | 252 +++++ src/main/java/common/blocks/Block_YSZUnit.java | 29 + src/main/java/common/itemBlocks/IB_IchorJar.java | 27 + .../common/itemBlocks/IB_LapotronicEnergyUnit.java | 190 ++++ .../common/itemBlocks/IB_TFFTStorageField.java | 63 ++ .../itemBlocks/IB_ThaumiumReinforcedJar.java | 27 + src/main/java/common/items/ErrorItem.java | 48 + .../common/items/MetaItem_CraftingComponent.java | 89 ++ .../java/common/recipeLoaders/AlloySmelter.java | 32 + src/main/java/common/recipeLoaders/Assembler.java | 295 +++++ .../java/common/recipeLoaders/AssemblyLine.java | 227 ++++ .../java/common/recipeLoaders/ChemicalReactor.java | 30 + src/main/java/common/recipeLoaders/Crafting.java | 72 ++ .../java/common/recipeLoaders/FormingPress.java | 29 + src/main/java/common/recipeLoaders/Mixer.java | 48 + .../recipeLoaders/ResearchableAssemblyLine.java | 137 +++ src/main/java/common/recipeLoaders/Unpackager.java | 200 ++++ .../GTMTE_LapotronicSuperCapacitor.java | 1189 ++++++++++++++++++++ .../common/tileentities/GTMTE_SOFuelCellMK1.java | 221 ++++ .../common/tileentities/GTMTE_SOFuelCellMK2.java | 222 ++++ src/main/java/common/tileentities/GTMTE_TFFT.java | 787 +++++++++++++ .../java/common/tileentities/GTMTE_TFFTHatch.java | 271 +++++ src/main/java/common/tileentities/TE_IchorJar.java | 10 + .../java/common/tileentities/TE_IchorVoidJar.java | 10 + .../tileentities/TE_ThaumiumReinforcedJar.java | 10 + .../tileentities/TE_ThaumiumReinforcedVoidJar.java | 10 + src/main/java/kekztech/Items.java | 70 ++ src/main/java/kekztech/KekzCore.java | 83 ++ src/main/java/kekztech/ServerProxy.java | 6 + src/main/java/util/Util.java | 93 ++ .../gregtech/textures/blocks/iconsets/TFFT.png | Bin 0 -> 238 bytes .../textures/blocks/iconsets/TFFT_ACTIVE.png | Bin 0 -> 412 bytes .../blocks/iconsets/TFFT_ACTIVE.png.mcmeta | 5 + .../textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png | Bin 0 -> 255 bytes .../blocks/iconsets/TFFT_ACTIVE_GLOW.png.mcmeta | 6 + .../textures/blocks/iconsets/TFFT_HATCH.png | Bin 0 -> 113 bytes src/main/resources/assets/kekztech/lang/en_US.lang | 109 ++ src/main/resources/assets/kekztech/lang/zh_CN.lang | 93 ++ .../textures/blocks/GDCCeramicElectrolyteUnit.png | Bin 0 -> 425 bytes .../blocks/InsanelyUltimateEnergyUnit_side.png | Bin 0 -> 448 bytes .../blocks/InsanelyUltimateEnergyUnit_top.png | Bin 0 -> 277 bytes .../kekztech/textures/blocks/LSCBase_side.png | Bin 0 -> 251 bytes .../kekztech/textures/blocks/LSCBase_top.png | Bin 0 -> 266 bytes .../textures/blocks/LapotronicEnergyUnit1_side.png | Bin 0 -> 279 bytes .../textures/blocks/LapotronicEnergyUnit1_top.png | Bin 0 -> 296 bytes .../textures/blocks/LapotronicEnergyUnit2_side.png | Bin 0 -> 280 bytes .../textures/blocks/LapotronicEnergyUnit2_top.png | Bin 0 -> 296 bytes .../textures/blocks/LapotronicEnergyUnit3_side.png | Bin 0 -> 279 bytes .../textures/blocks/LapotronicEnergyUnit3_top.png | Bin 0 -> 295 bytes .../textures/blocks/LapotronicEnergyUnit4_side.png | Bin 0 -> 279 bytes .../textures/blocks/LapotronicEnergyUnit4_top.png | Bin 0 -> 296 bytes .../textures/blocks/LapotronicEnergyUnit6_side.png | Bin 0 -> 279 bytes .../textures/blocks/LapotronicEnergyUnit6_top.png | Bin 0 -> 259 bytes .../textures/blocks/LapotronicEnergyUnit7_side.png | Bin 0 -> 279 bytes .../textures/blocks/LapotronicEnergyUnit7_top.png | Bin 0 -> 276 bytes .../kekztech/textures/blocks/LargeHexTile_0_0.png | Bin 0 -> 212902 bytes .../kekztech/textures/blocks/LargeHexTile_0_1.png | Bin 0 -> 194679 bytes .../kekztech/textures/blocks/LargeHexTile_0_2.png | Bin 0 -> 188252 bytes .../kekztech/textures/blocks/LargeHexTile_0_3.png | Bin 0 -> 202085 bytes .../kekztech/textures/blocks/LargeHexTile_1_0.png | Bin 0 -> 203604 bytes .../kekztech/textures/blocks/LargeHexTile_1_1.png | Bin 0 -> 202723 bytes .../kekztech/textures/blocks/LargeHexTile_1_2.png | Bin 0 -> 184021 bytes .../kekztech/textures/blocks/LargeHexTile_1_3.png | Bin 0 -> 185686 bytes .../kekztech/textures/blocks/LargeHexTile_2_0.png | Bin 0 -> 183484 bytes .../kekztech/textures/blocks/LargeHexTile_2_1.png | Bin 0 -> 189460 bytes .../kekztech/textures/blocks/LargeHexTile_2_2.png | Bin 0 -> 205600 bytes .../kekztech/textures/blocks/LargeHexTile_2_3.png | Bin 0 -> 197674 bytes .../kekztech/textures/blocks/LargeHexTile_3_0.png | Bin 0 -> 193911 bytes .../kekztech/textures/blocks/LargeHexTile_3_1.png | Bin 0 -> 205189 bytes .../kekztech/textures/blocks/LargeHexTile_3_2.png | Bin 0 -> 198508 bytes .../kekztech/textures/blocks/LargeHexTile_3_3.png | Bin 0 -> 202600 bytes .../blocks/MegaUltimateEnergyUnit_side.png | Bin 0 -> 492 bytes .../textures/blocks/MegaUltimateEnergyUnit_top.png | Bin 0 -> 243 bytes .../blocks/ReallyUltimateEnergyUnit_side.png | Bin 0 -> 488 bytes .../blocks/ReallyUltimateEnergyUnit_top.png | Bin 0 -> 227 bytes .../assets/kekztech/textures/blocks/TFFTCasing.png | Bin 0 -> 320 bytes .../textures/blocks/TFFTStorageFieldBlock1.png | Bin 0 -> 156 bytes .../textures/blocks/TFFTStorageFieldBlock10.png | Bin 0 -> 887 bytes .../blocks/TFFTStorageFieldBlock10.png.mcmeta | 45 + .../textures/blocks/TFFTStorageFieldBlock2.png | Bin 0 -> 156 bytes .../textures/blocks/TFFTStorageFieldBlock3.png | Bin 0 -> 156 bytes .../textures/blocks/TFFTStorageFieldBlock4.png | Bin 0 -> 156 bytes .../textures/blocks/TFFTStorageFieldBlock5.png | Bin 0 -> 156 bytes .../textures/blocks/TFFTStorageFieldBlock6.png | Bin 0 -> 156 bytes .../textures/blocks/TFFTStorageFieldBlock7.png | Bin 0 -> 161 bytes .../textures/blocks/TFFTStorageFieldBlock8.png | Bin 0 -> 156 bytes .../textures/blocks/TFFTStorageFieldBlock9.png | Bin 0 -> 156 bytes .../textures/blocks/UltimateEnergyUnit_side.png | Bin 0 -> 274 bytes .../textures/blocks/UltimateEnergyUnit_top.png | Bin 0 -> 241 bytes .../textures/blocks/YSZCeramicElectrolyteUnit.png | Bin 0 -> 423 bytes .../kekztech/textures/blocks/ichor_jar_bottom.png | Bin 0 -> 384 bytes .../kekztech/textures/blocks/ichor_jar_side.png | Bin 0 -> 465 bytes .../textures/blocks/ichor_jar_side_void.png | Bin 0 -> 467 bytes .../kekztech/textures/blocks/ichor_jar_top.png | Bin 0 -> 547 bytes .../textures/blocks/ichor_jar_top_void.png | Bin 0 -> 560 bytes .../textures/blocks/thaumreinforced_jar_bottom.png | Bin 0 -> 566 bytes .../textures/blocks/thaumreinforced_jar_side.png | Bin 0 -> 718 bytes .../blocks/thaumreinforced_jar_side_void.png | Bin 0 -> 717 bytes .../textures/blocks/thaumreinforced_jar_top.png | Bin 0 -> 670 bytes .../blocks/thaumreinforced_jar_top_void.png | Bin 0 -> 669 bytes .../textures/gui/overlay_button/wireless_off.png | Bin 0 -> 703 bytes .../gui/overlay_button/wireless_off_disabled.png | Bin 0 -> 743 bytes .../textures/gui/overlay_button/wireless_on.png | Bin 0 -> 644 bytes .../assets/kekztech/textures/items/CeriaDust.png | Bin 0 -> 263 bytes .../assets/kekztech/textures/items/Error.png | Bin 0 -> 6206 bytes .../kekztech/textures/items/GDCCeramicDust.png | Bin 0 -> 254 bytes .../kekztech/textures/items/GDCCeramicPlate.png | Bin 0 -> 281 bytes .../kekztech/textures/items/YSZCeramicDust.png | Bin 0 -> 254 bytes .../kekztech/textures/items/YSZCeramicPlate.png | Bin 0 -> 277 bytes .../assets/kekztech/textures/items/YttriaDust.png | Bin 0 -> 252 bytes .../kekztech/textures/items/ZirconiaDust.png | Bin 0 -> 253 bytes 248 files changed, 6073 insertions(+), 6073 deletions(-) delete mode 100644 kekztech/src/main/java/client/ClientProxy.java delete mode 100644 kekztech/src/main/java/client/gui/KT_UITextures.java delete mode 100644 kekztech/src/main/java/common/Blocks.java delete mode 100644 kekztech/src/main/java/common/CommonProxy.java delete mode 100644 kekztech/src/main/java/common/Recipes.java delete mode 100644 kekztech/src/main/java/common/Researches.java delete mode 100644 kekztech/src/main/java/common/TileEntities.java delete mode 100644 kekztech/src/main/java/common/blocks/BaseGTUpdateableBlock.java delete mode 100644 kekztech/src/main/java/common/blocks/Block_GDCUnit.java delete mode 100644 kekztech/src/main/java/common/blocks/Block_IchorJar.java delete mode 100644 kekztech/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java delete mode 100644 kekztech/src/main/java/common/blocks/Block_LargeHexPlate.java delete mode 100644 kekztech/src/main/java/common/blocks/Block_TFFTStorageField.java delete mode 100644 kekztech/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java delete mode 100644 kekztech/src/main/java/common/blocks/Block_YSZUnit.java delete mode 100644 kekztech/src/main/java/common/itemBlocks/IB_IchorJar.java delete mode 100644 kekztech/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java delete mode 100644 kekztech/src/main/java/common/itemBlocks/IB_TFFTStorageField.java delete mode 100644 kekztech/src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java delete mode 100644 kekztech/src/main/java/common/items/ErrorItem.java delete mode 100644 kekztech/src/main/java/common/items/MetaItem_CraftingComponent.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/AlloySmelter.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/Assembler.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/AssemblyLine.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/ChemicalReactor.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/Crafting.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/FormingPress.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/Mixer.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java delete mode 100644 kekztech/src/main/java/common/recipeLoaders/Unpackager.java delete mode 100644 kekztech/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java delete mode 100644 kekztech/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java delete mode 100644 kekztech/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java delete mode 100644 kekztech/src/main/java/common/tileentities/GTMTE_TFFT.java delete mode 100644 kekztech/src/main/java/common/tileentities/GTMTE_TFFTHatch.java delete mode 100644 kekztech/src/main/java/common/tileentities/TE_IchorJar.java delete mode 100644 kekztech/src/main/java/common/tileentities/TE_IchorVoidJar.java delete mode 100644 kekztech/src/main/java/common/tileentities/TE_ThaumiumReinforcedJar.java delete mode 100644 kekztech/src/main/java/common/tileentities/TE_ThaumiumReinforcedVoidJar.java delete mode 100644 kekztech/src/main/java/kekztech/Items.java delete mode 100644 kekztech/src/main/java/kekztech/KekzCore.java delete mode 100644 kekztech/src/main/java/kekztech/ServerProxy.java delete mode 100644 kekztech/src/main/java/util/Util.java delete mode 100644 kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT.png delete mode 100644 kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png delete mode 100644 kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png.mcmeta delete mode 100644 kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png delete mode 100644 kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png.mcmeta delete mode 100644 kekztech/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_HATCH.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/lang/en_US.lang delete mode 100644 kekztech/src/main/resources/assets/kekztech/lang/zh_CN.lang delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/GDCCeramicElectrolyteUnit.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/InsanelyUltimateEnergyUnit_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/InsanelyUltimateEnergyUnit_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LSCBase_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LSCBase_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit6_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit6_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit7_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit7_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/MegaUltimateEnergyUnit_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/MegaUltimateEnergyUnit_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTCasing.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock1.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png.mcmeta delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock2.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock3.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock4.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock5.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock6.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock7.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock8.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock9.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/UltimateEnergyUnit_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/UltimateEnergyUnit_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/YSZCeramicElectrolyteUnit.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_bottom.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side_void.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top_void.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_bottom.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_side.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_side_void.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_top.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_top_void.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_off.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_off_disabled.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_on.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/items/CeriaDust.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/items/Error.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/items/GDCCeramicDust.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/items/GDCCeramicPlate.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/items/YSZCeramicDust.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/items/YSZCeramicPlate.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/items/YttriaDust.png delete mode 100644 kekztech/src/main/resources/assets/kekztech/textures/items/ZirconiaDust.png create mode 100644 src/main/java/client/ClientProxy.java create mode 100644 src/main/java/client/gui/KT_UITextures.java create mode 100644 src/main/java/common/Blocks.java create mode 100644 src/main/java/common/CommonProxy.java create mode 100644 src/main/java/common/Recipes.java create mode 100644 src/main/java/common/Researches.java create mode 100644 src/main/java/common/TileEntities.java create mode 100644 src/main/java/common/blocks/BaseGTUpdateableBlock.java create mode 100644 src/main/java/common/blocks/Block_GDCUnit.java create mode 100644 src/main/java/common/blocks/Block_IchorJar.java create mode 100644 src/main/java/common/blocks/Block_LapotronicEnergyUnit.java create mode 100644 src/main/java/common/blocks/Block_LargeHexPlate.java create mode 100644 src/main/java/common/blocks/Block_TFFTStorageField.java create mode 100644 src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java create mode 100644 src/main/java/common/blocks/Block_YSZUnit.java create mode 100644 src/main/java/common/itemBlocks/IB_IchorJar.java create mode 100644 src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java create mode 100644 src/main/java/common/itemBlocks/IB_TFFTStorageField.java create mode 100644 src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java create mode 100644 src/main/java/common/items/ErrorItem.java create mode 100644 src/main/java/common/items/MetaItem_CraftingComponent.java create mode 100644 src/main/java/common/recipeLoaders/AlloySmelter.java create mode 100644 src/main/java/common/recipeLoaders/Assembler.java create mode 100644 src/main/java/common/recipeLoaders/AssemblyLine.java create mode 100644 src/main/java/common/recipeLoaders/ChemicalReactor.java create mode 100644 src/main/java/common/recipeLoaders/Crafting.java create mode 100644 src/main/java/common/recipeLoaders/FormingPress.java create mode 100644 src/main/java/common/recipeLoaders/Mixer.java create mode 100644 src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java create mode 100644 src/main/java/common/recipeLoaders/Unpackager.java create mode 100644 src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java create mode 100644 src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java create mode 100644 src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java create mode 100644 src/main/java/common/tileentities/GTMTE_TFFT.java create mode 100644 src/main/java/common/tileentities/GTMTE_TFFTHatch.java create mode 100644 src/main/java/common/tileentities/TE_IchorJar.java create mode 100644 src/main/java/common/tileentities/TE_IchorVoidJar.java create mode 100644 src/main/java/common/tileentities/TE_ThaumiumReinforcedJar.java create mode 100644 src/main/java/common/tileentities/TE_ThaumiumReinforcedVoidJar.java create mode 100644 src/main/java/kekztech/Items.java create mode 100644 src/main/java/kekztech/KekzCore.java create mode 100644 src/main/java/kekztech/ServerProxy.java create mode 100644 src/main/java/util/Util.java create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_HATCH.png create mode 100644 src/main/resources/assets/kekztech/lang/en_US.lang create mode 100644 src/main/resources/assets/kekztech/lang/zh_CN.lang create mode 100644 src/main/resources/assets/kekztech/textures/blocks/GDCCeramicElectrolyteUnit.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/InsanelyUltimateEnergyUnit_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/InsanelyUltimateEnergyUnit_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LSCBase_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LSCBase_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit1_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit2_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit3_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit4_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit6_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit6_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit7_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LapotronicEnergyUnit7_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/MegaUltimateEnergyUnit_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/MegaUltimateEnergyUnit_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTCasing.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png.mcmeta create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock3.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock4.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock5.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock6.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock7.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock8.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock9.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/UltimateEnergyUnit_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/UltimateEnergyUnit_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/YSZCeramicElectrolyteUnit.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/ichor_jar_bottom.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side_void.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top_void.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_bottom.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_side.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_side_void.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_top.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/thaumreinforced_jar_top_void.png create mode 100644 src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_off.png create mode 100644 src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_off_disabled.png create mode 100644 src/main/resources/assets/kekztech/textures/gui/overlay_button/wireless_on.png create mode 100644 src/main/resources/assets/kekztech/textures/items/CeriaDust.png create mode 100644 src/main/resources/assets/kekztech/textures/items/Error.png create mode 100644 src/main/resources/assets/kekztech/textures/items/GDCCeramicDust.png create mode 100644 src/main/resources/assets/kekztech/textures/items/GDCCeramicPlate.png create mode 100644 src/main/resources/assets/kekztech/textures/items/YSZCeramicDust.png create mode 100644 src/main/resources/assets/kekztech/textures/items/YSZCeramicPlate.png create mode 100644 src/main/resources/assets/kekztech/textures/items/YttriaDust.png create mode 100644 src/main/resources/assets/kekztech/textures/items/ZirconiaDust.png diff --git a/kekztech/src/main/java/client/ClientProxy.java b/kekztech/src/main/java/client/ClientProxy.java deleted file mode 100644 index 9dfaea0d33..0000000000 --- a/kekztech/src/main/java/client/ClientProxy.java +++ /dev/null @@ -1,19 +0,0 @@ -package client; - -import common.CommonProxy; - -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; - -public class ClientProxy extends CommonProxy { - - @Override - public void preInit(final FMLPreInitializationEvent e) { - super.preInit(e); - } - - @Override - public void init(final FMLInitializationEvent e) { - super.init(e); - } -} diff --git a/kekztech/src/main/java/client/gui/KT_UITextures.java b/kekztech/src/main/java/client/gui/KT_UITextures.java deleted file mode 100644 index 6f28a0280b..0000000000 --- a/kekztech/src/main/java/client/gui/KT_UITextures.java +++ /dev/null @@ -1,17 +0,0 @@ -package client.gui; - -import com.gtnewhorizons.modularui.api.drawable.UITexture; - -import kekztech.KekzCore; - -public class KT_UITextures { - - public static final UITexture OVERLAY_BUTTON_WIRELESS_ON = UITexture - .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_on"); - - public static final UITexture OVERLAY_BUTTON_WIRELESS_OFF = UITexture - .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_off"); - - public static final UITexture OVERLAY_BUTTON_WIRELESS_OFF_DISABLED = UITexture - .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_off_disabled"); -} diff --git a/kekztech/src/main/java/common/Blocks.java b/kekztech/src/main/java/common/Blocks.java deleted file mode 100644 index 4003e8e9e4..0000000000 --- a/kekztech/src/main/java/common/Blocks.java +++ /dev/null @@ -1,59 +0,0 @@ -package common; - -import net.minecraft.block.Block; - -import common.blocks.Block_GDCUnit; -import common.blocks.Block_IchorJar; -import common.blocks.Block_LapotronicEnergyUnit; -import common.blocks.Block_LargeHexPlate; -import common.blocks.Block_TFFTStorageField; -import common.blocks.Block_ThaumiumReinforcedJar; -import common.blocks.Block_YSZUnit; - -import kekztech.KekzCore; - -public class Blocks { - - public static Block yszUnit; - public static Block gdcUnit; - public static Block tfftStorageField; - public static Block jarThaumiumReinforced; - public static Block jarIchor; - public static Block lscLapotronicEnergyUnit; - - public static Block largeHexPlate; - - public static void preInit() { - KekzCore.LOGGER.info("Registering blocks..."); - - registerBlocks_SOFC(); - registerBlocks_TFFT(); - registerBlocks_Jars(); - registerBlocks_LSC(); - registerBlocks_Cosmetics(); - - KekzCore.LOGGER.info("Finished registering blocks"); - } - - private static void registerBlocks_SOFC() { - yszUnit = Block_YSZUnit.registerBlock(); - gdcUnit = Block_GDCUnit.registerBlock(); - } - - private static void registerBlocks_TFFT() { - tfftStorageField = Block_TFFTStorageField.registerBlock(); - } - - private static void registerBlocks_Jars() { - jarThaumiumReinforced = Block_ThaumiumReinforcedJar.registerBlock(); - jarIchor = Block_IchorJar.registerBlock(); - } - - private static void registerBlocks_LSC() { - lscLapotronicEnergyUnit = Block_LapotronicEnergyUnit.registerBlock(); - } - - private static void registerBlocks_Cosmetics() { - largeHexPlate = Block_LargeHexPlate.registerBlock(); - } -} diff --git a/kekztech/src/main/java/common/CommonProxy.java b/kekztech/src/main/java/common/CommonProxy.java deleted file mode 100644 index 777a8af268..0000000000 --- a/kekztech/src/main/java/common/CommonProxy.java +++ /dev/null @@ -1,42 +0,0 @@ -package common; - -import common.items.ErrorItem; -import common.items.MetaItem_CraftingComponent; -import common.tileentities.GTMTE_TFFTHatch; - -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import kekztech.Items; - -public class CommonProxy { - - public void preInit(final FMLPreInitializationEvent e) { - // Items - ErrorItem.getInstance() - .registerItem(); - MetaItem_CraftingComponent.getInstance() - .registerItem(); - Items.registerOreDictNames(); - // Blocks - Blocks.preInit(); - // TileEntities - TileEntities.preInit(); - // TC Research - Researches.preInit(); - } - - public void init(final FMLInitializationEvent e) { - // GregTech Meta TileEntities - TileEntities.init(); - } - - public void postInit(final FMLPostInitializationEvent e) { - // Recipes - Recipes.postInit(); - // Research - Researches.postInit(); - - GTMTE_TFFTHatch.registerAEIntegration(); - } -} diff --git a/kekztech/src/main/java/common/Recipes.java b/kekztech/src/main/java/common/Recipes.java deleted file mode 100644 index 2560e8dc37..0000000000 --- a/kekztech/src/main/java/common/Recipes.java +++ /dev/null @@ -1,141 +0,0 @@ -package common; - -import static gregtech.api.enums.Mods.ThaumicTinkerer; - -import java.util.HashMap; - -import net.minecraft.item.ItemStack; - -import common.recipeLoaders.AlloySmelter; -import common.recipeLoaders.Assembler; -import common.recipeLoaders.AssemblyLine; -import common.recipeLoaders.ChemicalReactor; -import common.recipeLoaders.Crafting; -import common.recipeLoaders.FormingPress; -import common.recipeLoaders.Mixer; -import common.recipeLoaders.ResearchableAssemblyLine; -import common.recipeLoaders.Unpackager; - -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import kekztech.KekzCore; -import thaumcraft.api.ItemApi; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.InfusionRecipe; - -public class Recipes { - - public static final HashMap infusionRecipes = new HashMap<>(); - - public static void postInit() { - KekzCore.LOGGER.info("Registering recipes..."); - - new AlloySmelter().run(); - new Assembler().run(); - new AssemblyLine().run(); - new ChemicalReactor().run(); - new Crafting().run(); - new FormingPress().run(); - new Mixer().run(); - new ResearchableAssemblyLine().run(); - new Unpackager().run(); - - registerRecipes_Jars(); - - KekzCore.LOGGER.info("Finished registering recipes"); - } - - private static void registerRecipes_Jars() { - - // Thaumium Reinforced Jar - final ItemStack[] recipe_jarthaumiumreinforced = { - GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), }; - final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 64) - .add(Aspect.ORDER, 32) - .add(Aspect.WATER, 32) - .add(Aspect.GREED, 16) - .add(Aspect.VOID, 16) - .add(Aspect.AIR, 8); - infusionRecipes.put( - "THAUMIUMREINFORCEDJAR", - ThaumcraftApi.addInfusionCraftingRecipe( - "THAUMIUMREINFORCEDJAR", - new ItemStack(Blocks.jarThaumiumReinforced, 1, 0), - 5, - aspects_jarthaumiumreinforced, - ItemApi.getBlock("blockJar", 0), - recipe_jarthaumiumreinforced)); - // Thaumium Reinforced Void Jar - final ItemStack[] recipe_voidjarupgrade = { - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1), ItemApi.getItem("itemNugget", 5) }; - final AspectList aspects_voidjarupgrade = new AspectList().add(Aspect.VOID, 14) - .add(Aspect.MAGIC, 14) - .add(Aspect.ENTROPY, 14) - .add(Aspect.WATER, 14); - infusionRecipes.put( - "THAUMIUMREINFORCEDVOIDJAR", - ThaumcraftApi.addInfusionCraftingRecipe( - "THAUMIUMREINFORCEDJAR", - new ItemStack(Blocks.jarThaumiumReinforced, 1, 3), - 2, - aspects_voidjarupgrade, - new ItemStack(Blocks.jarThaumiumReinforced, 1, 0), - recipe_voidjarupgrade)); - - final ItemStack[] recipe_jarichor = { GT_ModHandler.getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), }; - final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 256) - .add(Aspect.ELDRITCH, 128) - .add(Aspect.ORDER, 128) - .add(Aspect.WATER, 128) - .add(Aspect.GREED, 64) - .add(Aspect.VOID, 64) - .add(Aspect.AIR, 32); - infusionRecipes.put( - "ICHORJAR", - ThaumcraftApi.addInfusionCraftingRecipe( - "ICHORJAR", - new ItemStack(Blocks.jarIchor, 1, 0), - 15, - aspects_jarichor, - ItemApi.getBlock("blockJar", 0), - recipe_jarichor)); - // Ichor Void Jar - infusionRecipes.put( - "ICHORVOIDJAR", - ThaumcraftApi.addInfusionCraftingRecipe( - "ICHORJAR", - new ItemStack(Blocks.jarIchor, 1, 3), - 5, - aspects_voidjarupgrade, - new ItemStack(Blocks.jarIchor, 1, 0), - recipe_voidjarupgrade)); - } - -} diff --git a/kekztech/src/main/java/common/Researches.java b/kekztech/src/main/java/common/Researches.java deleted file mode 100644 index 0ebe161da4..0000000000 --- a/kekztech/src/main/java/common/Researches.java +++ /dev/null @@ -1,71 +0,0 @@ -package common; - -import net.minecraft.item.ItemStack; - -import kekztech.KekzCore; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchItem; -import thaumcraft.api.research.ResearchPage; -import thaumic.tinkerer.common.research.KamiResearchItem; - -public class Researches { - - public static final String THAUMIUMREINFORCEDJAR = "THAUMIUMREINFORCEDJAR"; - public static final String ICHORJAR = "ICHORJAR"; - - public static void preInit() { - // Blacklist these researches from being a requirement to unlock TTKami - KekzCore.LOGGER.info("Blacklisting research " + THAUMIUMREINFORCEDJAR + " from /iskamiunlocked"); - KamiResearchItem.Blacklist.add(ICHORJAR); - KekzCore.LOGGER.info("Blacklisting research" + ICHORJAR + "from /iskamiunlocked"); - KamiResearchItem.Blacklist.add(ICHORJAR); - } - - public static void postInit() { - final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 3) - .add(Aspect.WATER, 3) - .add(Aspect.GREED, 3) - .add(Aspect.VOID, 3); - @SuppressWarnings("unused") - final ResearchItem jar_thaumiumreinforced = new ResearchItem( - "THAUMIUMREINFORCEDJAR", - "ALCHEMY", - aspects_jarthaumiumreinforced, - 3, - -4, - 2, - new ItemStack(Blocks.jarThaumiumReinforced, 1)) - .setPages( - new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"), - new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")), - new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDVOIDJAR")), - new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1")) - .setConcealed() - .setParents("JARLABEL") - .registerResearchItem(); - - final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 3) - .add(Aspect.ELDRITCH, 3) - .add(Aspect.WATER, 3) - .add(Aspect.GREED, 5) - .add(Aspect.VOID, 5); - @SuppressWarnings("unused") - final ResearchItem jar_ichor = new ResearchItem( - "ICHORJAR", - "ALCHEMY", - aspects_jarichor, - 2, - -5, - 3, - new ItemStack(Blocks.jarIchor, 1)) - .setPages( - new ResearchPage("kekztech.research_page.ICHORJAR.0"), - new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")), - new ResearchPage(Recipes.infusionRecipes.get("ICHORVOIDJAR"))) - .setConcealed() - .setParents("THAUMIUMREINFORCEDJAR") - .setParentsHidden("ICHOR") - .registerResearchItem(); - } -} diff --git a/kekztech/src/main/java/common/TileEntities.java b/kekztech/src/main/java/common/TileEntities.java deleted file mode 100644 index 31246ac5d8..0000000000 --- a/kekztech/src/main/java/common/TileEntities.java +++ /dev/null @@ -1,43 +0,0 @@ -package common; - -import common.tileentities.GTMTE_LapotronicSuperCapacitor; -import common.tileentities.GTMTE_SOFuelCellMK1; -import common.tileentities.GTMTE_SOFuelCellMK2; -import common.tileentities.GTMTE_TFFT; -import common.tileentities.GTMTE_TFFTHatch; -import common.tileentities.TE_IchorJar; -import common.tileentities.TE_IchorVoidJar; -import common.tileentities.TE_ThaumiumReinforcedJar; -import common.tileentities.TE_ThaumiumReinforcedVoidJar; - -import cpw.mods.fml.common.registry.GameRegistry; - -public class TileEntities { - - // Multiblock controllers - public static GTMTE_SOFuelCellMK1 sofc1; - public static GTMTE_SOFuelCellMK2 sofc2; - public static GTMTE_TFFT tfft; - public static GTMTE_LapotronicSuperCapacitor lsc; - - // Singleblocks - public static GTMTE_TFFTHatch tfftHatch; - - public static void preInit() { - GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar"); - GameRegistry.registerTileEntity(TE_ThaumiumReinforcedVoidJar.class, "kekztech_thaumiumreinforcedvoidjar"); - GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar"); - GameRegistry.registerTileEntity(TE_IchorVoidJar.class, "kekztech_ichorvoidjar"); - } - - public static void init() { - // Multiblock controllers - sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I"); - sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II"); - tfft = new GTMTE_TFFT(13104, "multimachine.tfft", "T.F.F.T"); - lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor"); - - // Singleblocks - tfftHatch = new GTMTE_TFFTHatch(13109, "machine.tffthatch", "T.F.F.T Multi I/O Hatch"); - } -} diff --git a/kekztech/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/kekztech/src/main/java/common/blocks/BaseGTUpdateableBlock.java deleted file mode 100644 index ef61327dd7..0000000000 --- a/kekztech/src/main/java/common/blocks/BaseGTUpdateableBlock.java +++ /dev/null @@ -1,57 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import gregtech.api.GregTech_API; - -/** - * Any blocks that are used as structure parts for GregTech multi machines have to inherit from this class. Otherwise - * the checkMachine() method that verifies a machine's structure won't be called correctly. - */ -public abstract class BaseGTUpdateableBlock extends Block { - - protected BaseGTUpdateableBlock(Material material) { - super(material); - GregTech_API.registerMachineBlock(this, -1); - super.setHarvestLevel("wrench", 2); - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z) { - return false; - } - - @Override - public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { - return false; - } - - @Override - public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { - return false; - } - - @Override - public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); - } - } - - @Override - public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); - } - } -} diff --git a/kekztech/src/main/java/common/blocks/Block_GDCUnit.java b/kekztech/src/main/java/common/blocks/Block_GDCUnit.java deleted file mode 100644 index 27bc95759d..0000000000 --- a/kekztech/src/main/java/common/blocks/Block_GDCUnit.java +++ /dev/null @@ -1,29 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; - -public class Block_GDCUnit extends BaseGTUpdateableBlock { - - private static final Block_GDCUnit instance = new Block_GDCUnit(); - - private Block_GDCUnit() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_gdcceramicelectrolyteunit_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit"); - instance.setHardness(5.0f); - instance.setResistance(6.0f); - GameRegistry.registerBlock(instance, blockName); - - return instance; - } -} diff --git a/kekztech/src/main/java/common/blocks/Block_IchorJar.java b/kekztech/src/main/java/common/blocks/Block_IchorJar.java deleted file mode 100644 index a82f9862f0..0000000000 --- a/kekztech/src/main/java/common/blocks/Block_IchorJar.java +++ /dev/null @@ -1,230 +0,0 @@ -package common.blocks; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; - -import common.itemBlocks.IB_IchorJar; -import common.tileentities.TE_IchorJar; -import common.tileentities.TE_IchorVoidJar; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.blocks.BlockJar; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; -import thaumcraft.common.items.ItemEssence; -import thaumcraft.common.tiles.TileJarFillable; - -public class Block_IchorJar extends BlockJar { - - private static final Block_IchorJar INSTANCE = new Block_IchorJar(); - - private Block_IchorJar() { - super(); - - super.setHardness(12.0F); - super.setResistance(3.0f); - } - - public static Block registerBlock() { - final String blockName = "kekztech_ichorjar_block"; - INSTANCE.setBlockName(blockName); - INSTANCE.setHarvestLevel("pickaxe", 3); - GameRegistry.registerBlock(INSTANCE, IB_IchorJar.class, blockName); - - return INSTANCE; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister ir) { - super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow"); - super.iconJarSide = ir.registerIcon("kekztech:ichor_jar_side"); - super.iconJarTop = ir.registerIcon("kekztech:ichor_jar_top"); - super.iconJarTopVoid = ir.registerIcon("kekztech:ichor_jar_top_void"); - super.iconJarSideVoid = ir.registerIcon("kekztech:ichor_jar_side_void"); - super.iconJarBottom = ir.registerIcon("kekztech:ichor_jar_bottom"); - } - - @Override - @SideOnly(Side.CLIENT) - @SuppressWarnings({ "unchecked" }) - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - par3List.add(new ItemStack(par1, 1, 0)); // Normal jar - par3List.add(new ItemStack(par1, 1, 3)); // Void jar - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - if (meta == 3) { - return new TE_IchorVoidJar(); - } else { - return new TE_IchorJar(); - } - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2, - float f3) { - // Call parent method to handle jar emptying, labels stuff etc - super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3); - // Interact with Essentia Phials if the player holds one - final ItemStack heldItem = player.getHeldItem(); - if (heldItem != null && heldItem.getItem() == ConfigItems.itemEssence) { - final TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TE_IchorJar) { - return dealWithPhial(world, player, x, y, z); - } else if (te instanceof TE_IchorVoidJar) { - return dealWithPhial(world, player, x, y, z); - } - } - - return true; - } - - /** - * Handle compatibility with Essentia Phials - * - * @param world Pass through from onBlockActivated() - * @param player Pass through from onBlockActivated() - * @param x Pass through from onBlockActivated() - * @param y Pass through from onBlockActivated() - * @param z Pass through from onBlockActivated() - * @return Not sure tbh - */ - private boolean dealWithPhial(World world, EntityPlayer player, int x, int y, int z) { - final TileJarFillable jarTE = (TileJarFillable) world.getTileEntity(x, y, z); - final ItemStack heldItem = player.getHeldItem(); - // Check whether to fill or to drain the phial - if (heldItem.getItemDamage() == 0) { - if (jarTE.amount >= 8) { - if (world.isRemote) { - player.swingItem(); - return false; - } -